Skip to content

Commit

Permalink
progress
Browse files Browse the repository at this point in the history
  • Loading branch information
dtplsongithub authored Jun 9, 2024
1 parent 8dffc47 commit 2dd84fe
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 14 deletions.
2 changes: 1 addition & 1 deletion ChildApplet.pde
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class ChildApplet extends PApplet {
windowMove(150, 200);
windowResizable(false);
textFont(MSGothic20);
log.loaded("configured childapplet");
log.loaded(" childapplet");
}

public void draw() {
Expand Down
1 change: 1 addition & 0 deletions ebgg.pde
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ void setup() {
}

void draw() {
mouseX = 29;
inactive++;
realt++;
background(0);
Expand Down
50 changes: 38 additions & 12 deletions editor.pde
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,50 @@ class Toolbox {
Button[] b;
int currentToolSelected = 0;
public Toolbox() {
ib = new ImageButton[7];
b = new Button[1];
ib = new ImageButton[6];
b = new Button[4];
ib[0] = new ImageButton("editorPencil", 30, 100, 7, "assets/pencil.png", 2);
ib[1] = new ImageButton("editorLine", 30+32*1, 100, 7, "assets/line.png", 2);
ib[2] = new ImageButton("editorRect", 30+32*2, 100, 7, "assets/rectangle.png", 2);
ib[3] = new ImageButton("editorFillRect", 30+32*3, 100, 7, "assets/filledRectangle.png", 2);
ib[4] = new ImageButton("editorCircle", 30+32*4, 100, 7, "assets/circle.png", 2);
ib[5] = new ImageButton("editorFillCircle", 30+32*5, 100, 7, "assets/filledCircle.png", 2);
ib[6] = new ImageButton("editorGrid", 30+32*6, 100, 7, "assets/grid.png", 2);
b[0] = new Button("editorStatusBar", 30+32*7, 100, 33*7, 32, "Toggle status bar", 7);
ib[1] = new ImageButton("editorLine", 62, 100, 7, "assets/line.png", 2);
ib[2] = new ImageButton("editorRect", 94, 100, 7, "assets/rectangle.png", 2);
ib[3] = new ImageButton("editorFillRect", 126, 100, 7, "assets/filledRectangle.png", 2);
ib[4] = new ImageButton("editorCircle", 158, 100, 7, "assets/circle.png", 2);
ib[5] = new ImageButton("editorFillCircle", 190, 100, 7, "assets/filledCircle.png", 2);
b[0] = new Button("editorGrid", 222, 100, 110, 32, "Show grid", 7);
b[0].toggler = true;
b[0].toggle = true;
b[1] = new Button("editorStatusBar", 332, 100, 180, 32, "Show status bar", 7);
b[1].toggler = true;
b[1].toggle = true;
b[2] = new Button("editorPreviewMode", 512, 100, 230, 32, "Show numbers", 7);
b[2].toggler = true;
b[3] = new Button("editorUsePaloffset", 742, 100, 160, 32, "Use paloffset", 7);
b[3].toggler = true;
}
public void render() {
for (ImageButton i: ib) i.render();
for (Button i: b) i.render();
editor.text("current tool selected: "+this.currentToolSelected, 500, 100);

editor.fill(0, 127, 255, 64);
editor.rect(this.currentToolSelected*32+30, 100, 32, 32);
int rs = floor(min(930/ptm[0].length, 440/ptm.length));
editor.noStroke();
for (int y = 0; y<ptm.length; y++) {
for (int x = 0; x<ptm[0].length; x++) {
if (b[3].toggle) {
if (ptm[y][x] < palssa) {
editor.fill(pal[ptm[y][x]]);
} else {
editor.fill(pal[rem(ptm[y][x]+paloffset, pal.length-palssa)+palssa]);
}
} else if (!b[2].toggle){
editor.fill(pal[ptm[y][x]]);
} else {
editor.colorMode(HSB, 100);
editor.fill(ptm[y][x]*4, 100, 70);
editor.colorMode(RGB, 255);
}
editor.rect(x*rs, y*rs+150, rs-int(b[0].toggle), rs-int(b[0].toggle));
}
}
editor.stroke(0);
}
public void checkPress() {
for (int i = 0; i<ib.length; i++) {
Expand Down
12 changes: 12 additions & 0 deletions fontData.pde
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
byte[] sevenSegmentDisplay = {
0b01110111,
0b00010010,
0b01011101,
0b01011010,
0b00111010,
0b01101011,
0b01101111,
0b01010010,
0b01111111,
0b01111011
};
2 changes: 1 addition & 1 deletion options.pde
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
int menuselect = 0;
int menu = 0;
String[] menutitle = {
"choose a background",
"load a background",
"editor",
"loading...",
"loading...",
Expand Down

0 comments on commit 2dd84fe

Please sign in to comment.