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

Added camera shaking

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

2
src/objects/Player.h
View File

@ -13,6 +13,8 @@ public:
Hitbox* hitbox; Hitbox* hitbox;
int choosenBlock; int choosenBlock;
float camX, camY; float camX, camY;
float cameraShaking = 0.0f;
float cameraShakingTimer = 0.0f;
Player(glm::vec3 position, float speed, Camera* camera); Player(glm::vec3 position, float speed, Camera* camera);
~Player(); ~Player();
}; };

40
src/voxel_engine.cpp
View File

@ -1,6 +1,7 @@
// Install dependencies: // Install dependencies:
// sudo apt install libgl-dev libglew-dev libglfw3-dev libpng-dev libglm-dev // sudo apt install libgl-dev libglew-dev libglfw3-dev libpng-dev libglm-dev
#include <iostream> #include <iostream>
#include <cmath>
#define GLEW_STATIC #define GLEW_STATIC
#include <GL/glew.h> #include <GL/glew.h>
@ -73,12 +74,28 @@ void close_world(WorldFiles* wfile, Chunks* chunks){
#define ZOOM_SPEED 16.0f #define ZOOM_SPEED 16.0f
#define DEFAULT_AIR_DAMPING 0.1f #define DEFAULT_AIR_DAMPING 0.1f
#define PLAYER_NOT_ONGROUND_DAMPING 18.0f #define PLAYER_NOT_ONGROUND_DAMPING 18.0f
#define CAMERA_SHAKING_OFFSET 0.027f
#define CAMERA_SHAKING_SPEED 1.8f
#define CAMERA_SHAKING_DELTA_K 3.0f
void update_controls(PhysicsSolver* physics, void update_controls(PhysicsSolver* physics,
Chunks* chunks, Chunks* chunks,
Player* player, Player* player,
float delta){ float delta){
if (Events::jpressed(GLFW_KEY_ESCAPE)){
Window::setShouldClose(true);
}
if (Events::jpressed(GLFW_KEY_TAB)){
Events::toogleCursor();
}
for (int i = 1; i < 10; i++){
if (Events::jpressed(GLFW_KEY_0+i)){
player->choosenBlock = i;
}
}
// Controls // Controls
Camera* camera = player->camera; Camera* camera = player->camera;
Hitbox* hitbox = player->hitbox; Hitbox* hitbox = player->hitbox;
@ -94,6 +111,15 @@ void update_controls(PhysicsSolver* physics,
camera->position.y = hitbox->position.y + 0.5f; camera->position.y = hitbox->position.y + 0.5f;
camera->position.z = hitbox->position.z; camera->position.z = hitbox->position.z;
// Camera shaking
float factor = hitbox->grounded ? length(vec2(hitbox->velocity.x, hitbox->velocity.z)) : 0.0f;
player->cameraShakingTimer += delta * factor * CAMERA_SHAKING_SPEED;
float shakeTimer = player->cameraShakingTimer;
player->cameraShaking = player->cameraShaking * (1.0f - delta * CAMERA_SHAKING_DELTA_K) + factor * delta * CAMERA_SHAKING_DELTA_K;
camera->position += camera->right * sin(shakeTimer) * CAMERA_SHAKING_OFFSET * player->cameraShaking;
camera->position += camera->up * abs(cos(shakeTimer)) * CAMERA_SHAKING_OFFSET * player->cameraShaking;
// Field of view manipulations
float dt = min(1.0f, delta * ZOOM_SPEED); float dt = min(1.0f, delta * ZOOM_SPEED);
if (shift){ if (shift){
speed *= CROUCH_SPEED_MUL; speed *= CROUCH_SPEED_MUL;
@ -188,6 +214,7 @@ void update_interaction(Chunks* chunks, PhysicsSolver* physics, Player* player,
int WIDTH = 1280; int WIDTH = 1280;
int HEIGHT = 720; int HEIGHT = 720;
int main() { int main() {
setup_definitions(); setup_definitions();
@ -245,19 +272,6 @@ int main() {
occlusion = !occlusion; occlusion = !occlusion;
} }
if (Events::jpressed(GLFW_KEY_ESCAPE)){
Window::setShouldClose(true);
}
if (Events::jpressed(GLFW_KEY_TAB)){
Events::toogleCursor();
}
for (int i = 1; i < 10; i++){
if (Events::jpressed(GLFW_KEY_0+i)){
player->choosenBlock = i;
}
}
update_controls(&physics, chunks, player, delta); update_controls(&physics, chunks, player, delta);
update_interaction(chunks, &physics, player, &lighting); update_interaction(chunks, &physics, player, &lighting);