aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes
diff options
context:
space:
mode:
authorhwc4872012-02-23 15:21:56 -0800
committerhwc4872012-02-23 15:21:56 -0800
commit26bb2894c29d4608e843de01829d352dd3d00823 (patch)
treec5a9d10976304fe5b3dec59f40977d8c72df57de /js/helper-classes
parent64280907f31e6f6e5659acb0893df3e0da5bb044 (diff)
parent81ce79819ba574b03b46e91e9a153dab82b550cd (diff)
downloadninja-26bb2894c29d4608e843de01829d352dd3d00823.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration
Conflicts: js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/Materials/PulseMaterial.js js/helper-classes/RDGE/Materials/RadialBlurMaterial.js js/helper-classes/RDGE/src/tools/rdge-compiled.js js/preloader/Preloader.js
Diffstat (limited to 'js/helper-classes')
-rw-r--r--js/helper-classes/RDGE/Materials/PulseMaterial.js12
-rw-r--r--js/helper-classes/RDGE/Materials/RadialBlurMaterial.js11
2 files changed, 22 insertions, 1 deletions
diff --git a/js/helper-classes/RDGE/Materials/PulseMaterial.js b/js/helper-classes/RDGE/Materials/PulseMaterial.js
index 6f7e9fe0..d76b9966 100644
--- a/js/helper-classes/RDGE/Materials/PulseMaterial.js
+++ b/js/helper-classes/RDGE/Materials/PulseMaterial.js
@@ -200,7 +200,17 @@ function PulseMaterial()
200 this.setName( pu.nextValue( "name: ") ); 200 this.setName( pu.nextValue( "name: ") );
201 201
202 var rtnStr; 202 var rtnStr;
203 203 try
204 {
205 var endKey = "endMaterial\n";
206 var index = importStr.indexOf( endKey );
207 index += endKey.length;
208 rtnStr = importStr.substr( index );
209 }
210 catch (e)
211 {
212 throw new Error( "could not import material: " + importStr );
213 }
204 return rtnStr; 214 return rtnStr;
205 } 215 }
206} 216}
diff --git a/js/helper-classes/RDGE/Materials/RadialBlurMaterial.js b/js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
index 732800cf..a5fb134c 100644
--- a/js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
+++ b/js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
@@ -192,6 +192,17 @@ function RadialBlurMaterial()
192 this.setName( pu.nextValue( "name: ") ); 192 this.setName( pu.nextValue( "name: ") );
193 193
194 var rtnStr; 194 var rtnStr;
195 try
196 {
197 var endKey = "endMaterial\n";
198 var index = importStr.indexOf( endKey );
199 index += endKey.length;
200 rtnStr = importStr.substr( index );
201 }
202 catch (e)
203 {
204 throw new Error( "could not import material: " + importStr );
205 }
195 206
196 return rtnStr; 207 return rtnStr;
197 } 208 }