aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/bump-metal-material.js
diff options
context:
space:
mode:
authorEric Guzman2012-04-02 15:36:08 -0700
committerEric Guzman2012-04-02 15:36:08 -0700
commit0241bf331b7e06e206a54be441edf2f4c7261f63 (patch)
treeb7e2f9cad73eed4fc616cf1841cd0be02bd955d4 /js/lib/rdge/materials/bump-metal-material.js
parentdde5b5054f93db493e5d4d502e677f5781334b08 (diff)
parentc6de22bf42be90b403491b5f87b1818d9020310c (diff)
downloadninja-0241bf331b7e06e206a54be441edf2f4c7261f63.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/lib/rdge/materials/bump-metal-material.js')
-rwxr-xr-xjs/lib/rdge/materials/bump-metal-material.js40
1 files changed, 40 insertions, 0 deletions
diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js
index fa6f5300..2ef83227 100755
--- a/js/lib/rdge/materials/bump-metal-material.js
+++ b/js/lib/rdge/materials/bump-metal-material.js
@@ -152,6 +152,46 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
152 } 152 }
153 }; 153 };
154 154
155 this.exportJSON = function()
156 {
157 var jObj =
158 {
159 'material' : this.getShaderName(),
160 'name' : this.getName(),
161 'lightDiff' : this.getLightDiff(),
162 'diffuseTexture' : this.getDiffuseTexture(),
163 'specularTexture' : this.getSpecularTexture(),
164 'normalMap' : this.getNormalTexture()
165 };
166
167 return jObj;
168 };
169
170 this.importJSON = function( jObj )
171 {
172 if (this.getShaderName() != jObj.material) throw new Error( "ill-formed material" );
173 this.setName( jObj.name );
174
175 try
176 {
177 var lightDiff = jObj.lightDiff,
178 dt = jObj.diffuseTexture,
179 st = jObj.specularTexture,
180 nt = jObj.normalMap;
181
182 this.setProperty( "lightDiff", lightDiff);
183 this.setProperty( "diffuseTexture", dt );
184 this.setProperty( "specularTexture", st );
185 this.setProperty( "normalMap", nt );
186 }
187 catch (e)
188 {
189 throw new Error( "could not import BumpMetal material: " + jObj );
190 }
191
192 return;
193 };
194
155 this.export = function() 195 this.export = function()
156 { 196 {
157 // every material needs the base type and instance name 197 // every material needs the base type and instance name