View fixed

xfusek08 · Feb 21, 2020 · 25ab77e · 25ab77e
1 parent 0fe4533
commit 25ab77e
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 17 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -125,8 +125,8 @@ source_group("GeoPlanetDemo\\vt\\planet" FILES ${SRC_GEO_PLANET_DEMO_VT_PLANET})
 source_group("GeoPlanetDemo\\sdl"        FILES ${SRC_GEO_PLANET_DEMO_SDL})
 source_group("GeoPlanetDemo\\interfaces" FILES ${SRC_GEO_PLANET_DEMO_INTERFACES})
 
-source_group("vendor\\stb"                FILES ${SRC_VENDOR_STB})
-source_group("vendor\\imgui"              FILES ${SRC_VENDOR_IAMGUI})
+source_group("vendor\\stb"               FILES ${SRC_VENDOR_STB})
+source_group("vendor\\imgui"             FILES ${SRC_VENDOR_IAMGUI})
 
 # generate shader definitions from SHADER_FILES based on their location
 set(SHADER_COMPILE_DEFINITIONS )

diff --git a/resources/shaders/basic/vertex.glsl b/resources/shaders/basic/vertex.glsl
@@ -3,10 +3,11 @@
 
 in layout(location = 0) vec3 position;
 
-uniform mat4 projectionMatrix;  // Projection matrix
-uniform mat4 viewMatrix;        // View Matrix
+uniform mat4 projectionMatrix; // Projection matrix
+uniform mat4 viewMatrix;       // View Matrix
 
 void main()
 {
     gl_Position = projectionMatrix * viewMatrix * vec4(position, 1.0f);
+    // gl_Position = vec4(position, 1.0f);
 }
diff --git a/src/GeoPlanetDemo/ApplicationGui.cpp b/src/GeoPlanetDemo/ApplicationGui.cpp
@@ -10,6 +10,7 @@
 
 #include <GeoPlanetDemo/core/Camera.h>
 #include <GeoPlanetDemo/core/Scene.h>
+#include <GeoPlanetDemo/core/Utils.h>
 
 #include <GeoPlanetDemo/sdl/SDLGlMainLoop.h>
 #include <GeoPlanetDemo/sdl/SDLPerformance.h>
@@ -222,4 +223,6 @@ int ApplicationGui::vtTypeToInt(vt::VTType val) const
         }
         ++index;
     }
+    GPD_ASSERT(false, "ApplicationGui::vtTypeToInt(" << val << "): not found.");
+    return -1;
 }
diff --git a/src/GeoPlanetDemo/core/Camera.h b/src/GeoPlanetDemo/core/Camera.h
@@ -32,7 +32,7 @@ namespace gpd
             // flags
             inline bool hasViewChanged() const { return viewChanged || !changeAccepted; }
             inline void setViewChanged() { viewChanged = true; changeAccepted = false; }
-            inline void acceptChange() { changeAccepted = true; }
+            inline void acceptChange()   { changeAccepted = true; }
 
             // matrices
             glm::mat4 getViewMatrix();
@@ -44,10 +44,10 @@ namespace gpd
             inline glm::vec3 getUpVector()        const { return up; }
             inline glm::vec3 getCameraDirection() const { return position - target;  }
 
-            inline void setCameraPosition(glm::vec3 position)                { position = position; setViewChanged(); }
-            inline void setTargetPosition(glm::vec3 target)                  { target   = target;   setViewChanged(); }
-            inline void setUpVector(glm::vec3 up)                            { up       = up;       setViewChanged(); }
-            inline void setViewSize(unsigned int width, unsigned int height) { viewWidth = width; viewHeight = height; updateProjectionMatrix(); setViewChanged(); }
+            inline void setCameraPosition(glm::vec3 position)                { this->position = position; setViewChanged(); }
+            inline void setTargetPosition(glm::vec3 target)                  { this->target = target;     setViewChanged(); }
+            inline void setUpVector(glm::vec3 up)                            { this->up = up;             setViewChanged(); }
+            inline void setViewSize(unsigned int width, unsigned int height) { this->viewWidth = width; this->viewHeight = height; updateProjectionMatrix(); setViewChanged(); }
             inline void setViewSize(glm::uvec2 newSize)                      { setViewSize(newSize.x, newSize.y); }
 
             // projection scalars
@@ -59,7 +59,7 @@ namespace gpd
             // properties
 
             // flags
-            bool viewChanged = true;
+            bool viewChanged    = true;
             bool changeAccepted = false;
 
             glm::mat4 viewMatrix;

diff --git a/src/GeoPlanetDemo/core/Utils.h b/src/GeoPlanetDemo/core/Utils.h
@@ -6,18 +6,21 @@
 
 #define STREAM_TO_STR(S) (std::ostringstream() << S).str()
 
-#define GPD_LOG_ERROR(...)  gpd::core::Log::getLogger()->writeError(STREAM_TO_STR(__VA_ARGS__))
-#define GPD_LOG_WARNING(...) gpd::core::Log::getLogger()->writeWarning(STREAM_TO_STR(__VA_ARGS__))
-#define GPD_LOG_INFO(...)  gpd::core::Log::getLogger()->writeInfo(STREAM_TO_STR(__VA_ARGS__))
-
 #ifdef GPD_DEBUG
-#define GPD_LOG_DEBUG(...)  gpd::core::Log::getLogger()->writeDebug(STREAM_TO_STR(__VA_ARGS__))
+#include <stdio.h>
+#define GPD_LOG_DEBUG(...)   gpd::core::Log::getLogger()->writeDebug(STREAM_TO_STR(__VA_ARGS__))
+#define GPD_LOG_DEBUG_F(...) printf(__VA_ARGS__)
 #else
 #define GPD_LOG_DEBUG(...)
+#define GPD_LOG_DEBUG_F(...)
 #endif
 
 #ifdef GPD_ENABLE_ASSERTS
 #define GPD_ASSERT(x, ...) { if(!(x)) { GPD_LOG_ERROR("Assertion Failed: " << __VA_ARGS__); __debugbreak(); } }
 #else
 #define GPD_ASSERT(x, ...)
 #endif
+
+#define GPD_LOG_ERROR(...)   gpd::core::Log::getLogger()->writeError(STREAM_TO_STR(__VA_ARGS__))
+#define GPD_LOG_WARNING(...) gpd::core::Log::getLogger()->writeWarning(STREAM_TO_STR(__VA_ARGS__))
+#define GPD_LOG_INFO(...)    gpd::core::Log::getLogger()->writeInfo(STREAM_TO_STR(__VA_ARGS__))
diff --git a/src/GeoPlanetDemo/vt/VTFactory.h b/src/GeoPlanetDemo/vt/VTFactory.h
@@ -58,9 +58,9 @@ namespace gpd
                 return getMap()[type]->create(type, gl);
             }
 
-            static std::map<std::string, VTFactorySpecific*>& getMap()
+            static std::map<VTType, VTFactorySpecific*>& getMap()
             {
-                static std::map<std::string, VTFactorySpecific*> map;
+                static std::map<VTType, VTFactorySpecific*> map;
                 return map;
             }