new laptop

diff --git a/run_tree/assets/calibri.ttf b/run_tree/assets/calibri.ttf
deleted file mode 100644 (file)
index aac4726..0000000
Binary files a/run_tree/assets/calibri.ttf and /dev/null differ

diff --git a/run_tree/assets/fonts/calibri.ttf b/run_tree/assets/fonts/calibri.ttf
new file mode 100644 (file)
index 0000000..aac4726
Binary files /dev/null and b/run_tree/assets/fonts/calibri.ttf differ

diff --git a/src/chunk.onyx b/src/chunk.onyx
index 45c8b1c222c7decf5846739266fb024d3d432b4e..9bd74437ce2c7508e8eeb1cbb8a80cc179f48383 100644 (file)
--- a/src/chunk.onyx
+++ b/src/chunk.onyx
@@ -150,4 +150,4 @@ chunk_foreach :: macro (chunk: ^Chunk, body: Code) {
         block := chunk.blocks[x * Chunk_Size * Chunk_Size + y * Chunk_Size + z];
         #insert body;
     }
-}
\ No newline at end of file
+}

diff --git a/src/main.onyx b/src/main.onyx
index 2d08686d3e7484547e0b4f1db5a2b8fb0f5a33e1..9502bca96838889f2fe1fcb4f3b809219d7b45c8 100644 (file)
--- a/src/main.onyx
+++ b/src/main.onyx
@@ -18,7 +18,7 @@ create_window :: () => {
         glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
         glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
     }
-    window = glfwCreateWindow(1200, 720, #cstr "Voxel Shooter");
+    window = glfwCreateWindow(1600, 900, #cstr "Voxel Shooter");
 
     glfwMakeContextCurrent(window);
     glfwSwapInterval(1);
@@ -83,7 +83,7 @@ setup_opengl :: () {
 
     shader_link_world_matrix_block(world_shader);
 
-    font = font_lookup(.{"./assets/calibri.ttf", 32});
+    font = font_lookup(.{"./assets/fonts/calibri.ttf", 32});
     
     shader_use(world_shader);
     world = world_make();

diff --git a/src/shader.onyx b/src/shader.onyx
index 2b3279d13ee3cea9b9469af5c2bf93566dea53bf..a75242d21bc83e47e7a0c41f61c5feb023e21cf5 100644 (file)
--- a/src/shader.onyx
+++ b/src/shader.onyx
@@ -95,7 +95,7 @@ update_model_matrix :: (v: Vector3) {
     model_mat: [16] f32;
     model_mat[0]  = 1;
     model_mat[5]  = 1;
-    model_mat[10]  = 1;
+    model_mat[10] = 1;
     model_mat[12] = v.x;
     model_mat[13] = v.y;
     model_mat[14] = v.z;