aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/taper-material.js
diff options
context:
space:
mode:
authorEric Guzman2012-03-27 10:22:42 -0700
committerEric Guzman2012-03-27 10:22:42 -0700
commit309b201017da2a4094df4f06adeeff9d396b193a (patch)
tree92257b32855bcd31dd74967b085a6632fd7dbe9b /js/lib/rdge/materials/taper-material.js
parentda03585a0b03220281f6d54d9acf0ae0fafaef16 (diff)
parent309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff)
downloadninja-309b201017da2a4094df4f06adeeff9d396b193a.tar.gz
Merge branch 'refs/heads/master' into PresetsPI
Diffstat (limited to 'js/lib/rdge/materials/taper-material.js')
-rw-r--r--js/lib/rdge/materials/taper-material.js27
1 files changed, 27 insertions, 0 deletions
diff --git a/js/lib/rdge/materials/taper-material.js b/js/lib/rdge/materials/taper-material.js
index 03a7ba9c..15b7b2b0 100644
--- a/js/lib/rdge/materials/taper-material.js
+++ b/js/lib/rdge/materials/taper-material.js
@@ -96,6 +96,33 @@ function TaperMaterial()
96 } 96 }
97 } 97 }
98 /////////////////////////////////////////////////////////////////////// 98 ///////////////////////////////////////////////////////////////////////
99 this.exportJSON = function()
100 {
101 var jObj =
102 {
103 'material' : this.getShaderName(),
104 'name' : this.getName(),
105 'color' : this._propValues["color"]
106 };
107
108 return jObj;
109 }
110
111 this.importJSON = function( jObj )
112 {
113 if (this.getShaderName() != jObj.material) throw new Error( "ill-formed material" );
114 this.setName( jObj.name );
115
116 try
117 {
118 var color = jObj.color;
119 this.setProperty( "color", color);
120 }
121 catch (e)
122 {
123 throw new Error( "could not import material: " + jObj );
124 }
125 }
99 126
100 this.export = function() 127 this.export = function()
101 { 128 {