memartel/SQCSimulator2023
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/SQC-15_animation' into SQC-15_paquets

Browse Source
This commit is contained in:
MarcEricMartel
2023-11-13 17:02:39 -05:00
parent bb810ba1c1 dfd2ddc8af
commit e011e2f1fc
6 changed files with 77 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
SQCSim2021/engine.cpp
View File

@@ -11,12 +11,13 @@ struct Notification {
float displayStartTime = 0.0f;
};
// Use a queue to manage notifications
//std::queue<Notification> notificationQueue;
// Use a vector to manage notifications
std::vector<Notification> notifications;
Engine::Engine() {}
Engine::Engine() : m_remotePlayer(&m_pinfo), m_pinfo(){}
Engine::~Engine() {
m_world.CleanUpWorld(m_renderCount, true);
@@ -316,7 +317,6 @@ void Engine::DrawPause()
void Engine::Init() {
GLenum glewErr = glewInit();
if (glewErr != GLEW_OK) {
std::cerr << " ERREUR GLEW : " << glewGetErrorString(glewErr) << std::endl;
@@ -415,6 +415,7 @@ void Engine::Init() {
m_startTime = std::chrono::high_resolution_clock::now();
// Gestion de souris.
CenterMouse();
HideCursor();
@@ -844,6 +845,7 @@ void Engine::DisplaySingleOrMultiplayerMenu() {
glBindTexture(GL_TEXTURE_2D, 0);
// Single Player and Multiplayer button background quads
float buttonWidthProportion = 0.4f;
float buttonHeightProportion = 0.075f;
@@ -1076,6 +1078,11 @@ void Engine::Render(float elapsedTime) {
m_player.ApplyTransformation(skybox, false); // Version d'ApplyTransformation qui ne tient compte que de la rotation
// (donc l'objet ne bouge pas relativement au joueur, ce qui est pratique pour une skybox!).
m_remotePlayer.Render(m_textureAtlas, m_shader01, elapsedTime);
//m_remotePlayer.ApplyTransformation(all);
if (m_mouseWU) bloc++;
else if (m_mouseWD) bloc--;
@@ -1131,7 +1138,7 @@ void Engine::Render(float elapsedTime) {
}
}
m_renderer.RenderWorld(&m_world, m_renderCount, m_player.GetPosition(), m_player.GetDirection(), all, m_shader01, m_textureAtlas);
//m_renderer.RenderWorld(&m_world, m_renderCount, m_player.GetPosition(), m_player.GetDirection(), all, m_shader01, m_textureAtlas);
m_world.Update(m_bullets, m_player.GetPosition(), m_blockinfo);
m_renderer.UpdateMesh(&m_world, m_player.GetPosition(), m_blockinfo);