fixes: tests, editor

Author: g--o

editor/scripts/game.js

@@ -11,15 +11,6 @@ function loadResources()
 function loadScene()
 {
 	game.debug = true;
-	game.inputManager.setOnMouseDown(function() {
-		if (game.inputManager.isKeyDown(__RECTANGLE_GRAB_BUTTON)) {
-			var tb = game.getCurrentScene().getEntity(__GUIMANAGER_DEBUG_PANEL_NAME).getChildAt(6);
-			var name = "";
-			if (RectangleEditor.currently_selected)
-				name = RectangleEditor.currently_selected.name;
-			tb.getChildAt(0).textBox.value(name);
-		}
-	});
 	editor.toggleDebugPanel();
 }
 

editor/scripts/jscf-editor.js

@@ -42,8 +42,8 @@ function JSCFEditor (game)
     this.createEditor = function(editor_id, script_object, useWebWorker)
     {
         // fetch script
-        const COMMENT = ""; // "// WARNING! scripting anonymous functions may be fatal here!\r\n";
-        document.getElementById(editor_id).innerHTML = COMMENT + script_object;
+        const COMMENT = ""; // "// this = " + script_object.constructor.name;
+        document.getElementById(editor_id).innerHTML = COMMENT + "\n" + script_object;
 
         //create editor
         var editor = ace.edit(editor_id);
@@ -389,6 +389,21 @@ function JSCFEditor (game)
         };
         panel.insertChild(addBtn);
 
+        // delete button
+        var delBtn = guim.createDefaultButton(0, 0, "Delete");
+        delBtn.getComponentOfType(ButtonHandler).onClick = function() {
+            if (obj.constructor.component_name) {
+                obj.parent.delComponent(obj.name);
+            } else {
+                if (obj.parent)
+                    obj.parent.delEntity(obj.name);
+                else
+                    game.getCurrentScene().delEntity(obj.name);
+            }
+            SceneUtils.deleteParent(game, delBtn);
+        };
+        panel.insertChild(delBtn);
+
         // close button
         var closeBtn = guim.createDefaultButton(0, 0, "Close");
         closeBtn.getComponentOfType(ButtonHandler).onClick = function() {
@@ -416,11 +431,13 @@ function JSCFEditor (game)
         var guim = game.guiManager;
 
         const PANEL_WIDTH = guim.theme.getSize("panel", "width");
+        const PANEL_HEIGHT = guim.theme.getSize("panel","height");
         const DP_WIDTH =  PANEL_WIDTH + guim.theme.getSize("panel", "margin");
         const COMPONENT_LIST = [ LayoutHandler, ButtonHandler, Script, Collider, Rigidbody, RectangleEditor ];
 
         var addWindow = guim.createDefaultWindow(DP_WIDTH*2, PANEL_WIDTH);
         addWindow.name = guim.generateUIName(__JSCFEDITOR_ADD_WINDOW_NAME);
+        addWindow.setDimentions(PANEL_WIDTH,PANEL_HEIGHT/2);
         addWindow.addComponent(LayoutHandler);
         addWindow.getComponentOfType(LayoutHandler).layoutType = FitLayout;
 
@@ -441,6 +458,14 @@ function JSCFEditor (game)
             addWindow.insertChild(btn);
         }
 
+        addWindow.insertChild(guim.createLabel(0,0,"prefabs"));
+
+        var entityBtn = guim.createDefaultButton(0,0,"Empty Entity",function() {
+            obj.insertChild(new Entity(game, game.getCurrentScene().getEntityName(), true, 0,0, true));
+            closeFn();
+        });
+        addWindow.insertChild(entityBtn);
+
         var planeBtn = guim.createDefaultButton(0,0,"Plane",function() {
             obj.insertChild(new Plane(game,100,100,"black"));
             closeFn();
@@ -519,6 +544,16 @@ function JSCFEditor (game)
         game.inputManager.setOnKeyUpSpec(__JSCFEDITOR_KB_DEV_TOGGLE, function() {
             self.toggleDebugPanel();
         });
+
+        game.inputManager.setOnMouseDown(function() {
+            if (game.inputManager.isKeyDown(__RECTANGLE_GRAB_BUTTON)) {
+                var tb = game.getCurrentScene().getEntity(__GUIMANAGER_DEBUG_PANEL_NAME).getChildAt(6);
+                var name = "";
+                if (RectangleEditor.currently_selected)
+                    name = RectangleEditor.currently_selected.name;
+                tb.getChildAt(0).textBox.value(name);
+            }
+        });
     }
 
     this.init();

jscf/components/buttonHandler.js

@@ -5,6 +5,7 @@
 const __BUTTON_HANDLER_NAME = "[builtin_button_handler]";
 const __BUTTON_HANDLER_HOVER_SPEED = 1.1;
 const __BUTTON_HANDLER_HOVER_MAX = 1.5;
+const __BUTTON_HANDLER_ESCAPE_BUTTON = 17; // ctrl
 
 /**
  * @class
@@ -47,6 +48,7 @@ function ButtonHandler(owner, speed)
 		var mx = owner.game.inputManager.getMouseX();
 		var my = owner.game.inputManager.getMouseY();
 		var mDown = owner.game.inputManager.isMouseDown();
+		var grabbed = owner.game.inputManager.isKeyDown(__BUTTON_HANDLER_ESCAPE_BUTTON);
 
 		if (this.bb.containsPoint(mx, my) && owner.game.guiManager.focus()) {
 			if (transform.scale.length() < __BUTTON_HANDLER_HOVER_MAX)
@@ -60,7 +62,8 @@ function ButtonHandler(owner, speed)
 
 		if (this.pressed && !mDown) {
 			this.pressed = false;
-			this.onClick();
+			if (!grabbed)
+				this.onClick();
 		}
 	};
 

jscf/components/layoutHandler.js

@@ -38,6 +38,17 @@ var LayoutHandler = function(owner)
 		this.layoutType.doLayout(this.parent);
 		this.update = null;
 	};
+
+	/**
+	 * updates dimensions in a layout conserving way
+	 *
+	 * @param {Number} w width
+	 * @param {Number} h height
+	 */
+	this.setDimentions = function(w,h)
+	{
+		this.layoutType.doLayout(this.parent);
+	};
 };
 
 /**

jscf/scene/scene.js

@@ -8,6 +8,10 @@
 function Scene(game)
 {
 
+    this.max_euid = 0;
+    this.entities = {};
+    this.entities_keys = [];
+
     /**
      *    is scene paused
      *
@@ -266,10 +270,6 @@ function Scene(game)
 
     this.init = function()
     {
-        var self = this;
-        this.max_euid = 0;
-        this.entities = {};
-        this.entities_keys = [];
         InputManager.droppedFileCallback = this.onFileDrop.bind(this);
     };
 

jscf/ui/gui.js

@@ -313,8 +313,7 @@ function GuiManager(game, utheme)
             if (!ents.hasOwnProperty(e))
                 continue;
 
-			var hasComponent = (ents[e].hasComponentOfType(RectangleEditor));
-            if (ents[e].name != __GUIMANAGER_DEBUG_PANEL_NAME && !hasComponent)
+            if (!(ents[e].hasComponentOfType(RectangleEditor)))
                 ents[e].addComponent(RectangleEditor);
         }
     };