Modifications dans Player

SQCSim2021/engine.cpp

@@ -211,7 +211,7 @@ void Engine::Render(float elapsedTime) {
 												// (donc l'objet ne bouge pas relativement au joueur, ce qui est pratique pour une skybox!).
 	
 	glDisable(GL_LIGHT0);
-	//m_skybox.Render(skybox);
+	if (m_isSkybox) m_skybox.Render(skybox);
 	glEnable(GL_LIGHT0);
 
 	if (m_mouseL)
@@ -317,7 +317,7 @@ void Engine::Render(float elapsedTime) {
 		glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
 
 	if (m_player.GetPosition().y < -20.f)
-		m_player = Player(Vector3f(CHUNK_SIZE_X * WORLD_SIZE_X / 2, CHUNK_SIZE_Y + 1.8f, CHUNK_SIZE_Z * WORLD_SIZE_X / 2)); // Respawn si le bonho- joueur tombe en bas du monde.
+		m_player = Player(Vector3f(0, CHUNK_SIZE_Y + 1.8f, 0)); // Respawn si le bonho- joueur tombe en bas du monde.
 }
 
 void Engine::KeyPressEvent(unsigned char key)
@@ -387,7 +387,7 @@ void Engine::KeyReleaseEvent(unsigned char key)
 		m_audio.ToggleMusicState();
 		break;
 	case 17:
-		m_renderer = !m_renderer;
+		m_isSkybox = !m_isSkybox;
 		break;
 	case 24: // Y
 		m_wireframe = !m_wireframe;

SQCSim2021/engine.h

@@ -41,7 +41,7 @@ private:
     void ChangeBlockAtCursor(BlockType blocktype);
 
     bool m_wireframe = false;
-    bool m_renderer = false;
+    bool m_isSkybox = true;
 
     int m_renderCount = 0;
     int m_badHitCount = 0;
@@ -62,7 +62,7 @@ private:
     Shader m_shader01;
     Audio m_audio = Audio(AUDIO_PATH "music01.wav");
 
-    Player m_player = Player(Vector3f(CHUNK_SIZE_X * WORLD_SIZE_X / 2, CHUNK_SIZE_Y + 1.8f, CHUNK_SIZE_Z * WORLD_SIZE_X / 2));
+    Player m_player = Player(Vector3f(0, CHUNK_SIZE_Y + 1.8f, 0));
 
     bool m_keyW = false;
     bool m_keyA = false;
@@ -79,10 +79,5 @@ private:
     bool m_block = false;
 };
 
-template <class T>
-static bool EqualWithEpsilon(const T& v1, const T& v2, T epsilon = T(0.0001)) { return (fabs(v2 - v1) < epsilon); }
-
-template <class T>
-static bool InRangeWithEpsilon(const T& v, const T& vinf, const T& vsup, T epsilon = T(0.0001)) { return (v >= vinf - epsilon && v <= vsup + epsilon); }
 
 #endif // ENGINE_H__