From 206dc3f5b2e89abf15459e4eddedcf63528ceb3a Mon Sep 17 00:00:00 2001 From: Brett Laptop Date: Wed, 10 Jan 2024 12:13:04 -0500 Subject: [PATCH] u --- libraries/imgui | 2 +- libraries/openal-soft | 2 +- tests/src/main.cpp | 11 ++++++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/libraries/imgui b/libraries/imgui index a1b0682..240ab58 160000 --- a/libraries/imgui +++ b/libraries/imgui @@ -1 +1 @@ -Subproject commit a1b06823fe2d964a62fda99385499b218cf5cea5 +Subproject commit 240ab5890b2e8da294937a1710b021ac3f271472 diff --git a/libraries/openal-soft b/libraries/openal-soft index 6675317..cfab142 160000 --- a/libraries/openal-soft +++ b/libraries/openal-soft @@ -1 +1 @@ -Subproject commit 6675317107257c2cc16c947b359d557821d85bf2 +Subproject commit cfab14287405a0d34f6a0fec1336f46415728fcf diff --git a/tests/src/main.cpp b/tests/src/main.cpp index a6e9830..51ee673 100644 --- a/tests/src/main.cpp +++ b/tests/src/main.cpp @@ -8,12 +8,15 @@ #include "blt/gfx/renderer/resource_manager.h" #include "blt/gfx/renderer/batch_2d_renderer.h" #include "blt/gfx/renderer/camera.h" - +#include blt::gfx::matrix_state_manager global_matrices; blt::gfx::resource_manager resources; blt::gfx::batch_renderer_2d renderer_2d(resources); blt::gfx::first_person_camera camera; + +blt::gfx::vertex_array** vao; + float x = 0, y = 0, z = 0; float bx = 500, by = 500; float mx = 0, my = -9.8; @@ -53,6 +56,12 @@ void init() resources.enqueue("../resources/textures/cumdollar.jpg", "ibuythat"); resources.enqueue("../resources/textures/dfoedbi-28157978-1555-45c3-b2f4-d5e5fe25b253.png", "niko"); + auto object = blt::gfx::quick_load("../resources/models/complex_cube.obj"); + + vbo_t vertices_vbo; + + vertices_vbo.allocate(static_cast(object.vertex_data().size() * sizeof(blt::gfx::constructed_vertex_t))); + global_matrices.create_internals(); resources.load_resources(); renderer_2d.create();