aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/twist-vert-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/twist-vert-material.js
parentdde5b5054f93db493e5d4d502e677f5781334b08 (diff)
parentc6de22bf42be90b403491b5f87b1818d9020310c (diff)
downloadninja-0241bf331b7e06e206a54be441edf2f4c7261f63.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
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