aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rw-r--r--js/io/system/ninjalibrary.json2
-rwxr-xr-xjs/lib/geom/geom-obj.js1
-rw-r--r--js/lib/rdge/materials/twist-vert-material.js24
3 files changed, 24 insertions, 3 deletions
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index 0d211fb5..9547c1e8 100644
--- a/js/io/system/ninjalibrary.json
+++ b/js/io/system/ninjalibrary.json
@@ -1,6 +1,6 @@
1{ 1{
2 "libraries": [ 2 "libraries": [
3 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.8.0.0"}, 3 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.8.0.0"},
4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.6.2"} 4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.6.4"}
5 ] 5 ]
6} \ No newline at end of file 6} \ No newline at end of file
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index 6b73463f..417c8731 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -388,6 +388,7 @@ exports.GeomObj = Object.create(Object.prototype, {
388 case "keleidoscope": 388 case "keleidoscope":
389 case "radialBlur": 389 case "radialBlur":
390 case "pulse": 390 case "pulse":
391 case "twistVert":
391 mat = MaterialsModel.getMaterialByShader(shaderName); 392 mat = MaterialsModel.getMaterialByShader(shaderName);
392 if (mat) mat = mat.dup(); 393 if (mat) mat = mat.dup();
393 break; 394 break;
diff --git a/js/lib/rdge/materials/twist-vert-material.js b/js/lib/rdge/materials/twist-vert-material.js
index 4d5ab88d..cc232444 100644
--- a/js/lib/rdge/materials/twist-vert-material.js
+++ b/js/lib/rdge/materials/twist-vert-material.js
@@ -125,8 +125,17 @@ var TwistVertMaterial = function TwistVertMaterial()
125 this.exportJSON = function () { 125 this.exportJSON = function () {
126 var jObj = 126 var jObj =
127 { 127 {
128 'material': this.getShaderName(), 128 'material' : this.getShaderName(),
129 'name': this.getName(), 129 'name' : this.getName(),
130
131 'tex0' : this._propValues[this._propNames[4]],
132 'tex1' : this._propValues[this._propNames[5]],
133
134 'speed' : this._propValues[this._propNames[3]],
135
136 'limit1' : this._propValues[this._propNames[0]],
137 'limit2' : this._propValues[this._propNames[1]],
138 'angle' : this._propValues[this._propNames[2]]
130 } 139 }
131 140
132 return jObj; 141 return jObj;
@@ -137,6 +146,17 @@ var TwistVertMaterial = function TwistVertMaterial()
137 this.setName(jObj.name); 146 this.setName(jObj.name);
138 147
139 try { 148 try {
149
150 this._propValues[this._propNames[4]] = jObj.tex0;
151 this._propValues[this._propNames[5]] = jObj.tex1;
152
153 this._propValues[this._propNames[3]] = jObj.speed;
154
155 this._propValues[this._propNames[0]] = jObj.limit1;
156 this._propValues[this._propNames[1]] = jObj.limit2;
157 this._propValues[this._propNames[2]] = jObj.angle;
158
159 this.updateShaderValues();
140 } 160 }
141 catch (e) { 161 catch (e) {
142 throw new Error("could not import material: " + importStr); 162 throw new Error("could not import material: " + importStr);