summaryrefslogtreecommitdiffstats
path: root/src/World.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/World.cpp148
1 files changed, 110 insertions, 38 deletions
diff --git a/src/World.cpp b/src/World.cpp
index dda7058..44816e7 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -7,10 +7,20 @@ void World::ParseChunkData(std::shared_ptr<PacketChunkData> packet) {
for (int i = 0; i < 16; i++) {
if (bitmask[i]) {
Vector chunkPosition = Vector(packet->ChunkX, i, packet->ChunkZ);
- Section section = ParseSection(&chunkData, chunkPosition);
- parseMutex.lock();
+ PackedSection section = ParseSection(&chunkData, chunkPosition);
+ auto it = sections.find(chunkPosition);
+ if (it == sections.end()) {
+ sections.insert(std::make_pair(chunkPosition, section));
+ }
+ else {
+ using std::swap;
+ swap(it->second, section);
+ }
+ EventAgregator::PushEvent(EventType::ChunkChanged, ChunkChangedData{ chunkPosition });
+
+ /*parseMutex.lock();
toParse.push(section);
- parseMutex.unlock();
+ parseMutex.unlock();*/
/*section.Parse();
sectionMutexes[chunkPosition].lock();
auto it = sections.find(chunkPosition);
@@ -27,7 +37,7 @@ void World::ParseChunkData(std::shared_ptr<PacketChunkData> packet) {
}
}
-Section World::ParseSection(StreamInput *data, Vector position) {
+PackedSection World::ParseSection(StreamInput *data, Vector position) {
unsigned char bitsPerBlock = data->ReadUByte();
int paletteLength = data->ReadVarInt();
std::vector<unsigned short> palette;
@@ -40,10 +50,10 @@ Section World::ParseSection(StreamInput *data, Vector position) {
std::vector<unsigned char> skyLight;
if (dimension == 0)
skyLight = data->ReadByteArray(4096 / 2);
- return Section(position, dataArray.data(), dataArray.size(), blockLight.data(),
+ return PackedSection(position, dataArray.data(), dataArray.size(), blockLight.data(),
(skyLight.size() > 0 ? skyLight.data() : nullptr), bitsPerBlock, palette);
}
-
+/*
void World::ParserFunc()
{
LoopExecutionTimeController timer(std::chrono::milliseconds(32));
@@ -74,14 +84,30 @@ void World::ParserFunc()
timer.Update();
}
}
-
+*/
World::~World() {
- isRunning = false;
- parser.join();
+}
+
+Block & World::GetBlock(Vector worldPosition)
+{
+ Vector sectionPos(std::floor(worldPosition.x / 16.0), std::floor(worldPosition.y / 16.0), std::floor(worldPosition.z / 16.0));
+ auto sectionIt = sections.find(sectionPos);
+ if (sectionIt != sections.end()) {
+ Section section(sectionIt->second);
+ auto result = cachedSections.insert(std::make_pair(sectionPos, section));
+ sections.erase(sectionIt);
+ }
+ auto it = cachedSections.find(sectionPos);
+ if (it == cachedSections.end()) {
+ static Block fallbackBlock;
+ return fallbackBlock;
+ }
+ Section& section = it->second;
+ Block& block = section.GetBlock(worldPosition - sectionPos * 16);
+ return block;
}
World::World() {
- parser = std::thread(&World::ParserFunc, this);
}
bool World::isPlayerCollides(double X, double Y, double Z) {
@@ -95,14 +121,13 @@ bool World::isPlayerCollides(double X, double Y, double Z) {
Vector(PlayerChunk.x, PlayerChunk.y, PlayerChunk.z + 1),
Vector(PlayerChunk.x, PlayerChunk.y, PlayerChunk.z - 1),
};
- std::vector<std::map<Vector, Section>::iterator> closestSections;
+ std::vector<Vector> closestSections;
for (auto &coord:closestSectionsCoordinates) {
- auto it = sections.find(coord);
- if (it != sections.end())
- closestSections.push_back(it);
+ if (sections.find(coord) != sections.end())
+ closestSections.push_back(coord);
+ else if (cachedSections.find(coord) != cachedSections.end())
+ closestSections.push_back(coord);
}
- if (closestSections.empty())
- return false;
for (auto &it:closestSections) {
@@ -118,15 +143,16 @@ bool World::isPlayerCollides(double X, double Y, double Z) {
playerColl.z = Z - PlayerLength / 2.0;
playerColl.l = PlayerLength;
+ const Section &section = this->GetSection(it);
for (int x = 0; x < 16; x++) {
for (int y = 0; y < 16; y++) {
for (int z = 0; z < 16; z++) {
- Block block = it->second.GetBlock(Vector(x, y, z));
+ Block block = section.GetBlock(Vector(x, y, z));
if (block.id == 0 || block.id == 31)
continue;
- AABB blockColl{(x + it->first.x * 16.0),
- (y + it->first.y * 16.0),
- (z + it->first.z * 16.0), 1, 1, 1};
+ AABB blockColl{(x + it.x * 16.0),
+ (y + it.y * 16.0),
+ (z + it.z * 16.0), 1, 1, 1};
if (TestCollision(playerColl, blockColl))
return true;
}
@@ -136,31 +162,30 @@ bool World::isPlayerCollides(double X, double Y, double Z) {
return false;
}
-Block &World::GetBlock(Vector pos) {
- Vector sectionPos (floor(pos.x / 16.0f),floor(pos.y / 16.0f),floor(pos.z/16.0f));
- Vector inSectionPos = pos - (sectionPos * 16u);
- if (sections.find(sectionPos)==sections.end()){
- static Block block(0,0);
- return block;
- }
- sectionMutexes[sectionPos].lock();
- Block& block = sections.find(sectionPos)->second.GetBlock(inSectionPos);
- sectionMutexes[sectionPos].unlock();
- return block;
-}
-
std::vector<Vector> World::GetSectionsList() {
std::vector<Vector> sectionsList;
for (auto& it:sections) {
sectionsList.push_back(it.first);
}
+ for (auto& it : cachedSections) {
+ if (std::find(sectionsList.begin(), sectionsList.end(), it.first) == sectionsList.end())
+ sectionsList.push_back(it.first);
+ }
return sectionsList;
}
-Section &World::GetSection(Vector sectionPos) {
- sectionMutexes[sectionPos].lock();
- sectionMutexes[sectionPos].unlock();
- return sections.find(sectionPos)->second;
+const Section &World::GetSection(Vector sectionPos) {
+ auto result = cachedSections.find(sectionPos);
+ if (result == cachedSections.end()) {
+ auto it = sections.find(sectionPos);
+ if (it == sections.end())
+ LOG(ERROR) << "BAD";
+ Section section(it->second);
+ auto result = cachedSections.insert(std::make_pair(sectionPos, section));
+ return result.first->second;
+ } else {
+ return result->second;
+ }
}
glm::vec3 World::Raycast(glm::vec3 position, glm::vec3 direction, float maxLength, float minPrecision) {
@@ -169,10 +194,12 @@ glm::vec3 World::Raycast(glm::vec3 position, glm::vec3 direction, float maxLengt
void World::UpdatePhysics(float delta)
{
- delta /= 5;
+ //delta /= 5;
+ entitiesMutex.lock();
for (auto& it : entities) {
it.pos = it.pos + it.vel * delta;
}
+ entitiesMutex.unlock();
}
//Faces: 14 650 653
//Models: 937.641.792 Bytes x64
@@ -181,26 +208,32 @@ void World::UpdatePhysics(float delta)
Entity & World::GetEntity(unsigned int EntityId)
{
+ entitiesMutex.lock();
for (auto& it : entities) {
if (it.entityId == EntityId) {
+ entitiesMutex.unlock();
return it;
}
}
+ entitiesMutex.unlock();
static Entity fallback;
return fallback;
}
std::vector<unsigned int> World::GetEntitiesList()
{
+ entitiesMutex.lock();
std::vector<unsigned int> ret;
for (auto& it : entities) {
ret.push_back(it.entityId);
}
+ entitiesMutex.unlock();
return ret;
}
void World::AddEntity(Entity entity)
{
+ entitiesMutex.lock();
for (auto& it : entities) {
if (it.entityId == entity.entityId) {
LOG(ERROR) << "Adding already existing entity" << entity.entityId;
@@ -208,5 +241,44 @@ void World::AddEntity(Entity entity)
}
}
entities.push_back(entity);
+ entitiesMutex.unlock();
+}
+
+void World::DeleteEntity(unsigned int EntityId)
+{
+ entitiesMutex.lock();
+ auto it = entities.begin();
+ for (; it != entities.end(); ++it) {
+ if (it->entityId == EntityId) {
+ break;
+ }
+ }
+ if (it != entities.end())
+ entities.erase(it);
+ entitiesMutex.unlock();
+}
+void World::ParseChunkData(std::shared_ptr<PacketBlockChange> packet) {
+ Block& block = this->GetBlock(packet->Position);
+ block = Block(packet->BlockId >> 4, packet->BlockId & 15);
+ Vector sectionPos(std::floor(packet->Position.x / 16.0), std::floor(packet->Position.y / 16.0), std::floor(packet->Position.z / 16.0));
+ EventAgregator::PushEvent(EventType::ChunkChanged, ChunkChangedData{ sectionPos });
}
+
+void World::ParseChunkData(std::shared_ptr<PacketMultiBlockChange> packet) {
+ std::vector<Vector> changedSections;
+ for (auto& it : packet->Records) {
+ int x = (it.HorizontalPosition >> 4 & 15) + (packet->ChunkX * 16);
+ int y = it.YCoordinate;
+ int z = (it.HorizontalPosition & 15) + (packet->ChunkZ * 16);
+ Vector worldPos(x, y, z);
+ Block& block = GetBlock(worldPos);
+ block = Block(it.BlockId >> 4, it.BlockId & 15);
+
+ Vector sectionPos(packet->ChunkX, std::floor(it.YCoordinate / 16.0), packet->ChunkZ);
+ if (std::find(changedSections.begin(), changedSections.end(), sectionPos) == changedSections.end())
+ changedSections.push_back(sectionPos);
+ }
+ for (auto& sectionPos: changedSections)
+ EventAgregator::PushEvent(EventType::ChunkChanged, ChunkChangedData{ sectionPos });
+} \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 08:08:32 +0100