aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mayhew2012-05-15 15:24:13 -0700
committerJohn Mayhew2012-05-15 17:08:00 -0700
commit9539e778dd678cec90cf83528df69a189be3a192 (patch)
tree39f172fa36d08486273ee6b5f41afaa65c468b30
parent64d32b512c94fb470654897bfa799b248122431b (diff)
downloadninja-9539e778dd678cec90cf83528df69a189be3a192.tar.gz
updated object 3D options bar to use the new radio styles
removed its use of the sprite sheet
Diffstat
-rwxr-xr-xcss/ninja.css18
-rw-r--r--images/optionsbar/options3D/rotate-globally.pngbin0 -> 753 bytes
-rw-r--r--images/optionsbar/options3D/rotate-locally.pngbin0 -> 626 bytes
-rwxr-xr-ximages/tools/sprite-toolbar-3d.pngbin2599 -> 0 bytes
-rwxr-xr-xjs/components/tools-properties/object3d-properties.reel/object3d-properties.html4
-rwxr-xr-xjs/components/tools-properties/object3d-properties.reel/object3d-properties.js18
-rwxr-xr-xscss/imports/scss/_Tools.scss42
7 files changed, 17 insertions, 65 deletions
diff --git a/css/ninja.css b/css/ninja.css
index 33ec332c..682dfc9d 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -769,23 +769,9 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
769 769
770#zoomToolOptionHolder .zoomInToolIcon { background-image: url("../images/optionsbar/zoom/zoom_plus.png"); } 770#zoomToolOptionHolder .zoomInToolIcon { background-image: url("../images/optionsbar/zoom/zoom_plus.png"); }
771 771
772.object3DToolContainer input.tag-type { background: none; width: 20px; height: 20px; display: block; float: left; margin: 0px; margin-right: 5px; background-repeat: no-repeat; opacity: 0.8; text-indent: -9999px; cursor: pointer; -webkit-border-radius: 3px; -webkit-user-select: none; border: 1px solid transparent; } 772.object3DToolContainer input.rotateLocally { background-image: url("../images/optionsbar/options3D/rotate-locally.png"); }
773 773
774.object3DToolContainer input.tag-type { background-image: url("../images/tools/sprite-toolbar-3d.png"); } 774.object3DToolContainer input.rotateGlobally { background-image: url("../images/optionsbar/options3D/rotate-globally.png"); }
775
776.object3DToolContainer input.tag-type:active { border: 1px solid transparent; }
777
778.object3DToolContainer input.tag-type:hover { opacity: 1.0; -webkit-box-shadow: 0px 0px 4px #fff; }
779
780.object3DToolContainer input.tag-type:checked { background-color: transparent; opacity: 1.0; cursor: default; -webkit-box-shadow: none; }
781
782.object3DToolContainer input.rotateLocally { background-position: -20px 0px; }
783
784.object3DToolContainer input.rotateLocally:checked { background-position: -20px -20px; }
785
786.object3DToolContainer input.rotateGlobally { background-position: 0px 0px; }
787
788.object3DToolContainer input.rotateGlobally:checked { background-position: 0px -20px; }
789 775
790.optionsSelectionTool button { padding-top: 0px; } 776.optionsSelectionTool button { padding-top: 0px; }
791 777
diff --git a/images/optionsbar/options3D/rotate-globally.png b/images/optionsbar/options3D/rotate-globally.png
new file mode 100644
index 00000000..64c144b4
--- /dev/null
+++ b/images/optionsbar/options3D/rotate-globally.png
Binary files differ
diff --git a/images/optionsbar/options3D/rotate-locally.png b/images/optionsbar/options3D/rotate-locally.png
new file mode 100644
index 00000000..b0950675
--- /dev/null
+++ b/images/optionsbar/options3D/rotate-locally.png
Binary files differ
diff --git a/images/tools/sprite-toolbar-3d.png b/images/tools/sprite-toolbar-3d.png
deleted file mode 100755
index d4746064..00000000
--- a/images/tools/sprite-toolbar-3d.png
+++ /dev/null
Binary files differ
diff --git a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html
index 17bafacd..70ed79f9 100755
--- a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html
+++ b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html
@@ -31,8 +31,8 @@
31 <body> 31 <body>
32 <div data-montage-id="object3DProperties" class="subToolHolderPanel"> 32 <div data-montage-id="object3DProperties" class="subToolHolderPanel">
33 <div class="tagRadioButtons object3DToolContainer"> 33 <div class="tagRadioButtons object3DToolContainer">
34 <input type="radio" data-montage-id="rotateLocally" class="tag-type rotateLocally" title="Rotate Locally" name="rotateObject" checked/> 34 <input type="radio" data-montage-id="rotateLocally" class="toolOptsRadioButton rotateLocally" title="Rotate Locally" name="rotateObject" checked/>
35 <input type="radio" data-montage-id="rotateGlobally" class="tag-type rotateGlobally" title="Rotate Globally" name="rotateObject"/> 35 <input type="radio" data-montage-id="rotateGlobally" class="toolOptsRadioButton rotateGlobally" title="Rotate Globally" name="rotateObject"/>
36 </div> 36 </div>
37 </div> 37 </div>
38 </body> 38 </body>
diff --git a/js/components/tools-properties/object3d-properties.reel/object3d-properties.js b/js/components/tools-properties/object3d-properties.reel/object3d-properties.js
index afcb2400..d7f0976c 100755
--- a/js/components/tools-properties/object3d-properties.reel/object3d-properties.js
+++ b/js/components/tools-properties/object3d-properties.reel/object3d-properties.js
@@ -14,17 +14,21 @@ exports.Object3DProperties = Montage.create(ToolProperties, {
14 rotateGlobally: { value: null, enumerable: false }, 14 rotateGlobally: { value: null, enumerable: false },
15 15
16 _subPrepare: { 16 _subPrepare: {
17 value: function() { 17 value: function () {
18 this.rotateLocally.addEventListener("click", this, false); 18 this.rotateLocally.addEventListener("click", this, false);
19 this.rotateGlobally.addEventListener("click", this, false); 19 this.rotateGlobally.addEventListener("click", this, false);
20 } 20 }
21 }, 21 },
22 22
23 handleClick: { 23 handleClick: {
24 value: function(event) { 24 value: function (event) {
25 this.selectedMode = event._event.target.id; 25 if (event._event.target === this.rotateLocally) {
26 26 this.selectedMode = "rotateLocally";
27 NJevent("toolOptionsChange", {source: "Object3DProperties", mode: (this.selectedMode === "rotateLocally")}); 27 } else {
28 this.selectedMode = "rotateGlobally";
29 }
30
31 NJevent("toolOptionsChange", { source: "Object3DProperties", mode: (this.selectedMode === "rotateLocally") });
28 } 32 }
29 }, 33 },
30 34
@@ -33,8 +37,8 @@ exports.Object3DProperties = Montage.create(ToolProperties, {
33 }, 37 },
34 38
35 selectedMode: { 39 selectedMode: {
36 get: function() { return this._selectedMode;}, 40 get: function () { return this._selectedMode; },
37 set: function(value) { this._selectedMode = value; } 41 set: function (value) { this._selectedMode = value; }
38 } 42 }
39 43
40 44
diff --git a/scss/imports/scss/_Tools.scss b/scss/imports/scss/_Tools.scss
index d068fd2e..c63e695d 100755
--- a/scss/imports/scss/_Tools.scss
+++ b/scss/imports/scss/_Tools.scss
@@ -337,49 +337,11 @@ input[type="radio"]:disabled {
337} 337}
338 338
339// object 3D container styles 339// object 3D container styles
340.object3DToolContainer input.tag-type {
341 background: none;
342 width: 20px;
343 height: 20px;
344 display: block;
345 float: left;
346 margin: 0px;
347 margin-right: 5px;
348 background-repeat: no-repeat;
349 opacity: 0.8;
350 text-indent: -9999px;
351 cursor: pointer;
352 -webkit-border-radius: 3px;
353 -webkit-user-select: none;
354 border: 1px solid transparent;
355}
356.object3DToolContainer input.tag-type {
357 background-image: url("../images/tools/sprite-toolbar-3d.png");
358}
359.object3DToolContainer input.tag-type:active {
360 border: 1px solid transparent;
361}
362.object3DToolContainer input.tag-type:hover {
363 opacity: 1.0;
364 -webkit-box-shadow: 0px 0px 4px #fff;
365}
366.object3DToolContainer input.tag-type:checked {
367 background-color: transparent;
368 opacity: 1.0;
369 cursor: default;
370 -webkit-box-shadow: none;
371}
372.object3DToolContainer input.rotateLocally { 340.object3DToolContainer input.rotateLocally {
373 background-position: -20px 0px; 341 background-image: url("../images/optionsbar/options3D/rotate-locally.png");
374}
375.object3DToolContainer input.rotateLocally:checked {
376 background-position: -20px -20px;
377} 342}
378.object3DToolContainer input.rotateGlobally { 343.object3DToolContainer input.rotateGlobally {
379 background-position: 0px 0px; 344 background-image: url("../images/optionsbar/options3D/rotate-globally.png");
380}
381.object3DToolContainer input.rotateGlobally:checked {
382 background-position: 0px -20px;
383} 345}
384 346
385// Selection Tool Options Styles 347// Selection Tool Options Styles
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 20:14:05 +0000