git
修订版 | f31372c9d65e249279d0a43d55fc4b84b2229f84 (tree) |
---|---|
时间 | 2014-08-03 16:31:08 |
作者 | karaage0703 <karaage0703@user...> |
Commiter | karaage0703 |
add lightenmode
@@ -27,7 +27,7 @@ float[] lut_s = new float[256]; | ||
27 | 27 | float[] lut_m = new float[256]; |
28 | 28 | |
29 | 29 | //Window Size |
30 | -int view_width=800, view_height=600; | |
30 | +int view_width=1024, view_height=768; | |
31 | 31 | int view_swidth0, view_sheight0; |
32 | 32 | int view_swidth1, view_sheight1; |
33 | 33 |
@@ -35,7 +35,7 @@ int size_sx = 160; | ||
35 | 35 | int size_sy = 120; |
36 | 36 | |
37 | 37 | int size_x = 800; |
38 | -int size_y = 600; | |
38 | +int size_y = 640; | |
39 | 39 | |
40 | 40 | |
41 | 41 | void TuneImage(){ |
@@ -151,6 +151,32 @@ void ImageMultiExposed(){ | ||
151 | 151 | writeimg.pixels[i] = color(r,g,b); |
152 | 152 | } |
153 | 153 | break; |
154 | + case 4: // Lighten | |
155 | + for(int i = 0; i < img0.width*img0.height; i++){ | |
156 | + color tmp_color0 = tuned_img0.pixels[i]; | |
157 | + color tmp_color1 = tuned_img1.pixels[i]; | |
158 | + int r, g, b; | |
159 | + if((int)red(tmp_color0) > (int)red(tmp_color1)){ | |
160 | + r =(int)red(tmp_color0); | |
161 | + }else{ | |
162 | + r =(int)red(tmp_color1); | |
163 | + } | |
164 | + | |
165 | + if((int)green(tmp_color0) > (int)green(tmp_color1)){ | |
166 | + g =(int)green(tmp_color0); | |
167 | + }else{ | |
168 | + g =(int)green(tmp_color1); | |
169 | + } | |
170 | + | |
171 | + if((int)blue(tmp_color0) > (int)blue(tmp_color1)){ | |
172 | + b =(int)blue(tmp_color0); | |
173 | + }else{ | |
174 | + b =(int)blue(tmp_color1); | |
175 | + } | |
176 | + | |
177 | + writeimg.pixels[i] = color(r,g,b); | |
178 | + } | |
179 | + break; | |
154 | 180 | default: |
155 | 181 | break; |
156 | 182 | } |
@@ -209,7 +235,7 @@ void setup(){ | ||
209 | 235 | |
210 | 236 | l = cp5.addListBox("myList") |
211 | 237 | .setPosition(40, 250) |
212 | - .setSize(120, 120) | |
238 | + .setSize(120, 180) | |
213 | 239 | .setItemHeight(39) |
214 | 240 | .setBarHeight(20) |
215 | 241 | .setColorBackground(color(40, 128)) |
@@ -230,7 +256,8 @@ void setup(){ | ||
230 | 256 | lbi.setColorBackground(0xffff0000); |
231 | 257 | lbi = l.addItem("Overlay", 2); |
232 | 258 | lbi.setColorBackground(0xffff0000); |
233 | - | |
259 | + lbi = l.addItem("Lighten", 3); | |
260 | + lbi.setColorBackground(0xffff0000); | |
234 | 261 | |
235 | 262 | cp5.addButton("Save Image") |
236 | 263 | .setPosition(40,500) |
@@ -326,4 +353,4 @@ void draw(){ | ||
326 | 353 | if(img0.width == img1.width && img0.height == img0.height){ |
327 | 354 | image(writeimg, 0, size_sy, view_width, view_height); |
328 | 355 | } |
329 | -} | |
356 | +} | |
\ No newline at end of file |