Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
514b259
no message
mkazhdan Apr 15, 2018
65dd683
no message
mkazhdan Apr 15, 2018
2c3ef3f
no message
mkazhdan Apr 15, 2018
b696d6a
no message
mkazhdan Apr 15, 2018
f951328
no message
mkazhdan Apr 15, 2018
d4d6f72
no message
mkazhdan Apr 15, 2018
0b3b738
no message
mkazhdan Apr 15, 2018
32223e9
no message
mkazhdan Apr 15, 2018
a2d7666
no message
mkazhdan May 14, 2018
b97aaf4
Included Makefile for Linux compilation of PNG library as it appears …
mkazhdan May 16, 2018
154731e
no message
mkazhdan Jun 1, 2018
ce5005a
no message
mkazhdan Jun 20, 2018
d58488e
Moved static const definition outside of the class definition to supp…
mkazhdan Jul 6, 2018
b733c9e
Retargeted solution
mkazhdan Jul 31, 2018
a2a1949
Modified support for double precision.
mkazhdan Jul 31, 2018
4cbbb6e
no message
mkazhdan Oct 8, 2018
0964205
no message
mkazhdan Oct 8, 2018
ff275f3
Version 10.04
mkazhdan Oct 11, 2018
55b6d21
no message
mkazhdan Oct 12, 2018
7d3ba85
Removed the "-Wno-write-strings" flag from the compiler flags in the …
mkazhdan Oct 12, 2018
22285c0
Updated the code to support gcc version 4.8
mkazhdan Oct 15, 2018
44ba73a
no message
mkazhdan Oct 15, 2018
830de15
Added check if write succeeded.
mkazhdan Oct 30, 2018
1b8e2d0
Cleaned up small bugs and added exception handling code.
mkazhdan Dec 7, 2018
fd3b3cd
no message
mkazhdan Dec 7, 2018
0f225ff
no message
mkazhdan Dec 7, 2018
fb4aca4
Added support for the --inCore flag.
mkazhdan Dec 9, 2018
7c0b908
no message
mkazhdan Dec 9, 2018
c19d318
Version 10.06
mkazhdan Jan 27, 2019
f4f4788
no message
mkazhdan Jan 27, 2019
3107d15
Catch exception when failing to write image.
mkazhdan Jan 27, 2019
7a3db19
Resolved bug that would cause a bad memory access when the octree had…
mkazhdan Feb 7, 2019
b71f7cf
no message
mkazhdan Feb 7, 2019
6c221c3
no message
mkazhdan Feb 7, 2019
2f5a205
First pass at creating an Xcodeproj and runner for PoissonRecon and S…
Feb 13, 2019
6994571
Better code organization that works around the C++ issues
Feb 13, 2019
324b8dc
Switch back to included scan file
Feb 13, 2019
f4ee269
More refactoring
Feb 13, 2019
18a27ba
Rename PoissonRecon -> Meshing
Feb 14, 2019
c2a183e
Added libmeshing target
Feb 15, 2019
4c2c793
Add progress
Feb 16, 2019
f34ea81
Add Xcode build folder (for command-line builds) to gitignore
Feb 16, 2019
f45add6
Add Dirichlet as an option and also make the trimming amount adjustable
Feb 19, 2019
9f30316
Updates for latest Xcode
Jun 4, 2019
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
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,13 @@
/Bin/
*.opensdf
*.bat
*.zip
.vs/*

## Xcode
*.pbxuser
!default.pbxuser
xcuserdata/
*.xcuserdatad
*.xccheckout
build/
136 changes: 136 additions & 0 deletions AdaptiveSolvers.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26730.16
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZLIB", "ZLIB.vcxproj", "{D3D173AB-D306-4179-BEC4-95CE1B14E647}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SSDRecon", "SSDRecon.vcxproj", "{477765F8-C16A-406B-807F-1302DAE74EBA}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PNG", "PNG.vcxproj", "{B5899B32-FAC2-477E-99AA-86736B97F2FC}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JPEG", "JPEG.vcxproj", "{0BE55595-4080-4265-82AF-51108EC956B2}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImageStitching", "ImageStitching.vcxproj", "{E09D1615-1036-4F43-909A-2E751FC947F6}"
ProjectSection(ProjectDependencies) = postProject
{B5899B32-FAC2-477E-99AA-86736B97F2FC} = {B5899B32-FAC2-477E-99AA-86736B97F2FC}
{0BE55595-4080-4265-82AF-51108EC956B2} = {0BE55595-4080-4265-82AF-51108EC956B2}
{D3D173AB-D306-4179-BEC4-95CE1B14E647} = {D3D173AB-D306-4179-BEC4-95CE1B14E647}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EDTInHeat", "EDTInHeat.vcxproj", "{3B94F9AD-35E8-4E1E-B176-AAA091E4C3CC}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SurfaceTrimmer", "SurfaceTrimmer.vcxproj", "{99BEAFED-8DB9-4B7D-A0BE-5186158193FE}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PoissonRecon", "PoissonRecon.vcxproj", "{46F87D0E-C53A-4F95-AB48-A5DBA8014340}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AdaptiveTreeVisualization", "AdaptiveTreeVisualization.vcxproj", "{742064B3-CEBB-4AF8-B43C-D213EB1C6D7A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Header Files", "Header Files", "{C83FBEC5-FED8-4C72-AF1B-FCBA6E8640AB}"
ProjectSection(SolutionItems) = preProject
Src\Allocator.h = Src\Allocator.h
Src\Array.h = Src\Array.h
Src\BinaryNode.h = Src\BinaryNode.h
Src\BSplineData.h = Src\BSplineData.h
Src\CmdLineParser.h = Src\CmdLineParser.h
Src\Factor.h = Src\Factor.h
Src\FEMTree.h = Src\FEMTree.h
Src\FunctionData.h = Src\FunctionData.h
Src\Geometry.h = Src\Geometry.h
Src\Image.h = Src\Image.h
Src\JPEG.h = Src\JPEG.h
Src\MarchingCubes.h = Src\MarchingCubes.h
Src\MAT.h = Src\MAT.h
Src\MyMiscellany.h = Src\MyMiscellany.h
Src\Ply.h = Src\Ply.h
Src\PlyFile.h = Src\PlyFile.h
Src\PNG.h = Src\PNG.h
Src\PointStream.h = Src\PointStream.h
Src\PointStreamData.h = Src\PointStreamData.h
Src\Polynomial.h = Src\Polynomial.h
Src\PPolynomial.h = Src\PPolynomial.h
Src\RegularTree.h = Src\RegularTree.h
Src\SparseMatrix.h = Src\SparseMatrix.h
Src\SparseMatrixInterface.h = Src\SparseMatrixInterface.h
Src\Window.h = Src\Window.h
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Inline Files", "Inline Files", "{ACD217C3-BE24-4438-A4E6-C713312FEA34}"
ProjectSection(SolutionItems) = preProject
Src\Array.inl = Src\Array.inl
Src\BMPStream.inl = Src\BMPStream.inl
Src\BSplineData.inl = Src\BSplineData.inl
Src\CmdLineParser.inl = Src\CmdLineParser.inl
Src\FEMTree.Evaluation.inl = Src\FEMTree.Evaluation.inl
Src\FEMTree.Initialize.inl = Src\FEMTree.Initialize.inl
Src\FEMTree.inl = Src\FEMTree.inl
Src\FEMTree.IsoSurface.specialized.inl = Src\FEMTree.IsoSurface.specialized.inl
Src\FEMTree.SortedTreeNodes.inl = Src\FEMTree.SortedTreeNodes.inl
Src\FEMTree.System.inl = Src\FEMTree.System.inl
Src\FEMTree.WeightedSamples.inl = Src\FEMTree.WeightedSamples.inl
Src\FunctionData.inl = Src\FunctionData.inl
Src\Geometry.inl = Src\Geometry.inl
Src\JPEG.inl = Src\JPEG.inl
Src\MAT.inl = Src\MAT.inl
Src\PNG.inl = Src\PNG.inl
Src\PointStream.inl = Src\PointStream.inl
Src\Polynomial.inl = Src\Polynomial.inl
Src\PPolynomial.inl = Src\PPolynomial.inl
Src\RegularTree.inl = Src\RegularTree.inl
Src\SparseMatrix.inl = Src\SparseMatrix.inl
Src\SparseMatrixInterface.inl = Src\SparseMatrixInterface.inl
Src\Window.inl = Src\Window.inl
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D3D173AB-D306-4179-BEC4-95CE1B14E647}.Release|x64.ActiveCfg = Release|x64
{D3D173AB-D306-4179-BEC4-95CE1B14E647}.Release|x64.Build.0 = Release|x64
{D3D173AB-D306-4179-BEC4-95CE1B14E647}.Release|x86.ActiveCfg = Release|Win32
{D3D173AB-D306-4179-BEC4-95CE1B14E647}.Release|x86.Build.0 = Release|Win32
{477765F8-C16A-406B-807F-1302DAE74EBA}.Release|x64.ActiveCfg = Release|x64
{477765F8-C16A-406B-807F-1302DAE74EBA}.Release|x64.Build.0 = Release|x64
{477765F8-C16A-406B-807F-1302DAE74EBA}.Release|x86.ActiveCfg = Release|Win32
{477765F8-C16A-406B-807F-1302DAE74EBA}.Release|x86.Build.0 = Release|Win32
{B5899B32-FAC2-477E-99AA-86736B97F2FC}.Release|x64.ActiveCfg = Release|x64
{B5899B32-FAC2-477E-99AA-86736B97F2FC}.Release|x64.Build.0 = Release|x64
{B5899B32-FAC2-477E-99AA-86736B97F2FC}.Release|x86.ActiveCfg = Release|Win32
{B5899B32-FAC2-477E-99AA-86736B97F2FC}.Release|x86.Build.0 = Release|Win32
{0BE55595-4080-4265-82AF-51108EC956B2}.Release|x64.ActiveCfg = Release|x64
{0BE55595-4080-4265-82AF-51108EC956B2}.Release|x64.Build.0 = Release|x64
{0BE55595-4080-4265-82AF-51108EC956B2}.Release|x86.ActiveCfg = Release|Win32
{0BE55595-4080-4265-82AF-51108EC956B2}.Release|x86.Build.0 = Release|Win32
{E09D1615-1036-4F43-909A-2E751FC947F6}.Release|x64.ActiveCfg = Release|x64
{E09D1615-1036-4F43-909A-2E751FC947F6}.Release|x64.Build.0 = Release|x64
{E09D1615-1036-4F43-909A-2E751FC947F6}.Release|x86.ActiveCfg = Release|Win32
{E09D1615-1036-4F43-909A-2E751FC947F6}.Release|x86.Build.0 = Release|Win32
{3B94F9AD-35E8-4E1E-B176-AAA091E4C3CC}.Release|x64.ActiveCfg = Release|x64
{3B94F9AD-35E8-4E1E-B176-AAA091E4C3CC}.Release|x64.Build.0 = Release|x64
{3B94F9AD-35E8-4E1E-B176-AAA091E4C3CC}.Release|x64.Deploy.0 = Release|x64
{3B94F9AD-35E8-4E1E-B176-AAA091E4C3CC}.Release|x86.ActiveCfg = Release|Win32
{3B94F9AD-35E8-4E1E-B176-AAA091E4C3CC}.Release|x86.Build.0 = Release|Win32
{3B94F9AD-35E8-4E1E-B176-AAA091E4C3CC}.Release|x86.Deploy.0 = Release|Win32
{99BEAFED-8DB9-4B7D-A0BE-5186158193FE}.Release|x64.ActiveCfg = Release|x64
{99BEAFED-8DB9-4B7D-A0BE-5186158193FE}.Release|x64.Build.0 = Release|x64
{99BEAFED-8DB9-4B7D-A0BE-5186158193FE}.Release|x86.ActiveCfg = Release|Win32
{99BEAFED-8DB9-4B7D-A0BE-5186158193FE}.Release|x86.Build.0 = Release|Win32
{46F87D0E-C53A-4F95-AB48-A5DBA8014340}.Release|x64.ActiveCfg = Release|x64
{46F87D0E-C53A-4F95-AB48-A5DBA8014340}.Release|x64.Build.0 = Release|x64
{46F87D0E-C53A-4F95-AB48-A5DBA8014340}.Release|x86.ActiveCfg = Release|Win32
{46F87D0E-C53A-4F95-AB48-A5DBA8014340}.Release|x86.Build.0 = Release|Win32
{742064B3-CEBB-4AF8-B43C-D213EB1C6D7A}.Release|x64.ActiveCfg = Release|x64
{742064B3-CEBB-4AF8-B43C-D213EB1C6D7A}.Release|x64.Build.0 = Release|x64
{742064B3-CEBB-4AF8-B43C-D213EB1C6D7A}.Release|x86.ActiveCfg = Release|Win32
{742064B3-CEBB-4AF8-B43C-D213EB1C6D7A}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {F963AD25-6C34-4074-9B17-605D19CC6165}
EndGlobalSection
EndGlobal
159 changes: 159 additions & 0 deletions AdaptiveTreeVisualization.vcxproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,159 @@
<?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|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="Src\AdaptiveTreeVisualization.cpp" />
<ClCompile Include="Src\PlyFile.cpp" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{742064B3-CEBB-4AF8-B43C-D213EB1C6D7A}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>OctreeVisualization</RootNamespace>
<WindowsTargetPlatformVersion>10.0.17134.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>v141</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</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" />
</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" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)\Bin\$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\Obj\$(TargetName)\$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<OpenMPSupport>true</OpenMPSupport>
<AdditionalOptions>
</AdditionalOptions>
<AdditionalIncludeDirectories>.</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
<AdditionalDependencies>ZLIB.lib;JPEG.lib;PNG.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>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
Loading