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

Changements pour v143 et autres corrections.

Browse Source
This commit is contained in:
MarcEricMartel
2022-04-02 15:26:55 -04:00
parent a226d95923
commit 16a67035d0
57 changed files with 2655 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
SQCSim2021/world.cpp
View File

@@ -125,12 +125,12 @@ void World::GetScope(unsigned int& x, unsigned int& y) {
y = m_center[1];
}
void World::Update(int& rendercount, Bullet* bullets[MAX_BULLETS], Player& player, Transformation& world, Shader& shader, TextureAtlas& atlas, Perlin& perlin, BlockInfo* blockinfo[BTYPE_LAST]) {
void World::Update(int& rendercount, Bullet* bullets[MAX_BULLETS], Player& player, Transformation& world, Shader& shader, TextureAtlas& atlas, BlockInfo* blockinfo[BTYPE_LAST]) {
glStencilFunc(GL_EQUAL, 1, 0x00);
glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
atlas.Bind();
RenderWorld(rendercount, player, world, shader);
UpdateWorld(player, perlin, blockinfo);
UpdateWorld(player, blockinfo);
TransposeWorld(player, bullets);
shader.Disable();
glStencilFunc(GL_GREATER, 1, 0xFF);
@@ -301,7 +301,7 @@ void World::RenderWorld(int& rendercount, Player& player, Transformation& world,
shader.Disable();
};
void World::UpdateWorld(Player& player, Perlin& perlin, BlockInfo* blockinfo[BTYPE_LAST]) {
void World::UpdateWorld(Player& player, BlockInfo* blockinfo[BTYPE_LAST]) {
int cx = player.GetPosition().x;
int cy = player.GetPosition().z;
static int frameGenerate = 0;
@@ -466,9 +466,10 @@ void World::UpdateWorld(Player& player, Perlin& perlin, BlockInfo* blockinfo[BTY
else m_tbDeleted.pop_back();
}
for (int x = 0; x < threads; ++x)
for (int x = 0; x < threads; ++x) {
delThList[x].wait();
delThList[x].get();
}
}
int World::GettbDeleted() const { return m_tbDeleted.size(); }