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

One step closer to multiplayer

Browse Source
This commit is contained in:
InfiniteCoder
2024-03-02 22:59:31 +03:00
parent 9d9c9f5570
commit 0157213a56
26 changed files with 213 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/logic/BlocksController.cpp
+2 -2
View File
@@ -53,8 +53,8 @@ int Clock::getTickId() const {
BlocksController::BlocksController(Level* level, uint padding)
: level(level),
chunks(level->chunks),
lighting(level->lighting),
chunks(level->chunks.get()),
lighting(level->lighting.get()),
randTickClock(20, 3),
blocksTickClock(20, 1),
padding(padding) {
src/logic/BlocksController.h
+1
View File
@@ -28,6 +28,7 @@ public:
int getTickId() const;
};
/* BlocksController manages block updates and block data (aka inventories) */
class BlocksController {
Level* level;
Chunks* chunks;
src/logic/ChunksController.cpp
+3 -3
View File
@@ -24,8 +24,8 @@ const uint MIN_SURROUNDING = 9;
ChunksController::ChunksController(Level* level, uint padding)
: level(level),
chunks(level->chunks),
lighting(level->lighting),
chunks(level->chunks.get()),
lighting(level->lighting.get()),
padding(padding),
generator(WorldGenerators::createGenerator(level->getWorld()->getGenerator(), level->content)) {
}
@@ -131,4 +131,4 @@ void ChunksController::createChunk(int x, int z) {
}
chunk->setLoaded(true);
chunk->setReady(true);
}
}
src/logic/LevelController.cpp
+21 -13
View File
@@ -1,32 +1,32 @@
#include "LevelController.h"
#include "../world/Level.h"
#include "PlayerController.h"
#include "BlocksController.h"
#include "ChunksController.h"
#include "../physics/Hitbox.h"
#include "scripting/scripting.h"
#include "../interfaces/Object.h"
LevelController::LevelController(EngineSettings& settings, Level* level)
: settings(settings), level(level) {
blocks = std::make_unique<BlocksController>(level, settings.chunks.padding);
chunks = std::make_unique<ChunksController>(level, settings.chunks.padding);
player = std::make_unique<PlayerController>(level, settings, blocks.get());
: settings(settings), level(level),
blocks(std::make_unique<BlocksController>(level, settings.chunks.padding)),
chunks(std::make_unique<ChunksController>(level, settings.chunks.padding)),
player(std::make_unique<PlayerController>(level, settings, blocks.get())) {
scripting::on_world_load(level, blocks.get());
}
LevelController::~LevelController() {
}
void LevelController::update(float delta, bool input, bool pause) {
player->update(delta, input, pause);
level->update();
glm::vec3 position = player->getPlayer()->hitbox->position;
level->loadMatrix(position.x, position.z, settings.chunks.loadDistance + settings.chunks.padding * 2);
chunks->update(settings.chunks.loadSpeed);
// erease null pointers
level->objects.remove_if([](auto obj) { return obj == nullptr; });
level->objects.erase(
std::remove_if(
level->objects.begin(), level->objects.end(),
[](auto obj) { return obj == nullptr; }),
level->objects.end()
);
if (!pause) {
// update all objects that needed
@@ -49,3 +49,11 @@ void LevelController::onWorldSave() {
void LevelController::onWorldQuit() {
scripting::on_world_quit();
}
Level* LevelController::getLevel() {
return level.get();
}
Player* LevelController::getPlayer() {
return player->getPlayer();
}
src/logic/LevelController.h
+9 -5
View File
@@ -4,22 +4,23 @@
#include <memory>
#include "../settings.h"
#include "PlayerController.h"
#include "BlocksController.h"
#include "ChunksController.h"
class Level;
class BlocksController;
class ChunksController;
class PlayerController;
class Player;
/* LevelController manages other controllers */
class LevelController {
EngineSettings& settings;
Level* level;
std::unique_ptr<Level> level;
// Sub-controllers
std::unique_ptr<BlocksController> blocks;
std::unique_ptr<ChunksController> chunks;
std::unique_ptr<PlayerController> player;
public:
LevelController(EngineSettings& settings, Level* level);
~LevelController();
/*
@param delta time elapsed since the last update
@@ -32,6 +33,9 @@ public:
void onWorldSave();
void onWorldQuit();
Level* getLevel();
Player* getPlayer();
};
#endif // LOGIC_LEVEL_CONTROLLER_H_
src/logic/PlayerController.cpp
+14 -11
View File
@@ -142,8 +142,8 @@ PlayerController::PlayerController(
const EngineSettings& settings,
BlocksController* blocksController)
: level(level),
player(level->player),
camControl(level->player, settings.camera),
player(level->getObject<Player>(0)),
camControl(player, settings.camera),
blocksController(blocksController) {
}
@@ -186,7 +186,7 @@ void PlayerController::updateCamera(float delta, bool movement) {
if (movement) {
camControl.updateMouse(input);
}
camControl.update(input, delta, level->chunks);
camControl.update(input, delta, level->chunks.get());
}
void PlayerController::resetKeyboard() {
@@ -207,9 +207,8 @@ void PlayerController::updateControls(float delta){
void PlayerController::updateInteraction(){
auto indices = level->content->getIndices();
Chunks* chunks = level->chunks;
Player* player = level->player.get();
Lighting* lighting = level->lighting;
Chunks* chunks = level->chunks.get();
Lighting* lighting = level->lighting.get();
Camera* camera = player->camera.get();
glm::vec3 end;
glm::ivec3 iend;
@@ -269,24 +268,24 @@ void PlayerController::updateInteraction(){
if (lclick) {
if (!input.shift && item->rt.funcsset.on_block_break_by) {
if (scripting::on_item_break_block(player, item, x, y, z))
if (scripting::on_item_break_block(player.get(), item, x, y, z))
return;
}
}
Block* target = indices->getBlockDef(vox->id);
if (lclick && target->breakable){
blocksController->breakBlock(player, target, x, y, z);
blocksController->breakBlock(player.get(), target, x, y, z);
}
if (rclick) {
if (!input.shift && item->rt.funcsset.on_use_on_block) {
if (scripting::on_item_use_on_block(player, item, x, y, z))
if (scripting::on_item_use_on_block(player.get(), item, x, y, z))
return;
}
}
if (def && rclick){
if (!input.shift && target->rt.funcsset.oninteract) {
if (scripting::on_block_interact(player, target, x, y, z))
if (scripting::on_block_interact(player.get(), target, x, y, z))
return;
}
if (!target->replaceable){
@@ -310,7 +309,7 @@ void PlayerController::updateInteraction(){
chunks->set(x, y, z, chosenBlock, states);
lighting->onBlockSet(x,y,z, chosenBlock);
if (def->rt.funcsset.onplaced) {
scripting::on_block_placed(player, def, x, y, z);
scripting::on_block_placed(player.get(), def, x, y, z);
}
blocksController->updateSides(x, y, z);
}
@@ -337,3 +336,7 @@ void PlayerController::updateInteraction(){
selectedBlockStates = 0;
}
}
Player* PlayerController::getPlayer() {
return player.get();
}
src/logic/PlayerController.h
+2
View File
@@ -49,6 +49,8 @@ public:
const EngineSettings& settings,
BlocksController* blocksController);
void update(float delta, bool input, bool pause);
Player* getPlayer();
};
#endif /* PLAYER_CONTROL_H_ */
src/logic/scripting/lua/libplayer.cpp
+18 -21
View File
@@ -11,9 +11,9 @@
/* == player library ==*/
int l_player_get_pos(lua_State* L) {
int playerid = lua_tointeger(L, 1);
if (playerid != 1)
return 0;
glm::vec3 pos = scripting::level->player->hitbox->position;
auto player = scripting::level->getObject<Player>(playerid);
if (!player) return 0;
glm::vec3 pos = player->hitbox->position;
lua_pushnumber(L, pos.x);
lua_pushnumber(L, pos.y);
lua_pushnumber(L, pos.z);
@@ -22,20 +22,19 @@ int l_player_get_pos(lua_State* L) {
int l_player_set_pos(lua_State* L) {
int playerid = lua_tointeger(L, 1);
if (playerid != 1)
return 0;
lua::luanumber x = lua_tonumber(L, 2);
lua::luanumber y = lua_tonumber(L, 3);
lua::luanumber z = lua_tonumber(L, 4);
scripting::level->player->hitbox->position = glm::vec3(x, y, z);
auto player = scripting::level->getObject<Player>(playerid);
if (player) player->hitbox->position = glm::vec3(x, y, z);
return 0;
}
int l_player_get_vel(lua_State* L) {
int playerid = lua_tointeger(L, 1);
if (playerid != 1)
return 0;
glm::vec3 vel = scripting::level->player->hitbox->velocity;
auto player = scripting::level->getObject<Player>(playerid);
if (!player) return 0;
glm::vec3 vel = player->hitbox->velocity;
lua_pushnumber(L, vel.x);
lua_pushnumber(L, vel.y);
lua_pushnumber(L, vel.z);
@@ -44,20 +43,19 @@ int l_player_get_vel(lua_State* L) {
int l_player_set_vel(lua_State* L) {
int playerid = lua_tointeger(L, 1);
if (playerid != 1)
return 0;
lua::luanumber x = lua_tonumber(L, 2);
lua::luanumber y = lua_tonumber(L, 3);
lua::luanumber z = lua_tonumber(L, 4);
scripting::level->player->hitbox->velocity = glm::vec3(x, y, z);
auto player = scripting::level->getObject<Player>(playerid);
if (player) player->hitbox->velocity = glm::vec3(x, y, z);
return 0;
}
int l_player_get_rot(lua_State* L) {
int playerid = lua_tointeger(L, 1);
if (playerid != 1)
return 0;
glm::vec2 rot = scripting::level->player->cam;
auto player = scripting::level->getObject<Player>(playerid);
if (!player) return 0;
glm::vec2 rot = player->cam;
lua_pushnumber(L, rot.x);
lua_pushnumber(L, rot.y);
return 2;
@@ -65,11 +63,11 @@ int l_player_get_rot(lua_State* L) {
int l_player_set_rot(lua_State* L) {
int playerid = lua_tointeger(L, 1);
if (playerid != 1)
return 0;
auto player = scripting::level->getObject<Player>(playerid);
if (!player) return 0;
lua::luanumber x = lua_tonumber(L, 2);
lua::luanumber y = lua_tonumber(L, 3);
glm::vec2& cam = scripting::level->player->cam;
glm::vec2& cam = player->cam;
cam.x = x;
cam.y = y;
return 0;
@@ -77,9 +75,8 @@ int l_player_set_rot(lua_State* L) {
int l_player_get_inv(lua_State* L) {
int playerid = lua_tointeger(L, 1);
if (playerid != 1)
return 0;
auto player = scripting::level->player;
auto player = scripting::level->getObject<Player>(playerid);
if (!player) return 0;
lua_pushinteger(L, player->getInventory()->getId());
lua_pushinteger(L, player->getChosenSlot());
return 2;
src/logic/scripting/scripting.cpp
+6 -5
View File
@@ -8,6 +8,7 @@
#include "../../files/files.h"
#include "../../util/timeutil.h"
#include "../../world/Level.h"
#include "../../objects/Player.h"
#include "../../voxels/Block.h"
#include "../../items/ItemDef.h"
#include "../../items/Inventory.h"
@@ -160,7 +161,7 @@ void scripting::on_block_placed(Player* player, const Block* block, int x, int y
std::string name = block->name+".placed";
if (state->getglobal(name)) {
state->pushivec3(x, y, z);
state->pushinteger(1); // playerid placeholder
state->pushinteger(player->getId());
state->callNoThrow(4);
}
}
@@ -169,7 +170,7 @@ void scripting::on_block_broken(Player* player, const Block* block, int x, int y
std::string name = block->name+".broken";
if (state->getglobal(name)) {
state->pushivec3(x, y, z);
state->pushinteger(1); // playerid placeholder
state->pushinteger(player->getId());
state->callNoThrow(4);
}
}
@@ -178,7 +179,7 @@ bool scripting::on_block_interact(Player* player, const Block* block, int x, int
std::string name = block->name+".interact";
if (state->getglobal(name)) {
state->pushivec3(x, y, z);
state->pushinteger(1); // playerid placeholder
state->pushinteger(player->getId());
if (state->callNoThrow(4)) {
return state->toboolean(-1);
}
@@ -190,7 +191,7 @@ bool scripting::on_item_use_on_block(Player* player, const ItemDef* item, int x,
std::string name = item->name+".useon";
if (state->getglobal(name)) {
state->pushivec3(x, y, z);
state->pushinteger(1); // playerid placeholder
state->pushinteger(player->getId());
if (state->callNoThrow(4)) {
return state->toboolean(-1);
}
@@ -202,7 +203,7 @@ bool scripting::on_item_break_block(Player* player, const ItemDef* item, int x,
std::string name = item->name+".blockbreakby";
if (state->getglobal(name)) {
state->pushivec3(x, y, z);
state->pushinteger(1); // playerid placeholder
state->pushinteger(player->getId());
if (state->callNoThrow(4)) {
return state->toboolean(-1);
}