Clang-based modifications, tested with MSVS 2019 16.11.8 using C++ cl…

…ang tools for Windows (12.0.0). I updated the file versions on the previous push of source code. The DX11Engine.h file needed the "override" modifier. GL45Engine.cpp has "(char*)0+offset", which I modified to use reinterpret_cast. GL45InputLayout constructor has an unused parameter, removed it. Added braces to initialize subobjects in MarchingCubes.h. In RootsBisection2.h, the YFunction lambda had a 'this' parameter but did not use it, removed the parameter. WICFileIONative.cpp uses PROPBAG2 and VARIANT which clang complained about in multiple ways. I made enough changes to get the file to compile. The code probably needs to use the CCom* wrapper to encapsulate VARIANT. Better yet is for Microsoft to rewrite the Windows SDK header files to eliminate the code analysis complaints. Cylinder3.h has a mechanism similar to Cone3.h to distinguish between finite and infinite cylinders. I clarified a comment in AlignedBox.h about vertex extraction.
Math-Collection · Dec 21, 2021 · 5b88fa7 · 5b88fa7
1 parent 75cfcec
commit 5b88fa7
Show file tree

Hide file tree

Showing 16 changed files with 290 additions and 303 deletions.
diff --git a/GTE/Applications/GLX/Window.h b/GTE/Applications/GLX/Window.h
@@ -3,7 +3,7 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 // https://www.geometrictools.com/License/Boost/LICENSE_1_0.txt
-// Version: 4.0.2019.08.13
+// Version: 4.0.2021.12.20
 
 #pragma once
 

diff --git a/GTE/Applications/GLX/WindowSystem.cpp b/GTE/Applications/GLX/WindowSystem.cpp
@@ -3,7 +3,7 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 // https://www.geometrictools.com/License/Boost/LICENSE_1_0.txt
-// Version: 4.0.2019.08.13
+// Version: 4.0.2021.12.20
 
 #include <Applications/GTApplicationsPCH.h>
 #include <Applications/GLX/WindowSystem.h>
@@ -27,7 +27,6 @@ WindowSystem::~WindowSystem()
 
 WindowSystem::WindowSystem()
     :
-    // 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
@@ -3,7 +3,7 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 // https://www.geometrictools.com/License/Boost/LICENSE_1_0.txt
-// Version: 4.0.2019.08.13
+// Version: 4.0.2021.12.20
 
 #pragma once
 
@@ -48,7 +48,6 @@ namespace gte
         // Window creation and destruction.
         void CreateFrom(Window::Parameters& parameters);
 
-        // char const* mDisplayName; /*< Unused variable */
         _XDisplay* mDisplay;
         std::map<unsigned long, std::shared_ptr<Window>> mWindowMap;
     };

diff --git a/GTE/Applications/MSW/WICFileIONative.cpp b/GTE/Applications/MSW/WICFileIONative.cpp
@@ -3,7 +3,7 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 // https://www.geometrictools.com/License/Boost/LICENSE_1_0.txt
-// Version: 4.7.2021.05.27
+// Version: 4.7.2021.12.20
 
 #include <Applications/GTApplicationsPCH.h>
 #include <Applications/MSW/WICFileIONative.h>
@@ -439,15 +439,16 @@ void WICFileIONative::SaveTo(std::string const& filename, uint32_t inFormat,
         throw std::runtime_error("wicEncoder->CreateNewFrame failed.");
     }
 
