From e96a81ad62de39ec857967688997b83c6e15f5c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9?= <noe.artru@polytechnique.org>
Date: Tue, 25 Apr 2023 11:26:35 +0200
Subject: [PATCH] ideas txt, removed trapped cursor in gui

---
 Idea.txt                                      |   7 +++++++
 .../camera_controller_first_person_euler.cpp  |   2 +-
 projet-code/scenes_inf443/base/base.exe       | Bin 2062848 -> 2062848 bytes
 projet-code/scenes_inf443/base/src/scene.cpp  |   5 -----
 projet-code/scenes_inf443/base/src/scene.hpp  |   1 -
 5 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 Idea.txt

diff --git a/Idea.txt b/Idea.txt
new file mode 100644
index 0000000..ff0e283
--- /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 99c18b7..b64b1af 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
GIT binary patch
delta 3117
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
IXtb~K|3$?BApigX

delta 3172
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

diff --git a/projet-code/scenes_inf443/base/src/scene.cpp b/projet-code/scenes_inf443/base/src/scene.cpp
index b836787..44add06 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 09df3ae..c35b348 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;
 };
-- 
GitLab