diff --git a/demo/main.cpp b/demo/main.cpp index 55ffb9f4f535871fdb3834b697a48d0f90f15d6e..db2e3c73c20fb23518b2639941b051d50d096395 100644 --- a/demo/main.cpp +++ b/demo/main.cpp @@ -49,11 +49,9 @@ enum camera_type { cam_free, cam_arcball }; camera_type cam_mode = cam_free; //TODO proper input system -using namespace fggl::input; using InputManager = std::shared_ptr<fggl::input::Input>; - -void process_camera(fggl::ecs3::World& ecs, InputManager input) { +void process_camera(fggl::ecs3::World& ecs, const InputManager& input) { auto cameras = ecs.findMatching<fggl::gfx::Camera>(); fggl::ecs3::entity_t cam = cameras[0]; @@ -148,7 +146,7 @@ public: fggl::data::Mesh mesh; for (int j=-(nSections/2); j<=nSections/2; j++) { - const auto shapeOffset = glm::vec3( 0.0f, 0.0f, j * 1.0f ); + const auto shapeOffset = glm::vec3( 0.0f, 0.0f, (float)j * 1.0f ); const auto cubeMat = glm::translate( fggl::math::mat4( 1.0f ) , shapeOffset ); const auto leftSlope = fggl::math::modelMatrix( @@ -172,7 +170,7 @@ public: for ( int i=0; i<nCubes; i++ ) { auto bunkerClone = m_world.copy(bunker); auto result = m_world.get<fggl::math::Transform>(bunkerClone); - result->origin( glm::vec3( i * 5.0f, 0.0f, 0.0f) ); + result->origin( glm::vec3( (float)i * 5.0f, 0.0f, 0.0f) ); } } @@ -191,11 +189,11 @@ public: } void render() override { - + debugInspector(); } // entity inspector - void debugInspector(bool* visible) { + void debugInspector() { auto types = m_world.types(); ImGui::Begin("Entities");