aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorhwc4872012-03-08 09:32:06 -0800
committerhwc4872012-03-08 09:32:06 -0800
commit4f7590251dd0fa4c07e04fd1f7fc927d9223c9b4 (patch)
tree8fcf7c10fe25cf66c43a4afe47923fe52e982663 /js
parent9e812f35ffa751e9215c5427c0c44005bd357924 (diff)
downloadninja-4f7590251dd0fa4c07e04fd1f7fc927d9223c9b4.tar.gz
Fix for runtime Radial blur material
Diffstat (limited to 'js')
-rw-r--r--js/lib/rdge/materials/radial-blur-material.js3
-rw-r--r--js/lib/rdge/runtime/RuntimeGeomObj.js1
2 files changed, 4 insertions, 0 deletions
diff --git a/js/lib/rdge/materials/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js
index 89116af4..d0d05e8d 100644
--- a/js/lib/rdge/materials/radial-blur-material.js
+++ b/js/lib/rdge/materials/radial-blur-material.js
@@ -161,6 +161,9 @@ var RadialBlurMaterial = function RadialBlurMaterial() {
161 // every material needs the base type and instance name 161 // every material needs the base type and instance name
162 var exportStr = "material: " + this.getShaderName() + "\n"; 162 var exportStr = "material: " + this.getShaderName() + "\n";
163 exportStr += "name: " + this.getName() + "\n"; 163 exportStr += "name: " + this.getName() + "\n";
164
165 var texMapName = this._propValues[this._propNames[0]];
166 exportStr += "texture: " + texMapName + "\n";
164 167
165 // every material needs to terminate like this 168 // every material needs to terminate like this
166 exportStr += "endMaterial\n"; 169 exportStr += "endMaterial\n";
diff --git a/js/lib/rdge/runtime/RuntimeGeomObj.js b/js/lib/rdge/runtime/RuntimeGeomObj.js
index 93d4d9a1..3dc81be2 100644
--- a/js/lib/rdge/runtime/RuntimeGeomObj.js
+++ b/js/lib/rdge/runtime/RuntimeGeomObj.js
@@ -109,6 +109,7 @@ var RuntimeGeomObj = function RuntimeGeomObj()
109 case "star": 109 case "star":
110 case "zinvert": 110 case "zinvert":
111 case "keleidoscope": 111 case "keleidoscope":
112 case "radialBlur":
112 case "pulse": mat = new RuntimePulseMaterial(); break; 113 case "pulse": mat = new RuntimePulseMaterial(); break;
113 114
114 default: 115 default: