Fix camera movement

zlondrej · Oct 26, 2023 · 79e3502 · 79e3502
1 parent ffce8bf
commit 79e3502
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/shaders/blend.frag b/shaders/blend.frag
@@ -10,11 +10,11 @@ in vec2 textureCoords;
 out vec3 color;
 
 void main() {
-  vec4 front = texture2D(frontTexture, textureCoords);
-  vec4 back = texture2D(backTexture, textureCoords);
+  vec4 front = texture(frontTexture, textureCoords);
+  vec4 back = texture(backTexture, textureCoords);
 
-  vec4 frontD = texture2D(frontDepth, textureCoords);
-  vec4 backD = texture2D(backDepth, textureCoords);
+  vec4 frontD = texture(frontDepth, textureCoords);
+  vec4 backD = texture(backDepth, textureCoords);
 
   if(backD.x <= frontD.x) {
     color = back.rgb;

diff --git a/src/Camera.cpp b/src/Camera.cpp
@@ -9,7 +9,7 @@
 using namespace pgp;
 using namespace glm;
 
-Camera::Camera(SDL_Window *_window) : position(0.0, 35.0, 0.0), rotation(0, 0) {
+Camera::Camera(SDL_Window *_window) : position(0.0, 35.0, 0.0), rotation(0, 0), movement(0, 0, 0) {
     window = _window;
     SDL_GetWindowSize(window, &(windowSize.x), &(windowSize.y));
 }
@@ -40,7 +40,7 @@ IEventListener::EventResponse Camera::onEvent(SDL_Event* evt) {
         SDL_KeyboardEvent *e = &evt->key;
 
         positive = max(ivec3(0, 0, 0), movement);
-        negative = min(ivec3(0, 0, 0), movement);
+        negative = -min(ivec3(0, 0, 0), movement);
 
         int active = (evt->type == SDL_KEYDOWN) ? 1 : 0;
 
@@ -76,8 +76,8 @@ IEventListener::EventResponse Camera::onEvent(SDL_Event* evt) {
 
         if (SDL_BUTTON_LEFT & e->state) {
             // TODO: Adjust mouse sensitivity coeficient
-            rotation.y += e->xrel * 0.002;
-            rotation.x -= e->yrel * 0.002;
+            rotation.y -= e->xrel * 0.002;
+            rotation.x += e->yrel * 0.002;
 
             // To prevent horizontal turn
             rotation.x = clamp(rotation.x, -PI_HALF_CLAMP, PI_HALF_CLAMP);