From dccf56b21abd0f426ae33577eb0291d09aaddde9 Mon Sep 17 00:00:00 2001 From: bailwillharr Date: Wed, 31 May 2023 23:56:57 +0100 Subject: [PATCH] cobble HOUSE. no texture :( --- test/res/models/cobble_house/cobble_house.dae | 3 +++ test/src/game.cpp | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 test/res/models/cobble_house/cobble_house.dae diff --git a/test/res/models/cobble_house/cobble_house.dae b/test/res/models/cobble_house/cobble_house.dae new file mode 100644 index 0000000..b4c11c9 --- /dev/null +++ b/test/res/models/cobble_house/cobble_house.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ded54651be7af945a4237d013c434613a5d745db82242dd8cb07eb7a8aca671d +size 7614 diff --git a/test/src/game.cpp b/test/src/game.cpp index efe02e6..1af7f40 100644 --- a/test/src/game.cpp +++ b/test/src/game.cpp @@ -153,8 +153,11 @@ void PlayGame(GameSettings settings) { floor_collider->aabb = {{0.0f, 0.0f, 0.0f}, {100.0f, 0.1f, 100.0f}}; } + engine::util::LoadMeshFromFile(my_scene, + app.GetResourcePath("models/test_scene.dae")); + engine::util::LoadMeshFromFile( - my_scene, app.GetResourcePath("models/test_scene.dae")); + my_scene, app.GetResourcePath("models/cobble_house/cobble_house.dae")); /* some text */ { @@ -190,7 +193,8 @@ void PlayGame(GameSettings settings) { LOG_INFO("Creating new bitmap..."); /*auto fpsBitmap = app.GetResource("builtin.mono") - ->GetTextBitmap(std::to_string(ts), 768.0f, fpsWidth, fpsHeight);*/ + ->GetTextBitmap(std::to_string(ts), 768.0f, fpsWidth, + fpsHeight);*/ LOG_INFO("Bitmap created! Loading into new texture..."); /*textbox_renderable->material->texture_ = std::make_unique(