From 3c9835a66212895e279e13e9bc3ef3545d3db7e1 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Mon, 15 Aug 2022 11:08:00 -0400 Subject: [PATCH] Reformat example code --- example/CMakeLists.txt | 18 +++++++++--------- example/src/example.cpp | 21 +++++++++++++-------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index e9fb457..c98373e 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -1,15 +1,15 @@ set(SRC - include/example.hpp - src/example.cpp) + include/example.hpp + src/example.cpp) add_platform_executable( - TARGET ExampleApp - APP_CLASS ExampleApp - APP_INCLUDE example.hpp - SRC ${SRC} - SKIP_DATA OFF) + TARGET ExampleApp + APP_CLASS ExampleApp + APP_INCLUDE example.hpp + SRC ${SRC} + SKIP_DATA OFF) target_link_libraries(ExampleApp PUBLIC - Core) + Core) target_include_directories(ExampleApp PUBLIC - include) + include) set_engine_properties(ExampleApp) \ No newline at end of file diff --git a/example/src/example.cpp b/example/src/example.cpp index b2ee349..7af450a 100644 --- a/example/src/example.cpp +++ b/example/src/example.cpp @@ -1,11 +1,11 @@ #include "example.hpp" -#include "platform.hpp" -#include "file.hpp" -#include "engine.hpp" -#include "scene.hpp" #include "asset.hpp" +#include "engine.hpp" +#include "file.hpp" #include "path.hpp" +#include "platform.hpp" +#include "scene.hpp" void app_main(prism::engine*) { platform::open_window("Example", {-1, -1, 1280, 720}, WindowFlags::Resizable); @@ -44,15 +44,16 @@ void ExampleApp::initialize_render() { main_object = scene->add_object(); auto& sphere_render = scene->add(main_object); sphere_render.mesh = assetm->get(prism::path(prism::game_domain / "models/bunny.model")); - sphere_render.materials = { assetm->get(prism::path(prism::game_domain / "materials/Material.material")) }; + sphere_render.materials = {assetm->get(prism::path(prism::game_domain / "materials/Material.material"))}; auto sibenik_obj = scene->add_object(); auto& sibenik_render = scene->add(sibenik_obj); sibenik_render.mesh = assetm->get(prism::path(prism::game_domain / "models/sibenik.model")); scene->get(sibenik_obj).position.y = 13.5; - for(auto& part : sibenik_render.mesh->parts) { - sibenik_render.materials.push_back(assetm->get(prism::path(prism::game_domain / "materials" / (part.material_hint + ".material")))); + for (auto& part : sibenik_render.mesh->parts) { + sibenik_render.materials.push_back( + assetm->get(prism::path(prism::game_domain / "materials" / (part.material_hint + ".material")))); } auto probe_obj = scene->add_object(); @@ -66,5 +67,9 @@ void ExampleApp::update(const float delta_time) { engine->get_scene()->get(main_object).position.x = sin(main_object_movement) * 8.0f; engine->get_scene()->get(main_object).rotation = euler_to_quat({0, radians(main_object_spin), 0}); - camera_look_at(*engine->get_scene(), camera_obj, prism::float3{2, 2, -2} + engine->get_scene()->get(main_object).position, engine->get_scene()->get(main_object).position); + camera_look_at( + *engine->get_scene(), + camera_obj, + prism::float3{2, 2, -2} + engine->get_scene()->get(main_object).position, + engine->get_scene()->get(main_object).position); } \ No newline at end of file