diff options
author | Valerio Virgillito | 2012-02-06 11:02:14 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-06 11:02:14 -0800 |
commit | 671a27069db6a121507c2b342653aede685cff67 (patch) | |
tree | 77e9f1499c400229273f880c9d365115b411b227 /js/panels/Color/colortoolbar.reel | |
parent | e58204970e398ce3a36a52bbf72d120c7ffdc167 (diff) | |
parent | 1b0c5c0e7ebf9dda95a624da546aaece268631ad (diff) | |
download | ninja-671a27069db6a121507c2b342653aede685cff67.tar.gz |
Merge pull request #15 from mqg734/ToolFixes
Adding, deleting and modifying elements now keep the element planes and PI in sync.
Diffstat (limited to 'js/panels/Color/colortoolbar.reel')
-rw-r--r-- | js/panels/Color/colortoolbar.reel/colortoolbar.js | 68 |
1 files changed, 15 insertions, 53 deletions
diff --git a/js/panels/Color/colortoolbar.reel/colortoolbar.js b/js/panels/Color/colortoolbar.reel/colortoolbar.js index 19fe7b85..6b8e476b 100644 --- a/js/panels/Color/colortoolbar.reel/colortoolbar.js +++ b/js/panels/Color/colortoolbar.reel/colortoolbar.js | |||
@@ -20,7 +20,7 @@ exports.ColorToolbar = Montage.create(Component, { | |||
20 | //Storing stroke (stores color in mode use to select color) | 20 | //Storing stroke (stores color in mode use to select color) |
21 | _stroke: { | 21 | _stroke: { |
22 | enumerable: false, | 22 | enumerable: false, |
23 | value: {colorMode: 'rgb', color: {r: 0, g: 0, b: 0, a: 1, css: 'rgb(0,0,0)'}, webGlColor: [0, 0, 0, 1]} | 23 | value: {colorMode: 'rgb', color: {r: 0, g: 0, b: 0, a: 1, css: 'rgb(0,0,0)', mode:'rgb', wasSetByCode: true, type: 'change'}, webGlColor: [0, 0, 0, 1]} |
24 | }, | 24 | }, |
25 | //////////////////////////////////////////////////////////////////// | 25 | //////////////////////////////////////////////////////////////////// |
26 | // | 26 | // |
@@ -39,7 +39,7 @@ exports.ColorToolbar = Montage.create(Component, { | |||
39 | //Storing fill (stores color in mode use to select color) | 39 | //Storing fill (stores color in mode use to select color) |
40 | _fill: { | 40 | _fill: { |
41 | enumerable: false, | 41 | enumerable: false, |
42 | value: {colorMode: 'rgb', color: {r: 255, g: 255, b: 255, a: 1, css: 'rgb(255,255,255)'}, webGlColor: [1, 1, 1, 1]} | 42 | value: {colorMode: 'rgb', color: {r: 255, g: 255, b: 255, a: 1, css: 'rgb(255,255,255)', mode:'rgb', wasSetByCode: true, type: 'change'}, webGlColor: [1, 1, 1, 1]} |
43 | }, | 43 | }, |
44 | //////////////////////////////////////////////////////////////////// | 44 | //////////////////////////////////////////////////////////////////// |
45 | // | 45 | // |
@@ -86,8 +86,8 @@ exports.ColorToolbar = Montage.create(Component, { | |||
86 | this.application.ninja.colorController.addButton('chip', this.fill_btn); | 86 | this.application.ninja.colorController.addButton('chip', this.fill_btn); |
87 | this.application.ninja.colorController.addButton('chip', this.stroke_btn); | 87 | this.application.ninja.colorController.addButton('chip', this.stroke_btn); |
88 | // | 88 | // |
89 | this.fill_btn.color('rgb', {wasSetByCode: false, type: 'change', color: {r: 255, g: 255, b: 255}, css: 'rgb(255,255,255)'}); | 89 | this.fill_btn.color('rgb', {wasSetByCode: true, type: 'change', color: {r: 255, g: 255, b: 255}, css: 'rgb(255,255,255)'}); |
90 | this.stroke_btn.color('rgb', {wasSetByCode: false, type: 'change', color: {r: 0, g: 0, b: 0}, css: 'rgb(0,0,0)'}); | 90 | this.stroke_btn.color('rgb', {wasSetByCode: true, type: 'change', color: {r: 0, g: 0, b: 0}, css: 'rgb(0,0,0)'}); |
91 | } | 91 | } |
92 | }, | 92 | }, |
93 | //////////////////////////////////////////////////////////////////// | 93 | //////////////////////////////////////////////////////////////////// |
@@ -95,76 +95,38 @@ exports.ColorToolbar = Montage.create(Component, { | |||
95 | didDraw: { | 95 | didDraw: { |
96 | enumerable: false, | 96 | enumerable: false, |
97 | value: function() { | 97 | value: function() { |
98 | // | 98 | |
99 | this.fill_btn.addEventListener('change', function (e) { | 99 | this.fill_btn.addEventListener('change', function (e) { |
100 | // | 100 | this.fill = e._event; |
101 | var temp; | 101 | this.fill.webGlColor = this.application.ninja.colorController.colorModel.colorToWebGl(e._event.color); |
102 | // | ||
103 | this.fill = e._event; | ||
104 | // | ||
105 | if (e._event.color && e._event.color.l) { | ||
106 | temp = this.application.ninja.colorController.colorModel.hslToRgb(e._event.color.h/360, e._event.color.s/100, e._event.color.l/100); | ||
107 | temp.a = e._event.color.a; | ||
108 | } else if (e._event.color && e._event.color.r){ | ||
109 | temp = e._event.color; | ||
110 | temp.a = e._event.color.a; | ||
111 | } else { | ||
112 | temp = null; | ||
113 | } | ||
114 | //WebGL uses array | ||
115 | if (temp) { | ||
116 | this.fill.webGlColor = [temp.r/255, temp.g/255, temp.b/255, temp.a]; | ||
117 | } else { | ||
118 | this.fill.webGlColor = null; | ||
119 | } | ||
120 | // | ||
121 | this.application.ninja.colorController.colorModel.input = 'fill'; | 102 | this.application.ninja.colorController.colorModel.input = 'fill'; |
122 | // | 103 | |
123 | var color = e._event.color; | 104 | var color = e._event.color; |
124 | if (e._event.colorMode !== 'nocolor' && color) { | 105 | if (e._event.colorMode !== 'nocolor' && color) { |
125 | color.wasSetByCode = false; | 106 | color.wasSetByCode = false; |
126 | color.type = 'change'; | 107 | color.type = 'change'; |
108 | color.mode = e._event.colorMode; | ||
127 | this.application.ninja.colorController.colorModel[e._event.colorMode] = color; | 109 | this.application.ninja.colorController.colorModel[e._event.colorMode] = color; |
128 | } else { | 110 | } else { |
129 | this.application.ninja.colorController.colorModel.applyNoColor(); | 111 | this.application.ninja.colorController.colorModel.applyNoColor(); |
130 | } | 112 | } |
131 | // | ||
132 | this.application.ninja.colorController.colorModel.input = 'chip'; | 113 | this.application.ninja.colorController.colorModel.input = 'chip'; |
133 | }.bind(this)); | 114 | }.bind(this)); |
134 | // | 115 | |
135 | this.stroke_btn.addEventListener('change', function (e) { | 116 | this.stroke_btn.addEventListener('change', function (e) { |
136 | // | ||
137 | var temp; | ||
138 | // | ||
139 | this.stroke = e._event; | 117 | this.stroke = e._event; |
140 | // | 118 | this.stroke.webGlColor = this.application.ninja.colorController.colorModel.colorToWebGl(e._event.color); |
141 | if (e._event.color && e._event.color.l) { | ||
142 | temp = this.application.ninja.colorController.colorModel.hslToRgb(e._event.color.h/360, e._event.color.s/100, e._event.color.l/100); | ||
143 | temp.a = e._event.color.a; | ||
144 | } else if (e._event.color && e._event.color.r){ | ||
145 | temp = e._event.color; | ||
146 | temp.a = e._event.color.a; | ||
147 | } else { | ||
148 | temp = null; | ||
149 | } | ||
150 | //WebGL uses array | ||
151 | if (temp) { | ||
152 | this.stroke.webGlColor = [temp.r/255, temp.g/255, temp.b/255, temp.a]; | ||
153 | } else { | ||
154 | this.stroke.webGlColor = null; | ||
155 | } | ||
156 | // | ||
157 | this.application.ninja.colorController.colorModel.input = 'stroke'; | 119 | this.application.ninja.colorController.colorModel.input = 'stroke'; |
158 | // | 120 | |
159 | var color = e._event.color; | 121 | var color = e._event.color; |
160 | if (e._event.colorMode !== 'nocolor' && color) { | 122 | if (e._event.colorMode !== 'nocolor' && color) { |
161 | color.wasSetByCode = false; | 123 | color.wasSetByCode = false; |
162 | color.type = 'change'; | 124 | color.type = 'change'; |
125 | color.mode = e._event.colorMode; | ||
163 | this.application.ninja.colorController.colorModel[e._event.colorMode] = color; | 126 | this.application.ninja.colorController.colorModel[e._event.colorMode] = color; |
164 | } else { | 127 | } else { |
165 | this.application.ninja.colorController.colorModel.applyNoColor(); | 128 | this.application.ninja.colorController.colorModel.applyNoColor(); |
166 | } | 129 | } |
167 | // | ||
168 | this.application.ninja.colorController.colorModel.input = 'chip'; | 130 | this.application.ninja.colorController.colorModel.input = 'chip'; |
169 | }.bind(this)); | 131 | }.bind(this)); |
170 | } | 132 | } |