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

Merge branch 'SQC-15_paquets' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_paquets

Browse Source
This commit is contained in:
MarcEricMartel 2023-12-02 09:06:54 -05:00
commit 37ea09aaf3
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SQCSim-common/define.h
View File

@ -76,6 +76,7 @@ typedef uint64_t Timestamp;
#include <arpa/inet.h>
#include <netinet/in.h>
#include <cstring>
#include <poll.h>
#define flag_t unsigned int
#define addrlen_t unsigned int

6
SQCSim-srv/connection.cpp
View File

@ -145,8 +145,8 @@ void Connection::Run(World* world) {
}
void Connection::CleanInputManifest(Timestamp time) {
auto wat = m_input_manifest.find(time);
// auto wat = m_input_manifest.find(time);
while (wat != m_input_manifest.begin())
m_input_manifest.erase(wat--);
// while (wat != m_input_manifest.begin())
// m_input_manifest.erase(wat--);
}

4
SQCSim2021/booster.cpp
View File

@ -1,4 +1,4 @@
#include "booster.h";
#include "booster.h"
void Booster::RenderBillboard(const Vector3f pos, TextureAtlas& textureAtlas, Shader& shader, Transformation tran)
{
@ -43,4 +43,4 @@ void Booster::RenderBillboard(const Vector3f pos, TextureAtlas& textureAtlas, S
shader.Disable();
//tran.ApplyTranslation(-m_position);
//glEnable(GL_DEPTH_TEST);
}
}

2
SQCSim2021/cmake/CMakeLists.txt
View File

@ -28,6 +28,7 @@ include_directories(
add_library(SQCSim-common
"${SQCSIM_COMMON_DIR}boostinfo.cpp"
"${SQCSIM_COMMON_DIR}blockinfo.cpp"
"${SQCSIM_COMMON_DIR}bullet.cpp"
"${SQCSIM_COMMON_DIR}chunk.cpp"
@ -40,6 +41,7 @@ add_library(SQCSim-common
add_executable(SQCSim-client
"../audio.cpp"
"../booster.cpp"
"../connector.cpp"
"../engine.cpp"
"../mesh.cpp"