Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

How to you open this program? #47

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

How to you open this program? #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3c5b6ca
First commit
wuyingnan May 10, 2019
e4e156b
Modified README.md
wuyingnan May 10, 2019
bd9bdd6
gif updated
wuyingnan May 10, 2019
f4b812a
Update README.md
wuyingnan May 10, 2019
dde5dc7
Fix PrimeSense compilation errors
ybh1998 May 18, 2020
c461ce2
Merge pull request #1 from ybh1998/master
wuyingnan May 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added FriedLiver/CompiledShaders/PhongLighting.hlsl.PhongPS.p
View file
Open in desktop
Binary file not shown.
Binary file added FriedLiver/CompiledShaders/QuadDrawer.hlsl.QuadFloatPS.p
View file
Open in desktop
Binary file not shown.
Binary file added FriedLiver/CompiledShaders/QuadDrawer.hlsl.QuadRGBAPS.p
View file
Open in desktop
Binary file not shown.
Binary file added FriedLiver/CompiledShaders/QuadDrawer.hlsl.QuadVS.p
View file
Open in desktop
Binary file not shown.
Binary file added FriedLiver/CompiledShaders/RGBDRenderer.hlsl.EmptyVS.p
View file
Open in desktop
Binary file not shown.
Binary file added FriedLiver/CompiledShaders/RGBDRenderer.hlsl.RGBDRendererGS.p
View file
Open in desktop
Binary file not shown.
Binary file added FriedLiver/CompiledShaders/RGBDRenderer.hlsl.RGBDRendererRawDepthPS.p
View file
Open in desktop
Binary file not shown.
Binary file added FriedLiver/CompiledShaders/RayIntervalSplatting.hlsl.PS.p
View file
Open in desktop
Binary file not shown.
Binary file added FriedLiver/CompiledShaders/RayIntervalSplatting.hlsl.VS.p
View file
Open in desktop
Binary file not shown.
54 changes: 42 additions & 12 deletions FriedLiver/FriedLiver.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
Expand All @@ -15,24 +15,25 @@
<Keyword>Win32Proj</Keyword>
<RootNamespace>DepthWithColor.D3D</RootNamespace>
<ProjectName>FriedLiver</ProjectName>
<WindowsTargetPlatformVersion>10.0.16299.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>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
<Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 7.0.props" />
<Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 10.1.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
Expand Down Expand Up @@ -72,7 +73,7 @@
<DisableSpecificWarnings>4819</DisableSpecificWarnings>
</ClCompile>
<Link>
<AdditionalDependencies>d3d11.lib;d3dcompiler.lib;d3dx11d.lib;d3dx9d.lib;dxerr.lib;dxguid.lib;winmm.lib;comctl32.lib;Shlwapi.lib;cudart.lib;cublas.lib;FreeImage.lib;zlib64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>d3d11.lib;d3dcompiler.lib;dxguid.lib;winmm.lib;comctl32.lib;Shlwapi.lib;cudart.lib;cublas.lib;FreeImage.lib;zlib64.lib;usp10.lib;Imm32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>../opencv/lib/;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
Expand Down Expand Up @@ -106,7 +107,7 @@
<AdditionalOptions>/Zm113 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<AdditionalDependencies>d3d11.lib;d3dcompiler.lib;d3dx11.lib;d3dx9.lib;dxerr.lib;dxguid.lib;winmm.lib;comctl32.lib;Shlwapi.lib;cudart.lib;cublas.lib;FreeImage.lib;zlib64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>d3d11.lib;d3dcompiler.lib;dxguid.lib;winmm.lib;comctl32.lib;Shlwapi.lib;cudart.lib;cublas.lib;FreeImage.lib;zlib64.lib;usp10.lib;Imm32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<SubSystem>Console</SubSystem>
Expand All @@ -119,7 +120,7 @@
<CudaCompile>
<TargetMachinePlatform>64</TargetMachinePlatform>
<Include>Include\cutil\inc;$(SolutionDir)</Include>
<CodeGeneration>compute_35,sm_35</CodeGeneration>
<CodeGeneration>compute_30,sm_30</CodeGeneration>
<MaxRegCount>62</MaxRegCount>
<FastMath>true</FastMath>
<Optimization>O3</Optimization>
Expand Down Expand Up @@ -173,14 +174,20 @@
<ClInclude Include="Source\DepthSensing\Util.h" />
<ClInclude Include="Source\DepthSensing\VoxelUtilHashSDF.h" />
<ClInclude Include="Source\DualGPU.h" />
<ClInclude Include="Source\DXUT\Core\DDSTextureLoader.h" />
<ClInclude Include="Source\DXUT\Core\dxerr.h" />
<ClInclude Include="Source\DXUT\Core\DXUT.h" />
<ClInclude Include="Source\DXUT\Core\DXUTDevice11.h" />
<ClInclude Include="Source\DXUT\Core\DXUTDevice9.h" />
<ClInclude Include="Source\DXUT\Core\DXUTmisc.h" />
<ClInclude Include="Source\DXUT\Core\ScreenGrab.h" />
<ClInclude Include="Source\DXUT\Core\WICTextureLoader.h" />
<ClInclude Include="Source\DXUT\Optional\DXUTcamera.h" />
<ClInclude Include="Source\DXUT\Optional\DXUTgui.h" />
<ClInclude Include="Source\DXUT\Optional\DXUTguiIME.h" />
<ClInclude Include="Source\DXUT\Optional\DXUTLockFreePipe.h" />
<ClInclude Include="Source\DXUT\Optional\DXUTres.h" />
<ClInclude Include="Source\DXUT\Optional\DXUTsettingsdlg.h" />
<ClInclude Include="Source\DXUT\Optional\ImeUi.h" />
<ClInclude Include="Source\DXUT\Optional\SDKmesh.h" />
<ClInclude Include="Source\DXUT\Optional\SDKmisc.h" />
<ClInclude Include="Source\FriedLiver.h" />
Expand Down Expand Up @@ -257,6 +264,14 @@
<ClCompile Include="Source\DepthSensing\StdOutputLogger.cpp" />
<ClCompile Include="Source\DepthSensing\TimingLogDepthSensing.cpp" />
<ClCompile Include="Source\DualGPU.cpp" />
<ClCompile Include="Source\DXUT\Core\DDSTextureLoader.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="Source\DXUT\Core\dxerr.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="Source\DXUT\Core\DXUT.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
Expand All @@ -265,11 +280,15 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="Source\DXUT\Core\DXUTDevice9.cpp">
<ClCompile Include="Source\DXUT\Core\DXUTmisc.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="Source\DXUT\Core\DXUTmisc.cpp">
<ClCompile Include="Source\DXUT\Core\ScreenGrab.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="Source\DXUT\Core\WICTextureLoader.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
Expand All @@ -281,6 +300,10 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="Source\DXUT\Optional\DXUTguiIME.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="Source\DXUT\Optional\DXUTres.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
Expand All @@ -289,6 +312,10 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="Source\DXUT\Optional\ImeUi.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="Source\DXUT\Optional\SDKmesh.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
Expand Down Expand Up @@ -343,7 +370,10 @@
<CudaCompile Include="Source\OnlineBundler.cu" />
<CudaCompile Include="Source\SBA.cu" />
<CudaCompile Include="Source\SiftGPU\CUDASiftConstant.cu" />
<CudaCompile Include="Source\SiftGPU\ProgramCU.cu" />
<CudaCompile Include="Source\SiftGPU\ProgramCU.cu">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
<FileType>Document</FileType>
</CudaCompile>
<CudaCompile Include="Source\SiftGPU\SIFTImageManager.cu" />
<CudaCompile Include="Source\Solver\SolverBundling.cu">
<MaxRegCount Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">0</MaxRegCount>
Expand Down Expand Up @@ -372,6 +402,6 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 7.0.targets" />
<Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 10.1.targets" />
</ImportGroup>
</Project>
45 changes: 39 additions & 6 deletions FriedLiver/FriedLiver.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
<ClCompile Include="Source\DXUT\Core\DXUT.cpp">
<Filter>DXUT</Filter>
</ClCompile>
<ClCompile Include="Source\DXUT\Core\DXUTDevice9.cpp">
<Filter>DXUT</Filter>
</ClCompile>
<ClCompile Include="Source\DXUT\Core\DXUTDevice11.cpp">
<Filter>DXUT</Filter>
</ClCompile>
Expand Down Expand Up @@ -149,6 +146,24 @@
<ClCompile Include="Source\KinectOneSensor.cpp">
<Filter>Sensors</Filter>
</ClCompile>
<ClCompile Include="Source\DXUT\Core\DDSTextureLoader.cpp">
<Filter>DXUT</Filter>
</ClCompile>
<ClCompile Include="Source\DXUT\Core\dxerr.cpp">
<Filter>DXUT</Filter>
</ClCompile>
<ClCompile Include="Source\DXUT\Core\ScreenGrab.cpp">
<Filter>DXUT</Filter>
</ClCompile>
<ClCompile Include="Source\DXUT\Core\WICTextureLoader.cpp">
<Filter>DXUT</Filter>
</ClCompile>
<ClCompile Include="Source\DXUT\Optional\DXUTguiIME.cpp">
<Filter>DXUT</Filter>
</ClCompile>
<ClCompile Include="Source\DXUT\Optional\ImeUi.cpp">
<Filter>DXUT</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="Source\FriedLiver.h" />
Expand All @@ -159,9 +174,6 @@
<ClInclude Include="Source\DXUT\Core\DXUT.h">
<Filter>DXUT</Filter>
</ClInclude>
<ClInclude Include="Source\DXUT\Core\DXUTDevice9.h">
<Filter>DXUT</Filter>
</ClInclude>
<ClInclude Include="Source\DXUT\Core\DXUTDevice11.h">
<Filter>DXUT</Filter>
</ClInclude>
Expand Down Expand Up @@ -399,6 +411,27 @@
<ClInclude Include="Source\KinectOneSensor.h">
<Filter>Sensors</Filter>
</ClInclude>
<ClInclude Include="Source\DXUT\Core\DDSTextureLoader.h">
<Filter>DXUT</Filter>
</ClInclude>
<ClInclude Include="Source\DXUT\Core\dxerr.h">
<Filter>DXUT</Filter>
</ClInclude>
<ClInclude Include="Source\DXUT\Core\ScreenGrab.h">
<Filter>DXUT</Filter>
</ClInclude>
<ClInclude Include="Source\DXUT\Core\WICTextureLoader.h">
<Filter>DXUT</Filter>
</ClInclude>
<ClInclude Include="Source\DXUT\Optional\DXUTguiIME.h">
<Filter>DXUT</Filter>
</ClInclude>
<ClInclude Include="Source\DXUT\Optional\DXUTLockFreePipe.h">
<Filter>DXUT</Filter>
</ClInclude>
<ClInclude Include="Source\DXUT\Optional\ImeUi.h">
<Filter>DXUT</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="DXUT">
Expand Down
4 changes: 4 additions & 0 deletions FriedLiver/FriedLiver.vcxproj.user
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup />
</Project>
Loading