ver. 1.4.3 WiP - vgMath

BrutPitt · Dec 3, 2019 · 428ee71 · 428ee71
1 parent 7ccbda0
commit 428ee71
Show file tree

Hide file tree

Showing 6 changed files with 794 additions and 669 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -69,8 +69,8 @@ set(SRC "${CMAKE_SOURCE_DIR}/src")
         ${SRC}/tools/glslShaderObject.cpp
         ${SRC}/tools/glslShaderObject.h
         ${SRC}/tools/transforms.h
-        ${SRC}/tools/vGizmoMath.h
-        ${SRC}/tools/vGizmoConfig.h
+        ${SRC}/tools/vgMath.h
+        ${SRC}/tools/vgConfig.h
         ${SRC}/tools/vGizmo.h
         ${SRC}/ui/uiAttractorsDlg.cpp
         ${SRC}/ui/uiMainDlg.cpp

diff --git a/src/src/tools/vGizmo.h b/src/src/tools/vGizmo.h
@@ -12,10 +12,10 @@
 //------------------------------------------------------------------------------
 #pragma once
 
-#include "vGizmoConfig.h"
-#include "vGizmoMath.h"
+#define VGIZMO_H_FILE
+#include "vgMath.h"
 
-#ifdef VGIZMO_USES_TEMPLATE
+#ifdef VGM_USES_TEMPLATE
     #define VGIZMO_BASE_CLASS virtualGizmoBaseClass<T>
 #else
     #define VGIZMO_BASE_CLASS virtualGizmoBaseClass
@@ -495,8 +495,8 @@ using VGIZMO_BASE_CLASS::qtV;
     T wheelScale = T(5);   //dolly multiply for wheel
 };
 
-#ifdef VGIZMO_USES_TEMPLATE
-    #ifdef VGIZMO_USES_DOUBLE_PRECISION
+#ifdef VGM_USES_TEMPLATE
+    #ifdef VGM_USES_DOUBLE_PRECISION
         using vGizmo   = virtualGizmoClass<double>;
         using vGizmo3D = virtualGizmo3DClass<double>;
     #else
@@ -513,4 +513,5 @@ using VGIZMO_BASE_CLASS::qtV;
 
 } // end namespace vg::
 
-#undef T  // if used T as #define, undef it
+#undef T  // if used T as #define, undef it
+#undef VGIZMO_H_FILE