windows debug postfix fix

raisimTech · Sep 4, 2022 · 19dbbbe · 19dbbbe
1 parent e97b267
commit 19dbbbe
Show file tree

Hide file tree

Showing 96 changed files with 41 additions and 223 deletions.
diff --git a/raisim/win32/mt_debug/bin/aliengo.exe b/raisim/win32/mt_debug/bin/aliengo.exe
diff --git a/raisim/win32/mt_debug/bin/aliengo.ilk b/raisim/win32/mt_debug/bin/aliengo.ilk
diff --git a/raisim/win32/mt_debug/bin/aliengo.pdb b/raisim/win32/mt_debug/bin/aliengo.pdb
diff --git a/raisim/win32/mt_debug/bin/anymals.exe b/raisim/win32/mt_debug/bin/anymals.exe
diff --git a/raisim/win32/mt_debug/bin/anymals.ilk b/raisim/win32/mt_debug/bin/anymals.ilk
diff --git a/raisim/win32/mt_debug/bin/anymals.pdb b/raisim/win32/mt_debug/bin/anymals.pdb
diff --git a/raisim/win32/mt_debug/bin/atlas.exe b/raisim/win32/mt_debug/bin/atlas.exe
diff --git a/raisim/win32/mt_debug/bin/atlas.ilk b/raisim/win32/mt_debug/bin/atlas.ilk
diff --git a/raisim/win32/mt_debug/bin/atlas.pdb b/raisim/win32/mt_debug/bin/atlas.pdb
diff --git a/raisim/win32/mt_debug/bin/heightmap.exe b/raisim/win32/mt_debug/bin/heightmap.exe
diff --git a/raisim/win32/mt_debug/bin/heightmap.ilk b/raisim/win32/mt_debug/bin/heightmap.ilk
diff --git a/raisim/win32/mt_debug/bin/heightmap.pdb b/raisim/win32/mt_debug/bin/heightmap.pdb
diff --git a/raisim/win32/mt_debug/bin/hill1.exe b/raisim/win32/mt_debug/bin/hill1.exe
diff --git a/raisim/win32/mt_debug/bin/hill1.ilk b/raisim/win32/mt_debug/bin/hill1.ilk
diff --git a/raisim/win32/mt_debug/bin/hill1.pdb b/raisim/win32/mt_debug/bin/hill1.pdb
diff --git a/raisim/win32/mt_debug/bin/kinematicObject.exe b/raisim/win32/mt_debug/bin/kinematicObject.exe
diff --git a/raisim/win32/mt_debug/bin/kinematicObject.ilk b/raisim/win32/mt_debug/bin/kinematicObject.ilk
diff --git a/raisim/win32/mt_debug/bin/kinematicObject.pdb b/raisim/win32/mt_debug/bin/kinematicObject.pdb
diff --git a/raisim/win32/mt_debug/bin/lake1.exe b/raisim/win32/mt_debug/bin/lake1.exe
diff --git a/raisim/win32/mt_debug/bin/lake1.ilk b/raisim/win32/mt_debug/bin/lake1.ilk
diff --git a/raisim/win32/mt_debug/bin/lake1.pdb b/raisim/win32/mt_debug/bin/lake1.pdb
diff --git a/raisim/win32/mt_debug/bin/mountain1.exe b/raisim/win32/mt_debug/bin/mountain1.exe
diff --git a/raisim/win32/mt_debug/bin/mountain1.ilk b/raisim/win32/mt_debug/bin/mountain1.ilk
diff --git a/raisim/win32/mt_debug/bin/mountain1.pdb b/raisim/win32/mt_debug/bin/mountain1.pdb
diff --git a/raisim/win32/mt_debug/bin/raisimMine.dll → raisim/win32/mt_debug/bin/raisimMined.dll b/raisim/win32/mt_debug/bin/raisimMine.dll → raisim/win32/mt_debug/bin/raisimMined.dll
diff --git a/raisim/win32/mt_debug/bin/raisimODE.dll → raisim/win32/mt_debug/bin/raisimODEd.dll b/raisim/win32/mt_debug/bin/raisimODE.dll → raisim/win32/mt_debug/bin/raisimODEd.dll
diff --git a/raisim/win32/mt_debug/bin/raisimPng.dll → raisim/win32/mt_debug/bin/raisimPngd.dll b/raisim/win32/mt_debug/bin/raisimPng.dll → raisim/win32/mt_debug/bin/raisimPngd.dll
diff --git a/raisim/win32/mt_debug/bin/raisimZ.dll → raisim/win32/mt_debug/bin/raisimZd.dll b/raisim/win32/mt_debug/bin/raisimZ.dll → raisim/win32/mt_debug/bin/raisimZd.dll
diff --git a/raisim/win32/mt_debug/bin/raisim.dll → raisim/win32/mt_debug/bin/raisimd.dll b/raisim/win32/mt_debug/bin/raisim.dll → raisim/win32/mt_debug/bin/raisimd.dll
diff --git a/raisim/win32/mt_debug/include/raisim/Terrain.hpp b/raisim/win32/mt_debug/include/raisim/Terrain.hpp
@@ -107,6 +107,7 @@ struct TerrainProperties {
                     double fractalLacunarity,
                     double fractalGain,
                     double stepSize,
+                    double heightOffset,
                     std::uint32_t seed) :
       frequency(frequency),
       xSize(xSize),
