- fixed single precision build

Author: janbender

CMake/Common.cmake

@@ -32,3 +32,8 @@ endif()
 set (CMAKE_CXX_STANDARD 11)
 
 add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
+
+OPTION(USE_DOUBLE_PRECISION "Use double precision"	ON)
+if (USE_DOUBLE_PRECISION)
+	add_definitions( -DUSE_DOUBLE)	
+endif (USE_DOUBLE_PRECISION)

CMakeLists.txt

@@ -11,9 +11,9 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 include(${PROJECT_PATH}/CMake/Common.cmake)
 
 if (WIN32)
-  subdirs(extern/freeglut extern/AntTweakBar extern/glew extern/md5 Demos PositionBasedDynamics)
+  subdirs(extern/freeglut extern/AntTweakBar extern/glew extern/md5 Demos PositionBasedDynamics Simulation Utils)
 else()
-  subdirs(extern/AntTweakBar extern/glew extern/md5 Demos PositionBasedDynamics)
+  subdirs(extern/AntTweakBar extern/glew extern/md5 Demos PositionBasedDynamics Simulation Utils)
 endif()
 
 include(ExternalProject)
@@ -29,11 +29,21 @@ ExternalProject_Add(
    ExternalProject_Discregrid
    PREFIX "${CMAKE_SOURCE_DIR}/extern/Discregrid"
    GIT_REPOSITORY https://github.com/InteractiveComputerGraphics/Discregrid.git
-   GIT_TAG "f16a29afebf7a7f43139d5832bbfc7124c5d98db"
+   GIT_TAG "573c2f51f433c74de832454272e47f590140e80b"
    INSTALL_DIR ${ExternalInstallDir}/Discregrid
    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${ExternalInstallDir}/Discregrid -DBUILD_CMD_EXECUTABLE:BOOL=0 -DEIGEN3_INCLUDE_DIR:PATH=${EigenDir}
 ) 
 
+## GenericParameters
+ExternalProject_Add(
+   ExternalProject_GenericParameters
+   PREFIX "${CMAKE_SOURCE_DIR}/extern/GenericParameters"
+   GIT_REPOSITORY https://github.com/InteractiveComputerGraphics/GenericParameters.git
+   GIT_TAG "1ec904bf8555e78ae0d8ba2f9f9a395371c5d4eb"
+   INSTALL_DIR ${ExternalInstallDir}/GenericParameters
+   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${ExternalInstallDir}/GenericParameters -DGENERICPARAMETERS_NO_TESTS:BOOL=1		
+) 
+
 install(DIRECTORY ./Common
 DESTINATION include
 FILES_MATCHING PATTERN "*.h")

Changelog.txt

@@ -1,3 +1,6 @@
+	- fixed single precision build
+	- cleanup code
+	- using GenericParameters
 	- Crispin Deul added the implementation of his paper Deul, Kugelstadt, Weiler, Bender, "Direct Position-Based Solver for Stiff Rods", Computer Graphics Forum 2018 and a corresponding demo
 
 1.6.0

Common/Common.h

@@ -4,24 +4,32 @@
 #include <Eigen/Dense>
 #include <float.h>
 
-#define USE_DOUBLE
+//#define USE_DOUBLE
 #define MIN_PARALLEL_SIZE 64
 
 #ifdef USE_DOUBLE
 typedef double Real;
 
 #define REAL_MAX DBL_MAX
 #define REAL_MIN DBL_MIN
+#define RealParameter DoubleParameter
+#define RealParameterType ParameterBase::DOUBLE
+#define RealVectorParameterType ParameterBase::VEC_DOUBLE
 #else
 typedef float Real;
 
 #define REAL_MAX FLT_MAX
 #define REAL_MIN FLT_MIN
+#define RealParameter FloatParameter
+#define RealParameterType ParameterBase::FLOAT
+#define RealVectorParameterType ParameterBase::VEC_FLOAT
 #endif
 
 using Vector2r = Eigen::Matrix<Real, 2, 1>;
 using Vector3r = Eigen::Matrix<Real, 3, 1>;
 using Vector4r = Eigen::Matrix<Real, 4, 1>;
+using Vector5r = Eigen::Matrix<Real, 5, 1>;
+using Vector6r = Eigen::Matrix<Real, 6, 1>;
 using Matrix2r = Eigen::Matrix<Real, 2, 2>;
 using Matrix3r = Eigen::Matrix<Real, 3, 3>;
 using Matrix4r = Eigen::Matrix<Real, 4, 4>;

Demos/BarDemo/CMakeLists.txt

@@ -15,8 +15,19 @@ else()
   )
 endif()
 
+############################################################
+# GenericParameters
+############################################################
+include_directories(${PROJECT_PATH}/extern/install/GenericParameters/include)
+set(SIMULATION_DEPENDENCIES ${SIMULATION_DEPENDENCIES} ExternalProject_GenericParameters)
+
 add_executable(BarDemo
 	  main.cpp
+
+	  ../Common/TweakBarParameters.cpp
+	  ../Common/TweakBarParameters.h
+	  ../Common/DemoBase.cpp
+	  ../Common/DemoBase.h
 
 	  ${VIS_FILES}          
 	  ${PROJECT_PATH}/Common/Common.h