-
Notifications
You must be signed in to change notification settings - Fork 99
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #67 from Forceflow/dev
Dev
- Loading branch information
Showing
9 changed files
with
266 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
|
|
||
| Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| # Visual Studio 15 | ||
| VisualStudioVersion = 15.0.28307.271 | ||
| MinimumVisualStudioVersion = 10.0.40219.1 | ||
| Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cuda_voxelizer", "cuda_voxelizer.vcxproj", "{D4330816-735D-4CC7-AE2A-04A0E998099E}" | ||
| EndProject | ||
| Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C52A2702-E60C-4590-9C55-C8C66CCA5BAB}" | ||
| EndProject | ||
| Global | ||
| GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| Debug|x64 = Debug|x64 | ||
| Release|x64 = Release|x64 | ||
| EndGlobalSection | ||
| GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| {D4330816-735D-4CC7-AE2A-04A0E998099E}.Debug|x64.ActiveCfg = Debug|x64 | ||
| {D4330816-735D-4CC7-AE2A-04A0E998099E}.Debug|x64.Build.0 = Debug|x64 | ||
| {D4330816-735D-4CC7-AE2A-04A0E998099E}.Release|x64.ActiveCfg = Release|x64 | ||
| {D4330816-735D-4CC7-AE2A-04A0E998099E}.Release|x64.Build.0 = Release|x64 | ||
| EndGlobalSection | ||
| GlobalSection(SolutionProperties) = preSolution | ||
| HideSolutionNode = FALSE | ||
| EndGlobalSection | ||
| GlobalSection(ExtensibilityGlobals) = postSolution | ||
| SolutionGuid = {D7628502-09E5-4B15-AB62-365471E954D4} | ||
| EndGlobalSection | ||
| EndGlobal |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,138 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <ItemGroup Label="ProjectConfigurations"> | ||
| <ProjectConfiguration Include="Debug|x64"> | ||
| <Configuration>Debug</Configuration> | ||
| <Platform>x64</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Release|x64"> | ||
| <Configuration>Release</Configuration> | ||
| <Platform>x64</Platform> | ||
| </ProjectConfiguration> | ||
| </ItemGroup> | ||
| <PropertyGroup Label="Globals"> | ||
| <ProjectGuid>{D4330816-735D-4CC7-AE2A-04A0E998099E}</ProjectGuid> | ||
| <RootNamespace>cuda_voxelizer</RootNamespace> | ||
| <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> | ||
| </PropertyGroup> | ||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | ||
| <ConfigurationType>Application</ConfigurationType> | ||
| <UseDebugLibraries>true</UseDebugLibraries> | ||
| <CharacterSet>MultiByte</CharacterSet> | ||
| <PlatformToolset>v143</PlatformToolset> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | ||
| <ConfigurationType>Application</ConfigurationType> | ||
| <UseDebugLibraries>false</UseDebugLibraries> | ||
| <WholeProgramOptimization>true</WholeProgramOptimization> | ||
| <CharacterSet>MultiByte</CharacterSet> | ||
| <PlatformToolset>v143</PlatformToolset> | ||
| </PropertyGroup> | ||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||
| <ImportGroup Label="ExtensionSettings"> | ||
| <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 11.7.props" /> | ||
| </ImportGroup> | ||
| <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | ||
| <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| <Import Project="custom_includes.props" /> | ||
| </ImportGroup> | ||
| <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | ||
| <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| <Import Project="custom_includes.props" /> | ||
| </ImportGroup> | ||
| <PropertyGroup Label="UserMacros" /> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | ||
| <LinkIncremental>true</LinkIncremental> | ||
| <IncludePath>C:\libs\trimesh2\include;C:\libs\glm;$(IncludePath)</IncludePath> | ||
| <LibraryPath>C:\libs\trimesh2\lib.Win64;$(LibraryPath)</LibraryPath> | ||
| <CustomBuildAfterTargets>xcopy /y "$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName).exe" "$(BINARY_OUTPUT_DIR)$(ProjectName).exe"</CustomBuildAfterTargets> | ||
| <TargetName>$(ProjectName)_debug</TargetName> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | ||
| <IncludePath>C:\libs\trimesh2\include;C:\libs\glm;$(IncludePath)</IncludePath> | ||
| <LibraryPath>C:\libs\trimesh2\lib.Win64;$(LibraryPath)</LibraryPath> | ||
| <CustomBuildAfterTargets>xcopy /y "$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName).exe" "$(BINARY_OUTPUT_DIR)$(ProjectName).exe"</CustomBuildAfterTargets> | ||
| </PropertyGroup> | ||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | ||
| <ClCompile> | ||
| <WarningLevel>Level3</WarningLevel> | ||
| <Optimization>Disabled</Optimization> | ||
| <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| <OpenMPSupport>true</OpenMPSupport> | ||
| </ClCompile> | ||
| <Link> | ||
| <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| <SubSystem>Console</SubSystem> | ||
| <AdditionalDependencies>trimeshd.lib;cudart.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| </Link> | ||
| <PostBuildEvent> | ||
| <Command>copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)" | ||
| copy "$(CudaToolkitBinDir)\cudart*.dll" "$(BINARY_OUTPUT_DIR)" | ||
| copy /y "$(SolutionDir)$(Platform)\$(Configuration)\$(TargetName).exe" "$(BINARY_OUTPUT_DIR)$(TargetName).exe"</Command> | ||
| </PostBuildEvent> | ||
| <CudaCompile> | ||
| <PtxAsOptionV>true</PtxAsOptionV> | ||
| <AdditionalOptions>--source-in-ptx %(AdditionalOptions)</AdditionalOptions> | ||
| </CudaCompile> | ||
| </ItemDefinitionGroup> | ||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | ||
| <ClCompile> | ||
| <WarningLevel>Level3</WarningLevel> | ||
| <Optimization>MaxSpeed</Optimization> | ||
| <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| <IntrinsicFunctions>true</IntrinsicFunctions> | ||
| <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> | ||
| <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> | ||
| <OpenMPSupport>true</OpenMPSupport> | ||
| <WholeProgramOptimization>false</WholeProgramOptimization> | ||
| <FloatingPointModel>Strict</FloatingPointModel> | ||
| </ClCompile> | ||
| <Link> | ||
| <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| <OptimizeReferences>true</OptimizeReferences> | ||
| <SubSystem>Console</SubSystem> | ||
| <AdditionalDependencies>trimesh.lib;cudart.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| </Link> | ||
| <PostBuildEvent> | ||
| <Command>copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)" | ||
| copy "$(CudaToolkitBinDir)\cudart*.dll" "$(BINARY_OUTPUT_DIR)" | ||
| copy /y "$(SolutionDir)$(Platform)\$(Configuration)\$(TargetName).exe" "$(BINARY_OUTPUT_DIR)$(TargetName).exe"</Command> | ||
| </PostBuildEvent> | ||
| <CudaCompile> | ||
| <FastMath>true</FastMath> | ||
| </CudaCompile> | ||
| </ItemDefinitionGroup> | ||
| <ItemGroup> | ||
| <CudaCompile Include="..\..\src/voxelize.cu" /> | ||
| <CudaCompile Include="..\..\src\thrust_operations.cu" /> | ||
| <CudaCompile Include="..\..\src\voxelize_solid.cu" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ClCompile Include="..\..\src\cpu_voxelizer.cpp" /> | ||
| <ClCompile Include="..\..\src\util_io.cpp" /> | ||
| <ClCompile Include="..\..\src\util_cuda.cpp" /> | ||
| <ClCompile Include="..\..\src\main.cpp" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ClInclude Include="..\..\src\cpu_voxelizer.h" /> | ||
| <ClInclude Include="..\..\src\util_io.h" /> | ||
| <ClInclude Include="..\..\src\util.h" /> | ||
| <ClInclude Include="..\..\src\util_cuda.h" /> | ||
| <ClInclude Include="..\..\src\libs\helper_cuda.h" /> | ||
| <ClInclude Include="..\..\src\libs\helper_string.h" /> | ||
| <ClInclude Include="..\..\src\morton_LUTs.h" /> | ||
| <ClInclude Include="..\..\src\thrust_operations.cuh" /> | ||
| <ClInclude Include="..\..\src\timer.h" /> | ||
| <ClInclude Include="..\..\src\voxelize.cuh" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Text Include="..\..\src\todo.txt" /> | ||
| </ItemGroup> | ||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||
| <ImportGroup Label="ExtensionTargets"> | ||
| <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 11.7.targets" /> | ||
| </ImportGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <ItemGroup> | ||
| <CudaCompile Include="..\..\src\thrust_operations.cu" /> | ||
| <CudaCompile Include="..\..\src/voxelize.cu" /> | ||
| <CudaCompile Include="..\..\src\voxelize_solid.cu" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ClCompile Include="..\..\src\main.cpp" /> | ||
| <ClCompile Include="..\..\src\util_cuda.cpp"> | ||
| <Filter>util</Filter> | ||
| </ClCompile> | ||
| <ClCompile Include="..\..\src\util_io.cpp"> | ||
| <Filter>util</Filter> | ||
| </ClCompile> | ||
| <ClCompile Include="..\..\src\cpu_voxelizer.cpp" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ClInclude Include="..\..\src\libs\helper_cuda.h"> | ||
| <Filter>cuda</Filter> | ||
| </ClInclude> | ||
| <ClInclude Include="..\..\src\libs\helper_string.h"> | ||
| <Filter>cuda</Filter> | ||
| </ClInclude> | ||
| <ClInclude Include="..\..\src\voxelize.cuh" /> | ||
| <ClInclude Include="..\..\src\thrust_operations.cuh" /> | ||
| <ClInclude Include="..\..\src\morton_LUTs.h"> | ||
| <Filter>util</Filter> | ||
| </ClInclude> | ||
| <ClInclude Include="..\..\src\timer.h" /> | ||
| <ClInclude Include="..\..\src\util_cuda.h"> | ||
| <Filter>util</Filter> | ||
| </ClInclude> | ||
| <ClInclude Include="..\..\src\util_io.h"> | ||
| <Filter>util</Filter> | ||
| </ClInclude> | ||
| <ClInclude Include="..\..\src\util.h"> | ||
| <Filter>util</Filter> | ||
| </ClInclude> | ||
| <ClInclude Include="..\..\src\cpu_voxelizer.h"> | ||
| <Filter>util</Filter> | ||
| </ClInclude> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Text Include="..\..\src\todo.txt" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Filter Include="util"> | ||
| <UniqueIdentifier>{a0232da8-2097-49f4-9412-0e4223c7ba4d}</UniqueIdentifier> | ||
| </Filter> | ||
| <Filter Include="cuda"> | ||
| <UniqueIdentifier>{ea2a8fd1-3d76-496e-9ad4-123e8f208140}</UniqueIdentifier> | ||
| </Filter> | ||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <ImportGroup Label="PropertySheets" /> | ||
| <PropertyGroup Label="UserMacros"> | ||
| <TRIMESH_DIR>D:\dev\libs\trimesh2\</TRIMESH_DIR> | ||
| <GLM_DIR>D:\dev\libs\glm\</GLM_DIR> | ||
| <BINARY_OUTPUT_DIR>D:\dev\Binaries\</BINARY_OUTPUT_DIR> | ||
| </PropertyGroup> | ||
| <PropertyGroup> | ||
| <IncludePath>$(GLM_DIR);$(TRIMESH_DIR)\include\;$(IncludePath)</IncludePath> | ||
| <_PropertySheetDisplayName>custom_includes</_PropertySheetDisplayName> | ||
| <LibraryPath>$(TRIMESH_DIR)\lib.Win$(PlatformArchitecture).vs$(PlatformToolsetVersion);$(LibraryPath)</LibraryPath> | ||
| </PropertyGroup> | ||
| <PropertyGroup /> | ||
| <ItemDefinitionGroup /> | ||
| <ItemGroup> | ||
| <BuildMacro Include="BINARY_OUTPUT_DIR"> | ||
| <Value>$(BINARY_OUTPUT_DIR)</Value> | ||
| <EnvironmentVariable>true</EnvironmentVariable> | ||
| </BuildMacro> | ||
| <BuildMacro Include="TRIMESH_DIR"> | ||
| <Value>$(TRIMESH_DIR)</Value> | ||
| <EnvironmentVariable>true</EnvironmentVariable> | ||
| </BuildMacro> | ||
| <BuildMacro Include="GLM_DIR"> | ||
| <Value>$(GLM_DIR)</Value> | ||
| <EnvironmentVariable>true</EnvironmentVariable> | ||
| </BuildMacro> | ||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters