aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/twist-vert-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/twist-vert-material.js
parentda03585a0b03220281f6d54d9acf0ae0fafaef16 (diff)
parent309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff)
downloadninja-309b201017da2a4094df4f06adeeff9d396b193a.tar.gz
Merge branch 'refs/heads/master' into PresetsPI
Diffstat (limited to 'js/lib/rdge/materials/twist-vert-material.js')
-rw-r--r--js/lib/rdge/materials/twist-vert-material.js28
1 files changed, 28 insertions, 0 deletions
diff --git a/js/lib/rdge/materials/twist-vert-material.js b/js/lib/rdge/materials/twist-vert-material.js
index 05172a1b..2d2cdcc5 100644
--- a/js/lib/rdge/materials/twist-vert-material.js
+++ b/js/lib/rdge/materials/twist-vert-material.js
@@ -102,6 +102,34 @@ function TwistVertMaterial()
102 } 102 }
103 /////////////////////////////////////////////////////////////////////// 103 ///////////////////////////////////////////////////////////////////////
104 104
105 this.exportJSON = function()
106 {
107 var jObj =
108 {
109 'material' : this.getShaderName(),
110 'name' : this.getName(),
111 'color' : this._propValues["color"]
112 };
113
114 return jObj;
115 }
116
117 this.importJSON = function( jObj )
118 {
119 if (this.getShaderName() != jObj.material) throw new Error( "ill-formed material" );
120 this.setName( jObj.name );
121
122 try
123 {
124 var color = jObj.color;
125 this.setProperty( "color", color);
126 }
127 catch (e)
128 {
129 throw new Error( "could not import material: " + importStr );
130 }
131 }
132
105 this.export = function() 133 this.export = function()
106 { 134 {
107 // this function should be overridden by subclasses 135 // this function should be overridden by subclasses