Skip to content

Commit abe9cd6

Browse files
author
Marek Kowalski
committed
Updated visual studio version, removed commented-out code
1 parent 733c540 commit abe9cd6

File tree

3 files changed

+12
-24
lines changed

3 files changed

+12
-24
lines changed

ICP/ICP.vcxproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,46 +29,46 @@
2929
<PropertyGroup Label="Globals">
3030
<ProjectGuid>{973EE923-B423-4BCD-AA08-B03DA40CB51F}</ProjectGuid>
3131
<RootNamespace>ICP</RootNamespace>
32-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
32+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
3333
</PropertyGroup>
3434
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3535
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3636
<ConfigurationType>Application</ConfigurationType>
3737
<UseDebugLibraries>true</UseDebugLibraries>
38-
<PlatformToolset>v140</PlatformToolset>
38+
<PlatformToolset>v142</PlatformToolset>
3939
<CharacterSet>MultiByte</CharacterSet>
4040
</PropertyGroup>
4141
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4242
<ConfigurationType>Application</ConfigurationType>
4343
<UseDebugLibraries>true</UseDebugLibraries>
44-
<PlatformToolset>v140</PlatformToolset>
44+
<PlatformToolset>v142</PlatformToolset>
4545
<CharacterSet>MultiByte</CharacterSet>
4646
</PropertyGroup>
4747
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4848
<ConfigurationType>Application</ConfigurationType>
4949
<UseDebugLibraries>false</UseDebugLibraries>
50-
<PlatformToolset>v140</PlatformToolset>
50+
<PlatformToolset>v142</PlatformToolset>
5151
<WholeProgramOptimization>true</WholeProgramOptimization>
5252
<CharacterSet>MultiByte</CharacterSet>
5353
</PropertyGroup>
5454
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5555
<ConfigurationType>Application</ConfigurationType>
5656
<UseDebugLibraries>false</UseDebugLibraries>
57-
<PlatformToolset>v140</PlatformToolset>
57+
<PlatformToolset>v142</PlatformToolset>
5858
<WholeProgramOptimization>true</WholeProgramOptimization>
5959
<CharacterSet>MultiByte</CharacterSet>
6060
</PropertyGroup>
6161
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'" Label="Configuration">
6262
<ConfigurationType>DynamicLibrary</ConfigurationType>
6363
<UseDebugLibraries>false</UseDebugLibraries>
64-
<PlatformToolset>v140</PlatformToolset>
64+
<PlatformToolset>v142</PlatformToolset>
6565
<WholeProgramOptimization>true</WholeProgramOptimization>
6666
<CharacterSet>MultiByte</CharacterSet>
6767
</PropertyGroup>
6868
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release DLL|x64'" Label="Configuration">
6969
<ConfigurationType>DynamicLibrary</ConfigurationType>
7070
<UseDebugLibraries>false</UseDebugLibraries>
71-
<PlatformToolset>v140</PlatformToolset>
71+
<PlatformToolset>v142</PlatformToolset>
7272
<WholeProgramOptimization>true</WholeProgramOptimization>
7373
<CharacterSet>MultiByte</CharacterSet>
7474
</PropertyGroup>

LiveScanClient/KinectClient.vcxproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,32 +57,32 @@
5757
<ProjectGuid>{9B550BBA-EAFB-4D12-8B1C-8FDA39361F52}</ProjectGuid>
5858
<RootNamespace>KinectClient</RootNamespace>
5959
<ProjectName>LiveScanClient</ProjectName>
60-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
60+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
6161
</PropertyGroup>
6262
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
6363
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
6464
<ConfigurationType>Application</ConfigurationType>
6565
<UseDebugLibraries>true</UseDebugLibraries>
66-
<PlatformToolset>v140</PlatformToolset>
66+
<PlatformToolset>v142</PlatformToolset>
6767
<CharacterSet>Unicode</CharacterSet>
6868
</PropertyGroup>
6969
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
7070
<ConfigurationType>Application</ConfigurationType>
7171
<UseDebugLibraries>true</UseDebugLibraries>
72-
<PlatformToolset>v140</PlatformToolset>
72+
<PlatformToolset>v142</PlatformToolset>
7373
<CharacterSet>Unicode</CharacterSet>
7474
</PropertyGroup>
7575
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
7676
<ConfigurationType>Application</ConfigurationType>
7777
<UseDebugLibraries>false</UseDebugLibraries>
78-
<PlatformToolset>v140</PlatformToolset>
78+
<PlatformToolset>v142</PlatformToolset>
7979
<WholeProgramOptimization>true</WholeProgramOptimization>
8080
<CharacterSet>Unicode</CharacterSet>
8181
</PropertyGroup>
8282
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
8383
<ConfigurationType>Application</ConfigurationType>
8484
<UseDebugLibraries>false</UseDebugLibraries>
85-
<PlatformToolset>v140</PlatformToolset>
85+
<PlatformToolset>v142</PlatformToolset>
8686
<WholeProgramOptimization>true</WholeProgramOptimization>
8787
<CharacterSet>Unicode</CharacterSet>
8888
</PropertyGroup>

LiveScanServer/Utils.cs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,6 @@ public static void saveToPly(string filename, List<Single> vertices, List<byte>
193193
streamWriter.WriteLine("property uchar green");
194194
streamWriter.WriteLine("property uchar blue");
195195

196-
//streamWriter.WriteLine("element face " + faces.ToString(CultureInfo.InvariantCulture));
197-
//streamWriter.WriteLine("property list uchar int vertex_index");
198196
streamWriter.WriteLine("end_header");
199197
streamWriter.Flush();
200198

@@ -225,16 +223,6 @@ public static void saveToPly(string filename, List<Single> vertices, List<byte>
225223
}
226224
}
227225

228-
// Sequentially write the 3 vertex indices of the triangle face, for each triangle, 0-referenced in PLY files
229-
/*for (int i = 0; i < faces; i++)
230-
{
231-
string baseIndex0 = (i * 3).ToString(CultureInfo.InvariantCulture);
232-
string baseIndex1 = ((i * 3) + 1).ToString(CultureInfo.InvariantCulture);
233-
string baseIndex2 = ((i * 3) + 2).ToString(CultureInfo.InvariantCulture);
234-
235-
string faceString = "3 " + baseIndex0 + " " + baseIndex1 + " " + baseIndex2;
236-
streamWriter.WriteLine(faceString);
237-
}*/
238226
streamWriter.Flush();
239227
binaryWriter.Flush();
240228
fileStream.Close();

0 commit comments

Comments
 (0)