aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/flat-material.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-03-22 16:26:02 -0700
committerJose Antonio Marquez2012-03-22 16:26:02 -0700
commit748a5c55e15809add748a15a87cd730e3fcee4bf (patch)
tree688f3ee299b2985fa5617426a5789d86f518b877 /js/lib/rdge/materials/flat-material.js
parent7fbda862c62f37d4c67e4d5a619b7e3cffc309ff (diff)
parentb25195d010417417bb5b2e5362385078d68d9a84 (diff)
downloadninja-748a5c55e15809add748a15a87cd730e3fcee4bf.tar.gz
Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Components
Diffstat (limited to 'js/lib/rdge/materials/flat-material.js')
-rwxr-xr-xjs/lib/rdge/materials/flat-material.js21
1 files changed, 21 insertions, 0 deletions
diff --git a/js/lib/rdge/materials/flat-material.js b/js/lib/rdge/materials/flat-material.js
index fff0e68e..5030cc88 100755
--- a/js/lib/rdge/materials/flat-material.js
+++ b/js/lib/rdge/materials/flat-material.js
@@ -112,6 +112,27 @@ var FlatMaterial = function FlatMaterial() {
112 return rtnStr; 112 return rtnStr;
113 }; 113 };
114 114
115 this.exportJSON = function()
116 {
117 var jObj =
118 {
119 'material' : this.getShaderName(),
120 'name' : this.getName(),
121 'color' : this._propValues["color"]
122 };
123
124 return jObj;
125 }
126
127 this.importJSON = function( jObj )
128 {
129 if (this.getShaderName() != jObj.material) throw new Error( "ill-formed material" );
130 this.setName( jObj.name );
131
132 var color = jObj.color;
133 this.setProperty( "color", color);
134 }
135
115 this.update = function( time ) 136 this.update = function( time )
116 { 137 {
117 }; 138 };