aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/sections/three-d-view.reel
diff options
context:
space:
mode:
authorJon Reid2012-05-15 11:24:53 -0700
committerJon Reid2012-05-15 11:24:53 -0700
commit3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
treed6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/panels/properties.reel/sections/three-d-view.reel
parent53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parente33a4e58c271a9507082694a5268b840fdd05968 (diff)
downloadninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz
Merge branch 'timeline-local' into timeline-multiselect
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers)
Diffstat (limited to 'js/panels/properties.reel/sections/three-d-view.reel')
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.html66
1 files changed, 27 insertions, 39 deletions
diff --git a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html
index b6c25baf..5ef13fab 100755
--- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html
+++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html
@@ -9,8 +9,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
9 <script type="text/montage-serialization"> 9 <script type="text/montage-serialization">
10 { 10 {
11 "owner": { 11 "owner": {
12 "module": "js/panels/properties.reel/sections/three-d-view.reel", 12 "prototype": "js/panels/properties.reel/sections/three-d-view.reel[ThreeD]",
13 "name": "ThreeD",
14 "properties": { 13 "properties": {
15 "element": {"#": "section"}, 14 "element": {"#": "section"},
16 "x3DControl": {"@": "threeDPosX"}, 15 "x3DControl": {"@": "threeDPosX"},
@@ -28,8 +27,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
28 }, 27 },
29 28
30 "threeDPosX": { 29 "threeDPosX": {
31 "module": "js/components/hottextunit.reel", 30 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
32 "name": "HotTextUnit",
33 "properties": { 31 "properties": {
34 "element": {"#": "threeDPosX"}, 32 "element": {"#": "threeDPosX"},
35 "identifier": "x3D", 33 "identifier": "x3D",
@@ -57,8 +55,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
57 ] 55 ]
58 }, 56 },
59 "threeDPosY": { 57 "threeDPosY": {
60 "module": "js/components/hottextunit.reel", 58 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
61 "name": "HotTextUnit",
62 "properties": { 59 "properties": {
63 "element": {"#": "threeDPosY"}, 60 "element": {"#": "threeDPosY"},
64 "identifier": "y3D", 61 "identifier": "y3D",
@@ -86,8 +83,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
86 ] 83 ]
87 }, 84 },
88 "threeDPosZ": { 85 "threeDPosZ": {
89 "module": "js/components/hottextunit.reel", 86 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
90 "name": "HotTextUnit",
91 "properties": { 87 "properties": {
92 "element": {"#": "threeDPosZ"}, 88 "element": {"#": "threeDPosZ"},
93 "identifier": "z3D", 89 "identifier": "z3D",
@@ -115,8 +111,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
115 ] 111 ]
116 }, 112 },
117 "threeDRotX": { 113 "threeDRotX": {
118 "module": "js/components/hottextunit.reel", 114 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
119 "name": "HotTextUnit",
120 "properties": { 115 "properties": {
121 "element": {"#": "threeDRotX"}, 116 "element": {"#": "threeDRotX"},
122 "identifier": "xAngle", 117 "identifier": "xAngle",
@@ -146,8 +141,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
146 ] 141 ]
147 }, 142 },
148 "threeDRotY": { 143 "threeDRotY": {
149 "module": "js/components/hottextunit.reel", 144 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
150 "name": "HotTextUnit",
151 "properties": { 145 "properties": {
152 "element": {"#": "threeDRotY"}, 146 "element": {"#": "threeDRotY"},
153 "identifier": "yAngle", 147 "identifier": "yAngle",
@@ -177,8 +171,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
177 ] 171 ]
178 }, 172 },
179 "threeDRotZ": { 173 "threeDRotZ": {
180 "module": "js/components/hottextunit.reel", 174 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
181 "name": "HotTextUnit",
182 "properties": { 175 "properties": {
183 "element": {"#": "threeDRotZ"}, 176 "element": {"#": "threeDRotZ"},
184 "identifier": "zAngle", 177 "identifier": "zAngle",
@@ -208,15 +201,13 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
208 ] 201 ]
209 }, 202 },
210 "threeDPerspectiveDistance": { 203 "threeDPerspectiveDistance": {
211 "module": "js/components/hottextunit.reel", 204 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
212 "name": "HotTextUnit",
213 "properties": { 205 "properties": {
214 "element": {"#": "threeDPerspectiveDistance"} 206 "element": {"#": "threeDPerspectiveDistance"}
215 } 207 }
216 }, 208 },
217 "axisModeGroup": { 209 "axisModeGroup": {
218 "module": "js/components/radio.reel", 210 "prototype": "js/components/radio.reel[RadioGroup]",
219 "name": "RadioGroup",
220 "properties": { 211 "properties": {
221 "name": "rotationLG", 212 "name": "rotationLG",
222 "selectedItem": {"@": "rdioLocal"}, 213 "selectedItem": {"@": "rdioLocal"},
@@ -224,8 +215,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
224 } 215 }
225 }, 216 },
226 "rdioLocal": { 217 "rdioLocal": {
227 "module": "js/components/radio.reel", 218 "prototype": "js/components/radio.reel",
228 "name": "Radio",
229 "properties": { 219 "properties": {
230 "element": {"#": "rdioLocal"}, 220 "element": {"#": "rdioLocal"},
231 "label": "Local", 221 "label": "Local",
@@ -235,8 +225,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
235 } 225 }
236 }, 226 },
237 "rdioGlobal": { 227 "rdioGlobal": {
238 "module": "js/components/radio.reel", 228 "prototype": "js/components/radio.reel",
239 "name": "Radio",
240 "properties": { 229 "properties": {
241 "element": {"#": "rdioGlobal"}, 230 "element": {"#": "rdioGlobal"},
242 "label": "Global", 231 "label": "Global",
@@ -245,8 +234,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
245 } 234 }
246 }, 235 },
247 "flattenCheckbox": { 236 "flattenCheckbox": {
248 "module": "montage/ui/checkbox.reel", 237 "prototype": "montage/ui/checkbox.reel",
249 "name": "Checkbox",
250 "properties": { 238 "properties": {
251 "element": {"#": "flattenCh"}, 239 "element": {"#": "flattenCh"},
252 "identifier": "flatten", 240 "identifier": "flatten",
@@ -271,43 +259,43 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
271 </script> 259 </script>
272</head> 260</head>
273<body> 261<body>
274<section id="section" class="sectional"> 262<section data-montage-id="section" class="sectional">
275 <section id="axisMode" class="fieldCol rotation"> 263 <section data-montage-id="axisMode" class="fieldCol rotation">
276 <label>Axis:</label> 264 <label>Axis:</label>
277 <article class="fieldRow"> 265 <article class="fieldRow">
278 <div class="inputField"> 266 <div class="inputField">
279 <div id="rdioLocal"></div> 267 <div data-montage-id="rdioLocal"></div>
280 </div> 268 </div>
281 </article> 269 </article>
282 <article class="fieldRow"> 270 <article class="fieldRow">
283 <div class="inputField"> 271 <div class="inputField">
284 <div id="rdioGlobal"></div> 272 <div data-montage-id="rdioGlobal"></div>
285 </div> 273 </div>
286 </article> 274 </article>
287 </section> 275 </section>
288 <hr /> 276 <hr />
289 <section class="fieldCol"> 277 <section class="fieldCol">
290 <label id="lblthreeDX">X:</label> 278 <label data-montage-id="lblthreeDX">X:</label>
291 <article class="fieldRow threeCol"> 279 <article class="fieldRow threeCol">
292 <div> 280 <div>
293 <div class="inputField"> 281 <div class="inputField">
294 <div id="threeDPosX"></div> 282 <div data-montage-id="threeDPosX"></div>
295 </div> 283 </div>
296 </div> 284 </div>
297 <div> 285 <div>
298 <div> 286 <div>