Merge pull request #11 from m-schuetz/crf

Crf
m-schuetz · Jun 1, 2022 · f39ad46 · f39ad46
2 parents 4a86286 + 634f56b
commit f39ad46
Show file tree

Hide file tree

Showing 100 changed files with 40,969 additions and 733 deletions.
diff --git a/build/ComputeRasterizer.sln b/build/ComputeRasterizer.sln
@@ -1,34 +1,59 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29728.190
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.32014.148
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ComputeRasterizer", "ComputeRasterizer.vcxproj", "{6E98D902-2BE0-4AB8-97B8-1EBD66E95CA5}"
+	ProjectSection(ProjectDependencies) = postProject
+		{57010B68-87C5-33AE-8633-D479ABB84636} = {57010B68-87C5-33AE-8633-D479ABB84636}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "laszip", "laszip.vcxproj", "{57010B68-87C5-33AE-8633-D479ABB84636}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		MinSizeRel|x64 = MinSizeRel|x64
+		MinSizeRel|x86 = MinSizeRel|x86
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
+		RelWithDebInfo|x64 = RelWithDebInfo|x64
+		RelWithDebInfo|x86 = RelWithDebInfo|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{6E98D902-2BE0-4AB8-97B8-1EBD66E95CA5}.Debug|x64.ActiveCfg = Debug|x64
 		{6E98D902-2BE0-4AB8-97B8-1EBD66E95CA5}.Debug|x64.Build.0 = Debug|x64
 		{6E98D902-2BE0-4AB8-97B8-1EBD66E95CA5}.Debug|x86.ActiveCfg = Debug|Win32
 		{6E98D902-2BE0-4AB8-97B8-1EBD66E95CA5}.Debug|x86.Build.0 = Debug|Win32
+		{6E98D902-2BE0-4AB8-97B8-1EBD66E95CA5}.MinSizeRel|x64.ActiveCfg = Release|x64
+		{6E98D902-2BE0-4AB8-97B8-1EBD66E95CA5}.MinSizeRel|x64.Build.0 = Release|x64
+		{6E98D902-2BE0-4AB8-97B8-1EBD66E95CA5}.MinSizeRel|x86.ActiveCfg = Release|Win32
+		{6E98D902-2BE0-4AB8-97B8-1EBD66E95CA5}.MinSizeRel|x86.Build.0 = Release|Win32
 		{6E98D902-2BE0-4AB8-97B8-1EBD66E95CA5}.Release|x64.ActiveCfg = Release|x64
 		{6E98D902-2BE0-4AB8-97B8-1EBD66E95CA5}.Release|x64.Build.0 = Release|x64
 		{6E98D902-2BE0-4AB8-97B8-1EBD66E95CA5}.Release|x86.ActiveCfg = Release|Win32
 		{6E98D902-2BE0-4AB8-97B8-1EBD66E95CA5}.Release|x86.Build.0 = Release|Win32
