diff --git a/README b/README deleted file mode 100644 index 94f9b53..0000000 --- a/README +++ /dev/null @@ -1,6 +0,0 @@ -a random game engine thing. Now finally with ECS! - -Use the 'dev' branch for WIP. - -Uses the google style guide: - https://google.github.io/styleguide/cppguide.html \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..86f100a --- /dev/null +++ b/README.md @@ -0,0 +1,7 @@ +a random game engine thing. Now finally with ECS! + +Use the 'dev' branch for WIP. + +Uses the [Google Style Guide](https://google.github.io/styleguide/cppguide.html) + +![A screenshot](screenshots/commit_6d49f02.jpg) \ No newline at end of file diff --git a/screenshots/commit_6d49f02.jpg b/screenshots/commit_6d49f02.jpg new file mode 100644 index 0000000..92f76c6 Binary files /dev/null and b/screenshots/commit_6d49f02.jpg differ diff --git a/test/res/models/Map #4.002.tga b/test/res/models/Map #4.002.tga new file mode 100644 index 0000000..2f9f508 Binary files /dev/null and b/test/res/models/Map #4.002.tga differ diff --git a/test/res/models/piece2_basecolor.jpg b/test/res/models/piece2_basecolor.jpg new file mode 100644 index 0000000..89a0a5e Binary files /dev/null and b/test/res/models/piece2_basecolor.jpg differ diff --git a/test/res/models/piece3_basecolor.jpg b/test/res/models/piece3_basecolor.jpg new file mode 100644 index 0000000..2bf83f3 Binary files /dev/null and b/test/res/models/piece3_basecolor.jpg differ diff --git a/test/res/models/test_scene.blend b/test/res/models/test_scene.blend new file mode 100644 index 0000000..785f309 Binary files /dev/null and b/test/res/models/test_scene.blend differ diff --git a/test/res/models/test_scene.blend1 b/test/res/models/test_scene.blend1 new file mode 100644 index 0000000..073778d Binary files /dev/null and b/test/res/models/test_scene.blend1 differ diff --git a/test/res/models/test_scene.dae b/test/res/models/test_scene.dae new file mode 100644 index 0000000..0b85d63 --- /dev/null +++ b/test/res/models/test_scene.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:acfe1a762e17c6103e07a416cae2f03a19a289c9cffb538e78b29ba5d4dee908 +size 123962561 diff --git a/test/src/game.cpp b/test/src/game.cpp index 8b01cf5..efe02e6 100644 --- a/test/src/game.cpp +++ b/test/src/game.cpp @@ -93,6 +93,7 @@ void PlayGame(GameSettings settings) { &app.render_data_, app.GetResourcePath("textures/space2.png"), engine::resources::Texture::Filtering::kAnisotropic); +#if 0 /* cube */ { uint32_t cube = my_scene->CreateEntity("cube"); @@ -111,27 +112,13 @@ void PlayGame(GameSettings settings) { cube_collider->aabb = {{0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}}; } - /* floor */ - { - uint32_t floor = my_scene->CreateEntity("floor"); - my_scene->GetComponent(floor)->position = - glm::vec3{-5000.0f, -1.0f, -5000.0f}; - auto floor_renderable = - my_scene->AddComponent(floor); - floor_renderable->material = std::make_shared( - app.GetResource("builtin.standard")); - floor_renderable->material->texture_ = grass_texture; - floor_renderable->mesh = - GenCuboidMesh(app.gfxdev(), 10000.0f, 1.0f, 10000.0f, 5000.0f); - floor_renderable->shown = true; - auto floor_collider = - my_scene->AddComponent(floor); - floor_collider->is_static = true; - floor_collider->aabb = {{0.0f, 0.0f, 0.0f}, {10000.0f, 1.0f, 10000.0f}}; - } + engine::util::LoadMeshFromFile( + my_scene, app.GetResourcePath("models/astronaut/astronaut.dae")); - // engine::util::LoadMeshFromFile( - // my_scene, app.GetResourcePath("models/astronaut/astronaut.dae")); + engine::util::LoadMeshFromFile( + my_scene, app.GetResourcePath("models/plane/plane.dae")); + +#endif /* skybox */ { @@ -147,6 +134,28 @@ void PlayGame(GameSettings settings) { -5.0f, -5.0f, -5.0f}; } + /* floor */ + { + uint32_t floor = my_scene->CreateEntity("floor"); + my_scene->GetComponent(floor)->position = + glm::vec3{-50.0f, -0.1f, -50.0f}; + auto floor_renderable = + my_scene->AddComponent(floor); + floor_renderable->material = std::make_shared( + app.GetResource("builtin.standard")); + floor_renderable->material->texture_ = grass_texture; + floor_renderable->mesh = + GenCuboidMesh(app.gfxdev(), 100.0f, 0.1f, 100.0f, 100.0f); + floor_renderable->shown = true; + auto floor_collider = + my_scene->AddComponent(floor); + floor_collider->is_static = true; + 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")); + /* some text */ { int width, height; @@ -167,6 +176,7 @@ void PlayGame(GameSettings settings) { textbox_renderable->mesh = GenSphereMesh(app.gfxdev(), 1.0f, 5); my_scene->GetComponent(textbox)->scale.y = (float)height / (float)width; + textbox_renderable->shown = false; my_scene->AddComponent(textbox)->onUpdate = [&](float ts) {