Selector ray casting

.gitignore

@@ -4,3 +4,4 @@
 Icon
 
 build*
+.idea

ChangeLog.md

@@ -2,6 +2,9 @@
 
 ## OpenRaider (0.1.4) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20150803 ]
+    * Started working on ray casting for mouse object selection
+
     [ 20150801 ]
     * Updated to current Imgui version (now using indexed rendering)
     * Added mouse selection window (not yet doing anything useful)

include/Camera.h

@@ -41,16 +41,15 @@ class Camera {
     static void setRoom(int r) { if (room != r) dirty = true; room = r; }
     static int getRoom() { return room; }
 
-    static void setShowOverlay(bool s) { showOverlay = s; }
-    static bool getShowOverlay() { return showOverlay; }
-
     static void setKeepInRoom(bool k) { keepInRoom = k; }
     static bool getKeepInRoom() { return keepInRoom; }
 
     static bool boxInFrustum(BoundingBox b);
     static void displayFrustum(glm::mat4 MVP);
 
-    static void displayUI();
+    static const float fov;
+    static const float nearDist;
+    static const float farDist;
 
   private:
     static void calculateFrustumPlanes();
@@ -62,7 +61,7 @@ class Camera {
     static glm::mat4 projection;
     static glm::mat4 view;
     static float rotationDeltaX, rotationDeltaY;
-    static bool updateViewFrustum, dirty, showOverlay, movingFaster;
+    static bool updateViewFrustum, dirty, movingFaster;
     static bool keepInRoom;
     static int room;
 };

src/Camera.cpp

@@ -37,9 +37,10 @@ static bool equal(glm::vec3 a, float b) {
 
 // ----------------------------------------------------------------------------
 
-const static float fov = 45.0f;
-const static float nearDist = 0.1f;
-const static float farDist = 75000.0f;
+const float Camera::fov = 45.0f;
+const float Camera::nearDist = 0.1f;
+const float Camera::farDist = 75000.0f;
+
 const static float maxSpeed = 3072.0f;
 const static float controllerDeadZone = 0.33f;
 const static float controllerViewFactor = glm::pi<float>();
@@ -61,7 +62,6 @@ float Camera::rotationDeltaX = 0.75f;
 float Camera::rotationDeltaY = 0.75f;
 bool Camera::updateViewFrustum = true;
 bool Camera::dirty = true;
-bool Camera::showOverlay = false;
 bool Camera::movingFaster = false;
 bool Camera::keepInRoom = false;
 int Camera::room = -1;
@@ -216,19 +216,6 @@ bool Camera::update() {
     return updateViewFrustum;
 }
 
-void Camera::displayUI() {
-    if (!showOverlay)
-        return;
-
-    if (ImGui::Begin("Camera Look-At Overlay", &showOverlay, ImVec2(0, 0), -1.0f,
-                     ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize
-                     | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoSavedSettings
-                     | ImGuiWindowFlags_AlwaysAutoResize)) {
-        // TODO
-    }
-    ImGui::End();
-}
-
 // ----------------------------------------------------------------------------
 
 class FrustumPlane {

src/Render.cpp

@@ -274,11 +274,6 @@ void Render::displayUI() {
         ImGui::SameLine();
         ImGui::Checkbox("Show Frustum##camera", &displayViewFrustum);
         ImGui::SameLine();
-        bool showOverlay = Camera::getShowOverlay();
-        if (ImGui::Checkbox("Overlay##camera", &showOverlay)) {
-            Camera::setShowOverlay(showOverlay);
-        }
-        ImGui::SameLine();
         bool keepInRoom = Camera::getKeepInRoom();
         if (ImGui::Checkbox("Keep in Room##camera", &keepInRoom)) {
             Camera::setKeepInRoom(keepInRoom);

src/Selector.cpp

@@ -2,23 +2,34 @@
  * \file src/Selector.cpp
  * \brief Selector Window
  *
+ * http://antongerdelan.net/opengl/raycasting.html
+ *
  * \author xythobuz
  */
 
 #include "imgui/imgui.h"
 
 #include "global.h"
+#include "Camera.h"
 #include "Log.h"
+#include "system/Window.h"
 #include "Selector.h"
 
 bool Selector::visible = false;
 
-static unsigned int lastX = -1, lastY = -1;
+static int lastX = -1, lastY = -1;
+static bool workToDo = false;
 
 void Selector::handleMouseClick(unsigned int x, unsigned int y, KeyboardButton button, bool released) {
     if ((button == leftmouseKey) && (!released)) {
         lastX = x;
         lastY = y;
+
+        if (workToDo) {
+            Log::get(LOG_DEBUG) << "Selector missed mouse click event!" << Log::endl;
+        }
+
+        workToDo = true;
     }
 }
 
@@ -26,16 +37,30 @@ void Selector::display() {
     if (!visible)
         return;
 
-    if (!ImGui::Begin("Object Selector", &visible, ImVec2(300, 300))) {
+    if (!ImGui::Begin("Object Selector", &visible, ImVec2(500, 200))) {
         ImGui::End();
         return;
     }
 
-    ImGui::Text("Last Click (Screen): (%d %d)", lastX, lastY);
+    static glm::vec3 rayWorld;
+
+    if (workToDo) {
+        glm::vec2 normalized = glm::vec2((2.0f * lastX) / Window::getSize().x - 1.0f,
+                                         1.0f - (2.0f * lastY) / Window::getSize().y);
+        glm::vec4 rayClip(normalized.x, normalized.y, -1.0f, 1.0f);
+        glm::vec4 rayEye(glm::inverse(Camera::getProjectionMatrix()) * rayClip);
+        rayEye = glm::vec4(rayEye.x, rayEye.y, -1.0f, 0.0f);
+        rayWorld = glm::vec3(glm::inverse(Camera::getViewMatrix()) * rayEye);
+        rayWorld = glm::normalize(rayWorld);
+        workToDo = false;
+    }
+
+    ImGui::Text("Screenspace: (%d %d)", lastX, lastY);
+    ImGui::Text("Camera: (%.2f %.2f %.2f)", Camera::getPosition().x, Camera::getPosition().y, Camera::getPosition().z);
     if ((lastX < 0) || (lastY < 0)) {
-        ImGui::Text("Last Click (World): (? ?)");
+        ImGui::Text("Normalized Ray: (? ? ?)");
     } else {
-
+        ImGui::Text("Normalized Ray: (%.3f %.3f %.3f)", rayWorld.x, rayWorld.y, rayWorld.z);
     }
 
     if (ImGui::Button("Hide Selector")) {

src/UI.cpp

@@ -186,7 +186,7 @@ void UI::eventsFinished() {
     while (!keyboardEvents.empty()) {
         auto i = keyboardEvents.front();
 
-        if (!(visible || Console::isVisible() || Menu::isVisible() || Selector::isVisible())) {
+        if (!(visible || Console::isVisible() || Menu::isVisible() /* || Selector::isVisible() */ )) {
             for (int n = forwardAction; n < ActionEventCount; n++) {
                 auto ae = static_cast<ActionEvents>(n);
                 if (RunTime::getKeyBinding(ae) == std::get<0>(i))
@@ -269,9 +269,6 @@ void UI::display() {
         ImGui::End();
     }
 
-    if (Game::isLoaded())
-        Camera::displayUI();
-
     Console::display();
     Menu::display();
     Selector::display();