Sfoglia il codice sorgente

Fixed typo that caused SSE4.1 not to work under Linux (#98)

* Fixed typo that caused SSE4.1 not to work under Linux
* Sonar fix: Removed unused assignments
Jorrit Rouwe 3 anni fa
parent
commit
b602c7d72b
2 ha cambiato i file con 2 aggiunte e 4 eliminazioni
  1. 2 2
      Build/CMakeLists.txt
  2. 0 2
      Jolt/Geometry/ClosestPoint.h

+ 2 - 2
Build/CMakeLists.txt

@@ -86,7 +86,7 @@ if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
 		elseif (USE_SSE4_1)
 			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1")
 		else()
-		  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2")
+			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2")
 		endif()
 		if (USE_LZCNT)
 			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mlzcnt")
@@ -123,7 +123,7 @@ elseif ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" OR "${CMAKE_SYSTEM_NAME}" STREQU
 			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx -mpopcnt")
 		elseif (USE_SSE4_2)
 			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2 -mpopcnt")
-		elseif (USE_SSE_4_1)
+		elseif (USE_SSE4_1)
 			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1")
 		else()
 			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2")

+ 0 - 2
Jolt/Geometry/ClosestPoint.h

@@ -195,7 +195,6 @@ namespace ClosestPoint
 			if (dist_sq < best_dist_sq)
 			{
 				closest_point = q;
-				best_dist_sq = dist_sq;
 				closest_set = set << 1;
 			}
 
@@ -407,7 +406,6 @@ namespace ClosestPoint
 			float dist_sq = q.LengthSq(); 
 			if (dist_sq < best_dist_sq) 
 			{
-				best_dist_sq = dist_sq;
 				closest_point = q;
 				closest_set = ((set & 0b0001) << 1) + ((set & 0b0010) << 2) + (set & 0b0100); 
 			}