wip

1 files changed, 77 insertions, 74 deletions

diff --git a/xmake.lua b/xmake.lua
index f794221..8cbb910 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -61,10 +61,11 @@ local core_sources = {
     "src/platform/*.c",
     "src/physics/*.c",
     "src/ral/*.c",
-    "src/ral/backends/opengl/*.c",
-    "src/renderer/*.c",
-    "src/renderer/backends/*.c",
-    "src/renderer/backends/opengl/*.c",
+    -- "src/ral/backends/opengl/*.c",
+    "src/new_render/*.c",
+    -- "src/renderer/*.c",
+    -- "src/renderer/backends/*.c",
+    -- "src/renderer/backends/opengl/*.c",
     "src/resources/*.c",
     "src/std/*.c",
     "src/std/containers/*.c",
@@ -115,6 +116,8 @@ target("core_config")
     add_includedirs("src/platform/", {public = true})
     add_includedirs("src/physics/", {public = true})
     add_includedirs("src/ral", {public = true})
+    add_includedirs("src/ral/backends/opengl", {public = true})
+    add_includedirs("src/new_render", {public = true})
     -- add_includedirs("src/renderer/", {public = true})
     -- add_includedirs("src/renderer/backends/", {public = true})
     -- add_includedirs("src/renderer/backends/opengl", {public = true})
@@ -169,84 +172,84 @@ target("core_shared")
 --     add_files("examples/main_loop/ex_main_loop.c")
 --     set_rundir("$(projectdir)")
 
-target("tri")
-    set_kind("binary")
-    set_group("examples")
-    add_deps("core_static")
-    add_files("examples/triangle/ex_triangle.c")
-    set_rundir("$(projectdir)")
-    if is_plat("macosx") then
-        before_build(function (target)
-            print("build metal shaders lib")
-            os.exec("mkdir -p build/shaders")
-            os.exec("xcrun -sdk macosx metal -c assets/shaders/triangle.metal -o build/shaders/gfx.air")
-            os.exec("xcrun -sdk macosx metallib build/shaders/gfx.air -o build/gfx.metallib")
-        end)
-    end
-
-target("cube")
-    set_kind("binary")
-    set_group("examples")
-    -- add_defines("CEL_REND_BACKEND_OPENGL")
-    add_deps("core_static")
-    add_files("examples/cube/ex_cube.c")
-    set_rundir("$(projectdir)")
-
-target("primitives")
-    set_kind("binary")
-    set_group("examples")
-    add_deps("core_static")
-    add_files("examples/primitives/ex_primitives.c")
-    set_rundir("$(projectdir)")
-
--- target("std")
+-- target("tri")
 --     set_kind("binary")
 --     set_group("examples")
 --     add_deps("core_static")
---     add_files("examples/standard_lib/ex_std.c")
+--     add_files("examples/triangle/ex_triangle.c")
 --     set_rundir("$(projectdir)")
+--     if is_plat("macosx") then
+--         before_build(function (target)
+--             print("build metal shaders lib")
+--             os.exec("mkdir -p build/shaders")
+--             os.exec("xcrun -sdk macosx metal -c assets/shaders/triangle.metal -o build/shaders/gfx.air")
+--             os.exec("xcrun -sdk macosx metallib build/shaders/gfx.air -o build/gfx.metallib")
+--         end)
+--     end
 
--- target("obj")
+-- target("cube")
 --     set_kind("binary")
 --     set_group("examples")
+--     -- add_defines("CEL_REND_BACKEND_OPENGL")
 --     add_deps("core_static")
---     add_files("examples/obj_loading/ex_obj_loading.c")
+--     add_files("examples/cube/ex_cube.c")
 --     set_rundir("$(projectdir)")
 
--- target("input")
+-- target("primitives")
 --     set_kind("binary")
 --     set_group("examples")
 --     add_deps("core_static")
---     add_files("examples/input/ex_input.c")
+--     add_files("examples/primitives/ex_primitives.c")
 --     set_rundir("$(projectdir)")
 
-target("gltf")
-    set_kind("binary")
-    set_group("examples")
-    add_deps("core_static")
-    add_files("examples/gltf_loading/ex_gltf_loading.c")
-    set_rundir("$(projectdir)")
+-- -- target("std")
+-- --     set_kind("binary")
+-- --     set_group("examples")
+-- --     add_deps("core_static")
+-- --     add_files("examples/standard_lib/ex_std.c")
+-- --     set_rundir("$(projectdir)")
 
-target("pbr_params")
-    set_kind("binary")
-    set_group("examples")
-    add_deps("core_static")
-    add_files("examples/pbr_params/ex_pbr_params.c")
-    set_rundir("$(projectdir)")
+-- -- target("obj")
+-- --     set_kind("binary")
+-- --     set_group("examples")
+-- --     add_deps("core_static")
+-- --     add_files("examples/obj_loading/ex_obj_loading.c")
+-- --     set_rundir("$(projectdir)")
 
-target("pbr_textured")
-    set_kind("binary")
-    set_group("examples")
-    add_deps("core_static")
-    add_files("examples/pbr_textured/ex_pbr_textured.c")
-    set_rundir("$(projectdir)")
+-- -- target("input")
+-- --     set_kind("binary")
+-- --     set_group("examples")
+-- --     add_deps("core_static")
+-- --     add_files("examples/input/ex_input.c")
+-- --     set_rundir("$(projectdir)")
 
-target("shadows")
-    set_kind("binary")
-    set_group("examples")
-    add_deps("core_static")
-    add_files("examples/shadow_maps/ex_shadow_maps.c")
-    set_rundir("$(projectdir)")
+-- target("gltf")
+--     set_kind("binary")
+--     set_group("examples")
+--     add_deps("core_static")
+--     add_files("examples/gltf_loading/ex_gltf_loading.c")
+--     set_rundir("$(projectdir)")
+
+-- target("pbr_params")
+--     set_kind("binary")
+--     set_group("examples")
+--     add_deps("core_static")
+--     add_files("examples/pbr_params/ex_pbr_params.c")
+--     set_rundir("$(projectdir)")
+
+-- target("pbr_textured")
+--     set_kind("binary")
+--     set_group("examples")
+--     add_deps("core_static")
+--     add_files("examples/pbr_textured/ex_pbr_textured.c")
+--     set_rundir("$(projectdir)")
+
+-- target("shadows")
+--     set_kind("binary")
+--     set_group("examples")
+--     add_deps("core_static")
+--     add_files("examples/shadow_maps/ex_shadow_maps.c")
+--     set_rundir("$(projectdir)")
 
 -- target("transforms")
 --     set_kind("binary")
@@ -283,13 +286,13 @@ target("shadows")
 --     add_files("examples/demo/demo.c")
 --     set_rundir("$(projectdir)")
 
-target("pool_tests")
-    set_kind("binary")
-    set_group("tests")
-    add_deps("core_static")
-    add_files(unity_sources)
-    add_includedirs("deps/Unity/src", {public = true})
-    add_includedirs("deps/Unity/extras/fixture/src", {public = true})
-    add_includedirs("deps/Unity/extras/memory/src", {public = true})
-    add_files("tests/pool_tests.c")
-    add_files("tests/pool_test_runner.c")
+-- target("pool_tests")
+--     set_kind("binary")
+--     set_group("tests")
+--     add_deps("core_static")
+--     add_files(unity_sources)
+--     add_includedirs("deps/Unity/src", {public = true})
+--     add_includedirs("deps/Unity/extras/fixture/src", {public = true})
+--     add_includedirs("deps/Unity/extras/memory/src", {public = true})
+--     add_files("tests/pool_tests.c")
+--     add_files("tests/pool_test_runner.c")