Fixed RGB ordering when loading a bitmap. More tests in main.c.

Author: martincohen

.gitignore

@@ -1,5 +1,6 @@
 bin
 .idea
 .vs
+main.aps
 CMakeLists.txt
 NOTES.md

config.h

@@ -1,7 +1,7 @@
 #define WINDOW_TITLE "Punity"
-#define CANVAS_WIDTH 64
-#define CANVAS_HEIGHT 64
-#define CANVAS_SCALE 6
+#define CANVAS_WIDTH 128
+#define CANVAS_HEIGHT 128
+#define CANVAS_SCALE 3
 
 #define STACK_CAPACITY megabytes(16)
 #define STORAGE_CAPACITY megabytes(16)

main.c

@@ -1,5 +1,6 @@
 #include "punity.c"
 
+static Bitmap splash;
 static Font font;
 static Sound sound1;
 static Sound sound2;
@@ -14,57 +15,62 @@ init()
  CORE->palette.colors[1] = color_make(0x00, 0x00, 0x00, 0xff);
  CORE->palette.colors[2] = color_make(0xff, 0xff, 0xff, 0xff);
  CORE->palette.colors[3] = color_make(0x63, 0x9b, 0xff, 0xff);
+
  CORE->palette.colors_count = 4;
  canvas_clear(1);
 
+bitmap_load_resource(&splash, "splash.png");
+
  bitmap_load_resource(&font.bitmap, "font.png");
  font.char_width = 4;
  font.char_height = 7;
 
  sound_load_resource(&sound1, "sound1.ogg");
 sound_load_resource(&sound2, "sound2.ogg");
-sound2.rate = 48000;
+// sound2.rate = 48000;
 
  CORE->font = &font;
 }
 
 void
 step()
 {
-if (CORE->key_deltas[KEY_SPACE] && CORE->key_states[KEY_SPACE] == 1) {
-// sound_play(&sound1);
+if (key_pressed(KEY_SPACE)) {
 sound_play(&sound2);
 }
 
-if (CORE->key_states[KEY_RIGHT]) {
+if (key_down(KEY_RIGHT)) {
 CORE->translate_x++;
 }
 
-if (CORE->key_states[KEY_LEFT]) {
+if (key_down(KEY_LEFT)) {
 CORE->translate_x--;
 }
 
-if (CORE->key_states[KEY_DOWN]) {
+if (key_down(KEY_DOWN)) {
 CORE->translate_y++;
 }
 
-if (CORE->key_states[KEY_UP]) {
+if (key_down(KEY_UP)) {
 CORE->translate_y--;
 }
 
-if (CORE->key_states[KEY_ESCAPE]) {
+if (key_pressed(KEY_ESCAPE)) {
 CORE->running = 0;
 }
 
+
  canvas_clear(0);
- // Rect r = rect_make_size(0, 0, 16, 16);
- // bitmap_draw(0, 0, 0, 0, &splash, &r, 0, 0);
+
+ bitmap_draw(0, 0, 0, 0, &splash, 0, 0, 0);
 
  text_draw(0, 0, "\n\nHELLO\nWORLD", 3);
 
  rect_draw(rect_make_size(32, 32, 8, 8), 2);
 
  static char buf[256];
- sprintf(buf, "%03f %05d", CORE->perf_blit_gdi.delta, (i32)CORE->frame);
+ sprintf(buf, "%03f %05d", CORE->perf_step.delta, (i32)CORE->frame);
  text_draw(0, 0, buf, 2);
+
+CORE->canvas->pixels[0] = COLOR_WHITE;
 }

main.rc

@@ -1,4 +1,5 @@
 icon.ico ICON "res\\icon.ico"
+splash.png RESOURCE "res\\splash.png"
 font.png RESOURCE "res\\font.png"
 sound1.ogg RESOURCE "res\\sound2.ogg"
 sound2.ogg RESOURCE "res\\sound2-16kHz.ogg"

punity.c

@@ -423,7 +423,10 @@ bitmap_init(Bitmap *bitmap, i32 width, i32 height, void *pixels, int bpp)
  goto next;
  }
 
- pixel = *pixels_it;
+pixel = *pixels_it;
+// TODO: This is just for Windows, need to be done a bit better.
+pixel.b = pixels_it->r;
+pixel.r = pixels_it->b;
  pixel.a = 0xFF;
  for (ix = 1; ix < palette->colors_count; ix++) {
  if (palette->colors[ix].rgba == pixel.rgba)
@@ -435,7 +438,7 @@ bitmap_init(Bitmap *bitmap, i32 width, i32 height, void *pixels, int bpp)
  ASSERT(palette->colors_count != 0xFF);
  if (palette->colors_count != 0xFF) {
  ix = palette->colors_count;
- palette->colors[ix] = *pixels_it;
+ palette->colors[ix] = pixel;
  palette->colors_count++;
  // printf("[palette] + #%0.2x %0.2x%0.2x%0.2x%0.2x\n",
  // ix, pixel.r, pixel.g, pixel.b, pixel.a);

punity.h

@@ -276,13 +276,13 @@ bool clip_check();
 // This is useful if you want to lighten or darken the colors.
 // `ramp` is u8[256] array of indexes starting at darkest color as 1.
 // Index of 0 means the color is not being shifted.
-void palette_shift(Palette *A, Palette *B, u8 *ramp, i32 amount);
+// TODO: void palette_shift(Palette *A, Palette *B, u8 *ramp, i32 amount);
 
 
 // Draws a filled rectangle to the canvas.
 void rect_draw(Rect rect, u8 color);
 // Draws a frame of a rectangle to the canvas.
-void frame_draw(Rect rect, u8 color);
+// TODO: void frame_draw(Rect rect, u8 color);
 
 enum {
  DrawFlags_FlipH = 0x01,
@@ -416,6 +416,14 @@ void step();
 // Keys
 //
 
+// Returns true if key held down.
+//
+#define key_down(key) (CORE->key_states[key])
+
+// Returns true if key started to be held down in this frame.
+//
+#define key_pressed(key) (CORE->key_deltas[key] && key_down(key))
+
 #define KEY_MOD_SHIFT 0x0001
 #define KEY_MOD_CONTROL 0x0002
 #define KEY_MOD_ALT 0x0004