Fixed DnD object index, created extension

PushEd.gmx/Configs/Default.config.gmx

@@ -677,20 +677,5 @@
     <option_xbone_texture_page>1024</option_xbone_texture_page>
     <option_xbone_title_id></option_xbone_title_id>
   </Options>
-  <ConfigConstants>
-    <constants number="12">
-      <constant name="PEd_POS_X">"x"</constant>
-      <constant name="PEd_POS_Y">"y"</constant>
-      <constant name="PEd_POS_Z">"z"</constant>
-      <constant name="PEd_ROT_X">"rotX"</constant>
-      <constant name="PEd_ROT_Y">"rotY"</constant>
-      <constant name="PEd_ROT_Z">"image_angle"</constant>
-      <constant name="PEd_SCALE_X">"image_xscale"</constant>
-      <constant name="PEd_SCALE_Y">"image_yscale"</constant>
-      <constant name="PEd_SCALE_Z">"scaleZ"</constant>
-      <constant name="PEd_COLOUR">"image_blend"</constant>
-      <constant name="PEd_ALPHA">"image_alpha"</constant>
-      <constant name="PEd_CREATE_DUMMY_2D">true</constant>
-    </constants>
-  </ConfigConstants>
+  <ConfigConstants/>
 </Config>

PushEd.gmx/PushEd.project.gmx

@@ -3,7 +3,9 @@
   <Configs name="configs">
     <Config>Configs\Default</Config>
   </Configs>
-  <NewExtensions/>
+  <NewExtensions>
+    <extension index="0">extensions\PushEd</extension>
+  </NewExtensions>
   <sounds name="sound"/>
   <sprites name="sprites">
     <sprites name="PushEd">
@@ -21,14 +23,18 @@
         <sprite>sprites\PEd_guiSprWarning</sprite>
         <sprite>sprites\PEd_guiSprWindowCross</sprite>
       </sprites>
-      <sprite>sprites\PEd_sprTest</sprite>
       <sprite>sprites\PEd_sprDummy2D</sprite>
     </sprites>
+    <sprites name="Example">
+      <sprite>sprites\sprSmiley</sprite>
+    </sprites>
   </sprites>
   <backgrounds name="background">
     <backgrounds name="PushEd">
       <background>background\PEd_bgrDef</background>
-      <background>background\PEd_bgrTiles</background>
+    </backgrounds>
+    <backgrounds name="Example">
+      <background>background\bgrTiles</background>
     </backgrounds>
   </backgrounds>
   <paths name="paths"/>
@@ -712,14 +718,6 @@
     </fonts>
   </fonts>
   <objects name="objects">
-    <objects name="PEdExample">
-      <object>objects\oBlank</object>
-      <object>objects\oBlock</object>
-      <object>objects\oCone</object>
-      <object>objects\oCylinder</object>
-      <object>objects\oEllipsoid</object>
-      <object>objects\oSprite</object>
-    </objects>
     <objects name="PushEd">
       <object>objects\PEd_oEditor</object>
       <object>objects\PEd_oObject</object>
@@ -728,6 +726,14 @@
       <object>objects\PEd_oPivot</object>
       <object>objects\PEd_oPlay</object>
     </objects>
+    <objects name="Example">
+      <object>objects\oBlank</object>
+      <object>objects\oBlock</object>
+      <object>objects\oCone</object>
+      <object>objects\oCylinder</object>
+      <object>objects\oEllipsoid</object>
+      <object>objects\oSprite</object>
+    </objects>
   </objects>
   <rooms name="rooms">
     <rooms name="PushEd">

PushEd.gmx/background/PEd_bgrTiles.background.gmx → PushEd.gmx/background/bgrTiles.background.gmx

@@ -15,5 +15,5 @@
   <For3D>0</For3D>
   <width>256</width>
   <height>256</height>
-  <data>images\PEd_bgrTiles.png</data>
+  <data>images\bgrTiles.png</data>
 </background>

PushEd.gmx/objects/oSprite.object.gmx

@@ -1,6 +1,6 @@
 <!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
 <object>
-  <spriteName>PEd_sprTest</spriteName>
+  <spriteName>sprSmiley</spriteName>
   <solid>0</solid>
   <visible>-1</visible>
   <depth>0</depth>

PushEd.gmx/scripts/PEd_guiContentContentBrowser.gml

@@ -35,9 +35,10 @@ if (contentBrowserShowObjects)
             if (PEd_guiDrawListItem(_name, _contentX, _contentY, contentBrowserIndexObject == i, editMode != 0)) 
             {
                 // Create object
+                var _objectIndex = asset_get_index(_name);
                 if (contentBrowserIndexObject == i) 
                 {
-                    var _id = PEd_instanceCreate(_room, PEd_oPivot.x, PEd_oPivot.y, i);
+                    var _id = PEd_instanceCreate(_room, PEd_oPivot.x, PEd_oPivot.y, _objectIndex);
                     PEd_instanceSetPosX(_id, PEd_oPivot.x);
                     PEd_instanceSetPosY(_id, PEd_oPivot.y);
                     PEd_instanceSetPosZ(_id, PEd_oPivot.z);
@@ -47,7 +48,7 @@ if (contentBrowserShowObjects)
                 else 
                 {
                     contentBrowserIndexObject = i;
-                    guiDnDObject = asset_get_index(_name);
+                    guiDnDObject = _objectIndex;
                 }
             }
             _contentY += guiLineHeight;

PushEd.gmx/scripts/PEd_guiContentInfo.gml

@@ -5,6 +5,6 @@
  * @return {vec2} The content size.
  */
 var _container = argument0;
-var _text = "PushEd 1.5.3"; // TODO: Update on new release!
+var _text = "PushEd " + PEd_VERSION;
 draw_text(8, 8, _text);
 return PEd_vec2(string_width(_text) + 16, string_height(_text) + 16);

PushEd.gmx/sprites/PEd_sprTest.sprite.gmx → PushEd.gmx/sprites/sprSmiley.sprite.gmx

@@ -20,6 +20,6 @@
   <width>64</width>
   <height>64</height>
   <frames>
-    <frame index="0">images\PEd_sprTest_0.png</frame>
+    <frame index="0">images\sprSmiley_0.png</frame>
   </frames>
 </sprite>