From fdeed8051c3af538d28ca3bc599121cea483c22c Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Thu, 22 Mar 2012 15:47:56 -0700
Subject: Squashed commit of the following GL integration

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/lib/geom/circle.js    |  54 ++++++++++++++---
 js/lib/geom/geom-obj.js  | 154 +++++++++++++++++++++++++++++++++++------------
 js/lib/geom/line.js      |  44 +++++++++++++-
 js/lib/geom/rectangle.js |  63 ++++++++++++++++---
 4 files changed, 255 insertions(+), 60 deletions(-)

(limited to 'js/lib/geom')

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..dbef4859 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)
+		{
+			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":
+				case "radialBlur":
+				case "pulse":
+					mat = MaterialsModel.getMaterialByShader( shaderName );
+					if (mat)  mat = mat.dup();
+					break;
+
+				default:
+					console.log( "material type: " + shaderName + " is not supported" );
+					break;
+			}
+
+			if (mat)
+			{
+				mat.importJSON( matObj );
+				this._materialArray.push( mat );
+				this._materialTypeArray.push( matObj.type );
+				var type = matArray[i].type;
+				if (type == "fill")  this._fillMaterial = mat;
+				else  this._strokeMaterial = mat;
+			}
+		}
+	}
+
 	this.exportMaterials = function()
 	{
 		var rtnStr = "";
@@ -296,26 +366,30 @@ var GeomObj = function GLGeomObj() {
 			var materialType = this.getPropertyFromString( "material: ",	importStr );
 			switch (materialType)
 			{
-				case "flat":			mat = new FlatMaterial();				break;
-				case "radialGradient":  mat = new RadialGradientMaterial();		break;
-				case "linearGradient":  mat = new LinearGradientMaterial();		break;
-				case "bumpMetal":		mat = new BumpMetalMaterial();			break;
-				case "uber":			mat = new UberMaterial();				break;
-				case "plasma":			mat = new PlasmaMaterial();				break;
-				case "deform":			mat = new DeformMaterial();				break;
-				case "water":			mat = new WaterMaterial();				break;
-				case "tunnel":			mat = new TunnelMaterial();				break;
-				case "reliefTunnel":	mat = new ReliefTunnelMaterial();		break;
-				case "squareTunnel":	mat = new SquareTunnelMaterial();		break;
-				case "twist":			mat = new TwiseMaterial();				break;
-				case "fly":				mat = new FlyMaterial();				break;
-				case "julia":			mat = new JuliaMaterial();				break;
-				case "mandel":			mat = new MandelMaterial();				break;
-				case "star":			mat = new StarMaterial();				break;
-				case "zinvert":			mat = new ZInvertMaterial();			break;
-				case "keleidoscope":	mat = new KeleidoscopeMaterial();		break;
-				case "radialBlur":		mat = new RadialBlurMaterial();			break;
-				case "pulse":			mat = new PulseMaterial();				break;
+				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":
+				case "radialBlur":
+				case "pulse":
+					mat = MaterialsModel.getMaterialByShader( materialType );
+					if (mat)  mat = mat.dup();
+					break;
 
 				default:
 					console.log( "material type: " + materialType + " is not supported" );
diff --git a/js/lib/geom/line.js b/js/lib/geom/line.js
index 4a935de8..e839e229 100755
--- a/js/lib/geom/line.js
+++ b/js/lib/geom/line.js
@@ -99,9 +99,47 @@ var Line = function GLLine( world, xOffset, yOffset, width, height, slope, strok
 
 	this.geomType	= function()				{  return this.GEOM_TYPE_LINE;	}
 
-		///////////////////////////////////////////////////////////////////////
+	///////////////////////////////////////////////////////////////////////
 	// Methods
 	///////////////////////////////////////////////////////////////////////
+	this.exportJSON = function()
+	{
+		var jObj = 
+		{
+			'type'			: this.geomType(),
+			'xoff'			: this._xOffset,
+			'yoff'			: this._yOffset,
+			'width'			: this._width,
+			'height'		: this._height,
+			'xAdj'		    : this._xAdj,
+			'yAdj'		    : this._yAdj,
+			'slope'	        : this._slope,
+			'strokeWidth'	: this._strokeWidth,
+			'strokeColor'	: this._strokeColor,
+			'strokeStyle'	: this._strokeStyle,
+			'strokeMat'		: this._strokeMaterial ? this._strokeMaterial.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._xAdj			    = jObj.xAdj;
+		this._yAdj			    = jObj.yAdj;
+		this._strokeWidth		= jObj.strokeWidth;
+		this._slope 		    = jObj.slope;
+		this._strokeStyle		= jObj.strokeStyle;
+		this._strokeColor		= jObj.strokeColor;
+		var strokeMaterialName	= jObj.strokeMat;
+		this.importMaterialsJSON( jObj.materials );
+	};
+
 	this.export = function() {
 		var rtnStr = "type: " + this.geomType() + "\n";
 
@@ -127,7 +165,7 @@ var Line = function GLLine( world, xOffset, yOffset, width, height, slope, strok
 		if (this._strokeMaterial) {
 			rtnStr += this._strokeMaterial.getName();
         } else {
-			rtnStr += "flatMaterial";
+			rtnStr +=  MaterialsModel.getDefaultMaterialName();
         }
 
 		rtnStr += "\n";
@@ -165,7 +203,7 @@ var Line = function GLLine( world, xOffset, yOffset, width, height, slope, strok
 		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;
diff --git a/js/lib/geom/rectangle.js b/js/lib/geom/rectangle.js
index a47295e0..38e428bd 100755
--- a/js/lib/geom/rectangle.js
+++ b/js/lib/geom/rectangle.js
@@ -7,7 +7,6 @@
 var GeomObj = require("js/lib/geom/geom-obj").GeomObj;
 var ShapePrimitive =    require("js/lib/geom/shape-primitive").ShapePrimitive;
 var MaterialsModel = require("js/models/materials-model").MaterialsModel;
-var FlatMaterial = require("js/lib/rdge/materials/flat-material").FlatMaterial;
  ///////////////////////////////////////////////////////////////////////
 // Class GLRectangle
 //      GL representation of a rectangle.
@@ -71,16 +70,14 @@ var Rectangle = function GLRectangle() {
 		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();
 	};
 
 	///////////////////////////////////////////////////////////////////////
@@ -230,7 +227,7 @@ var Rectangle = function GLRectangle() {
 		if (this._strokeMaterial) {
 			rtnStr += this._strokeMaterial.getName();
         } else {
-			rtnStr += "flatMaterial";
+			rtnStr +=  MaterialsModel.getDefaultMaterialName();
         }
 		rtnStr += "\n";
 
@@ -238,7 +235,7 @@ var Rectangle = function GLRectangle() {
 		if (this._fillMaterial) {
 			rtnStr += this._fillMaterial.getName();
         } else {
-			rtnStr += "flatMaterial";
+			rtnStr +=  MaterialsModel.getDefaultMaterialName();
         }
 		rtnStr += "\n";
 
@@ -247,6 +244,53 @@ var Rectangle = function GLRectangle() {
 		return rtnStr;
 	};
 
+	// JSON export
+	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,
+			'tlRadius'		: this._tlRadius,
+			'trRadius'		: this._trRadius,
+			'blRadius'		: this._blRadius,
+			'brRadius'		: this._brRadius,
+			'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._tlRadius			= jObj.tlRadius;
+		this._trRadius			= jObj.trRadius;
+		this._blRadius			= jObj.blRadius;
+		this._brRadius			= jObj.brRadius;
+		this._innerRadius		= jObj.innerRadius;
+		this._strokeStyle		= jObj.strokeStyle;
+		var strokeMaterialName	= jObj.strokeMat;
+		var fillMaterialName	= jObj.fillMat;
+		this.importMaterialsJSON( jObj.materials );
+	};
+
 	this.import = function( importStr ) {
 		this._xOffset			= Number( this.getPropertyFromString( "xoff: ",			importStr )  );
 		this._yOffset			= Number( this.getPropertyFromString( "yoff: ",			importStr )  );
@@ -284,15 +328,14 @@ var Rectangle = function GLRectangle() {
 		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;
 
 		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;
 
-- 
cgit v1.2.3