From 9f6cb64e3db10978b95e5c5243b3b5af08840c73 Mon Sep 17 00:00:00 2001
From: Ricardo Ortiz <ricardo.ortiz@kitware.com>
Date: Mon, 20 Jul 2015 20:32:12 -0400
Subject: [PATCH] Fix Windows compile error.
Add _USE_MATH_DEFINES to the windows compile definitions.
---
CMakeLists.txt | 3 ++-
src/CMakeLists.txt | 2 +-
src/Collision/SpatialHashCollision.cpp | 3 ---
src/Core/CollisionPair.cpp | 2 +-
src/Core/Light.cpp | 3 ---
src/External/moller.h | 2 --
src/Mesh/VegaSceneObject.cpp | 2 +-
src/Mesh/VegaSceneObjectDeformable.cpp | 2 +-
src/RenderDelegates/Config.h | 1 -
src/Rendering/ConfigRendering.h | 2 --
src/{Tools => VirtualTools}/CMakeLists.txt | 4 ++--
src/{Tools => VirtualTools}/curvedGrasper.cpp | 0
src/{Tools => VirtualTools}/curvedGrasper.h | 0
13 files changed, 8 insertions(+), 18 deletions(-)
rename src/{Tools => VirtualTools}/CMakeLists.txt (64%)
rename src/{Tools => VirtualTools}/curvedGrasper.cpp (100%)
rename src/{Tools => VirtualTools}/curvedGrasper.h (100%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8229d8fd3..3f5645a5d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -143,6 +143,7 @@ if(MSVC)
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
add_definitions(-D_SCL_SECURE_NO_DEPRECATE)
+ add_definitions(-D_USE_MATH_DEFINES)
add_definitions(-DWIN32_LEAN_AND_MEAN)
add_definitions(-DWINDOWS_EXTRA_LEAN)
endif()
@@ -232,7 +233,7 @@ set(SimMedTK_exports
Mesh
Rendering
Simulators
- Tools
+ VirtualTools
Event)
if(SimMedTK_USE_OCULUS)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 96c9771d9..7020e0042 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,6 +8,6 @@ add_subdirectory(Mesh)
add_subdirectory(Rendering)
add_subdirectory(RenderDelegates)
add_subdirectory(Simulators)
-add_subdirectory(Tools)
+add_subdirectory(VirtualTools)
add_subdirectory(Event)
add_subdirectory(Geometry)
diff --git a/src/Collision/SpatialHashCollision.cpp b/src/Collision/SpatialHashCollision.cpp
index 7a3421d07..1507ec6ba 100644
--- a/src/Collision/SpatialHashCollision.cpp
+++ b/src/Collision/SpatialHashCollision.cpp
@@ -23,9 +23,6 @@
#include "SpatialHashCollision.h"
-// STL includes
-#include <cmath>
-
// SimMedTK includes
#include "Core/CollisionConfig.h"
#include "Collision/SurfaceTree.h"
diff --git a/src/Core/CollisionPair.cpp b/src/Core/CollisionPair.cpp
index 14612776c..a03203368 100644
--- a/src/Core/CollisionPair.cpp
+++ b/src/Core/CollisionPair.cpp
@@ -84,7 +84,7 @@ const std::vector< std::shared_ptr< Contact > >& CollisionPair::getContacts() co
void CollisionPair::printCollisionPairs()
{
std::cout << "# Contacts: " << this->contacts.size() << std::endl;
- for (int i = 0; i < this->contacts.size(); i++)
+ for (size_t i = 0; i < this->contacts.size(); i++)
{
std::cout << "Contact no: " << i << std::endl;
this->contacts[0]->printInfo();
diff --git a/src/Core/Light.cpp b/src/Core/Light.cpp
index 0ad07b991..845b1c946 100644
--- a/src/Core/Light.cpp
+++ b/src/Core/Light.cpp
@@ -21,9 +21,6 @@
// Contact:
//---------------------------------------------------------------------------
-// STD includes
-#include <cmath>
-
// SimMedTK includes
#include "Light.h"
#include "Quaternion.h"
diff --git a/src/External/moller.h b/src/External/moller.h
index 1f6c7d521..3778c7bc3 100644
--- a/src/External/moller.h
+++ b/src/External/moller.h
@@ -26,8 +26,6 @@
* isectpt1, isectpt2 are the endpoints of the line of intersection
*/
-#include <cmath>
-
//#define std::fabs(x) ((double)fabs(x)) /* implement as is fastest on your machine */
// #define std::fabs(x) (x>=0?x:-x) /* implement as is fastest on your machine */
diff --git a/src/Mesh/VegaSceneObject.cpp b/src/Mesh/VegaSceneObject.cpp
index 5cbb279c0..b14778aec 100644
--- a/src/Mesh/VegaSceneObject.cpp
+++ b/src/Mesh/VegaSceneObject.cpp
@@ -1,4 +1,4 @@
-#include <math.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/Mesh/VegaSceneObjectDeformable.cpp b/src/Mesh/VegaSceneObjectDeformable.cpp
index 67d42bc13..de71abc5a 100644
--- a/src/Mesh/VegaSceneObjectDeformable.cpp
+++ b/src/Mesh/VegaSceneObjectDeformable.cpp
@@ -1,4 +1,4 @@
-#include <math.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/RenderDelegates/Config.h b/src/RenderDelegates/Config.h
index 5703ab6b3..0d08484b9 100644
--- a/src/RenderDelegates/Config.h
+++ b/src/RenderDelegates/Config.h
@@ -6,7 +6,6 @@
#define SIMMEDTK_REGISTER_RENDER_DELEGATES() \
SIMMEDTK_RUN_LOADER(register_rendering_viewer); \
SIMMEDTK_RUN_LOADER(register_aabb_render_delegate); \
- SIMMEDTK_RUN_LOADER(register_lattice_render_delegate); \
SIMMEDTK_RUN_LOADER(register_mesh_render_delegate); \
SIMMEDTK_RUN_LOADER(register_plane_render_delegate); \
SIMMEDTK_RUN_LOADER(register_scene_object_deformable_render_delegate); \
diff --git a/src/Rendering/ConfigRendering.h b/src/Rendering/ConfigRendering.h
index acce80dc9..91d008765 100644
--- a/src/Rendering/ConfigRendering.h
+++ b/src/Rendering/ConfigRendering.h
@@ -24,8 +24,6 @@
#ifndef SMCONFIGRENDERING_H
#define SMCONFIGRENDERING_H
-// STL includes
-#include <cmath>
#include <memory>
#include <vector>
diff --git a/src/Tools/CMakeLists.txt b/src/VirtualTools/CMakeLists.txt
similarity index 64%
rename from src/Tools/CMakeLists.txt
rename to src/VirtualTools/CMakeLists.txt
index f3c195dc1..12f58b29c 100644
--- a/src/Tools/CMakeLists.txt
+++ b/src/VirtualTools/CMakeLists.txt
@@ -1,12 +1,12 @@
-simmedtk_add_library(Tools
+simmedtk_add_library(VirtualTools
SOURCES
curvedGrasper.cpp
PUBLIC_HEADERS
curvedGrasper.h
)
-target_link_libraries(Tools
+target_link_libraries(VirtualTools
PRIVATE
Core
Mesh
diff --git a/src/Tools/curvedGrasper.cpp b/src/VirtualTools/curvedGrasper.cpp
similarity index 100%
rename from src/Tools/curvedGrasper.cpp
rename to src/VirtualTools/curvedGrasper.cpp
diff --git a/src/Tools/curvedGrasper.h b/src/VirtualTools/curvedGrasper.h
similarity index 100%
rename from src/Tools/curvedGrasper.h
rename to src/VirtualTools/curvedGrasper.h
--
GitLab