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

Introduced Content, ContentIndices, no more integer ids hardcoded, common refactor

Browse Source
This commit is contained in:
MihailRis
2023-11-21 11:38:59 +03:00
parent f2f9343737
commit 3b03464d27
35 changed files with 472 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/objects/player_control.cpp
+4 -2
View File
@@ -5,6 +5,7 @@
#include "../physics/Hitbox.h"
#include "../lighting/Lighting.h"
#include "../world/Level.h"
#include "../content/Content.h"
#include "../voxels/Block.h"
#include "../voxels/voxel.h"
#include "../voxels/Chunks.h"
@@ -211,6 +212,7 @@ void PlayerController::updateCameraControl() {
}
void PlayerController::updateInteraction(){
const ContentIndices* contentIds = level->contentIds;
Chunks* chunks = level->chunks;
Player* player = level->player;
Lighting* lighting = level->lighting;
@@ -241,7 +243,7 @@ void PlayerController::updateInteraction(){
int z = (int)iend.z;
uint8_t states = 0;
if (Block::blocks[player->choosenBlock]->rotatable){
if (contentIds->getBlockDef(player->choosenBlock)->rotatable){
if (abs(norm.x) > abs(norm.z)){
if (abs(norm.x) > abs(norm.y)) states = BLOCK_DIR_X;
if (abs(norm.x) < abs(norm.y)) states = BLOCK_DIR_Y;
@@ -252,7 +254,7 @@ void PlayerController::updateInteraction(){
}
}
Block* block = Block::blocks[vox->id];
Block* block = contentIds->getBlockDef(vox->id);
if (lclick && block->breakable){
chunks->set(x,y,z, 0, 0);
lighting->onBlockSet(x,y,z, 0);