diff options
Diffstat (limited to 'js/panels')
-rw-r--r-- | js/panels/Materials/Materials.xml | 10 | ||||
-rw-r--r-- | js/panels/properties/sections/three-d-view.reel/three-d-view.html | 12 | ||||
-rw-r--r-- | js/panels/properties/sections/three-d-view.reel/three-d-view.js | 3 |
3 files changed, 18 insertions, 7 deletions
diff --git a/js/panels/Materials/Materials.xml b/js/panels/Materials/Materials.xml index de07990e..cdeee69e 100644 --- a/js/panels/Materials/Materials.xml +++ b/js/panels/Materials/Materials.xml | |||
@@ -2,7 +2,17 @@ | |||
2 | <tree id="Materials"> | 2 | <tree id="Materials"> |
3 | <folder id="ninjaMaterials" label="Ninja Materials"> | 3 | <folder id="ninjaMaterials" label="Ninja Materials"> |
4 | <leaf id="UberMaterial" label="Uber" /> | 4 | <leaf id="UberMaterial" label="Uber" /> |
5 | <leaf id="RadialBlurMaterial" label="Radial Blur" /> | ||
6 | <leaf id="PulseMaterial" label="Pulse" /> | ||
7 | <leaf id="TunnelMaterial" label="Tunnel" /> | ||
8 | <leaf id="TwistMaterial" label="Twist" /> | ||
9 | <leaf id="KeleidoscopeMaterial" label="Keleidoscope" /> | ||
10 | <leaf id="JuliaMaterial" label="Julia" /> | ||
11 | <leaf id="MandelMaterial" label="Mandel" /> | ||
12 | <leaf id="PlasmaMaterial" label="Plasma" /> | ||
5 | <leaf id="BumpMetalMaterial" label="Bump Metal" /> | 13 | <leaf id="BumpMetalMaterial" label="Bump Metal" /> |
14 | <leaf id="LinearGradientMaterial" label="Linear Gradient" /> | ||
15 | <leaf id="RadialGradientMaterial" label="Radial Gradient" /> | ||
6 | </folder> | 16 | </folder> |
7 | <folder id="customMaterials" label="Custom Materials"> | 17 | <folder id="customMaterials" label="Custom Materials"> |
8 | <leaf id="CheckerBoard" label="CheckerBoard" /> | 18 | <leaf id="CheckerBoard" label="CheckerBoard" /> |
diff --git a/js/panels/properties/sections/three-d-view.reel/three-d-view.html b/js/panels/properties/sections/three-d-view.reel/three-d-view.html index 11a5b3f2..1e24cb55 100644 --- a/js/panels/properties/sections/three-d-view.reel/three-d-view.html +++ b/js/panels/properties/sections/three-d-view.reel/three-d-view.html | |||
@@ -39,7 +39,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
39 | "value": { | 39 | "value": { |
40 | "boundObject": {"@": "owner"}, | 40 | "boundObject": {"@": "owner"}, |
41 | "boundObjectPropertyPath": "x3D", | 41 | "boundObjectPropertyPath": "x3D", |
42 | "oneway": true | 42 | "oneway": false |
43 | } | 43 | } |
44 | }, | 44 | }, |
45 | "listeners": [ | 45 | "listeners": [ |
@@ -68,7 +68,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
68 | "value": { | 68 | "value": { |
69 | "boundObject": {"@": "owner"}, | 69 | "boundObject": {"@": "owner"}, |
70 | "boundObjectPropertyPath": "y3D", | 70 | "boundObjectPropertyPath": "y3D", |
71 | "oneway": true | 71 | "oneway": false |
72 | } | 72 | } |
73 | }, | 73 | }, |
74 | "listeners": [ | 74 | "listeners": [ |
@@ -97,7 +97,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
97 | "value": { | 97 | "value": { |
98 | "boundObject": {"@": "owner"}, | 98 | "boundObject": {"@": "owner"}, |
99 | "boundObjectPropertyPath": "z3D", | 99 | "boundObjectPropertyPath": "z3D", |
100 | "oneway": true | 100 | "oneway": false |
101 | } | 101 | } |
102 | }, | 102 | }, |
103 | "listeners": [ | 103 | "listeners": [ |
@@ -128,7 +128,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
128 | "value": { | 128 | "value": { |
129 | "boundObject": {"@": "owner"}, | 129 | "boundObject": {"@": "owner"}, |
130 | "boundObjectPropertyPath": "xAngle", | 130 | "boundObjectPropertyPath": "xAngle", |
131 | "oneway": true | 131 | "oneway": false |
132 | } | 132 | } |
133 | }, | 133 | }, |
134 | "listeners": [ | 134 | "listeners": [ |
@@ -159,7 +159,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
159 | "value": { | 159 | "value": { |
160 | "boundObject": {"@": "owner"}, | 160 | "boundObject": {"@": "owner"}, |
161 | "boundObjectPropertyPath": "yAngle", | 161 | "boundObjectPropertyPath": "yAngle", |
162 | "oneway": true | 162 | "oneway": false |
163 | } | 163 | } |
164 | }, | 164 | }, |
165 | "listeners": [ | 165 | "listeners": [ |
@@ -190,7 +190,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
190 | "value": { | 190 | "value": { |
191 | "boundObject": {"@": "owner"}, | 191 | "boundObject": {"@": "owner"}, |
192 | "boundObjectPropertyPath": "zAngle", | 192 | "boundObjectPropertyPath": "zAngle", |
193 | "oneway": true | 193 | "oneway": false |
194 | } | 194 | } |
195 | }, | 195 | }, |
196 | "listeners": [ | 196 | "listeners": [ |
diff --git a/js/panels/properties/sections/three-d-view.reel/three-d-view.js b/js/panels/properties/sections/three-d-view.reel/three-d-view.js index 96053490..0c4a9171 100644 --- a/js/panels/properties/sections/three-d-view.reel/three-d-view.js +++ b/js/panels/properties/sections/three-d-view.reel/three-d-view.js | |||
@@ -215,7 +215,8 @@ exports.ThreeD = Montage.create(Component, { | |||
215 | Object.defineBinding(this, "item", { | 215 | Object.defineBinding(this, "item", { |
216 | boundObject: this, | 216 | boundObject: this, |
217 | boundObjectPropertyPath: "application.ninja.selectedElements", | 217 | boundObjectPropertyPath: "application.ninja.selectedElements", |
218 | boundValueMutator: this._getSelectedItem | 218 | boundValueMutator: this._getSelectedItem, |
219 | oneway: true | ||
219 | }); | 220 | }); |
220 | } | 221 | } |
221 | }, | 222 | }, |