aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/material.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/lib/rdge/materials/material.js')
-rwxr-xr-xjs/lib/rdge/materials/material.js35
1 files changed, 18 insertions, 17 deletions
diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js
index 34d3aa1f..ac2023e6 100755
--- a/js/lib/rdge/materials/material.js
+++ b/js/lib/rdge/materials/material.js
@@ -1,24 +1,25 @@
1/* <copyright> 1/* <copyright>
2Copyright (c) 2012, Motorola Mobility, Inc 2Copyright (c) 2012, Motorola Mobility LLC.
3All Rights Reserved. 3All Rights Reserved.
4BSD License.
5 4
6Redistribution and use in source and binary forms, with or without 5Redistribution and use in source and binary forms, with or without
7modification, are permitted provided that the following conditions are met: 6modification, are permitted provided that the following conditions are met:
8 7
9 - Redistributions of source code must retain the above copyright notice, 8* Redistributions of source code must retain the above copyright notice,
10 this list of conditions and the following disclaimer. 9 this list of conditions and the following disclaimer.
11 - Redistributions in binary form must reproduce the above copyright 10
12 notice, this list of conditions and the following disclaimer in the 11* Redistributions in binary form must reproduce the above copyright notice,
13 documentation and/or other materials provided with the distribution. 12 this list of conditions and the following disclaimer in the documentation
14 - Neither the name of Motorola Mobility nor the names of its contributors 13 and/or other materials provided with the distribution.
15 may be used to endorse or promote products derived from this software 14
16 without specific prior written permission. 15* Neither the name of Motorola Mobility LLC nor the names of its
16 contributors may be used to endorse or promote products derived from this
17 software without specific prior written permission.
17 18
18THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 21IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 22ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
22LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
23CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -103,7 +104,7 @@ var Material = function GLMaterial( world ) {
103 return this._materialNode; 104 return this._materialNode;
104 }; 105 };
105 106
106 // a material can be animated or not. default is not. 107 // a material can be animated or not. default is not.
107 // Any material needing continuous rendering should override this method 108 // Any material needing continuous rendering should override this method
108 this.isAnimated = function() { 109 this.isAnimated = function() {
109 return false; 110 return false;
@@ -187,7 +188,7 @@ var Material = function GLMaterial( world ) {
187 // get the current values; 188 // get the current values;
188 var propNames = [], propValues = [], propTypes = [], propLabels = []; 189 var propNames = [], propValues = [], propTypes = [], propLabels = [];
189 this.getAllProperties(propNames, propValues, propTypes, propLabels); 190 this.getAllProperties(propNames, propValues, propTypes, propLabels);
190 191
191 // allocate a new material 192 // allocate a new material
192 var MaterialLibrary = require("js/models/materials-model").MaterialsModel; 193 var MaterialLibrary = require("js/models/materials-model").MaterialsModel;
193 var newMat = MaterialLibrary.createMaterialByShaderName( this.getShaderName() ); 194 var newMat = MaterialLibrary.createMaterialByShaderName( this.getShaderName() );
@@ -221,7 +222,7 @@ var Material = function GLMaterial( world ) {
221 case "vector2d": 222 case "vector2d":
222 rtnVal = ((valType == "object") && (value.length >= 2)); 223 rtnVal = ((valType == "object") && (value.length >= 2));
223 break; 224 break;
224 225
225 case "vector3d": 226 case "vector3d":
226 rtnVal = ((valType == "object") && (value.length >= 3)); 227 rtnVal = ((valType == "object") && (value.length >= 3));
227 break; 228 break;
@@ -243,7 +244,7 @@ var Material = function GLMaterial( world ) {
243 catch(e) { 244 catch(e) {
244 console.log( "setting invalid material property: " + prop + ", value: " + value ); 245 console.log( "setting invalid material property: " + prop + ", value: " + value );
245 } 246 }
246 247
247// if (!rtnVal && (prop != 'color')) { 248// if (!rtnVal && (prop != 'color')) {
248// console.log( "invalid material property: " + prop + " : " + value ); 249// console.log( "invalid material property: " + prop + " : " + value );
249// } 250// }
@@ -360,7 +361,7 @@ var Material = function GLMaterial( world ) {
360 361
361 return jObj; 362 return jObj;
362 }; 363 };
363 364
364 this.importJSON = function (jObj) { 365 this.importJSON = function (jObj) {
365 if (this.getShaderName() != jObj.material) throw new Error("ill-formed material"); 366 if (this.getShaderName() != jObj.material) throw new Error("ill-formed material");
366 this.setName(jObj.name); 367 this.setName(jObj.name);
@@ -382,7 +383,7 @@ var Material = function GLMaterial( world ) {
382 }; 383 };
383 384
384 /////////////////////////////////////////////////////////////////////// 385 ///////////////////////////////////////////////////////////////////////
385 386
386 /////////////////////////////////////////////////////////////////////// 387 ///////////////////////////////////////////////////////////////////////
387 // Methods 388 // Methods
388 /////////////////////////////////////////////////////////////////////// 389 ///////////////////////////////////////////////////////////////////////