Mercurial > hg > forks > multipaint-js
comparison preview.pde @ 145:5af8b5ddf349
Merge and clean up changes from v1.8.2018
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Tue, 14 Aug 2018 13:12:43 +0300 |
parents | 1ec3488bfd1e |
children |
comparison
equal
deleted
inserted
replaced
144:f91dda5dc8da | 145:5af8b5ddf349 |
---|---|
4 int g_preview = 0; | 4 int g_preview = 0; |
5 int g_prevx = 0; | 5 int g_prevx = 0; |
6 int g_prevy = 0; | 6 int g_prevy = 0; |
7 int g_phandlex = 0; | 7 int g_phandlex = 0; |
8 int g_phandley = 0; | 8 int g_phandley = 0; |
9 int g_pgrab = 0; | 9 boolean g_pgrab = false; |
10 final int g_pwindow_px = 16, g_pwindow_py = 16; | 10 final int g_pwindow_px = 16, g_pwindow_py = 16; |
11 | 11 |
12 int[] g_pwindow = new int[(320 + g_pwindow_px) * (256 + g_pwindow_py)]; | 12 int[] g_pwindow = new int[(320 + g_pwindow_px) * (256 + g_pwindow_py)]; |
13 | 13 |
14 | 14 |
15 void preview_window() | 15 void preview_window() |
16 { | 16 { |
17 if (g_preview == 0) | |
18 return; | |
19 | |
17 int wix = X + 16; | 20 int wix = X + 16; |
18 int ofx = g_prevx; | 21 int ofx = g_prevx; |
19 int ofy = g_prevy; | 22 int ofy = g_prevy; |
20 | |
21 if (g_preview == 0) | |
22 return; | |
23 | 23 |
24 for (int y = 0; y < Y + g_pwindow_py; y++) | 24 for (int y = 0; y < Y + g_pwindow_py; y++) |
25 { | 25 { |
26 int ad = (ofy + y) * width; | 26 int ad = (ofy + y) * width; |
27 if (y + ofy >= 0 && y + ofy < height) | 27 if (y + ofy >= 0 && y + ofy < height) |
45 } | 45 } |
46 | 46 |
47 | 47 |
48 void update_preview_window() //done at mousereleased | 48 void update_preview_window() //done at mousereleased |
49 { | 49 { |
50 int wix = X + 16; | |
51 | |
52 if (g_preview == 0) | 50 if (g_preview == 0) |
53 return; | 51 return; |
52 | |
53 int wix = X + g_pwindow_px; | |
54 | 54 |
55 for (int y = 0; y < Y + g_pwindow_py; y++) | 55 for (int y = 0; y < Y + g_pwindow_py; y++) |
56 for (int x = 0; x < X + g_pwindow_py; x++) | 56 for (int x = 0; x < X + g_pwindow_py; x++) |
57 { | 57 { |
58 if (y == 0 || y == Y + 15 || x == 0 || x == X + 15) | 58 if (y == 0 || y == Y + g_pwindow_py - 1 || |
59 x == 0 || x == X + g_pwindow_py - 1) | |
59 g_pwindow[y * wix + x] = g_rgb[257]; | 60 g_pwindow[y * wix + x] = g_rgb[257]; |
60 else | 61 else |
61 if (y < 8 || x < 8 || y >= Y + 8 || x >= X + 8) | 62 if (y < 8 || x < 8 || y >= Y + 8 || x >= X + 8) |
62 g_pwindow[y * wix + x] = g_rgb[g_map[0]]; | 63 g_pwindow[y * wix + x] = g_rgb[g_map[0]]; |
63 else | 64 else |