From 8fa51b9d8c37896dfd13a5b238cf990fcbdb0c96 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Fri, 23 Mar 2012 13:46:40 -0700
Subject: textures

---
 js/lib/drawing/world.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'js/lib/drawing')

diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 07a2c3ae..4140208c 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -30,6 +30,7 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
 
     this._canvas = canvas;
 	if (this._useWebGL) {
+        preserveDrawingBuffer = true;
         if(preserveDrawingBuffer) {
             this._glContext = canvas.getContext("experimental-webgl", {preserveDrawingBuffer: true});
         } else {
-- 
cgit v1.2.3


From 2f66a9ab38f761b7796800bb37f8146f140db40b Mon Sep 17 00:00:00 2001
From: hwc487
Date: Mon, 26 Mar 2012 11:31:23 -0700
Subject: WebGL & Canvas as data for texture maps.

---
 js/lib/drawing/world.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'js/lib/drawing')

diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index d314760b..e3818178 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -327,6 +327,7 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
 		var rtnVal = false;
 		if (root) {
 			rtnVal = this.hHasAnimatedMaterials( root );
+            this._hasAnimatedMaterials = rtnVal;
         }
 
 		return rtnVal;
-- 
cgit v1.2.3


From 0a0aa4662ffa687dd049cc5a24e701cedf87253a Mon Sep 17 00:00:00 2001
From: hwc487
Date: Wed, 28 Mar 2012 05:44:38 -0700
Subject: added a notification procedure to worlds.

---
 js/lib/drawing/world.js | 71 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 69 insertions(+), 2 deletions(-)

(limited to 'js/lib/drawing')

diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index ebeeeb20..f077a5e2 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -78,6 +78,9 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
 	// keep a counter for generating node names
 	this._nodeCounter = 0;
 
+    // for sending notifications to listeners
+    this._notifier = new Notifier();
+
     ///////////////////////////////////////////////////////////////////////
     // Property accessors
     ///////////////////////////////////////////////////////////////////////
@@ -435,6 +438,9 @@ World.prototype.updateObject = function (obj) {
         childTrNode.attachMeshNode(this.renderer.id + "_prim_" + this._nodeCounter++, prim);
         childTrNode.attachMaterial(materialNodes[i]);
     }
+
+    // send a notification that the tree has changed
+    this._notifier.sendNotification( this._notifier.OBJECT_CHANGE );
 };
 
 World.prototype.addObject = function( obj ) {
@@ -463,6 +469,9 @@ World.prototype.addObject = function( obj ) {
 			obj.buildBuffers();
 			this.restartRenderLoop();
 		}
+
+        // send a notification that the tree has changed
+        this._notifier.sendNotification( this._notifier.OBJECT_CHANGE );
     }
 
     catch(e) {
@@ -520,13 +529,21 @@ World.prototype.addIfNewObject = function (obj) {
 			obj.buildBuffers();
 			this.restartRenderLoop();
 		}
+
+        // send a notification that the tree has changed
+        this._notifier.sendNotification( this._notifier.OBJECT_CHANGE );
+
     } catch (e) {
         alert("Exception in GLWorld.addIfNewObject " + e);
     }
 };
 
