summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--examples/assets/kot.png (renamed from examples/kot.png)bin7572 -> 7572 bytes
-rw-r--r--examples/assets/kothd.png (renamed from examples/kothd.png)bin108696 -> 108696 bytes
-rw-r--r--examples/assets/teapot.txt (renamed from examples/teapot.txt)0
-rw-r--r--examples/cube.c6
-rw-r--r--examples/example.h (renamed from example.h)0
-rw-r--r--examples/line.c2
-rw-r--r--examples/matrix.c3
-rw-r--r--examples/perspective.c2
-rw-r--r--examples/platform/platform_win32.c (renamed from platform_win32.c)6
-rw-r--r--examples/platform/platform_x11.c (renamed from platform_x11.c)0
-rw-r--r--examples/rainbow.c3
-rw-r--r--examples/rects.c2
-rw-r--r--examples/teapot.c4
-rw-r--r--examples/texture.c6
-rw-r--r--examples/triangle.c2
-rw-r--r--examples/triangles.c38
-rw-r--r--examples/uv.c6
-rw-r--r--examples/vendor/stb_image.h (renamed from stb_image.h)0
-rw-r--r--run.bat4
-rw-r--r--[-rwxr-xr-x]run_example (renamed from run)0
-rw-r--r--run_example.bat4
21 files changed, 24 insertions, 64 deletions
diff --git a/examples/kot.png b/examples/assets/kot.png
index 784c809..784c809 100644
--- a/examples/kot.png
+++ b/examples/assets/kot.png
Binary files differ
diff --git a/examples/kothd.png b/examples/assets/kothd.png
index 698ca46..698ca46 100644
--- a/examples/kothd.png
+++ b/examples/assets/kothd.png
Binary files differ
diff --git a/examples/teapot.txt b/examples/assets/teapot.txt
index bf8817a..bf8817a 100644
--- a/examples/teapot.txt
+++ b/examples/assets/teapot.txt
diff --git a/examples/cube.c b/examples/cube.c
index 240c387..c346d16 100644
--- a/examples/cube.c
+++ b/examples/cube.c
@@ -5,9 +5,9 @@
#define SPONGE_EXAMPLE_INIT_DEFINED
#define SPONGE_EXAMPLE_MOUSE_MOVE_DEFINED
#define SPONGE_EXAMPLE_DRAW_FRAME_3D_DEFINED
-#include "../example.h"
+#include "example.h"
-#include "../stb_image.h"
+#include "vendor/stb_image.h"
#define FOV (60.0f / PI * 2.0f)
#define DISTANCE (10.0f)
@@ -17,7 +17,7 @@ static int32_t mouse_x;
static int32_t mouse_y;
void init() {
- unsigned char *data = stbi_load("examples/kothd.png", &texture.width, &texture.height, NULL, 4);
+ unsigned char *data = stbi_load("examples/assets/kothd.png", &texture.width, &texture.height, NULL, 4);
if (!data) {
printf("%s\n", stbi_failure_reason());
assert(0);
diff --git a/example.h b/examples/example.h
index 29212aa..29212aa 100644
--- a/example.h
+++ b/examples/example.h
diff --git a/examples/line.c b/examples/line.c
index c190717..cd52255 100644
--- a/examples/line.c
+++ b/examples/line.c
@@ -2,7 +2,7 @@
#include "../sponge.h"
#define SPONGE_EXAMPLE_IMPLEMENTATION
-#include "../example.h"
+#include "example.h"
#define PI ((float)3.14159265358979323846)
#define SPEED (0.5f / 360.0f * 2 * PI)
diff --git a/examples/matrix.c b/examples/matrix.c
index 861b151..aed02d1 100644
--- a/examples/matrix.c
+++ b/examples/matrix.c
@@ -1,8 +1,7 @@
#include "../sponge.h"
#define SPONGE_EXAMPLE_IMPLEMENTATION
-#include "../example.h"
+#include "example.h"
-#define PI ((float)3.14159265358979323846)
#define SPEED ((1.0f / 360.0f) * 2 * PI)
static float angle = 0.0f;
diff --git a/examples/perspective.c b/examples/perspective.c
index 5a2e68a..4f0c9c1 100644
--- a/examples/perspective.c
+++ b/examples/perspective.c
@@ -2,7 +2,7 @@
#define SPONGE_EXAMPLE_IMPLEMENTATION
#define SPONGE_EXAMPLE_MOUSE_MOVE_DEFINED
#define SPONGE_EXAMPLE_DRAW_FRAME_3D_DEFINED
-#include "../example.h"
+#include "example.h"
#define FOV (60.0f / PI * 2.0f)
diff --git a/platform_win32.c b/examples/platform/platform_win32.c
index b8bb4b3..5984e75 100644
--- a/platform_win32.c
+++ b/examples/platform/platform_win32.c
@@ -8,12 +8,12 @@
#include <fcntl.h>
#define SPONGE_IMPLEMENTATION
-#include "sponge.h"
+#include "../../sponge.h"
#define STB_IMAGE_IMPLEMENTATION
-#include "stb_image.h"
+#include "../vendor/stb_image.h"
-#include "example.h"
+#include "../example.h"
#define DEFAULT_WIDTH 1280
#define DEFAULT_HEIGHT 720
diff --git a/platform_x11.c b/examples/platform/platform_x11.c
index 7887d11..7887d11 100644
--- a/platform_x11.c
+++ b/examples/platform/platform_x11.c
diff --git a/examples/rainbow.c b/examples/rainbow.c
index dac2fae..7f61b9b 100644
--- a/examples/rainbow.c
+++ b/examples/rainbow.c
@@ -2,9 +2,8 @@
#include "../sponge.h"
#define SPONGE_EXAMPLE_IMPLEMENTATION
-#include "../example.h"
+#include "example.h"
-#define PI ((float)3.14159265358979323846)
#define SPEED (2.0f / 360.0f * 2 * PI)
static float angle = 0.0f;
diff --git a/examples/rects.c b/examples/rects.c
index 5b12e40..667a78e 100644
--- a/examples/rects.c
+++ b/examples/rects.c
@@ -2,7 +2,7 @@
#include "../sponge.h"
#define SPONGE_EXAMPLE_IMPLEMENTATION
-#include "../example.h"
+#include "example.h"
void draw_frame(sponge_Texture c) {
assert(c.width > 140 + 20);
diff --git a/examples/teapot.c b/examples/teapot.c
index 026de22..4652e65 100644
--- a/examples/teapot.c
+++ b/examples/teapot.c
@@ -7,7 +7,7 @@
#define SPONGE_EXAMPLE_INIT_DEFINED
#define SPONGE_EXAMPLE_MOUSE_MOVE_DEFINED
#define SPONGE_EXAMPLE_DRAW_FRAME_3D_DEFINED
-#include "../example.h"
+#include "example.h"
#define FOV (60.0f / PI * 2.0f)
#define DISTANCE (10.0f)
@@ -22,7 +22,7 @@ static size_t triangles_count;
// TODO(kard): make proper error checking
void init() {
- FILE *handle = fopen("./examples/teapot.txt", "r");
+ FILE *handle = fopen("examples/assets/teapot.txt", "r");
assert(handle);
fscanf(handle, "%zu", &triangles_count);
triangles_count *= 3;
diff --git a/examples/texture.c b/examples/texture.c
index 80388f7..ce928d0 100644
--- a/examples/texture.c
+++ b/examples/texture.c
@@ -3,8 +3,8 @@
#include "../sponge.h"
#define SPONGE_EXAMPLE_IMPLEMENTATION
#define SPONGE_EXAMPLE_INIT_DEFINED
-#include "../example.h"
-#include "../stb_image.h"
+#include "example.h"
+#include "vendor/stb_image.h"
#define SPEED_X_ABS 2
#define SPEED_Y_ABS 2
@@ -17,7 +17,7 @@ int32_t speed_x;
int32_t speed_y;
void init() {
- unsigned char *data = stbi_load("examples/kot.png", &texture.width, &texture.height, NULL, 4);
+ unsigned char *data = stbi_load("examples/assets/kot.png", &texture.width, &texture.height, NULL, 4);
if (!data) {
printf("%s\n", stbi_failure_reason());
assert(0);
diff --git a/examples/triangle.c b/examples/triangle.c
index 9e20b90..df6b220 100644
--- a/examples/triangle.c
+++ b/examples/triangle.c
@@ -1,6 +1,6 @@
#include "../sponge.h"
#define SPONGE_EXAMPLE_IMPLEMENTATION
-#include "../example.h"
+#include "example.h"
#define SPEED (4)
static int32_t offset = 0;
diff --git a/examples/triangles.c b/examples/triangles.c
deleted file mode 100644
index 63a2ca9..0000000
--- a/examples/triangles.c
+++ /dev/null
@@ -1,38 +0,0 @@
-#include "../sponge.h"
-#define SPONGE_EXAMPLE_IMPLEMENTATION
-#include "../example.h"
-
-#define SPEED_ABS (2)
-#define GRID_SIZE (10)
-
-
-static int32_t offset = 0;
-static int32_t speed = SPEED_ABS;
-
-void draw_frame(sponge_Texture c) {
- sponge_clear(c, sponge_color32_make(0xFF000000));
- offset += speed;
-
- if (offset > 30) {
- speed = -SPEED_ABS;
- } else if (offset < -30) {
- speed = SPEED_ABS;
- }
-
- int32_t offset_x = c.width / GRID_SIZE;
- int32_t offset_y = c.height / GRID_SIZE;
-
- for (int i = 0; i < GRID_SIZE; i++) {
- for (int j = 0; j < GRID_SIZE; j++) {
- int32_t x = i * offset_x;
- int32_t y = j * offset_y + offset;
-
- sponge_draw_triangle_col3(
- c,
- sponge_vec2i_make(x, y + offset_y),
- sponge_vec2i_make(x + offset_x, y),
- sponge_vec2i_make(x + (offset_x * 3 / 4), y + (offset_y * 3 / 4)),
- sponge_colorf_make(0xFFFF0000), sponge_colorf_make(0xFF00FF00), sponge_colorf_make(0xFF0000FF));
- }
- }
-}
diff --git a/examples/uv.c b/examples/uv.c
index 937c4d5..9d56bf8 100644
--- a/examples/uv.c
+++ b/examples/uv.c
@@ -4,8 +4,8 @@
#define SPONGE_EXAMPLE_IMPLEMENTATION
#define SPONGE_EXAMPLE_INIT_DEFINED
#define SPONGE_EXAMPLE_MOUSE_MOVE_DEFINED
-#include "../example.h"
-#include "../stb_image.h"
+#include "example.h"
+#include "vendor/stb_image.h"
sponge_Texture texture;
@@ -13,7 +13,7 @@ int32_t mouse_x;
int32_t mouse_y;
void init() {
- unsigned char *data = stbi_load("examples/kot.png", &texture.width, &texture.height, NULL, 4);
+ unsigned char *data = stbi_load("examples/assets/kot.png", &texture.width, &texture.height, NULL, 4);
if (!data) {
printf("%s\n", stbi_failure_reason());
assert(0);
diff --git a/stb_image.h b/examples/vendor/stb_image.h
index 9eedabe..9eedabe 100644
--- a/stb_image.h
+++ b/examples/vendor/stb_image.h
diff --git a/run.bat b/run.bat
deleted file mode 100644
index 0ec23a4..0000000
--- a/run.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-del out.exe
-del *.obj
-cl platform_win32.c "examples\%1" user32.lib gdi32.lib /W3 /Fe:out.exe /Z7
-out.exe
diff --git a/run b/run_example
index f34e57a..f34e57a 100755..100644
--- a/run
+++ b/run_example
diff --git a/run_example.bat b/run_example.bat
new file mode 100644
index 0000000..33b5b8b
--- /dev/null
+++ b/run_example.bat
@@ -0,0 +1,4 @@
+del out.exe
+del *.obj
+cl "examples\platform\platform_win32.c" "examples\%1" user32.lib gdi32.lib /W3 /Fe:out.exe /Z7 /O2
+out.exe