@@ -118,7 +119,8 @@ struct TerrainProperties {
       fractalLacunarity(fractalLacunarity),
       fractalGain(fractalGain),
       stepSize(stepSize),
-      seed(seed) {
+      seed(seed),
+      heightOffset(heightOffset){
   };
 
   double frequency = 0.1;
@@ -128,6 +130,7 @@ struct TerrainProperties {
   double fractalLacunarity = 2.0;
   double fractalGain = 0.5;
   double stepSize = 0;
+  double heightOffset = 0;
 
   size_t fractalOctaves = 5;
   size_t xSamples = 100;
@@ -187,6 +190,10 @@ class TerrainGenerator {
         height_[y * terrainProperties_.xSamples + x] = e;
       }
 
+    for (int y = 0; y < terrainProperties_.ySamples; y++)
+      for (int x = 0; x < terrainProperties_.xSamples; x++)
+        height_[y * terrainProperties_.xSamples + x] += terrainProperties_.heightOffset;
+
     return height_;
   }
 

diff --git a/raisim/win32/mt_debug/lib/cmake/raisim/raisim-targets-debug.cmake b/raisim/win32/mt_debug/lib/cmake/raisim/raisim-targets-debug.cmake
@@ -8,52 +8,52 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
 # Import target "raisim::raisimZ" for configuration "Debug"
 set_property(TARGET raisim::raisimZ APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
 set_target_properties(raisim::raisimZ PROPERTIES
-  IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib/raisimZ.lib"
-  IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/bin/raisimZ.dll"
+  IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib/raisimZd.lib"
+  IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/bin/raisimZd.dll"
   )
 
 list(APPEND _IMPORT_CHECK_TARGETS raisim::raisimZ )
-list(APPEND _IMPORT_CHECK_FILES_FOR_raisim::raisimZ "${_IMPORT_PREFIX}/lib/raisimZ.lib" "${_IMPORT_PREFIX}/bin/raisimZ.dll" )
+list(APPEND _IMPORT_CHECK_FILES_FOR_raisim::raisimZ "${_IMPORT_PREFIX}/lib/raisimZd.lib" "${_IMPORT_PREFIX}/bin/raisimZd.dll" )
 
 # Import target "raisim::raisimPng" for configuration "Debug"
 set_property(TARGET raisim::raisimPng APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
 set_target_properties(raisim::raisimPng PROPERTIES
-  IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib/raisimPng.lib"
-  IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/bin/raisimPng.dll"
+  IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib/raisimPngd.lib"
+  IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/bin/raisimPngd.dll"
   )
 
 list(APPEND _IMPORT_CHECK_TARGETS raisim::raisimPng )
-list(APPEND _IMPORT_CHECK_FILES_FOR_raisim::raisimPng "${_IMPORT_PREFIX}/lib/raisimPng.lib" "${_IMPORT_PREFIX}/bin/raisimPng.dll" )
+list(APPEND _IMPORT_CHECK_FILES_FOR_raisim::raisimPng "${_IMPORT_PREFIX}/lib/raisimPngd.lib" "${_IMPORT_PREFIX}/bin/raisimPngd.dll" )
 
 # Import target "raisim::raisimMine" for configuration "Debug"
 set_property(TARGET raisim::raisimMine APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
 set_target_properties(raisim::raisimMine PROPERTIES
-  IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib/raisimMine.lib"
-  IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/bin/raisimMine.dll"
+  IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib/raisimMined.lib"
+  IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/bin/raisimMined.dll"
   )
 
 list(APPEND _IMPORT_CHECK_TARGETS raisim::raisimMine )
-list(APPEND _IMPORT_CHECK_FILES_FOR_raisim::raisimMine "${_IMPORT_PREFIX}/lib/raisimMine.lib" "${_IMPORT_PREFIX}/bin/raisimMine.dll" )
+list(APPEND _IMPORT_CHECK_FILES_FOR_raisim::raisimMine "${_IMPORT_PREFIX}/lib/raisimMined.lib" "${_IMPORT_PREFIX}/bin/raisimMined.dll" )
 
 # Import target "raisim::raisimODE" for configuration "Debug"
 set_property(TARGET raisim::raisimODE APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
 set_target_properties(raisim::raisimODE PROPERTIES
-  IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib/raisimODE.lib"
-  IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/bin/raisimODE.dll"
+  IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib/raisimODEd.lib"
+  IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/bin/raisimODEd.dll"
   )
 
 list(APPEND _IMPORT_CHECK_TARGETS raisim::raisimODE )
-list(APPEND _IMPORT_CHECK_FILES_FOR_raisim::raisimODE "${_IMPORT_PREFIX}/lib/raisimODE.lib" "${_IMPORT_PREFIX}/bin/raisimODE.dll" )
+list(APPEND _IMPORT_CHECK_FILES_FOR_raisim::raisimODE "${_IMPORT_PREFIX}/lib/raisimODEd.lib" "${_IMPORT_PREFIX}/bin/raisimODEd.dll" )
 
 # Import target "raisim::raisim" for configuration "Debug"
 set_property(TARGET raisim::raisim APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
 set_target_properties(raisim::raisim PROPERTIES
-  IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib/raisim.lib"
-  IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/bin/raisim.dll"
+  IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib/raisimd.lib"
+  IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/bin/raisimd.dll"
   )
 
 list(APPEND _IMPORT_CHECK_TARGETS raisim::raisim )
-list(APPEND _IMPORT_CHECK_FILES_FOR_raisim::raisim "${_IMPORT_PREFIX}/lib/raisim.lib" "${_IMPORT_PREFIX}/bin/raisim.dll" )
+list(APPEND _IMPORT_CHECK_FILES_FOR_raisim::raisim "${_IMPORT_PREFIX}/lib/raisimd.lib" "${_IMPORT_PREFIX}/bin/raisimd.dll" )
 
 # Commands beyond this point should not need to know the version.
 set(CMAKE_IMPORT_FILE_VERSION)
diff --git a/raisim/win32/mt_debug/lib/cmake/raisim/raisim-targets.cmake b/raisim/win32/mt_debug/lib/cmake/raisim/raisim-targets.cmake
@@ -54,22 +54,22 @@ endif()
 add_library(raisim::raisimZ SHARED IMPORTED)
 
 set_target_properties(raisim::raisimZ PROPERTIES
-  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/"
 )
 
 # Create imported target raisim::raisimPng
 add_library(raisim::raisimPng SHARED IMPORTED)
 
 set_target_properties(raisim::raisimPng PROPERTIES
-  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/"
   INTERFACE_LINK_LIBRARIES "raisim::raisimZ"
 )
 
 # Create imported target raisim::raisimMine
 add_library(raisim::raisimMine SHARED IMPORTED)
 
 set_target_properties(raisim::raisimMine PROPERTIES
-  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/"
 )
 
 # Create imported target raisim::raisimODE

diff --git a/raisim/win32/mt_debug/lib/raisimMine.lib b/raisim/win32/mt_debug/lib/raisimMine.lib
diff --git a/raisim/win32/mt_debug/lib/raisimMined.lib b/raisim/win32/mt_debug/lib/raisimMined.lib
diff --git a/raisim/win32/mt_debug/lib/raisimODE.lib b/raisim/win32/mt_debug/lib/raisimODE.lib
diff --git a/raisim/win32/mt_debug/lib/raisimODEd.lib b/raisim/win32/mt_debug/lib/raisimODEd.lib
diff --git a/raisim/win32/mt_debug/lib/raisimPng.lib b/raisim/win32/mt_debug/lib/raisimPng.lib
diff --git a/raisim/win32/mt_debug/lib/raisimPngd.lib b/raisim/win32/mt_debug/lib/raisimPngd.lib
diff --git a/raisim/win32/mt_debug/lib/raisimZ.lib b/raisim/win32/mt_debug/lib/raisimZ.lib
diff --git a/raisim/win32/mt_debug/lib/raisimZd.lib b/raisim/win32/mt_debug/lib/raisimZd.lib
diff --git a/raisim/win32/mt_debug/lib/raisim.lib → raisim/win32/mt_debug/lib/raisimd.lib b/raisim/win32/mt_debug/lib/raisim.lib → raisim/win32/mt_debug/lib/raisimd.lib
diff --git a/raisim/win32/mt_release/bin/aliengo.exe b/raisim/win32/mt_release/bin/aliengo.exe
diff --git a/raisim/win32/mt_release/bin/aliengo.exe.manifest b/raisim/win32/mt_release/bin/aliengo.exe.manifest
diff --git a/raisim/win32/mt_release/bin/anymal_stress_test.exe b/raisim/win32/mt_release/bin/anymal_stress_test.exe
diff --git a/raisim/win32/mt_release/bin/anymals.exe b/raisim/win32/mt_release/bin/anymals.exe
diff --git a/raisim/win32/mt_release/bin/anymals.exe.manifest b/raisim/win32/mt_release/bin/anymals.exe.manifest
diff --git a/raisim/win32/mt_release/bin/atlas.exe b/raisim/win32/mt_release/bin/atlas.exe
diff --git a/raisim/win32/mt_release/bin/atlas.exe.manifest b/raisim/win32/mt_release/bin/atlas.exe.manifest
diff --git a/raisim/win32/mt_release/bin/balls.exe b/raisim/win32/mt_release/bin/balls.exe
diff --git a/raisim/win32/mt_release/bin/cartPole.exe b/raisim/win32/mt_release/bin/cartPole.exe
diff --git a/raisim/win32/mt_release/bin/compound.exe b/raisim/win32/mt_release/bin/compound.exe
diff --git a/raisim/win32/mt_release/bin/exportedWorld.xml b/raisim/win32/mt_release/bin/exportedWorld.xml
diff --git a/raisim/win32/mt_release/bin/heightMapUsingPng.exe b/raisim/win32/mt_release/bin/heightMapUsingPng.exe
diff --git a/raisim/win32/mt_release/bin/heightmap.exe b/raisim/win32/mt_release/bin/heightmap.exe
diff --git a/raisim/win32/mt_release/bin/hill1.exe b/raisim/win32/mt_release/bin/hill1.exe
diff --git a/raisim/win32/mt_release/bin/hill1.exe.manifest b/raisim/win32/mt_release/bin/hill1.exe.manifest
diff --git a/raisim/win32/mt_release/bin/kinematicObject.exe b/raisim/win32/mt_release/bin/kinematicObject.exe
diff --git a/raisim/win32/mt_release/bin/kinova.exe b/raisim/win32/mt_release/bin/kinova.exe
diff --git a/raisim/win32/mt_release/bin/kinova.exe.manifest b/raisim/win32/mt_release/bin/kinova.exe.manifest
diff --git a/raisim/win32/mt_release/bin/laikago.exe b/raisim/win32/mt_release/bin/laikago.exe
diff --git a/raisim/win32/mt_release/bin/lake1.exe b/raisim/win32/mt_release/bin/lake1.exe
diff --git a/raisim/win32/mt_release/bin/lake1.exe.manifest b/raisim/win32/mt_release/bin/lake1.exe.manifest
diff --git a/raisim/win32/mt_release/bin/materialStaticFriction.exe b/raisim/win32/mt_release/bin/materialStaticFriction.exe
diff --git a/raisim/win32/mt_release/bin/materials.exe b/raisim/win32/mt_release/bin/materials.exe
diff --git a/raisim/win32/mt_release/bin/meshes.exe b/raisim/win32/mt_release/bin/meshes.exe
diff --git a/raisim/win32/mt_release/bin/meshes.exe.manifest b/raisim/win32/mt_release/bin/meshes.exe.manifest
diff --git a/raisim/win32/mt_release/bin/mjcf_ant.exe b/raisim/win32/mt_release/bin/mjcf_ant.exe
diff --git a/raisim/win32/mt_release/bin/mjcf_cassie.exe b/raisim/win32/mt_release/bin/mjcf_cassie.exe
diff --git a/raisim/win32/mt_release/bin/mjcf_humanoid.exe b/raisim/win32/mt_release/bin/mjcf_humanoid.exe
diff --git a/raisim/win32/mt_release/bin/mountain1.exe b/raisim/win32/mt_release/bin/mountain1.exe
diff --git a/raisim/win32/mt_release/bin/mountain1.exe.manifest b/raisim/win32/mt_release/bin/mountain1.exe.manifest
diff --git a/raisim/win32/mt_release/bin/newtonsCradle.exe b/raisim/win32/mt_release/bin/newtonsCradle.exe
diff --git a/raisim/win32/mt_release/bin/office1.exe b/raisim/win32/mt_release/bin/office1.exe
diff --git a/raisim/win32/mt_release/bin/office1.exe.manifest b/raisim/win32/mt_release/bin/office1.exe.manifest
diff --git a/raisim/win32/mt_release/bin/primitives.exe b/raisim/win32/mt_release/bin/primitives.exe
diff --git a/raisim/win32/mt_release/bin/raisim.dll b/raisim/win32/mt_release/bin/raisim.dll
diff --git a/raisim/win32/mt_release/bin/raisim.mexw64 b/raisim/win32/mt_release/bin/raisim.mexw64
diff --git a/raisim/win32/mt_release/bin/raisimMine.dll b/raisim/win32/mt_release/bin/raisimMine.dll
diff --git a/raisim/win32/mt_release/bin/raisimODE.dll b/raisim/win32/mt_release/bin/raisimODE.dll
diff --git a/raisim/win32/mt_release/bin/raisimPng.dll b/raisim/win32/mt_release/bin/raisimPng.dll
diff --git a/raisim/win32/mt_release/bin/raisimZ.dll b/raisim/win32/mt_release/bin/raisimZ.dll
diff --git a/raisim/win32/mt_release/bin/raisimpy.cp35-win_amd64.pyd b/raisim/win32/mt_release/bin/raisimpy.cp35-win_amd64.pyd
diff --git a/raisim/win32/mt_release/bin/rayDemo.exe b/raisim/win32/mt_release/bin/rayDemo.exe
diff --git a/raisim/win32/mt_release/bin/rayDemo2.exe b/raisim/win32/mt_release/bin/rayDemo2.exe
diff --git a/raisim/win32/mt_release/bin/sensors.exe b/raisim/win32/mt_release/bin/sensors.exe
diff --git a/raisim/win32/mt_release/bin/speed_test.exe b/raisim/win32/mt_release/bin/speed_test.exe
diff --git a/raisim/win32/mt_release/bin/springTest.exe b/raisim/win32/mt_release/bin/springTest.exe
diff --git a/raisim/win32/mt_release/bin/synchronousServerUpdate.exe b/raisim/win32/mt_release/bin/synchronousServerUpdate.exe
diff --git a/raisim/win32/mt_release/bin/trackedRobotAndTemplatedURDF.exe b/raisim/win32/mt_release/bin/trackedRobotAndTemplatedURDF.exe
diff --git a/raisim/win32/mt_release/bin/visualObjects.exe b/raisim/win32/mt_release/bin/visualObjects.exe
diff --git a/raisim/win32/mt_release/bin/wheeledRobot.exe b/raisim/win32/mt_release/bin/wheeledRobot.exe
diff --git a/raisim/win32/mt_release/bin/xmlRader.exe b/raisim/win32/mt_release/bin/xmlRader.exe
diff --git a/raisim/win32/mt_release/include/raisim/Terrain.hpp b/raisim/win32/mt_release/include/raisim/Terrain.hpp
@@ -107,6 +107,7 @@ struct TerrainProperties {
                     double fractalLacunarity,
                     double fractalGain,
                     double stepSize,
+                    double heightOffset,
                     std::uint32_t seed) :
       frequency(frequency),
       xSize(xSize),
@@ -118,7 +119,8 @@ struct TerrainProperties {
       fractalLacunarity(fractalLacunarity),
       fractalGain(fractalGain),
       stepSize(stepSize),
-      seed(seed) {
+      seed(seed),
+      heightOffset(heightOffset){
   };
 
   double frequency = 0.1;
@@ -128,6 +130,7 @@ struct TerrainProperties {
   double fractalLacunarity = 2.0;
   double fractalGain = 0.5;
   double stepSize = 0;
+  double heightOffset = 0;
 
   size_t fractalOctaves = 5;
   size_t xSamples = 100;
@@ -187,6 +190,10 @@ class TerrainGenerator {
         height_[y * terrainProperties_.xSamples + x] = e;
       }
 
+    for (int y = 0; y < terrainProperties_.ySamples; y++)
+      for (int x = 0; x < terrainProperties_.xSamples; x++)
+        height_[y * terrainProperties_.xSamples + x] += terrainProperties_.heightOffset;
+
     return height_;
   }