diff --git a/Idea.txt b/Idea.txt new file mode 100644 index 0000000000000000000000000000000000000000..ff0e2834b644ade6e58f140c845a37774100a6e1 --- /dev/null +++ b/Idea.txt @@ -0,0 +1,7 @@ +TODO: +Animals with animation through blender .obj +Multiple textures to have a pretty mountain with grass stone and snow +Skybox! +Day and night cycle +Balls of fire ice and thunder! -> d'abord faire des bouncing balls qu'on peut lancer +Enemies/HP \ No newline at end of file diff --git a/projet-code/cgp/library/cgp/graphics/camera/camera_controller/camera_controller_first_person_euler/camera_controller_first_person_euler.cpp b/projet-code/cgp/library/cgp/graphics/camera/camera_controller/camera_controller_first_person_euler/camera_controller_first_person_euler.cpp index 99c18b798fb5282c83706887cd17fe936c70c73f..b64b1afb3e10c6fc0442fe4de3d604ecdf0faf05 100644 --- a/projet-code/cgp/library/cgp/graphics/camera/camera_controller/camera_controller_first_person_euler/camera_controller_first_person_euler.cpp +++ b/projet-code/cgp/library/cgp/graphics/camera/camera_controller/camera_controller_first_person_euler/camera_controller_first_person_euler.cpp @@ -42,7 +42,7 @@ namespace cgp } - void camera_controller_first_person_euler::action_keyboard(mat4& ) + void camera_controller_first_person_euler::action_keyboard(mat4& camera_matrix_view) { if ( inputs->keyboard.last_action.is_pressed(GLFW_KEY_C) && inputs->keyboard.shift) { is_cursor_trapped = !is_cursor_trapped; diff --git a/projet-code/scenes_inf443/base/base.exe b/projet-code/scenes_inf443/base/base.exe index dcd778d0a84e94803cc63c04846e76045bacda2f..5ea7eb77bbf71820af314c1de15bc9c3590009dc 100644 Binary files a/projet-code/scenes_inf443/base/base.exe and b/projet-code/scenes_inf443/base/base.exe differ diff --git a/projet-code/scenes_inf443/base/src/scene.cpp b/projet-code/scenes_inf443/base/src/scene.cpp index b8367877332c0cf818b2d7037e73b305c87244b1..44add066151dc2495b0ab38a3ae27ca819bd4537 100644 --- a/projet-code/scenes_inf443/base/src/scene.cpp +++ b/projet-code/scenes_inf443/base/src/scene.cpp @@ -26,7 +26,6 @@ void scene_structure::initialize() camera_control.camera_model.position_camera = { 0,0,evaluate_terrain_height(0,0,terrain_length)+10}; camera_control.camera_model.set_rotation_axis({ 0,0,1 }); //custum function we added to ..first_person_euler - camera_control.trap_cursor(gui.trap_cursor); global_frame.initialize_data_on_gpu(mesh_primitive_frame()); @@ -117,9 +116,6 @@ void scene_structure::display_frame() // Update the current time timer.update(); - //custom function we added to ..first_person_eulor, changes whether the cursor is trapped or not - camera_control.trap_cursor(gui.trap_cursor); - //Walking on ground if (!gui.fly) { vec3 eye_level = camera_control.camera_model.position_camera; @@ -287,7 +283,6 @@ void scene_structure::display_gui() { ImGui::Checkbox("Frame", &gui.display_frame); ImGui::Checkbox("Wireframe", &gui.display_wireframe); - ImGui::Checkbox("Trapped Cursor", &gui.trap_cursor); ImGui::Checkbox("Fly", &gui.fly); ImGui::SliderFloat("Time", &timer_mvt.t, timer_mvt.t_min, timer_mvt.t_max); diff --git a/projet-code/scenes_inf443/base/src/scene.hpp b/projet-code/scenes_inf443/base/src/scene.hpp index 09df3aecf8bdc7cce524090c75a6a015b2a9f80e..c35b348ebfaeb32df0203fafdd7b48fa59149634 100644 --- a/projet-code/scenes_inf443/base/src/scene.hpp +++ b/projet-code/scenes_inf443/base/src/scene.hpp @@ -22,7 +22,6 @@ struct gui_parameters { bool display_frame = true; bool display_wireframe = false; float k = 0.5f; - bool trap_cursor = false; bool fly = true; float speed = 1.0f; };