simple mouse control

xfusek08 · May 2, 2020 · 04a9e32 · 04a9e32
1 parent aed3a92
commit 04a9e32
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 16 deletions.
diff --git a/src/GeoPlanetDemo/ApplicationEventReceiver.cpp b/src/GeoPlanetDemo/ApplicationEventReceiver.cpp
@@ -51,10 +51,6 @@ bool ApplicationEventReceiver::processSDLEvent(SDL_Event const& event)
                 case SDLK_F4: RUN_SET_ELEMENT_VT("planet", vt::types::PlanetWireFrameVT);
                 case SDLK_F5: RUN_SET_ELEMENT_VT("planet", vt::types::PlanetCubeMapVT);
 
-
-                case SDLK_1: RUN_SET_ELEMENT_VT("planet_data", vt::types::UndefinedVT);
-                case SDLK_2: RUN_SET_ELEMENT_VT("planet_data", vt::types::PlanetVectorsVT);
-
                 case SDLK_p: RUN_FOR_PLANET({
                     planetEntity->setResolution(planetEntity->getResolution() + 1);
                 });
@@ -83,6 +79,7 @@ bool ApplicationEventReceiver::processSDLEvent(SDL_Event const& event)
                     planetEntity->doWarp = !planetEntity->doWarp;
                 });
             }
+            break;
         default: break;
     }
     return false;

diff --git a/src/GeoPlanetDemo/core/OrbitCameraController.cpp b/src/GeoPlanetDemo/core/OrbitCameraController.cpp
@@ -25,34 +25,34 @@ OrbitCameraController::OrbitCameraController(shared_ptr<Camera> camera) :
     performRotation();
 }
 
-void OrbitCameraController::up()
+void OrbitCameraController::up(float degree)
 {
     performRotation(
-        speed,
+        (degree ? degree : speed),
         glm::normalize(glm::cross(camera->getCameraDirection(), glm::vec3{ 0.f,1.f,0.f }))
     );
 }
 
-void OrbitCameraController::down()
+void OrbitCameraController::down(float degree)
 {
     performRotation(
-        -speed,
+        -(degree ? degree : speed),
         glm::normalize(glm::cross(camera->getCameraDirection(), glm::vec3{ 0.f,1.f,0.f }))
     );
 }
 
-void OrbitCameraController::left()
+void OrbitCameraController::left(float degree)
 {
     performRotation(
-        -speed,
+        -(degree ? degree : speed),
         glm::vec3(0.f, 1.f, 0.f)
     );
 }
 
-void OrbitCameraController::right()
+void OrbitCameraController::right(float degree)
 {
     performRotation(
-        speed,
+        (degree ? degree : speed),
         glm::vec3(0.f, 1.f, 0.f)
     );
 }
@@ -69,8 +69,18 @@ void OrbitCameraController::zoomOut()
     performRotation();
 }
 
+void OrbitCameraController::zoom(float amount)
+{
+    radius += amount / 10;
+    GPD_LOG_INFO("zoom radius: " << radius);
+    performRotation();
+}
+
 void OrbitCameraController::lookXY(glm::vec2 delta)
 {
+    GPD_LOG_INFO("dragging: relx: " << delta.x <<" rely: " << delta.y);
+    down(radius * (delta.y / 2000));
+    right(radius * (delta.x / 2000));
 }
 
 void OrbitCameraController::performRotation(float angleIncrement, glm::vec3 axis)

diff --git a/src/GeoPlanetDemo/core/OrbitCameraController.h b/src/GeoPlanetDemo/core/OrbitCameraController.h
@@ -13,13 +13,14 @@ namespace gpd
 
             inline std::shared_ptr<core::Camera> getCamera() { return camera; }
 
-            void up();
-            void down();
-            void left();
-            void right();
+            void up(float degree = 0);
+            void down(float degree = 0);
+            void left(float degree = 0);
+            void right(float degree = 0);
 
             void zoomIn();
             void zoomOut();
+            void zoom(float amount);
 
             void lookXY(glm::vec2 delta);
         protected:

diff --git a/src/GeoPlanetDemo/sdl/SDLOrbitCameraController.cpp b/src/GeoPlanetDemo/sdl/SDLOrbitCameraController.cpp
@@ -16,6 +16,19 @@ SDLOrbitCameraController::SDLOrbitCameraController(shared_ptr<Camera> camera) :
 
 bool SDLOrbitCameraController::processSDLEvent(SDL_Event const& event)
 {
+    switch (event.type) {
+        case SDL_MOUSEMOTION:
+            if (event.motion.state & SDL_BUTTON_LEFT) {
+                lookXY({event.motion.xrel, event.motion.yrel});
+                return true;
+            }
+            break;
+        case SDL_MOUSEWHEEL:
+                zoom(-event.wheel.y);
+                return true;
+            break;
+        default: break;
+    }
     return false;
 }