aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/pulse-material.js
diff options
context:
space:
mode:
authorJonathan Duran2012-03-14 08:59:17 -0700
committerJonathan Duran2012-03-14 08:59:17 -0700
commite065244ac75d1d0f25fd5c75cb58e714a13fe16b (patch)
tree6b49a85a45fdd41b81be5603fbbc2e0d197eb187 /js/lib/rdge/materials/pulse-material.js
parente8f207dc50ad942ee8c1c1db6b146c0110ce3216 (diff)
downloadninja-e065244ac75d1d0f25fd5c75cb58e714a13fe16b.tar.gz
Squashed commit of the following:
merge master into timeline Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/lib/rdge/materials/pulse-material.js')
-rw-r--r--js/lib/rdge/materials/pulse-material.js11
1 files changed, 10 insertions, 1 deletions
diff --git a/js/lib/rdge/materials/pulse-material.js b/js/lib/rdge/materials/pulse-material.js
index 63cab2f4..81db36c6 100644
--- a/js/lib/rdge/materials/pulse-material.js
+++ b/js/lib/rdge/materials/pulse-material.js
@@ -101,7 +101,7 @@ var PulseMaterial = function PulseMaterial() {
101 this._shader.init(); 101 this._shader.init();
102 102
103 // set up the material node 103 // set up the material node
104 this._materialNode = createMaterialNode("pulseMaterial"); 104 this._materialNode = createMaterialNode("pulseMaterial" + "_" + world.generateUniqueNodeID());
105 this._materialNode.setShader(this._shader); 105 this._materialNode.setShader(this._shader);
106 106
107 this._time = 0; 107 this._time = 0;
@@ -178,6 +178,13 @@ var PulseMaterial = function PulseMaterial() {
178 // every material needs the base type and instance name 178 // every material needs the base type and instance name
179 var exportStr = "material: " + this.getShaderName() + "\n"; 179 var exportStr = "material: " + this.getShaderName() + "\n";
180 exportStr += "name: " + this.getName() + "\n"; 180 exportStr += "name: " + this.getName() + "\n";
181
182 var world = this.getWorld();
183 if (!world)
184 throw new Error( "no world in material.export, " + this.getName() );
185
186 var texMapName = this._propValues[this._propNames[0]];
187 exportStr += "texture: " +texMapName + "\n";
181 188
182 // every material needs to terminate like this 189 // every material needs to terminate like this
183 exportStr += "endMaterial\n"; 190 exportStr += "endMaterial\n";
@@ -193,6 +200,8 @@ var PulseMaterial = function PulseMaterial() {
193 200
194 var rtnStr; 201 var rtnStr;
195 try { 202 try {
203 this._propValues[this._propNames[0]] = pu.nextValue( "texture: " );
204
196 var endKey = "endMaterial\n"; 205 var endKey = "endMaterial\n";
197 var index = importStr.indexOf( endKey ); 206 var index = importStr.indexOf( endKey );
198 index += endKey.length; 207 index += endKey.length;