Added Selector, try fix for Travis

ChangeLog.md

@@ -4,6 +4,7 @@
 
     [ 20150801 ]
     * Updated to current Imgui version (now using indexed rendering)
+    * Added mouse selection window (not yet doing anything useful)
 
     [ 20150429 ]
     * Fixed the new BoundingBox rendering approach

cmake/travis_before_install_linux.sh

@@ -3,6 +3,6 @@
 sudo add-apt-repository -y ppa:zoogie/sdl2-snapshots
 sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
 sudo add-apt-repository -y ppa:andykimpe/cmake
-sudo add-apt-repository -y ppa:h-rayflood/llvm
+sudo add-apt-repository -y ppa:h-rayflood/llvm-upper
 sudo apt-get -qq -y update
 

cmake/travis_install_linux.sh

@@ -11,12 +11,14 @@ wget 'http://downloads.sourceforge.net/project/ogl-math/glm-0.9.6.3/glm-0.9.6.3.
 unzip glm-0.9.6.3.zip
 sudo cp -R glm/glm /usr/local/include/glm
 
-if [ "$CXX" = "clang++" ]; then export CXXFLAGS="-stdlib=libc++"; fi
-if [ "$CXX" = "clang++" ]; then svn co --quiet http://llvm.org/svn/llvm-project/libcxx/trunk libcxx; fi
-if [ "$CXX" = "clang++" ]; then cd libcxx/lib && bash buildit; fi
-if [ "$CXX" = "clang++" ]; then sudo cp ./libc++.so.1.0 /usr/lib/; fi
-if [ "$CXX" = "clang++" ]; then sudo mkdir /usr/include/c++/v1; fi
-if [ "$CXX" = "clang++" ]; then cd .. && sudo cp -r include/* /usr/include/c++/v1/; fi
-if [ "$CXX" = "clang++" ]; then cd /usr/lib && sudo ln -sf libc++.so.1.0 libc++.so; fi
-if [ "$CXX" = "clang++" ]; then sudo ln -sf libc++.so.1.0 libc++.so.1 && cd $cwd; fi
+if [ "$CXX" = "clang++" ]; then
+    export CXXFLAGS="-stdlib=libc++"
+    svn co --quiet http://llvm.org/svn/llvm-project/libcxx/trunk libcxx
+    cd libcxx/lib && bash buildit
+    sudo cp ./libc++.so.1.0 /usr/lib/
+    sudo mkdir /usr/include/c++/v1
+    cd .. && sudo cp -r include/* /usr/include/c++/v1/
+    cd /usr/lib && sudo ln -sf libc++.so.1.0 libc++.so
+    sudo ln -sf libc++.so.1.0 libc++.so.1 && cd $cwd
+fi
 

include/Selector.h

@@ -0,0 +1,25 @@
+/*!
+ * \file include/Selector.h
+ * \brief Selector Window
+ *
+ * \author xythobuz
+ */
+
+#ifndef _SELECTOR_H_
+#define _SELECTOR_H_
+
+class Selector {
+  public:
+    static void display();
+
+    static bool isVisible() { return visible; }
+    static void setVisible(bool v) { visible = v; }
+
+    static void handleMouseClick(unsigned int x, unsigned int y, KeyboardButton button, bool released);
+
+  private:
+    static bool visible;
+};
+
+#endif
+

src/CMakeLists.txt

@@ -61,6 +61,7 @@ set (SRCS ${SRCS} "RoomData.cpp" "../include/RoomData.h")
 set (SRCS ${SRCS} "RoomMesh.cpp" "../include/RoomMesh.h")
 set (SRCS ${SRCS} "RunTime.cpp" "../include/RunTime.h")
 set (SRCS ${SRCS} "Script.cpp" "../include/Script.h")
+set (SRCS ${SRCS} "Selector.cpp" "../include/Selector.h")
 set (SRCS ${SRCS} "SkeletalModel.cpp" "../include/SkeletalModel.h")
 set (SRCS ${SRCS} "SoundManager.cpp" "../include/SoundManager.h")
 set (SRCS ${SRCS} "Sprite.cpp" "../include/Sprite.h")

src/Selector.cpp

