Skip to content
Snippets Groups Projects

merge Malina's corner table updates

Closed Irina-Malina STRUGARU requested to merge Try_new_visualization into master
63 files
+ 59721
4769
Compare changes
  • Side-by-side
  • Inline
Files
63
+ 7
3
@@ -26,7 +26,9 @@
<ClCompile Include="..\src\datastructures\Mesh3DInterface.cpp" />
<ClCompile Include="..\src\datastructures\Mesh3DTriangle.cpp" />
<ClCompile Include="..\src\datastructures\Mesh3DVertex.cpp" />
<ClCompile Include="..\src\main.cpp" />
<ClCompile Include="..\src\main.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\istrugar\glew-2.1.0\include;C:\Users\istrugar\glew-2.1.0\include\GL</AdditionalIncludeDirectories>
</ClCompile>
<ClCompile Include="..\src\modules\CellSeparator.cpp" />
<ClCompile Include="..\src\modules\ComplexCellDetector.cpp" />
<ClCompile Include="..\src\modules\BadCellDetector.cpp" />
@@ -37,7 +39,7 @@
<ClCompile Include="..\src\modules\MultiLabelMarchingCuber.cpp" />
<ClCompile Include="..\src\rendering\OpenGLRenderer.cpp" />
<ClCompile Include="..\src\schemes\SDTopoFixer.cpp" />
<ClCompile Include="..\src\utilities\intersection\predicates.cpp" />
<ClCompile Include="..\src\utilities\intersection\ExactnessPredicates.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\datastructures\Grid3DCubical.h" />
@@ -57,6 +59,8 @@
<ClInclude Include="..\src\modules\MultiLabelMarchingCuber.h" />
<ClInclude Include="..\src\rendering\OpenGLRenderer.h" />
<ClInclude Include="..\src\schemes\SDTopoFixer.h" />
<ClInclude Include="..\src\utilities\intersection\ExactnessPredicates.h" />
<ClInclude Include="..\src\utilities\intersection\intersection_predicates.h" />
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>16.0</VCProjectVersion>
@@ -128,7 +132,7 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>C:\Users\psynak\Desktop\work\code\library\glew-2.1.0\include; C:\Users\psynak\Desktop\work\code\library\glut-3.7\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>C:\Users\istrugar\glew-2.1.0\include</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Loading