+    // Set the options for the PNG encoder.
+    PROPBAG2 option{};
+    VARIANT varValue{};
+    ZeroMemory(&option, sizeof(option));
+    VariantInit(&varValue);
+
     if (imageQuality == -1.0f)
     {
-        // Set the options for the PNG encoder.
-        PROPBAG2 option = { 0 };
-        VARIANT varValue;
-
         // Default subsampling.
         option.pstrName = const_cast<LPOLESTR>(L"InterlaceOption");
-        VariantInit(&varValue);
         varValue.vt = VT_BOOL;
         varValue.boolVal = FALSE;
         hr = wicPropertyBag->Write(1, &option, &varValue);
@@ -458,7 +459,6 @@ void WICFileIONative::SaveTo(std::string const& filename, uint32_t inFormat,
 
         // Disable filtering.
         option.pstrName = const_cast<LPOLESTR>(L"FilterOption");
-        VariantInit(&varValue);
         varValue.vt = VT_UI1;
         varValue.bVal = WICPngFilterNone;
         hr = wicPropertyBag->Write(1, &option, &varValue);
@@ -469,13 +469,8 @@ void WICFileIONative::SaveTo(std::string const& filename, uint32_t inFormat,
     }
     else
     {
-        // Set the options for the PNG encoder.
-        PROPBAG2 option = { 0 };
-        VARIANT varValue;
-
         // Set image quality, a number in [0,1].
         option.pstrName = const_cast<LPOLESTR>(L"ImageQuality");
-        VariantInit(&varValue);
         varValue.vt = VT_R4;
         varValue.fltVal = imageQuality;
         hr = wicPropertyBag->Write(1, &option, &varValue);

diff --git a/GTE/Graphics/DX11/DX11Engine.h b/GTE/Graphics/DX11/DX11Engine.h
@@ -3,7 +3,7 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 // https://www.geometrictools.com/License/Boost/LICENSE_1_0.txt
-// Version: 4.0.2020.04.12
+// Version: 4.0.2021.12.20
 
 #pragma once
 
@@ -224,14 +224,14 @@ namespace gte
 
         // The function returns 'true' when the depth range is [0,1] (DirectX)
         // or 'false' when the depth range is [-1,1] (OpenGL).
-        virtual bool HasDepthRange01() const
+        virtual bool HasDepthRange01() const override
         {
             return true;
         }
 
         // Append the extension of the shader file to 'name' (.hlsl for DirectX,
         // .glsl for OpenGL).
-        virtual std::string GetShaderName(std::string const& name) const
+        virtual std::string GetShaderName(std::string const& name) const override
         {
             return name + ".hlsl";
         }

diff --git a/GTE/Graphics/GL45/GL45.cpp b/GTE/Graphics/GL45/GL45.cpp
@@ -3,7 +3,7 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 // https://www.geometrictools.com/License/Boost/LICENSE_1_0.txt
-// Version: 4.0.2021.11.11
+// Version: 4.0.2021.12.20
 
 #include <Graphics/GL45/GL45.h>
 #include <cassert>
@@ -14,9 +14,6 @@
 #include <vector>
 
 // Support for versioning.
-// 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;
 int constexpr OPENGL_VERSION_1_4 = 14;
@@ -127,6 +124,8 @@ static void ReportGLNullFunction(const char* glFunction)
 
 #if !defined(GTE_USE_MSWINDOWS)
 
+int constexpr OPENGL_VERSION_1_1 = 11;
+
 // GL_VERSION_1_0
 
 static PFNGLCULLFACEPROC sglCullFace = nullptr;

diff --git a/GTE/Graphics/GL45/GL45Engine.cpp b/GTE/Graphics/GL45/GL45Engine.cpp
@@ -3,7 +3,7 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 // https://www.geometrictools.com/License/Boost/LICENSE_1_0.txt
-// Version: 4.0.2021.11.11
+// Version: 4.0.2021.12.20
 
 #include <Graphics/GL45/GTGraphicsGL45PCH.h>
 #include <Graphics/FontArialW400H18.h>
@@ -213,7 +213,7 @@ uint64_t GL45Engine::DrawPrimitive(VertexBuffer const* vbuffer, IndexBuffer cons
     unsigned int offset = ibuffer->GetOffset();
     if (ibuffer->IsIndexed())
     {
-        void const* data = (char*)0 + static_cast<size_t>(indexSize) * static_cast<size_t>(offset);
+        void const* data = reinterpret_cast<void const*>(static_cast<size_t>(indexSize) * static_cast<size_t>(offset));
         glDrawRangeElements(topology, 0, numActiveVertices - 1,
             static_cast<GLsizei>(numActiveIndices), indexType, data);
     }
@@ -1223,7 +1223,7 @@ void GL45Engine::Execute(std::shared_ptr<ComputeProgram> const& program,
     auto glslProgram = std::dynamic_pointer_cast<GLSLComputeProgram>(program);
     if (glslProgram && numXGroups > 0 && numYGroups > 0 && numZGroups > 0)
     {
-        auto cshader = glslProgram->GetComputeShader();
+        auto const& cshader = glslProgram->GetComputeShader();
         auto programHandle = glslProgram->GetProgramHandle();
         if (cshader && programHandle > 0)
         {

diff --git a/GTE/Graphics/GL45/GL45Engine.h b/GTE/Graphics/GL45/GL45Engine.h
@@ -3,7 +3,7 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 // https://www.geometrictools.com/License/Boost/LICENSE_1_0.txt
-// Version: 4.0.2019.08.13
+// Version: 4.0.2021.12.20
 
 #pragma once
 

diff --git a/GTE/Graphics/GL45/GL45InputLayout.cpp b/GTE/Graphics/GL45/GL45InputLayout.cpp
@@ -3,7 +3,7 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 // https://www.geometrictools.com/License/Boost/LICENSE_1_0.txt
-// Version: 4.0.2019.08.13
+// Version: 4.0.2021.12.20
 
 #include <Graphics/GL45/GTGraphicsGL45PCH.h>
 #include <Mathematics/Logger.h>
@@ -16,10 +16,9 @@ GL45InputLayout::~GL45InputLayout()
     glDeleteVertexArrays(1, &mVArrayHandle);
 }
 
-GL45InputLayout::GL45InputLayout(GLuint programHandle, GLuint vbufferHandle,
+GL45InputLayout::GL45InputLayout(GLuint, GLuint vbufferHandle,
     VertexBuffer const* vbuffer)
     :
-    // mProgramHandle(programHandle), /*< Unused variable */
     mVBufferHandle(vbufferHandle),
     mNumAttributes(0)
 {

diff --git a/GTE/Graphics/GL45/GL45InputLayout.h b/GTE/Graphics/GL45/GL45InputLayout.h
@@ -3,7 +3,7 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 // https://www.geometrictools.com/License/Boost/LICENSE_1_0.txt
-// Version: 4.0.2019.08.13
+// Version: 4.0.2021.12.20
 
 #pragma once
 
@@ -24,7 +24,6 @@ namespace gte
         void Disable();
 
     private:
-        // GLuint mProgramHandle; /*< Unused variable */
         GLuint mVBufferHandle;
         GLuint mVArrayHandle;
 

diff --git a/GTE/Graphics/GraphicsEngine.h b/GTE/Graphics/GraphicsEngine.h
@@ -3,7 +3,7 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 // https://www.geometrictools.com/License/Boost/LICENSE_1_0.txt
-// Version: 4.0.2019.08.13
+// Version: 4.0.2021.12.20
 
 #pragma once
 

diff --git a/GTE/Graphics/MorphController.cpp b/GTE/Graphics/MorphController.cpp
@@ -3,7 +3,7 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 // https://www.geometrictools.com/License/Boost/LICENSE_1_0.txt
-// Version: 4.0.2019.08.13
+// Version: 4.0.2021.12.20
 
 #include <Graphics/GTGraphicsPCH.h>
 #include <Graphics/MorphController.h>
@@ -109,12 +109,9 @@ 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; /*< Unused variables */
     for (size_t n = 0; n < mNumTargets; ++n)
     {
         float w = oneMinusNormTime * weights0[n] + normTime * weights1[n];
-        // wsum0 += weights0[n]; /*< Unused variables */
-        // wsum1 += weights1[n]; /*< Unused variables */
         combination = vbuffer->GetData();
         for (size_t m = 0; m < mNumVertices; ++m)
         {

diff --git a/GTE/Mathematics/AlignedBox.h b/GTE/Mathematics/AlignedBox.h
@@ -3,7 +3,7 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 // https://www.geometrictools.com/License/Boost/LICENSE_1_0.txt
-// Version: 4.0.2021.08.01
+// Version: 4.0.2021.12.20
 
 #pragma once
 
@@ -57,7 +57,8 @@ namespace gte
 
         // Compute the vertices of the box. If index i has the bit pattern
         // i = b[N-1]...b[0], then the corner at index i is vertex[i], where
-        // vertex[i] = min[i] whern b[d] = 0 or max[i] when b[d] = 1.
+        // vertex[i][d] = min[d] whern b[d] = 0 or vertex[i][d = max[d] when
+        // b[d] = 1.
         void GetVertices(std::array<Vector<N, T>, (1 << N)>& vertex) const
         {
             int32_t const imax = (1 << N);

diff --git a/GTE/Mathematics/Cylinder3.h b/GTE/Mathematics/Cylinder3.h
@@ -3,11 +3,10 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 // https://www.geometrictools.com/License/Boost/LICENSE_1_0.txt
-// Version: 4.0.2021.11.11
+// Version: 4.0.2021.12.20
 
 #pragma once
 
-#include <Mathematics/Logger.h>
 #include <Mathematics/Line.h>
 
 // The cylinder axis is a line. The origin of the cylinder is chosen to be