@@ -0,0 +1,47 @@
+/*!
+ * \file src/Selector.cpp
+ * \brief Selector Window
+ *
+ * \author xythobuz
+ */
+
+#include "imgui/imgui.h"
+
+#include "global.h"
+#include "Log.h"
+#include "Selector.h"
+
+bool Selector::visible = false;
+
+static unsigned int lastX = -1, lastY = -1;
+
+void Selector::handleMouseClick(unsigned int x, unsigned int y, KeyboardButton button, bool released) {
+    if ((button == leftmouseKey) && (!released)) {
+        lastX = x;
+        lastY = y;
+    }
+}
+
+void Selector::display() {
+    if (!visible)
+        return;
+
+    if (!ImGui::Begin("Object Selector", &visible, ImVec2(300, 300))) {
+        ImGui::End();
+        return;
+    }
+
+    ImGui::Text("Last Click (Screen): (%d %d)", lastX, lastY);
+    if ((lastX < 0) || (lastY < 0)) {
+        ImGui::Text("Last Click (World): (? ?)");
+    } else {
+
+    }
+
+    if (ImGui::Button("Hide Selector")) {
+        visible = false;
+    }
+
+    ImGui::End();
+}
+

src/UI.cpp

@@ -15,6 +15,7 @@
 #include "Menu.h"
 #include "Render.h"
 #include "RunTime.h"
+#include "Selector.h"
 #include "SoundManager.h"
 #include "TextureManager.h"
 #include "World.h"
@@ -173,7 +174,7 @@ void UI::eventsFinished() {
 
     ImGui::NewFrame();
 
-    if (!(visible || Console::isVisible() || Menu::isVisible())) {
+    if (!(visible || Console::isVisible() || Menu::isVisible() || Selector::isVisible())) {
         while (!motionEvents.empty()) {
             auto i = motionEvents.front();
             Game::handleMouseMotion(std::get<0>(i), std::get<1>(i),
@@ -185,7 +186,7 @@ void UI::eventsFinished() {
     while (!keyboardEvents.empty()) {
         auto i = keyboardEvents.front();
 
-        if (!(visible || Console::isVisible() || Menu::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))
@@ -194,7 +195,7 @@ void UI::eventsFinished() {
         }
 
         if (std::get<1>(i)) {
-            if ((!io.WantCaptureKeyboard) || (!(visible || Console::isVisible() || Menu::isVisible()))) {
+            if ((!io.WantCaptureKeyboard) || (!(visible || Console::isVisible() || Menu::isVisible() || Selector::isVisible()))) {
                 if (!metaKeyIsActive) {
                     if (RunTime::getKeyBinding(debugAction) == std::get<0>(i)) {
                         visible = !visible;
@@ -215,6 +216,16 @@ void UI::eventsFinished() {
     }
 
     bool clicked = !clickEvents.empty();
+    while (!clickEvents.empty()) {
+        auto i = clickEvents.front();
+
+        if (Selector::isVisible() && (!io.WantCaptureMouse)) {
+            Selector::handleMouseClick(std::get<0>(i), std::get<1>(i), std::get<2>(i), std::get<3>(i));
+        }
+
+        clickEvents.pop_front();
+    }
+
     clickEvents.clear();
     motionEvents.clear();
     scrollEvents.clear();
@@ -225,10 +236,10 @@ void UI::eventsFinished() {
         Console::setVisible(false);
     }
 
-    if (Window::getTextInput() != (visible || Console::isVisible() || Menu::isVisible()))
-        Window::setTextInput(visible || Console::isVisible() || Menu::isVisible());
+    if (Window::getTextInput() != (visible || Console::isVisible() || Menu::isVisible() || Selector::isVisible()))
+        Window::setTextInput(visible || Console::isVisible() || Menu::isVisible() || Selector::isVisible());
 
-    bool input = !(visible || Console::isVisible() || Menu::isVisible());
+    bool input = !(visible || Console::isVisible() || Menu::isVisible() || Selector::isVisible());
     if (Window::getMousegrab() != input)
         Window::setMousegrab(input);
 
@@ -263,6 +274,7 @@ void UI::display() {
 
     Console::display();
     Menu::display();
+    Selector::display();
 
     if (!visible) {
         ImGui::Render();
@@ -272,6 +284,16 @@ void UI::display() {
     static bool showTestWindow = false;
     static bool showStyleWindow = false;
     if (ImGui::Begin("Engine", &visible, ImVec2(500, 600))) {
+        if (Selector::isVisible()) {
+            if (ImGui::Button("Disable Mouse Object Picking")) {
+                Selector::setVisible(false);
+            }
+        } else {
+            if (ImGui::Button("Enable Mouse Object Picking")) {
+                Selector::setVisible(true);
+            }
+        }
+
         Render::displayUI();
         RunTime::display();
         TextureManager::display();
@@ -456,7 +478,7 @@ void UI::handleControllerAxis(float value, KeyboardButton axis) {
 }
 
 void UI::handleControllerButton(KeyboardButton button, bool released) {
-    if (visible || Console::isVisible())
+    if (visible || Console::isVisible() || Menu::isVisible() || Selector::isVisible())
         return;
 
     if (Menu::isVisible()) {