-		{90F2F7C7-E01B-4BC5-9A67-088352B9BCE9}.Debug|x64.ActiveCfg = Debug|x64
-		{90F2F7C7-E01B-4BC5-9A67-088352B9BCE9}.Debug|x64.Build.0 = Debug|x64
-		{90F2F7C7-E01B-4BC5-9A67-088352B9BCE9}.Debug|x86.ActiveCfg = Debug|Win32
-		{90F2F7C7-E01B-4BC5-9A67-088352B9BCE9}.Debug|x86.Build.0 = Debug|Win32
-		{90F2F7C7-E01B-4BC5-9A67-088352B9BCE9}.Release|x64.ActiveCfg = Release|x64
-		{90F2F7C7-E01B-4BC5-9A67-088352B9BCE9}.Release|x64.Build.0 = Release|x64
-		{90F2F7C7-E01B-4BC5-9A67-088352B9BCE9}.Release|x86.ActiveCfg = Release|Win32
-		{90F2F7C7-E01B-4BC5-9A67-088352B9BCE9}.Release|x86.Build.0 = Release|Win32
+		{6E98D902-2BE0-4AB8-97B8-1EBD66E95CA5}.RelWithDebInfo|x64.ActiveCfg = Release|x64
+		{6E98D902-2BE0-4AB8-97B8-1EBD66E95CA5}.RelWithDebInfo|x64.Build.0 = Release|x64
+		{6E98D902-2BE0-4AB8-97B8-1EBD66E95CA5}.RelWithDebInfo|x86.ActiveCfg = Release|Win32
+		{6E98D902-2BE0-4AB8-97B8-1EBD66E95CA5}.RelWithDebInfo|x86.Build.0 = Release|Win32
+		{57010B68-87C5-33AE-8633-D479ABB84636}.Debug|x64.ActiveCfg = Debug|x64
+		{57010B68-87C5-33AE-8633-D479ABB84636}.Debug|x64.Build.0 = Debug|x64
+		{57010B68-87C5-33AE-8633-D479ABB84636}.Debug|x86.ActiveCfg = Debug|x64
+		{57010B68-87C5-33AE-8633-D479ABB84636}.Debug|x86.Build.0 = Debug|x64
+		{57010B68-87C5-33AE-8633-D479ABB84636}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
+		{57010B68-87C5-33AE-8633-D479ABB84636}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
+		{57010B68-87C5-33AE-8633-D479ABB84636}.MinSizeRel|x86.ActiveCfg = MinSizeRel|x64
+		{57010B68-87C5-33AE-8633-D479ABB84636}.MinSizeRel|x86.Build.0 = MinSizeRel|x64
+		{57010B68-87C5-33AE-8633-D479ABB84636}.Release|x64.ActiveCfg = Release|x64
+		{57010B68-87C5-33AE-8633-D479ABB84636}.Release|x64.Build.0 = Release|x64
+		{57010B68-87C5-33AE-8633-D479ABB84636}.Release|x86.ActiveCfg = Release|x64
+		{57010B68-87C5-33AE-8633-D479ABB84636}.Release|x86.Build.0 = Release|x64
+		{57010B68-87C5-33AE-8633-D479ABB84636}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
+		{57010B68-87C5-33AE-8633-D479ABB84636}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
+		{57010B68-87C5-33AE-8633-D479ABB84636}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x64
+		{57010B68-87C5-33AE-8633-D479ABB84636}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/build/ComputeRasterizer.vcxproj b/build/ComputeRasterizer.vcxproj
@@ -25,19 +25,6 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
@@ -140,14 +127,14 @@
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpplatest</LanguageStandard>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\include;$(SolutionDir)..\libs\glfw\include;$(SolutionDir)..\libs\glew\include;$(SolutionDir)..\libs\imgui\;$(SolutionDir)..\libs\implot\;$(SolutionDir)..\libs\imgui\backends;$(SolutionDir)..\libs\glm;$(SolutionDir)..\modules;$(SolutionDir)..\libs\json;$(SolutionDir)..\libs\openvr\headers;$(CUDA_PATH)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\include;$(SolutionDir)..\libs\glfw\include;$(SolutionDir)..\libs\glew\include;$(SolutionDir)..\libs\imgui\;$(SolutionDir)..\libs\implot\;$(SolutionDir)..\libs\imgui\backends;$(SolutionDir)..\libs\glm;$(SolutionDir)..\modules;$(SolutionDir)..\libs\json;$(SolutionDir)..\libs\openvr\headers;$(CUDA_PATH)\include;$(SolutionDir)..\libs\laszip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(SolutionDir)..\libs\glfw\lib\msvc2017_x64\glfw3.lib;opengl32.lib;$(SolutionDir)..\libs\openvr\lib\win64\openvr_api.lib;$(CUDA_PATH)\lib\x64\cuda.lib;$(CUDA_PATH)\lib\x64\nvrtc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(SolutionDir)..\libs\glfw\lib\msvc2017_x64\glfw3.lib;opengl32.lib;$(SolutionDir)..\libs\openvr\lib\win64\openvr_api.lib;$(CUDA_PATH)\lib\x64\cuda.lib;$(CUDA_PATH)\lib\x64\nvrtc.lib;$(SolutionDir)Release\laszip.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>copy /Y "$(SolutionDir)..\libs\openvr\openvr_api.dll" "$(OutDir)"</Command>
@@ -167,6 +154,7 @@
     <ClCompile Include="..\libs\implot\implot_demo.cpp" />
     <ClCompile Include="..\libs\implot\implot_items.cpp" />
     <ClCompile Include="..\modules\compute\ComputeLasLoader.cpp" />
+    <ClCompile Include="..\modules\compute\LasLoaderSparse.cpp" />
     <ClCompile Include="..\src\Framebuffer.cpp" />
     <ClCompile Include="..\src\GLTimerQueries.cpp" />
     <ClCompile Include="..\src\main.cpp" />

diff --git a/build/ComputeRasterizer.vcxproj.filters b/build/ComputeRasterizer.vcxproj.filters
@@ -59,6 +59,9 @@
     <ClCompile Include="..\libs\glew\glew.c">
       <Filter>headers</Filter>
     </ClCompile>
+    <ClCompile Include="..\modules\compute\LasLoaderSparse.cpp">
+      <Filter>source</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\libs\imgui\backends\imgui_impl_glfw.h">

diff --git a/build/Release/laszip.exp b/build/Release/laszip.exp
diff --git a/build/Release/laszip.lib b/build/Release/laszip.lib