From 4b83774cdbfbf30add9a8fa2f11b1c4ff35179fa Mon Sep 17 00:00:00 2001
From: hwc487
Date: Thu, 26 Apr 2012 12:50:57 -0700
Subject: canvas interaction

---
 js/document/html-document.js         | 16 ++++++++--------
 js/helper-classes/3D/snap-manager.js | 10 +++++-----
 js/lib/drawing/world.js              |  2 +-
 js/tools/ShapeTool.js                | 18 ++++++++++++++++--
 4 files changed, 30 insertions(+), 16 deletions(-)

(limited to 'js')

diff --git a/js/document/html-document.js b/js/document/html-document.js
index ff5192b3..454b7154 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -207,16 +207,16 @@ exports.HTMLDocument = Montage.create(TextDocument, {
 			var elt = this.documentRoot;
 			if (elt)
 			{
+				/*
+				// Use this code to test the runtime version of WebGL
+				var cdm = new NinjaCvsRt.CanvasDataManager();
+				cdm.loadGLData(elt,  value,  null );
+				*/
+
+				// /*
 				var nWorlds= value.length;
 				for (var i=0;  i<nWorlds;  i++)
 				{
-					/*
-					// Use this code to test the runtime version of WebGL
-					var cdm = new NinjaCvsRt.CanvasDataManager();
-					cdm.loadGLData(elt,  value,  null );
-					*/
-
-					// /*
 					// get the data for the next canvas
 					var importStr = value[i];
 
@@ -281,8 +281,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
 							}
 						}
 					}
-					// */
 				}
+				// */
 			}
 		}
     },
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index 2c975985..dcfd5ddc 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -948,7 +948,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
 							{
 
 								// see if we can snap to a contained geometry object
-								if (hitRec && this.getGLWorld(elt) && !this.isARectangle(elt))
+								if (hitRec && this.getGLWorld(elt))	// && !this.isARectangle(elt))
 								{
 									var localPt = hitRec.calculateElementWorldPoint();
 									if (hitRec.getType() != hitRec.SNAP_TYPE_ELEMENT)
@@ -1346,13 +1346,13 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
 				var dist = vecUtils.vecDist(2, globalPt, targetScrPt );
 				if (dist < this.ELEMENT_VERTEX_HIT_RAD)
 				{
-					console.log( "hit a vertex" );
+					//console.log( "hit a vertex" );
 
 					// check if the distance is less than
 					// the distance on the current hit record
-					if (dist <= vecUtils.vecDist(2, targetScrPt, hitRec.getScreenPoint() ))
+					//if (dist <= vecUtils.vecDist(2, targetScrPt, hitRec.getScreenPoint() ))
 					{
-						console.log( "rejected - further than existing snap" );
+						//console.log( "rejected - further than existing snap" );
 
 						hitRec.setScreenPoint( globalPt );
 						//var localMatInv = hitRec.getPlaneMatrix().inverse();
@@ -1388,7 +1388,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
 					var dist = vecUtils.vecDist(2, globalPt, targetScrPt );
 					if (dist < this.ELEMENT_EDGE_HIT_RAD)
 					{
-						console.log( "hit an edge" );
+						//console.log( "hit an edge" );
 
 						// check if the distance is less than
 						// the distance on the current hit record
diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 7ee9ee00..7ce23921 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -758,7 +758,7 @@ World.prototype.exportJSON = function () {
 	// would not be destructive of the data.  You would be wrong...
 	// We need to rebuild everything
     if (this._useWebGL) {
-        if (worldObj.children && (worldObj.children.length === 1)) {
+        if (worldObj.children && (worldObj.children.length >= 1)) {
             this.rebuildTree(this._geomRoot);
             this.restartRenderLoop();
 		}
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js
index b2948fe7..74e692b6 100755
--- a/js/tools/ShapeTool.js
+++ b/js/tools/ShapeTool.js
@@ -69,6 +69,7 @@ exports.ShapeTool = Montage.create(DrawingTool, {
                                                                         drawData.planeMat, drawData.midPt, canvas, true);
 
                     canvas.elementModel.isShape = true;
+					this.application.ninja.elementMediator.addElements(canvas, elementModel.data);
                 } else {
                     canvas = this._targetedElement;
                     if (!canvas.getAttribute( "data-RDGE-id" ))
@@ -77,8 +78,8 @@ exports.ShapeTool = Montage.create(DrawingTool, {
                     if(!canvas.elementModel.shapeModel) {
                         canvas.elementModel.shapeModel = Montage.create(ShapeModel);
                     }
+					this.application.ninja.elementMediator.addElements(canvas, canvas.elementModel.data);
                 }
-                this.application.ninja.elementMediator.addElements(canvas, canvas.elementModel.data);
             }
 
             this.endDraw(event);
@@ -213,7 +214,20 @@ exports.ShapeTool = Montage.create(DrawingTool, {
 	_useExistingCanvas: {
 		value: function()
 		{
-			return (this._targetedElement && !ShapesController.isElementAShape(this._targetedElement));
+			var target;
+			if (this._targetedElement && (this._targetedElement.nodeName === "CANVAS") && !ShapesController.isElementAShape(this._targetedElement))
+				target = this._targetedElement;
+			else
+			{
+				var container = this.application.ninja.currentSelectedContainer;
+				if (container && (container.nodeName === "CANVAS"))
+				{
+					target = container;
+					this._targetedElement = target;
+				}
+			}
+
+			return target;
 		}
 	}
 
-- 
cgit v1.2.3