-World.prototype.clearTree = function() {
-	if (this._useWebGL) {
+World.prototype.clearTree = function()
+{
+    this._notifier.sendNotification( this._notifier.OBJECT_DELETE );
+
+	if (this._useWebGL)
+    {
 		var root = this._rootNode;
 		root.children = new Array();
 		g_Engine.unregisterCanvas( this._canvas.rdgeid )
@@ -1085,6 +1102,56 @@ World.prototype.importSubObject = function( objStr,  parentNode ) {
 	return trNode;
 };
 
+function Notifier()
+{
+    // notification types supported
+    this.OBJECT_DELETE      = 1;
+    this.OBJECT_REANIMATE   = 2;    // the object has come back after a deletion - as in undo
+    this.OBJECT_CHANGE      = 3;
+
+
+    // the array of listener objects
+    this._listenerArray = [];
+
+    this.sendNotification = function( type, callerData )
+    {
+        var n = this._listenerArray.length;
+        for (var i=0;  i<n;  i++)
+        {
+            var obj = this._listenerArray[i];
+            obj.callbackFunc( type, obj.callbackObj,  obj.calleeData,  callerData );
+        }
+    }
+
+    this.addListener = function( obj,  callbackFunc,  calleeData )
+    {
+        var obj = { 'callbackObj': obj,  'callbackFunc': callbackFunc,  'calleeData':  calleeData };
+        this._listenerArray.push( obj );
+    }
+
+    this.removeListener = function( obj )
+    {
+        var arr = this._listenerArray;
+        var n = arr.length;
+        for (var i=0;  i<n;  i++)
+        {
+            var localObj = arr[i];
+            if (obj === localObj)
+            {
+                var tmp = arr[n-1];
+                arr[n-1] = arr[i];
+                arr.pop();
+                return;
+            }
+        }
+
+        console.log( "*** listener object not found in removeListener, " + obj );
+    }
+        
+}
+
+
 if (typeof exports === "object") {
     exports.World = World;
+    exports.Notifier = Notifier;
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 2ab7fbef0df37f0c2bb6a4447f03993b9d50b5d0 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Thu, 29 Mar 2012 07:27:49 -0700
Subject: linked textures

---
 js/lib/drawing/world.js | 72 +++++++------------------------------------------
 1 file changed, 9 insertions(+), 63 deletions(-)

(limited to 'js/lib/drawing')

diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index f077a5e2..a489110f 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -364,6 +364,15 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
 		return str;
 	};
 
+    this.addListener = function( obj,  callbackFunc,  calleeData )
+    {
+        this._notifier.addListener( obj, callbackFunc, calleeData );
+    }
+
+    this.removeListener = function( obj )
+    {
+        this._notifier.removeListener( obj );
+    }
     
     // start RDGE passing your runtime object, and false to indicate we don't need a an initialization state
     // in the case of a procedurally built scene an init state is not needed for loading data
@@ -818,70 +827,7 @@ World.prototype.exportObjectsJSON = function( obj,  parentObj )
 		this.exportObjectsJSON( obj.getNext(), parentObj );
 }
 
-/*
-World.prototype.export = function()
-{
-	var exportStr = "GLWorld 1.0\n";
-	var id = this.getCanvas().getAttribute( "data-RDGE-id" );
-	exportStr += "id: " + id + "\n";
-	//exportStr += "id: " + this._canvas.rdgeid + "\n";
-	exportStr += "fov: " + this._fov + "\n";
-	exportStr += "zNear: " + this._zNear + "\n";
-	exportStr += "zFar: " + this._zFar + "\n";
-	exportStr += "viewDist: " + this._viewDist + "\n";
-	if (this._useWebGL)
-		exportStr += "webGL: true\n";
-
-	// we need 2 export modes:  One for save/restore, one for publish.
-	// hardcoding for now
-	//var exportForPublish = false;
-	//if (!exportForPublish)  exportForPublish = false;
-	var exportForPublish = true;
-	exportStr += "publish: " + exportForPublish + "\n";
-
-	if (exportForPublish && this._useWebGL)
-	{
-		exportStr += "scenedata: " + this.myScene.exportJSON() + "endscene\n";
-
-		// write out all of the objects
-		exportStr += "tree\n";
-		exportStr += this.exportObjects( this._geomRoot );
-		exportStr += "endtree\n";
-	}
-	else
-	{
-		// output the material library
-		//exportStr += MaterialsLibrary.export();	// THIS NEEDS TO BE DONE AT THE DOC LEVEL
-
-		// write out all of the objects
-		exportStr += "tree\n";
-		exportStr += this.exportObjects( this._geomRoot );
-		exportStr += "endtree\n";
-	}
-
-	return exportStr;
-};
-
-World.prototype.exportObjects = function( obj ) {
-	if (!obj)  return;
-
-	var rtnStr = "OBJECT\n";
-	rtnStr += obj.export();
 
-	if (obj.getChild()) {
-		rtnStr += this.exportObjects( obj.getChild ()  );
-    }
-
-	// the end object goes outside the children
-	rtnStr += "ENDOBJECT\n";
-
-	if (obj.getNext()) {
-		rtnStr += this.exportObjects( obj.getNext() );
-    }
-	
-	return rtnStr;
-};
-*/
 
 World.prototype.findTransformNodeByMaterial = function( materialNode,  trNode ) {
 	//if (trNode == null)  trNode = this._ctrNode;
-- 
cgit v1.2.3


From 679a0746bedab9c5871a83a5fea6a06ac6a4f41c Mon Sep 17 00:00:00 2001
From: hwc487
Date: Mon, 2 Apr 2012 10:17:48 -0700
Subject: texture abstraction

---
 js/lib/drawing/world.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'js/lib/drawing')

diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index a489110f..402563e9 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -1051,9 +1051,9 @@ World.prototype.importSubObject = function( objStr,  parentNode ) {
 function Notifier()
 {
     // notification types supported
-    this.OBJECT_DELETE      = 1;
-    this.OBJECT_REANIMATE   = 2;    // the object has come back after a deletion - as in undo
-    this.OBJECT_CHANGE      = 3;
+    this.OBJECT_DELETE          = 1;
+    this.OBJECT_REINSTANTIATE   = 2;    // the object has come back after a deletion - as in undo
+    this.OBJECT_CHANGE          = 3;
 
 
     // the array of listener objects
-- 
cgit v1.2.3


From 416ce9d4954e0a7f4ee7b9afe43bf691fdb276f4 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Fri, 6 Apr 2012 05:18:48 -0700
Subject: texture notifications

---
 js/lib/drawing/world.js | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

(limited to 'js/lib/drawing')

diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 402563e9..da8a26ad 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -239,6 +239,7 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
 				this.myScene.render();
 
 				if (this._firstRender) {
+					this._notifier.sendNotification( this._notifier.FIRST_RENDER );
 					if (this._canvas.task) {
 						this._firstRender = false;
 
@@ -828,7 +829,6 @@ World.prototype.exportObjectsJSON = function( obj,  parentObj )
 }
 
 
-
 World.prototype.findTransformNodeByMaterial = function( materialNode,  trNode ) {
 	//if (trNode == null)  trNode = this._ctrNode;
 	if (trNode == null)  trNode = this._rootNode;
@@ -926,6 +926,29 @@ World.prototype.importObjectJSON = function( jObj, parentGeomObj )
 	return obj;
 };
 
+World.prototype.refreshTextures = function( obj )
+{
+	if (obj == null)  obj = this._geomRoot;
+	if (!obj)  return;
+	if (obj._materialArray)
+	{
+		var nMats = obj._materialArray.length;
+		for (var i=0;  i<nMats;  i++)
+		{
+			var mat = obj._materialArray[i];
+			if (mat)
+				mat.updateTextures();
+		}
+	}
+
+	if (obj.getChild()) {
+		 this.refreshTextures( obj.getChild ()  );
+    }
+
+	if (obj.getNext())
+		this.refreshTextures( obj.getNext() );
+};
+
 World.prototype.import = function( importStr ) {
 	// import the worldattributes - not currently used
 
@@ -1054,6 +1077,7 @@ function Notifier()
     this.OBJECT_DELETE          = 1;
     this.OBJECT_REINSTANTIATE   = 2;    // the object has come back after a deletion - as in undo
     this.OBJECT_CHANGE          = 3;
+	this.FIRST_RENDER			= 4;
 
 
     // the array of listener objects
-- 
cgit v1.2.3


From 331b2ad4d602016f9bb3d03be759fd81fed50c10 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Fri, 13 Apr 2012 07:08:42 -0700
Subject: Cloud Material

---
 js/lib/drawing/world.js | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'js/lib/drawing')

diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index da8a26ad..5eca26b8 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -333,6 +333,15 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
 			rtnVal = this.hHasAnimatedMaterials( root );
             this._hasAnimatedMaterials = rtnVal;
         }
+		else
+		{
+			// currently...
+			// we set this case to true - cloud materials create a
+			// world with no objects but cloud materials animate.
+			// TODO - find a better way to do this
+			rtnVal = true;
+			this._hasAnimatedMaterials = true;
+		}
 
 		return rtnVal;
 	};
-- 
cgit v1.2.3


From 8992d9baf542135e910bb59328a592d9e330703a Mon Sep 17 00:00:00 2001
From: hwc487
Date: Sun, 15 Apr 2012 05:16:34 -0700
Subject: Cloud Material

---
 js/lib/drawing/world.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'js/lib/drawing')

diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 5eca26b8..4ca738f4 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -73,6 +73,7 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
 	this._firstRender = true;
 
 	this._worldCount = worldCounter;
+	console.log( "creating world " + this._worldCount );
 	worldCounter++;
 
 	// keep a counter for generating node names
@@ -514,6 +515,18 @@ World.prototype.restartRenderLoop = function() {
 	}
 };
 
+World.prototype.stop = function()
+{
+	if (this._canvas && this._canvas.task)
+		this._canvas.task.stop();
+}
+
+World.prototype.start = function()
+{
+	if (this._canvas && this._canvas.task)
+		this._canvas.task.start();
+}
+
 //append to the list of objects if obj doesn't already exist
 //if obj exists, then don't add to list of objects
 World.prototype.addIfNewObject = function (obj) {
-- 
cgit v1.2.3


From d21aaca3d7093b6af968b7f9f764ab54e004f02b Mon Sep 17 00:00:00 2001
From: hwc487
Date: Thu, 3 May 2012 16:42:56 -0700
Subject: Cleanup of indirect textures.

---
 js/lib/drawing/world.js | 23 -----------------------
 1 file changed, 23 deletions(-)

(limited to 'js/lib/drawing')

diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 9a7d42de..23e24347 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -1028,29 +1028,6 @@ World.prototype.importObjectJSON = function( jObj, parentGeomObj )
 	return obj;
 };
 
-World.prototype.refreshTextures = function( obj )
-{
-	if (obj == null)  obj = this._geomRoot;
-	if (!obj)  return;
-	if (obj._materialArray)
-	{
-		var nMats = obj._materialArray.length;
-		for (var i=0;  i<nMats;  i++)
-		{
-			var mat = obj._materialArray[i];
-			if (mat)
-				mat.updateTextures();
-		}
-	}
-
-	if (obj.getChild()) {
-		 this.refreshTextures( obj.getChild ()  );
-    }
-
-	if (obj.getNext())
-		this.refreshTextures( obj.getNext() );
-};
-
 function Notifier()
 {
     // notification types supported
-- 
cgit v1.2.3


From 5fcb96cae89007c684df3ce948831e2fcf9fd8b7 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Mon, 14 May 2012 10:00:52 -0700
Subject: Fixing merge issues

---
 js/lib/drawing/world.js | 2 --
 1 file changed, 2 deletions(-)

(limited to 'js/lib/drawing')

diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index b46a002b..14e63f4a 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -31,7 +31,6 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
     this._canvas = canvas;
 	if (this._useWebGL)
 	{
-        preserveDrawingBuffer = true;
         if(preserveDrawingBuffer)
 		{
             this._glContext = canvas.getContext("experimental-webgl", {preserveDrawingBuffer: true});
@@ -79,7 +78,6 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
 	this._firstRender = true;
 
 	this._worldCount = worldCounter;
-	console.log( "creating world " + this._worldCount );
 	worldCounter++;
 
 	// keep a counter for generating node names
-- 
cgit v1.2.3


From cc3b66f817c9d72ca247d5ff789a08ec5b57a2b5 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Tue, 22 May 2012 08:38:38 -0700
Subject: Editable material properties

---
 js/lib/drawing/world.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'js/lib/drawing')

diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 14e63f4a..3c93b2b7 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -180,14 +180,14 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
         
 		// create some lights
 		// light 1
-		this.light = RDGE.createLightNode("myLight");
-		this.light.setPosition([0,0,1.2]);
-		this.light.setDiffuseColor([0.75,0.9,1.0,1.0]);
+//		this.light = RDGE.createLightNode("myLight");
+//		this.light.setPosition([0,0,1.2]);
+//		this.light.setDiffuseColor([0.75,0.9,1.0,1.0]);
         
 		// light 2
-		this.light2 = RDGE.createLightNode("myLight2");
-		this.light2.setPosition([-0.5,0,1.2]);
-		this.light2.setDiffuseColor([1.0,0.9,0.75,1.0]);
+//		this.light2 = RDGE.createLightNode("myLight2");
+//		this.light2.setPosition([-0.5,0,1.2]);
+//		this.light2.setDiffuseColor([1.0,0.9,0.75,1.0]);
         
 		// create a light transform
 		var lightTr = RDGE.createTransformNode("lightTr");
@@ -196,8 +196,8 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
 		lightTr.attachMaterial(RDGE.createMaterialNode("lights"));
         
 		// enable light channels 1, 2 - channel 0 is used by the default shader
-		lightTr.materialNode.enableLightChannel(1, this.light);
-		lightTr.materialNode.enableLightChannel(2, this.light2);
+//		lightTr.materialNode.enableLightChannel(1, this.light);
+//		lightTr.materialNode.enableLightChannel(2, this.light2);
      
 		// all added objects are parented to the light node
 		this._rootNode = lightTr;
@@ -225,8 +225,8 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
 		    RDGE.rdgeGlobalParameters.u_light0Pos.set([5 * Math.cos(this.elapsed), 5 * Math.sin(this.elapsed), 20]);
         
 			// orbit the light nodes around the boxes
-			this.light.setPosition([1.2*Math.cos(this.elapsed*2.0), 1.2*Math.sin(this.elapsed*2.0), 1.2*Math.cos(this.elapsed*2.0)]);
-			this.light2.setPosition([-1.2*Math.cos(this.elapsed*2.0), 1.2*Math.sin(this.elapsed*2.0), -1.2*Math.cos(this.elapsed)]);
+//			this.light.setPosition([1.2*Math.cos(this.elapsed*2.0), 1.2*Math.sin(this.elapsed*2.0), 1.2*Math.cos(this.elapsed*2.0)]);
+//			this.light2.setPosition([-1.2*Math.cos(this.elapsed*2.0), 1.2*Math.sin(this.elapsed*2.0), -1.2*Math.cos(this.elapsed)]);
 		}
         
 		this.updateMaterials( this.getGeomRoot(), this.elapsed );
-- 
cgit v1.2.3


From 641d59527d842b5adc626a38677365cb9d943840 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Mon, 4 Jun 2012 15:12:49 -0700
Subject: Fixed RDGE render tree when PI changes causes node changes.

---
 js/lib/drawing/world.js | 76 ++++++++++++++++++++++++-------------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

(limited to 'js/lib/drawing')

diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 3c93b2b7..228c0d94 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -437,15 +437,15 @@ World.prototype.getGeomRoot = function()  {
 World.prototype.updateObject = function (obj) {
 	if (!this._useWebGL)  return;
 
-    var prims = obj.getPrimitiveArray();
+	var prims = obj.getPrimitiveArray();
 	var materialNodes = obj.getMaterialNodeArray();
-    if (prims.length != materialNodes.length)
-        throw new Error("inconsistent material and primitive counts");
-    var nPrims = prims.length;
-    var ctrTrNode;
-    if (nPrims > 0)
+	if (prims.length != materialNodes.length)
+		throw new Error("inconsistent material and primitive counts");
+	var nPrims = prims.length;
+	var ctrTrNode;
+	if (nPrims > 0)
 	{
-        ctrTrNode = obj.getTransformNode();
+		ctrTrNode = obj.getTransformNode();
 		if (ctrTrNode == null) {
 			ctrTrNode = RDGE.createTransformNode("objRootNode_" + this._nodeCounter++);
 			this._rootNode.insertAsChild( ctrTrNode );
@@ -459,42 +459,42 @@ World.prototype.updateObject = function (obj) {
 		);
 		ctrTrNode.meshes = [];
 
-        ctrTrNode.attachMeshNode(this.renderer.id + "_prim_" + this._nodeCounter++, prims[0]);
-        ctrTrNode.attachMaterial(materialNodes[0]);
-    }
+		ctrTrNode.attachMeshNode(this.renderer.id + "_prim_" + this._nodeCounter++, prims[0]);
+		ctrTrNode.attachMaterial(materialNodes[0]);
+	}
 	
+	// delete all of the child nodes
+	var i;
+	var childTrNode;
 	var children = ctrTrNode.children;
-    for (var i = 1; i < nPrims; i++)
+	for (i=0;  i<children.length;  i++)
 	{
-        // get the next primitive
-        var prim = prims[i];
-
-        // get a previously created transform node.  If the transform has not been created, create it
-        var childTrNode;
-		if (children && children.length >= i) {
-			childTrNode = children[i-1].transformNode;
-
-			childTrNode.meshes.forEach(
-				function(thisMesh)
-				{
-					RDGE.globals.meshMan.deleteMesh(thisMesh.mesh.name);
-				}
-			);
-			childTrNode.meshes = [];
-		}
-		else
-		{
-			childTrNode = RDGE.createTransformNode("objNode_" + this._nodeCounter++);
-			ctrTrNode.insertAsChild(childTrNode);
-		}
+		childTrNode = children[i].transformNode;
+		childTrNode.meshes.forEach(
+			function(thisMesh)
+			{
+				RDGE.globals.meshMan.deleteMesh(thisMesh.mesh.name);
+			}
+		);
+		childTrNode.meshes = [];
+		children[i] = null;
+	}
+	ctrTrNode.children = [];
 
-        // attach the instanced box goe
-        childTrNode.attachMeshNode(this.renderer.id + "_prim_" + this._nodeCounter++, prim);
-        childTrNode.attachMaterial(materialNodes[i]);
-    }
+	for (var i = 1; i < nPrims; i++)
+	{
+		// get the next primitive
+		var prim = prims[i];
+		childTrNode = RDGE.createTransformNode("objNode_" + this._nodeCounter++);
+		ctrTrNode.insertAsChild(childTrNode);
+
+		// attach the instanced box goe
+		childTrNode.attachMeshNode(this.renderer.id + "_prim_" + this._nodeCounter++, prim);
+		childTrNode.attachMaterial(materialNodes[i]);
+	}
 
-    // send a notification that the tree has changed
-    this._notifier.sendNotification( this._notifier.OBJECT_CHANGE );
+	// send a notification that the tree has changed
+	this._notifier.sendNotification( this._notifier.OBJECT_CHANGE );
 };
 
 World.prototype.addObject = function( obj )
-- 
cgit v1.2.3


From 6c994c4b90023cecf4fd0caafb404b859fe28f54 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Wed, 6 Jun 2012 16:34:41 -0700
Subject: material cleanup and rearchitecture

---
 js/lib/drawing/world.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/lib/drawing')

diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 228c0d94..8068284e 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -484,11 +484,11 @@ World.prototype.updateObject = function (obj) {
 	for (var i = 1; i < nPrims; i++)
 	{
 		// get the next primitive
-		var prim = prims[i];
 		childTrNode = RDGE.createTransformNode("objNode_" + this._nodeCounter++);
 		ctrTrNode.insertAsChild(childTrNode);
 
 		// attach the instanced box goe
+		var prim = prims[i];
 		childTrNode.attachMeshNode(this.renderer.id + "_prim_" + this._nodeCounter++, prim);
 		childTrNode.attachMaterial(materialNodes[i]);
 	}
-- 
cgit v1.2.3