First cut at editModels with the mouse

examples/editModels.js

@@ -368,41 +368,100 @@ function checkController(deltaTime) {
     moveOverlays();
 }
 
+var clickEvent = false;
+var newModel;
+var modifierType = -1;
+var moveYZ;
+var moveXZ;
+var moveXY;
+var yaw;
+var pitch;
+var roll;
+var scale;
+
+var modelSelected = false;
+var selectedModelID;
+var selectedModelProperties;
+
+
+function initToolBar() {
+    toolBar = new ToolBar(0, 0, ToolBar.VERTICAL);
+    // New Model
+    newModel = toolBar.addTool({
+                               imageURL: toolIconUrl + "voxel-tool.svg",
+                               subImage: { x: 0, y: Tool.IMAGE_WIDTH, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT },
+                               width: toolWidth, height: toolHeight,
+                               visible: true,
+                               alpha: 0.9
+                               });
+    print("New Model: " + newModel)
+    
+    // Move YZ
+    moveYZ = toolBar.addTool({
+                             imageURL: toolIconUrl + "voxel-tool.svg",
+                             subImage: { x: 0, y: 0, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT },
+                             width: toolWidth, height: toolHeight,
+                             visible: true,
+                             alpha: 0.9
+                             }, true);
+    // Move XZ
+    moveXZ = toolBar.addTool({
+                             imageURL: toolIconUrl + "voxel-tool.svg",
+                             subImage: { x: 0, y: 0, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT },
+                             width: toolWidth, height: toolHeight,
+                             visible: true,
+                             alpha: 0.9
+                             }, true);
+    // Move XY
+    moveXY = toolBar.addTool({
+                             imageURL: toolIconUrl + "voxel-tool.svg",
+                             subImage: { x: 0, y: 0, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT },
+                             width: toolWidth, height: toolHeight,
+                             visible: true,
+                             alpha: 0.9
+                             }, true);
+    
+    
+    // Yaw
+    yaw = toolBar.addTool({
+                          imageURL: toolIconUrl + "voxel-tool.svg",
+                          subImage: { x: 0, y: 0, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT },
+                          width: toolWidth, height: toolHeight,
+                          visible: true,
+                          alpha: 0.9
+                          }, true);
+    // Pitch
+    pitch = toolBar.addTool({
+                            imageURL: toolIconUrl + "voxel-tool.svg",
+                            subImage: { x: 0, y: 0, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT },
+                            width: toolWidth, height: toolHeight,
+                            visible: true,
+                            alpha: 0.9
+                            }, true);
+    // Roll
+    roll = toolBar.addTool({
+                           imageURL: toolIconUrl + "voxel-tool.svg",
+                           subImage: { x: 0, y: 0, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT },
+                           width: toolWidth, height: toolHeight,
+                           visible: true,
+                           alpha: 0.9
+                           }, true);
+    
+    
+    // Scale
+    scale = toolBar.addTool({
+                            imageURL: toolIconUrl + "voxel-tool.svg",
+                            subImage: { x: 0, y: 0, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT },
+                            width: toolWidth, height: toolHeight,
+                            visible: true,
+                            alpha: 0.9
+                            }, true);
+}
+
 function moveOverlays() {
     if (typeof(toolBar) === 'undefined') {
-        toolBar = new ToolBar(0, 0, ToolBar.VERTICAL);
+        initToolBar();
-        // New Model
+        
-        toolBar.addTool({
-                        imageURL: toolIconUrl + "voxel-tool.svg",
-                        subImage: { x: 0, y: Tool.IMAGE_WIDTH, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT },
-                        width: toolWidth, height: toolHeight,
-                        visible: true,
-                        alpha: 0.9
-                        });
-        // Move YZ
-        toolBar.addTool({
-                        imageURL: toolIconUrl + "voxel-tool.svg",
-                        subImage: { x: 0, y: 0, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT },
-                        width: toolWidth, height: toolHeight,
-                        visible: true,
-                        alpha: 0.9
-                        }, true);
-        // Move XZ
-        toolBar.addTool({
-                        imageURL: toolIconUrl + "voxel-tool.svg",
-                        subImage: { x: 0, y: 0, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT },
-                        width: toolWidth, height: toolHeight,
-                        visible: true,
-                        alpha: 0.9
-                        }, true);
-        // Move XY
-        toolBar.addTool({
-                        imageURL: toolIconUrl + "voxel-tool.svg",
-                        subImage: { x: 0, y: 0, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT },
-                        width: toolWidth, height: toolHeight,
-                        visible: true,
-                        alpha: 0.9
-                        }, true);
     } else if (windowDimensions.x == Controller.getViewportDimensions().x &&
                windowDimensions.y == Controller.getViewportDimensions().y) {
         return;
@@ -417,27 +476,147 @@ function moveOverlays() {
 }
 
 function mousePressEvent(event) {
+    modelSelected = false;
     var clickedOverlay = Overlays.getOverlayAtPoint({x: event.x, y: event.y});
-    var url;
+    
-    var index = toolBar.clicked(clickedOverlay);
+    if (clickedOverlay != 0) {
-    if (index == 0) {
+        var index = toolBar.clicked(clickedOverlay);
-        url = Window.prompt("Model url", modelURLs[Math.floor(Math.random() * modelURLs.length)]);
-        if (url == null) {
-            return;
-        }
         
-        var position = Vec3.sum(MyAvatar.position, Vec3.multiply(Quat.getFront(MyAvatar.orientation), SPAWN_DISTANCE));
+        switch(index) {
-        Models.addModel({ position: position,
+            case newModel:
-                        radius: radiusDefault,
+                var url = Window.prompt("Model url", modelURLs[Math.floor(Math.random() * modelURLs.length)]);
-                        modelURL: url
+                if (url == null) {
-                        });
+                    return;
-    } else if (index == -1) {
+                }
-        print("Didn't click on anything");
+                
+                var position = Vec3.sum(MyAvatar.position, Vec3.multiply(Quat.getFront(MyAvatar.orientation), SPAWN_DISTANCE));
+                Models.addModel({ position: position,
+                                radius: radiusDefault,
+                                modelURL: url
+                                });
+                break;
+            case moveYZ:
+                print("Selected moveYZ");
+                
+                break;
+            case moveXZ:
+                print("Selected moveXZ");
+                
+                break;
+            case moveXY:
+                print("Selected moveXY");
+                
+                break;
+            case yaw:
+                print("Selected yaw");
+                
+                break;
+            case pitch:
+                print("Selected pitch");
+                
+                break;
+            case roll:
+                print("Selected roll");
+                
+                break;
+            case scale:
+                print("Selected scale");
+                
+                break;
+            default:
+                clickEvent = false;
+                return;
+        }
+        clickEvent = true;
+        
+        if (modifierType != -1) {
+            toolBar.tools[modifierType].select(false);
+        }
+        modifierType = index;
+    } else {
+        var pickRay = Camera.computePickRay(event.x, event.y);
+        Vec3.print("Looking at: ", pickRay.origin);
+        var foundModels = Models.findModels(pickray.origin, LASER_LENGTH_FACTOR);
+        for (var i = 0; i < foundModels.length; i++) {
+            if (!foundModels[i].isKnownID) {
+                var identify = Models.identifyModel(foundModels[i]);
+                if (!identify.isKnownID) {
+                    print("Unknown ID " + identify.id + "(update loop)");
+                    return;
+                }
+                foundModels[i] = identify;
+            }
+            
+            var properties = Models.getModelProperties(foundModels[i]);
+            print("Checking properties: " + properties.id + " " + properties.isKnownID);
+            
+            //                P         P - Model
+            //               /|         A - Palm
+            //              / | d       B - unit vector toward tip
+            //             /  |         X - base of the perpendicular line
+            //            A---X----->B  d - distance fom axis
+            //              x           x - distance from A
+            //
+            //            |X-A| = (P-A).B
+            //            X == A + ((P-A).B)B
+            //            d = |P-X|
+            
+            var A = pickRay.origin;
+            var B = Vec3.sum(pickRay.origin, Vec3.multiply(pickRay.direction, LASER_LENGTH_FACTOR));
+            var P = properties.position;
+            
+            var x = Vec3.dot(Vec3.subtract(P, A), B);
+            var X = Vec3.sum(A, Vec3.multiply(B, x));
+            var d = Vec3.length(Vec3.subtract(P, X));
+            
+            if (d < properties.radius && 0 < x && x < LASER_LENGTH_FACTOR) {
+                modelSelected = true;
+                selectedModelID = foundModels[i];
+                selectedModelProperties = properties;
+                return;
+            }
+        }
     }
 }
 
 function mouseMoveEvent(event)  {
+    if (clickEvent && !modelSelected) {
+        return;
+    }
     
+    print("Dragging");
+    
+    switch(modifierType) {
+        case moveYZ:
+            print("Move " + moveYZ);
+            break;
+        case moveXZ:
+            print("Move " + moveXZ);
+            
+            break;
+        case moveXY:
+            print("Move " + moveXY);
+            
+            break;
+        case yaw:
+            print("Move " + yaw);
+            
+            break;
+        case pitch:
+            print("Move " + pitch);
+            
+            break;
+        case roll:
+            print("Move " + roll);
+            
+            break;
+        case scale:
+            print("Move " + scale);
+            
+            break;
+    }
+    
+    Model.editModel(selectedModelID, selectedModelProperties);
 }
 
 function scriptEnding() {

examples/toolBars.js

@@ -13,7 +13,6 @@ Overlay2D = function(properties, overlay) { // overlay is an optionnal variable
     if (!(typeof(properties) === 'undefined')) {
         if(typeof(overlay) === 'undefined') {
             overlay = Overlays.addOverlay("image", properties);
-            print("New overlay: " + overlay);
         } else {
             Overlays.editOverlay(overlay, properties);
         }
@@ -87,25 +86,23 @@ Tool = function(properties, selectable, selected) { // selectable and selected a
         return selectable;
     }
     
-    if (this.selectable()) {
+    this.selected = function() {
-        this.selected = function() {
+        return selected;
-            return selected;
-        }
-        this.select = function(doSelect) {
-            selected = doSelect;
-            properties.subImage.y = (selected ? 2 : 1) * properties.subImage.height;
-            Overlays.editOverlay(this.overlay(), { subImage: properties.subImage });
-        }
-        this.toggle = function() {
-            selected = !selected;
-            properties.subImage.y = (selected ? 2 : 1) * properties.subImage.height;
-            Overlays.editOverlay(this.overlay(), { subImage: properties.subImage });
-            
-            return selected;
-        }
-        
-        this.select(selected);
     }
+    this.select = function(doSelect) {
+        selected = doSelect;
+        properties.subImage.y = (selected ? 2 : 1) * properties.subImage.height;
+        Overlays.editOverlay(this.overlay(), { subImage: properties.subImage });
+    }
+    this.toggle = function() {
+        selected = !selected;
+        properties.subImage.y = (selected ? 2 : 1) * properties.subImage.height;
+        Overlays.editOverlay(this.overlay(), { subImage: properties.subImage });
+        
+        return selected;
+    }
+    
+    this.select(selected);
     
     this.baseClicked = this.clicked;
     this.clicked = function(clickedOverlay) {
@@ -144,7 +141,7 @@ ToolBar = function(x, y, direction) {
         }
         
         this.tools[this.tools.length] = new Tool(properties, selectable, selected);
-        return this.tools.length - 1;
+        return ((this.tools.length) - 1);
     }
     
     this.move = function(x, y) {
@@ -172,7 +169,7 @@ ToolBar = function(x, y, direction) {
     this.clicked = function(clickedOverlay) {
         for(var tool in this.tools) {
             if (this.tools[tool].visible() && this.tools[tool].clicked(clickedOverlay)) {
-                return tool;
+                return parseInt(tool);
             }
         }
         return -1;