aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhwc4872012-06-15 11:41:53 -0700
committerhwc4872012-06-15 11:41:53 -0700
commitdec69c3766aab7cf4c0ef2ebee6718efc4934e81 (patch)
tree1a2a3679b47ca19ec030f9c2c8e8ed6dce776a90
parent043ab3f0aa5099f88a32dc377e9de1011b79611f (diff)
downloadninja-dec69c3766aab7cf4c0ef2ebee6718efc4934e81.tar.gz
Runtime change for Paris material.
-rw-r--r--assets/canvas-runtime.js5
-rw-r--r--js/io/system/ninjalibrary.json2
2 files changed, 4 insertions, 3 deletions
diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js
index 091d8b7a..13b36540 100644
--- a/assets/canvas-runtime.js
+++ b/assets/canvas-runtime.js
@@ -607,11 +607,12 @@ NinjaCvsRt.RuntimeGeomObj = Object.create(Object.prototype, {
607 case "bumpMetal": mat = Object.create(NinjaCvsRt.RuntimeBumpMetalMaterial, {}); break; 607 case "bumpMetal": mat = Object.create(NinjaCvsRt.RuntimeBumpMetalMaterial, {}); break;
608 case "uber": mat = Object.create(NinjaCvsRt.RuntimeUberMaterial, {}); break; 608 case "uber": mat = Object.create(NinjaCvsRt.RuntimeUberMaterial, {}); break;
609 case "plasma": mat = Object.create(NinjaCvsRt.RuntimePlasmaMaterial, {}); break; 609 case "plasma": mat = Object.create(NinjaCvsRt.RuntimePlasmaMaterial, {}); break;
610 case "water": mat = Object.create(NinjaCvsRt.RuntimeWaterMaterial, {}); break;
611 case "taper": mat = Object.create(NinjaCvsRt.RuntimeTaperMaterial, {}); break; 610 case "taper": mat = Object.create(NinjaCvsRt.RuntimeTaperMaterial, {}); break;
611
612 case "paris":
613 case "water": mat = Object.create(NinjaCvsRt.RuntimeWaterMaterial, {}); break;
612 614
613 case "deform": 615 case "deform":
614 case "paris":
615 case "raiders": 616 case "raiders":
616 case "tunnel": 617 case "tunnel":
617 case "reliefTunnel": 618 case "reliefTunnel":
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index f8e61ca5..de11034b 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.10.1.0"}, 3 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.10.1.0"},
4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.1"} 4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.2"}
5 ] 5 ]
6} \ No newline at end of file 6} \ No newline at end of file