mirror of
https://github.com/bailwillharr/engine.git
synced 2024-09-21 04:51:18 +00:00
cobble HOUSE. no texture :(
This commit is contained in:
parent
225fdcc15a
commit
dccf56b21a
BIN
test/res/models/cobble_house/cobble_house.dae
(Stored with Git LFS)
Normal file
BIN
test/res/models/cobble_house/cobble_house.dae
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -153,8 +153,11 @@ void PlayGame(GameSettings settings) {
|
|||||||
floor_collider->aabb = {{0.0f, 0.0f, 0.0f}, {100.0f, 0.1f, 100.0f}};
|
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(
|
engine::util::LoadMeshFromFile(
|
||||||
my_scene, app.GetResourcePath("models/test_scene.dae"));
|
my_scene, app.GetResourcePath("models/cobble_house/cobble_house.dae"));
|
||||||
|
|
||||||
/* some text */
|
/* some text */
|
||||||
{
|
{
|
||||||
@ -190,7 +193,8 @@ void PlayGame(GameSettings settings) {
|
|||||||
LOG_INFO("Creating new bitmap...");
|
LOG_INFO("Creating new bitmap...");
|
||||||
/*auto fpsBitmap =
|
/*auto fpsBitmap =
|
||||||
app.GetResource<engine::resources::Font>("builtin.mono")
|
app.GetResource<engine::resources::Font>("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...");
|
LOG_INFO("Bitmap created! Loading into new texture...");
|
||||||
/*textbox_renderable->material->texture_ =
|
/*textbox_renderable->material->texture_ =
|
||||||
std::make_unique<engine::resources::Texture>(
|
std::make_unique<engine::resources::Texture>(
|
||||||
|
Loading…
Reference in New Issue
Block a user