fix for gpu particles terrain collision

Neill3d · Jul 16, 2019 · ea0097c · ea0097c
1 parent d1d485f
commit ea0097c
Show file tree

Hide file tree

Showing 10 changed files with 234 additions and 59 deletions.
diff --git a/Bin/x64/plugins_2016/mo_graphics.dll b/Bin/x64/plugins_2016/mo_graphics.dll
diff --git a/Bin/x64/plugins_2016/shader_gpu_particles.dll b/Bin/x64/plugins_2016/shader_gpu_particles.dll
diff --git a/Bin/x64/plugins_2017/mo_graphics.dll b/Bin/x64/plugins_2017/mo_graphics.dll
diff --git a/Bin/x64/plugins_2017/shader_gpu_particles.dll b/Bin/x64/plugins_2017/shader_gpu_particles.dll
diff --git a/MotionCodeLibrary/Projects/MoCodeLibrary.vcxproj b/MotionCodeLibrary/Projects/MoCodeLibrary.vcxproj
@@ -73,6 +73,14 @@
       <Configuration>Release 2018</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release 2019|Win32">
+      <Configuration>Release 2019</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release 2019|x64">
+      <Configuration>Release 2019</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -135,7 +143,7 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>NotSet</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
@@ -172,6 +180,13 @@
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 2019|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 2014|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -198,28 +213,35 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>NotSet</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 2017|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>NotSet</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 2018|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>NotSet</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 2019|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 2014|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>NotSet</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -263,6 +285,9 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release 2018|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release 2019|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release 2014|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
@@ -281,6 +306,9 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release 2018|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release 2019|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release 2014|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
@@ -356,6 +384,12 @@
     <TargetName>$(ProjectName)_$(Platform)_$(Configuration)</TargetName>
     <IntDir>..\..\..\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 2019|x64'">
+    <IncludePath>..\include;$(ADSK_MOBU_2019_64)\OpenRealitySDK\include;$(MOPLUGS_EXTERNAL)\glew\include;..\..\Cg\include;..\..\Include;$(MOPLUGS_FRAMEWORK)\code;$(IncludePath)</IncludePath>
+    <OutDir>..\lib\</OutDir>
+    <TargetName>$(ProjectName)_$(Platform)_$(Configuration)</TargetName>
+    <IntDir>..\..\..\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 2014|x64'">
     <IncludePath>..\include;$(ADSK_MOBU_2014_64)\OpenRealitySDK\include;..\..\..\glew\include;..\..\Cg\include;..\..\Include;..\..\..\MoPlugs_Framework\code;$(IncludePath)</IncludePath>
     <OutDir>..\lib\</OutDir>
@@ -551,6 +585,23 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 2019|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 2014|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -658,6 +709,24 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 2019|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>GLM_FORCE_SSE4;WIN32;NDEBUG;_LIB;NOMINMAX;CMD_SEND_CODE;TIXML_USE_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 2014|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -720,6 +789,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release 2016|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release 2017|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release 2018|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release 2019|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release 2014|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\ClusterAdvance.cpp" />
@@ -743,6 +813,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release 2016|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release 2017|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release 2018|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release 2019|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release 2014|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug 2013|Win32'">true</ExcludedFromBuild>
     </ClCompile>

diff --git a/Projects/MoGraphics.sln b/Projects/MoGraphics.sln
@@ -53,8 +53,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tool_bakeProjectors", "tool
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "renderer_colors", "renderer_colors\ColorsRenderer.vcxproj", "{110FCD0D-3C95-48D9-BB6E-DC8458F5AF21}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "solver_calculateNormals", "solver_AutoNormals\oruserobject_normalSolver.vcxproj", "{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug 2013|Win32 = Debug 2013|Win32
@@ -1283,51 +1281,6 @@ Global
 		{110FCD0D-3C95-48D9-BB6E-DC8458F5AF21}.RelWithDebInfo|Win32.ActiveCfg = Release|x64
 		{110FCD0D-3C95-48D9-BB6E-DC8458F5AF21}.RelWithDebInfo|x64.ActiveCfg = Release|x64
 		{110FCD0D-3C95-48D9-BB6E-DC8458F5AF21}.RelWithDebInfo|x64.Build.0 = Release|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.Debug 2013|Win32.ActiveCfg = Debug 2017|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.Debug 2013|x64.ActiveCfg = Debug 2017|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.Debug 2013|x64.Build.0 = Debug 2017|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.Debug 2015|Win32.ActiveCfg = Debug 2015|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.Debug 2015|x64.ActiveCfg = Debug 2015|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.Debug 2015|x64.Build.0 = Debug 2015|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.Debug 2017|Win32.ActiveCfg = Debug 2017|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.Debug 2017|x64.ActiveCfg = Debug 2017|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.Debug 2017|x64.Build.0 = Debug 2017|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.Debug_md|Win32.ActiveCfg = Debug|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.Debug_md|x64.ActiveCfg = Debug|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.Debug_md|x64.Build.0 = Debug|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.Debug|Win32.ActiveCfg = Debug|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.Debug|x64.ActiveCfg = Debug|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.Debug|x64.Build.0 = Debug|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.debugDll|Win32.ActiveCfg = Debug|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.debugDll|x64.ActiveCfg = Debug|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.debugDll|x64.Build.0 = Debug|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.MinSizeRel|Win32.ActiveCfg = Release|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.MinSizeRel|x64.ActiveCfg = Release|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.MinSizeRel|x64.Build.0 = Release|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.Release 2014|Win32.ActiveCfg = Release 2017|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.Release 2014|x64.ActiveCfg = Release 2017|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.Release 2015|Win32.ActiveCfg = Release 2017|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.Release 2015|x64.ActiveCfg = Release 2017|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.Release 2016|Win32.ActiveCfg = Release 2017|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.Release 2016|x64.ActiveCfg = Release 2017|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.Release 2017|Win32.ActiveCfg = Release 2017|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.Release 2017|x64.ActiveCfg = Release 2017|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.Release 2018|Win32.ActiveCfg = Release 2017|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.Release 2018|x64.ActiveCfg = Release 2017|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.Release 2019|Win32.ActiveCfg = Release 2019|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.Release 2019|x64.ActiveCfg = Release 2019|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.Release_md|Win32.ActiveCfg = Release|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.Release_md|x64.ActiveCfg = Release|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.Release_md|x64.Build.0 = Release|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.Release|Win32.ActiveCfg = Release|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.Release|x64.ActiveCfg = Release|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.Release|x64.Build.0 = Release|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.releaseDll|Win32.ActiveCfg = Release|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.releaseDll|x64.ActiveCfg = Release|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.releaseDll|x64.Build.0 = Release|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.RelWithDebInfo|Win32.ActiveCfg = Release|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.RelWithDebInfo|x64.ActiveCfg = Release|x64
-		{6BD0817A-76DD-4ECC-AE4D-AB6E6BF210EC}.RelWithDebInfo|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE