PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

'Player' class, separated main file

Browse Source 
Moved render code to world_render.h, declarations code (assets and blocks) to declarations.h
This commit is contained in:
MihailRis
2022-03-02 23:45:09 +03:00
committed by GitHub
parent 2a158bfb46
commit b7e8ff5bea
11 changed files with 370 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/files/WorldFiles.cpp
+14 -7
View File
@@ -1,6 +1,9 @@
#include "WorldFiles.h"
#include "files.h"
#include "../window/Camera.h"
#include "../objects/Player.h"
#include "../physics/Hitbox.h"
#include "../voxels/Chunk.h"
union {
@@ -185,9 +188,11 @@ void WorldFiles::write(){
}
}
void WorldFiles::writePlayer(glm::vec3 position, float camX, float camY){
void WorldFiles::writePlayer(Player* player){
char dst[1+3*4 + 1+2*4];
glm::vec3 position = player->hitbox->position;
size_t offset = 0;
dst[offset++] = SECTION_POSITION;
float2Bytes(position.x, dst, offset); offset += 4;
@@ -195,19 +200,20 @@ void WorldFiles::writePlayer(glm::vec3 position, float camX, float camY){
float2Bytes(position.z, dst, offset); offset += 4;
dst[offset++] = SECTION_ROTATION;
float2Bytes(camX, dst, offset); offset += 4;
float2Bytes(camY, dst, offset); offset += 4;
float2Bytes(player->camX, dst, offset); offset += 4;
float2Bytes(player->camY, dst, offset); offset += 4;
write_binary_file(getPlayerFile(), (const char*)dst, sizeof(dst));
}
bool WorldFiles::readPlayer(glm::vec3& position, float& camX, float& camY) {
bool WorldFiles::readPlayer(Player* player) {
size_t length = 0;
char* data = read_binary_file(getPlayerFile(), length);
if (data == nullptr){
std::cerr << "could not to read player.bin" << std::endl;
return false;
}
glm::vec3 position = player->hitbox->position;
size_t offset = 0;
while (offset < length){
char section = data[offset++];
@@ -218,12 +224,13 @@ bool WorldFiles::readPlayer(glm::vec3& position, float& camX, float& camY) {
position.z = bytes2Float(data, offset); offset += 4;
break;
case SECTION_ROTATION:
camX = bytes2Float(data, offset); offset += 4;
camY = bytes2Float(data, offset); offset += 4;
player->camX = bytes2Float(data, offset); offset += 4;
player->camY = bytes2Float(data, offset); offset += 4;
break;
}
}
std::cout << position.x << " " << position.y << " " << position.z << std::endl;
player->hitbox->position = position;
player->camera->position = position + vec3(0, 1, 0);
return true;
}