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