bugfixes

diff --git a/.gitignore b/.gitignore
index f0c0553954464cdddae49141addc56f5c5023423..2f3539408e1e938cf106d82fa5f7ec4209156c62 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,4 @@
 *.sublime-workspace
 src/config.onyx
 *.wasm
-lib/
\ No newline at end of file
+run_tree/lib/

diff --git a/onyx-pkg.ini b/onyx-pkg.ini
index b6da73ca6df906826ba9a28875ef1e4e19f1c985..9e3d0fc6c2be2ba05c59a3b109d42f7aca341e29 100644 (file)
--- a/onyx-pkg.ini
+++ b/onyx-pkg.ini
@@ -8,6 +8,9 @@ version=0.0.1
 [config]
 lib_source_directory=./lib
 lib_bin_directory=./run_tree/lib
+run_cmd=
+debug_cmd=
+test_cmd=
 
 [native_library]
 build_cmd=

diff --git a/run_tree/lib/onyx_glfw3.so b/run_tree/lib/onyx_glfw3.so
deleted file mode 100755 (executable)
index 168d722..0000000
Binary files a/run_tree/lib/onyx_glfw3.so and /dev/null differ

diff --git a/run_tree/lib/onyx_opengles.so b/run_tree/lib/onyx_opengles.so
deleted file mode 100755 (executable)
index 333ecb0..0000000
Binary files a/run_tree/lib/onyx_opengles.so and /dev/null differ

diff --git a/src/entity/components/dispenser.onyx b/src/entity/components/dispenser.onyx
index 649c8254dee51ed7ee588c4f2528910b5aec3c5e..683713e2d7dd0234bf7bbdfafec7e79c734b5ced 100644 (file)
--- a/src/entity/components/dispenser.onyx
+++ b/src/entity/components/dispenser.onyx
@@ -89,4 +89,3 @@ DispenserComponent :: struct {
         }
     }
 }
-

diff --git a/src/entity/scene.onyx b/src/entity/scene.onyx
index 6ee0c23719f8c5fa868a10b390c575e3bd4fd1aa..9e0a80a781f8f35b0eaaaa0280deb7f3dc661c89 100644 (file)
--- a/src/entity/scene.onyx
+++ b/src/entity/scene.onyx
@@ -267,7 +267,7 @@ scene_create_from_schematic :: (use this: ^Scene, schematic_name: str) -> ^Entit
     if schematic == null do return null;
 
     entity := schematic.create(this);
-    entity.schematic = schematic_name;
+    entity.schematic = schematic.name;
     return entity;
 }
 

diff --git a/src/main.onyx b/src/main.onyx
index 05c80aae8bcd46249e3218386a3538129ffe4f25..70d80980ccaae2a06cef7c428cf2beb558d64dfb 100644 (file)
--- a/src/main.onyx
+++ b/src/main.onyx
@@ -1,3 +1,4 @@
+// #inject runtime.vars.Onyx_Enable_Operator_Methods :: true
 
 use core
 use opengles
@@ -14,9 +15,7 @@ init :: () {
     window = window_create(1200, 900, #cstr "Bar Simulator");
     window_use(^window);
 
-    shaders_init();
-    fonts_init();
-    immediate_init();
+    ogre_init();
     editor_init();
     game_init();
 

diff --git a/src/ogre/ogre.onyx b/src/ogre/ogre.onyx
new file mode 100644 (file)
index 0000000..936d000
--- /dev/null
+++ b/src/ogre/ogre.onyx
@@ -0,0 +1,7 @@
+package ogre
+
+ogre_init :: () {
+    shaders_init();
+    fonts_init();
+    immediate_init();
+}

diff --git a/src/ogre/shader.onyx b/src/ogre/shader.onyx
index 671e5834fb514ce6618dd9635c9e20d500e812f9..449f6c856f660823542f80361602bd723df3510d 100644 (file)
--- a/src/ogre/shader.onyx
+++ b/src/ogre/shader.onyx
@@ -29,6 +29,10 @@ shaders_init :: () {
 
 shader_make :: (shader_path: str) -> Shader {
     shader_source := os.get_contents(shader_path);
+    return shader_make_from_source(shader_source);
+}
+
+shader_make_from_source :: (shader_source: str) -> Shader {
     vs := compile_shader(shader_source, GL_VERTEX_SHADER);
     fs := compile_shader(shader_source, GL_FRAGMENT_SHADER);
 
@@ -61,7 +65,7 @@ shader_set_uniform :: (shader: Shader, uniform: cstr, value: $T) {
     location := glGetUniformLocation(shader.prog, uniform);
 
     set_uniform_internal(location, value);
-    
+
     set_uniform_internal :: #match {
         macro (location: GLint, value: u32) do glUniform1i(location, value); ,
         macro (location: GLint, value: f32) do glUniform1f(location, value); ,
@@ -84,7 +88,7 @@ update_view_matrix :: (width, height: u32) {
     bottom := cast(f32) height;
     far    := 10.0f;
     near   := 0f;
-    
+
     matrix[0] = 2 / (right - left);
     matrix[5] = 2 / (top - bottom);
     matrix[10] = -2 / (far - near);
@@ -179,4 +183,3 @@ update_model_matrix :: (v: Vector2) {
         return prog;
     }
 }
-