Merge branch 'master' into brushtool

3 files changed, 35 insertions, 6 deletions

diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 1552178d..5a054224 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -761,13 +761,10 @@ World.prototype.exportJSON = function()
         // We need to rebuild everything
         if (this._useWebGL)
         {
-                var root = this._rootNode;
-                root.children = new Array();
                 if (worldObj.children && (worldObj.children.length === 1))
                 {
-                        this.init();
-                        this._geomRoot = undefined;
-                        this.importObjectsJSON( worldObj.children[0] );
+            this.rebuildTree(this._geomRoot);
+            this.restartRenderLoop();
                 }
         }
 
@@ -783,6 +780,20 @@ World.prototype.exportJSON = function()
         return jStr;
 }
 
+World.prototype.rebuildTree = function( obj )
+{
+        if (!obj)  return;
+
+        obj.buildBuffers();
+
+        if (obj.getChild()) {
+                 this.rebuildTree( obj.getChild () );
+    }
+
+        if (obj.getNext())
+                this.rebuildTree( obj.getNext() );
+}
+
 World.prototype.exportObjectsJSON = function( obj,  parentObj )
 {
         if (!obj)  return;
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index be80f1e4..f1aa9f8a 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -303,6 +303,7 @@ var GeomObj = function GLGeomObj() {
                                 case "deform":
                                 case "water":
                                 case "paris":
+                                case "raiders":
                                 case "tunnel":
                                 case "reliefTunnel":
                                 case "squareTunnel":
@@ -376,6 +377,7 @@ var GeomObj = function GLGeomObj() {
                                 case "deform":
                                 case "water":
                                 case "paris":
+                                case "raiders":
                                 case "tunnel":
                                 case "reliefTunnel":
                                 case "squareTunnel":
diff --git a/js/lib/rdge/materials/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js
index f4a4baa2..fee02a1d 100644
--- a/js/lib/rdge/materials/radial-blur-material.js
+++ b/js/lib/rdge/materials/radial-blur-material.js
@@ -282,10 +282,26 @@ var RaidersMaterial = function RaidersMaterial()
         this.inheritedFrom();
 
         this._name = "RaidersMaterial";
-        this._shaderName = "radialBlur";
+        this._shaderName = "raiders";
 
         this._texMap = 'assets/images/raiders.png';
         this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
+
+
+    // duplcate method requirde
+    this.dup = function( world ) {
+        // allocate a new uber material
+        var newMat = new RaidersMaterial();
+
+        // copy over the current values;
+        var propNames = [],  propValues = [],  propTypes = [],  propLabels = [];
+        this.getAllProperties( propNames,  propValues,  propTypes,  propLabels);
+        var n = propNames.length;
+        for (var i=0;  i<n;  i++)
+            newMat.setProperty( propNames[i], propValues[i] );
+
+        return newMat;
+    };
 }
 
 RaidersMaterial.prototype = new Material();