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

New defines | implemented Player destructor

Browse Source
This commit is contained in:
MihailRis 2022-03-12 16:51:34 +03:00 committed by GitHub
parent 32878de5f3
commit b0a15a7c8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/objects/Player.cpp
View File

@ -10,3 +10,7 @@ Player::Player(glm::vec3 position, float speed, Camera* camera) :
camX(0.0f), camY(0.0f){
hitbox = new Hitbox(position, vec3(0.2f,0.9f,0.2f));
}
Player::~Player(){
delete hitbox;
}

13
src/voxel_engine.cpp
View File

@ -247,11 +247,16 @@ void update_interaction(Chunks* chunks, PhysicsSolver* physics, Player* player,
int WIDTH = 1280;
int HEIGHT = 720;
#define GRAVITY 19.6f
#define DEFAULT_PLAYER_SPEED 4.0f
vec3 spawnpoint(-320, 255, 32);
int main() {
setup_definitions();
Window::initialize(WIDTH, HEIGHT, "Window 2.0");
Window::initialize(WIDTH, HEIGHT, "VoxelEngine Part-11");
Events::initialize();
std::cout << "-- loading assets" << std::endl;
@ -264,12 +269,12 @@ int main() {
}
std::cout << "-- loading world" << std::endl;
Camera *camera = new Camera(vec3(-320,255,32), radians(90.0f));
Camera *camera = new Camera(spawnpoint, radians(90.0f));
WorldFiles *wfile = new WorldFiles("world/", REGION_VOL * (CHUNK_VOL * 2 + 8));
Chunks *chunks = new Chunks(34,1,34, 0,0,0);
Player* player = new Player(vec3(camera->position), 4.0f, camera);
Player* player = new Player(vec3(camera->position), DEFAULT_PLAYER_SPEED, camera);
wfile->readPlayer(player);
camera->rotation = mat4(1.0f);
camera->rotate(player->camY, player->camX, 0);
@ -277,7 +282,7 @@ int main() {
std::cout << "-- preparing systems" << std::endl;
VoxelRenderer renderer(1024*1024);
PhysicsSolver physics(vec3(0,-9.8f*2.0f,0));
PhysicsSolver physics(vec3(0,-GRAVITY,0));
Lighting lighting(chunks);
init_renderer();