Merge branch 'refs/heads/Ninja-Internal' into Document

4 files changed, 258 insertions, 61 deletions

diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js
index 4b155b4c..d48bf98b 100755
--- a/js/lib/geom/circle.js
+++ b/js/lib/geom/circle.js
@@ -53,13 +53,13 @@ var Circle = function GLCircle() {
                 if(strokeMaterial){
                         this._strokeMaterial = strokeMaterial;
         } else {
-                        this._strokeMaterial = MaterialsModel.exportFlatMaterial();
+                        this._strokeMaterial = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() );
         }
 
                 if(fillMaterial) {
                         this._fillMaterial = fillMaterial;
         } else {
-                        this._fillMaterial = MaterialsModel.exportFlatMaterial();
+                        this._fillMaterial = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() );
         }
 
                 this.exportMaterials();
@@ -598,7 +598,47 @@ var Circle = function GLCircle() {
                 }
     };
 
-        this.export = function() {
+        this.exportJSON = function()
+        {
+                var jObj = 
+                {
+                        'type'                  : this.geomType(),
+                        'xoff'                  : this._xOffset,
+                        'yoff'                  : this._yOffset,
+                        'width'                 : this._width,
+                        'height'                : this._height,
+                        'strokeWidth'   : this._strokeWidth,
+                        'strokeColor'   : this._strokeColor,
+                        'fillColor'             : this._fillColor,
+                        'innerRadius'   : this._innerRadius,
+                        'strokeStyle'   : this._strokeStyle,
+                        'strokeMat'             : this._strokeMaterial ? this._strokeMaterial.getName() :  MaterialsModel.getDefaultMaterialName(),
+                        'fillMat'               : this._fillMaterial ?  this._fillMaterial.getName() :  MaterialsModel.getDefaultMaterialName(),
+                        'materials'             : this.exportMaterialsJSON()
+                };
+
+                return jObj;
+        };
+
+        this.importJSON = function( jObj )
+        {
+                this._xOffset                   = jObj.xoff;
+                this._yOffset                   = jObj.yoff;
+                this._width                             = jObj.width;
+                this._height                    = jObj.height;
+                this._strokeWidth               = jObj.strokeWidth;
+                this._strokeColor               = jObj.strokeColor;
+                this._fillColor                 = jObj.fillColor;
+                this._innerRadius               = jObj.innerRadius;
+                this._strokeStyle               = jObj.strokeStyle;
+                var strokeMaterialName  = jObj.strokeMat;
+                var fillMaterialName    = jObj.fillMat;
+                this.importMaterialsJSON( jObj.materials );
+        };
+
+
+        this.export = function()
+        {
                 var rtnStr = "type: " + this.geomType() + "\n";
 
                 rtnStr += "xoff: "                      + this._xOffset         + "\n";
@@ -627,7 +667,7 @@ var Circle = function GLCircle() {
                 if (this._strokeMaterial) {
                         rtnStr += this._strokeMaterial.getName();
         } else {
-                        rtnStr += "flatMaterial";
+                        rtnStr +=  MaterialsModel.getDefaultMaterialName();
         }
 
                 rtnStr += "\n";
@@ -636,7 +676,7 @@ var Circle = function GLCircle() {
                 if (this._fillMaterial) {
                         rtnStr += this._fillMaterial.getName();
         } else {
-                        rtnStr += "flatMaterial";
+                        rtnStr +=  MaterialsModel.getDefaultMaterialName();
         }
                 rtnStr += "\n";
 
@@ -675,7 +715,7 @@ var Circle = function GLCircle() {
                 var strokeMat = MaterialsModel.getMaterial( strokeMaterialName );
                 if (!strokeMat) {
                         console.log( "object material not found in library: " + strokeMaterialName );
-                        strokeMat = MaterialsModel.exportFlatMaterial();
+                        strokeMat = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() );
                 }
 
                 this._strokeMaterial = strokeMat;
@@ -683,7 +723,7 @@ var Circle = function GLCircle() {
                 var fillMat = MaterialsModel.getMaterial( fillMaterialName );
                 if (!fillMat) {
                         console.log( "object material not found in library: " + fillMaterialName );
-                        fillMat = MaterialsModel.exportFlatMaterial();
+                        fillMat = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() );
                 }
                 this._fillMaterial = fillMat;
 
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index a64980e0..a87bdbf5 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -5,26 +5,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 </copyright> */
 
 var MaterialsModel = require("js/models/materials-model").MaterialsModel;
-var FlatMaterial = require("js/lib/rdge/materials/flat-material").FlatMaterial;
-var LinearGradientMaterial = require("js/lib/rdge/materials/linear-gradient-material").LinearGradientMaterial;
-var RadialGradientMaterial = require("js/lib/rdge/materials/radial-gradient-material").RadialGradientMaterial;
-var BumpMetalMaterial = require("js/lib/rdge/materials/bump-metal-material").BumpMetalMaterial;
-var UberMaterial = require("js/lib/rdge/materials/uber-material").UberMaterial;
-var RadialBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").RadialBlurMaterial;
-var PlasmaMaterial = require("js/lib/rdge/materials/plasma-material").PlasmaMaterial;
-var PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial;
-var TunnelMaterial = require("js/lib/rdge/materials/tunnel-material").TunnelMaterial;
-var ReliefTunnelMaterial = require("js/lib/rdge/materials/relief-tunnel-material").ReliefTunnelMaterial;
-var SquareTunnelMaterial = require("js/lib/rdge/materials/square-tunnel-material").SquareTunnelMaterial;
-var FlyMaterial = require("js/lib/rdge/materials/fly-material").FlyMaterial;
-var WaterMaterial = require("js/lib/rdge/materials/water-material").WaterMaterial;
-var ZInvertMaterial = require("js/lib/rdge/materials/z-invert-material").ZInvertMaterial;
-var DeformMaterial = require("js/lib/rdge/materials/deform-material").DeformMaterial;
-var StarMaterial = require("js/lib/rdge/materials/star-material").StarMaterial;
-var TwistMaterial = require("js/lib/rdge/materials/twist-material").TwistMaterial;
-var JuliaMaterial = require("js/lib/rdge/materials/julia-material").JuliaMaterial;
-var KeleidoscopeMaterial = require("js/lib/rdge/materials/keleidoscope-material").KeleidoscopeMaterial;
-var MandelMaterial = require("js/lib/rdge/materials/mandel-material").MandelMaterial;
 
 ///////////////////////////////////////////////////////////////////////
 // Class GLGeomObj
@@ -265,6 +245,96 @@ var GeomObj = function GLGeomObj() {
         return fillMaterial;
     };
 
+        this.exportMaterialsJSON = function()
+        {
+                var jObj;
+                if (this._materialArray && this._materialNodeArray && this.getWorld().isWebGL())
+                {
+                        var nMats = this._materialArray.length;
+                        if (nMats > 0)
+                        {
+                                var arr = [];
+
+                                for (var i=0;  i<nMats;  i++)
+                                {
+                                        var matObj = 
+                                        {
+                                                'materialNodeName'      : this._materialNodeArray[i].name,
+                                                'material'                      : this._materialArray[i].exportJSON(),
+                                                'type'                          : this._materialTypeArray[i]
+                                        }
+                                        arr.push( matObj );
+                                }
+
+                                jObj =
+                                {
+                                        'nMaterials'    : nMats,
+                                        'materials'             : arr
+                                };
+                        }
+                }
+
+                return jObj;
+        }
+
+        this.importMaterialsJSON = function( jObj )
+        {
+                this._materialArray = [];
+                this._materialTypeArray = [];
+
+                if (!jObj)  return;
+
+                var nMaterials = jObj.nMaterials;
+                var matArray = jObj.materials;
+                for (var i=0;  i<nMaterials;  i++)
+                {
+                        var mat;
+                        var matObj = matArray[i].material;
+                        var shaderName = matObj.material;
+                        switch (shaderName)
+                        {
+                                case "flat":
+                                case "radialGradient":
+                                case "linearGradient":
+                                case "bumpMetal":
+                                case "uber":
+                                case "plasma":
+                                case "deform":
+                                case "water":
+                                case "paris":
+                                case "tunnel":
+                                case "reliefTunnel":
+                                case "squareTunnel":
+                                case "twist":
+                                case "fly":
+                                case "julia":
+                                case "mandel":
+                                case "star":
+                                case "zinvert":
+                                case "keleidoscope":