Merge pull request davideberly#35 from tbridel/hotfix/error_unused_va…

…riables Fix some unused variables triggering an error during compilation
Math-Collection · Dec 20, 2021 · 75cfcec · 75cfcec
2 parents 348d4ae + 1bb5fcd
commit 75cfcec
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/GTE/Applications/GLX/WindowSystem.cpp b/GTE/Applications/GLX/WindowSystem.cpp
@@ -27,7 +27,7 @@ WindowSystem::~WindowSystem()
 
 WindowSystem::WindowSystem()
     :
-    mDisplayName("GTEngineWindow"),
+    // mDisplayName("GTEngineWindow"), /*< Unused variables */
     mDisplay(nullptr)
 {
     // Connect to the X server.

diff --git a/GTE/Applications/GLX/WindowSystem.h b/GTE/Applications/GLX/WindowSystem.h
@@ -48,7 +48,7 @@ namespace gte
         // Window creation and destruction.
         void CreateFrom(Window::Parameters& parameters);
 
-        char const* mDisplayName;
+        // char const* mDisplayName; /*< Unused variable */
         _XDisplay* mDisplay;
         std::map<unsigned long, std::shared_ptr<Window>> mWindowMap;
     };

diff --git a/GTE/Graphics/GL45/GL45.cpp b/GTE/Graphics/GL45/GL45.cpp
@@ -14,8 +14,8 @@
 #include <vector>
 
 // Support for versioning.
-int constexpr OPENGL_VERSION_NONE = 0;
-int constexpr OPENGL_VERSION_1_0 = 10;
+// int constexpr OPENGL_VERSION_NONE = 0; /*< Unused variable */
+// int constexpr OPENGL_VERSION_1_0 = 10; /*< Unused variable */
 int constexpr OPENGL_VERSION_1_1 = 11;
 int constexpr OPENGL_VERSION_1_2 = 12;
 int constexpr OPENGL_VERSION_1_3 = 13;

diff --git a/GTE/Graphics/GL45/GL45InputLayout.cpp b/GTE/Graphics/GL45/GL45InputLayout.cpp
@@ -19,7 +19,7 @@ GL45InputLayout::~GL45InputLayout()
 GL45InputLayout::GL45InputLayout(GLuint programHandle, GLuint vbufferHandle,
     VertexBuffer const* vbuffer)
     :
-    mProgramHandle(programHandle),
+    // mProgramHandle(programHandle), /*< Unused variable */
     mVBufferHandle(vbufferHandle),
     mNumAttributes(0)
 {

diff --git a/GTE/Graphics/GL45/GL45InputLayout.h b/GTE/Graphics/GL45/GL45InputLayout.h
@@ -24,7 +24,7 @@ namespace gte
         void Disable();
 
     private:
-        GLuint mProgramHandle;
+        // GLuint mProgramHandle; /*< Unused variable */
         GLuint mVBufferHandle;
         GLuint mVArrayHandle;
 

diff --git a/GTE/Graphics/MorphController.cpp b/GTE/Graphics/MorphController.cpp
@@ -109,12 +109,12 @@ bool MorphController::Update(double applicationTime)
     float const* weights0 = &mWeights[key0 * mNumTargets];
     float const* weights1 = &mWeights[key1 * mNumTargets];
     Vector3<float> const* vertices = mVertices.data();
-    float wsum0 = 0.0f, wsum1 = 0.0f;
+    // float wsum0 = 0.0f, wsum1 = 0.0f; /*< Unused variables */
     for (size_t n = 0; n < mNumTargets; ++n)
     {
         float w = oneMinusNormTime * weights0[n] + normTime * weights1[n];
-        wsum0 += weights0[n];
-        wsum1 += weights1[n];
+        // wsum0 += weights0[n]; /*< Unused variables */
+        // wsum1 += weights1[n]; /*< Unused variables */
         combination = vbuffer->GetData();
         for (size_t m = 0; m < mNumVertices; ++m)
         {