diff --git a/imgui.ini b/imgui.ini index eb00ab1..785eb24 100644 --- a/imgui.ini +++ b/imgui.ini @@ -5,6 +5,6 @@ Collapsed=0 [Window][Object Modifier] Pos=60,60 -Size=957,134 +Size=925,127 Collapsed=0 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2f63414..765032b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -17,6 +17,7 @@ add_executable(Fall-Fever target_link_libraries( Fall-Fever PRIVATE glad + glm stb ${GLFW3_LIBRARY} ${OPENGL_LIBRARIES} diff --git a/src/Controller.cpp b/src/Controller.cpp index 639f54c..8073bda 100644 --- a/src/Controller.cpp +++ b/src/Controller.cpp @@ -79,23 +79,23 @@ void Controller::run() { ShaderProgram lightProgram("res/shaders/light.vert", "res/shaders/light.frag"); //Model model_backpack("res/models/backpack.ffo"); - Model model_plant("res/models/plant.ffo"); + //Model model_plant("res/models/plant.ffo"); Model model_container("res/models/container.ffo"); Model model_cube("res/models/cube.ffo"); - //Model model_dragon("res/models/dragon.ffo"); + Model model_dragon("res/models/dragon.ffo"); //Model model_sphere("res/models/sphere.ffo"); //Entity backpack(&model_backpack, &shaderProgram); //Entity sphere(&model_sphere, &shaderProgram); Entity container(&model_container, &shaderProgram); - //Entity dragon(&model_dragon, &shaderProgram); - Entity plant(&model_plant, &shaderProgram); + Entity dragon(&model_dragon, &shaderProgram); + //Entity plant(&model_plant, &shaderProgram); Entity lightSource(&model_cube, &lightProgram); lightSource.translate(glm::vec3(-5.0f, 1.0f, 0.0f)); lightSource.setScale(0.2f); - plant.setScale(5.0f); - //dragon.setScale(0.2f); + //plant.setScale(5.0f); + dragon.setScale(0.2f); glm::vec3 lightColor = glm::vec3(1.0f, 1.0f, 1.0f); glm::vec3 diffuseColor = lightColor * glm::vec3(1.0f); @@ -113,7 +113,7 @@ void Controller::run() { shaderProgram.unbind(); World world(&shaderProgram); - world.addEntity(plant); + world.addEntity(dragon); world.addEntity(lightSource); world.updateLight(0, lightSource.getPosition(), glm::vec3(1.0f)); diff --git a/src/EventHandler.cpp b/src/EventHandler.cpp index 91d6732..4425e33 100644 --- a/src/EventHandler.cpp +++ b/src/EventHandler.cpp @@ -7,7 +7,7 @@ double EventHandler::cameraMouseActionRegister[CAMERA_MOUSE_ACTION_NUM_ITEMS] = bool EventHandler::windowActionRegister[WINDOW_ACTION_NUM_ITEMS] = {0}; bool EventHandler::firstMouseInput = 1; -float EventHandler::mouseSensitivity = 0.08f; +float EventHandler::mouseSensitivity = 0.5f; EventHandler::EventHandler(GLFWwindow *window) diff --git a/src/Model.cpp b/src/Model.cpp index 465d5da..ce6bdaf 100644 --- a/src/Model.cpp +++ b/src/Model.cpp @@ -101,4 +101,7 @@ void Model::loadModel(std::string pathToModel) { Mesh currentMesh(meshVertices, meshIndices, meshTextures); meshes.push_back(currentMesh); } + + input.close(); + }