Bladeren bron

sonar fixes

Jorrit Rouwe 4 jaren geleden
bovenliggende
commit
37b1bf1055
4 gewijzigde bestanden met toevoegingen van 5 en 4 verwijderingen
  1. 2 1
      Jolt/AABBTree/AABBTreeBuilder.h
  2. 1 1
      Jolt/Core/Color.cpp
  3. 1 1
      Jolt/Core/FixedSizeFreeList.h
  4. 1 1
      Jolt/Core/TickCounter.cpp

+ 2 - 1
Jolt/AABBTree/AABBTreeBuilder.h

@@ -5,6 +5,7 @@
 
 #include <TriangleSplitter/TriangleSplitter.h>
 #include <Geometry/AABox.h>
+#include <Core/NonCopyable.h>
 
 namespace JPH {
 
@@ -34,7 +35,7 @@ class AABBTreeBuilder
 {
 public:
 	/// A node in the tree, contains the AABox for the tree and any child nodes or triangles
-	class Node
+	class Node : public NonCopyable
 	{
 	public:
 		/// Constructor

+ 1 - 1
Jolt/Core/Color.cpp

@@ -25,7 +25,7 @@ const Color Color::sLightGrey(192, 192, 192);
 const Color Color::sWhite(255, 255, 255);
 
 // Generated by: http://phrogz.net/css/distinct-colors.html (this algo: https://en.wikipedia.org/wiki/Color_difference#CMC_l:c_.281984.29)
-static Color sColors[] = { Color(255, 0, 0), Color(204, 143, 102), Color(226, 242, 0), Color(41, 166, 124), Color(0, 170, 255), Color(69, 38, 153), Color(153, 38, 130), Color(229, 57, 80), Color(204, 0, 0), Color(255, 170, 0), Color(85, 128, 0), Color(64, 255, 217), Color(0, 75, 140), Color(161, 115, 230), Color(242, 61, 157), Color(178, 101, 89), Color(140, 94, 0), Color(181, 217, 108), Color(64, 242, 255), Color(77, 117, 153), Color(157, 61, 242), Color(140, 0, 56), Color(127, 57, 32), Color(204, 173, 51), Color(64, 255, 64), Color(38, 145, 153), Color(0, 102, 255), Color(242, 0, 226), Color(153, 77, 107), Color(229, 92, 0), Color(140, 126, 70), Color(0, 179, 71), Color(0, 194, 242), Color(27, 0, 204), Color(230, 115, 222), Color(127, 0, 17) };
+static const Color sColors[] = { Color(255, 0, 0), Color(204, 143, 102), Color(226, 242, 0), Color(41, 166, 124), Color(0, 170, 255), Color(69, 38, 153), Color(153, 38, 130), Color(229, 57, 80), Color(204, 0, 0), Color(255, 170, 0), Color(85, 128, 0), Color(64, 255, 217), Color(0, 75, 140), Color(161, 115, 230), Color(242, 61, 157), Color(178, 101, 89), Color(140, 94, 0), Color(181, 217, 108), Color(64, 242, 255), Color(77, 117, 153), Color(157, 61, 242), Color(140, 0, 56), Color(127, 57, 32), Color(204, 173, 51), Color(64, 255, 64), Color(38, 145, 153), Color(0, 102, 255), Color(242, 0, 226), Color(153, 77, 107), Color(229, 92, 0), Color(140, 126, 70), Color(0, 179, 71), Color(0, 194, 242), Color(27, 0, 204), Color(230, 115, 222), Color(127, 0, 17) };
 
 Color Color::sGetDistinctColor(int inIndex)
 {

+ 1 - 1
Jolt/Core/FixedSizeFreeList.h

@@ -21,7 +21,7 @@ private:
 	struct alignas(Object) ObjectStorage
 	{
 		/// Constructor to satisfy the vector class
-							ObjectStorage() { }
+							ObjectStorage() = default;
 							ObjectStorage(const ObjectStorage &inRHS) : mNextFreeObject(inRHS.mNextFreeObject.load()) { memcpy(mData, inRHS.mData, sizeof(Object)); }
 
 		/// Storage space for the Object, stored as uninitialized data

+ 1 - 1
Jolt/Core/TickCounter.cpp

@@ -17,7 +17,7 @@
 
 namespace JPH {
 
-static uint64 sProcessorTicksPerSecond = []() {
+static const uint64 sProcessorTicksPerSecond = []() {
 #if defined(JPH_PLATFORM_WINDOWS)
 	// Open the key where the processor speed is stored
 	HKEY hkey;