mirror of
https://github.com/microsoft/UVAtlas
synced 2024-11-09 13:50:05 +00:00
Add VS 2015 projects (using VS 2015 Technical Preview)
Fixed warnings found by VS2015
This commit is contained in:
walbourn_cp
parent
09a485000f
commit
8774e8aebe
30
UVAtlas/UVAtlas_2015.sln
Normal file
30
UVAtlas/UVAtlas_2015.sln
Normal file
@ -0,0 +1,30 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 14
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UVAtlas_2015", "UVAtlas_2015.vcxproj", "{10359E70-6A7F-4433-8EF1-B0FB688D830E}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Win32 = Debug|Win32
|
||||
Debug|x64 = Debug|x64
|
||||
Release|Win32 = Release|Win32
|
||||
Release|x64 = Release|x64
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Debug|Win32.Deploy.0 = Debug|Win32
|
||||
{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Debug|x64.Build.0 = Debug|x64
|
||||
{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Debug|x64.Deploy.0 = Debug|x64
|
||||
{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Release|Win32.Build.0 = Release|Win32
|
||||
{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Release|Win32.Deploy.0 = Release|Win32
|
||||
{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Release|x64.ActiveCfg = Release|x64
|
||||
{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Release|x64.Build.0 = Release|x64
|
||||
{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Release|x64.Deploy.0 = Release|x64
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
225
UVAtlas/UVAtlas_2015.vcxproj
Normal file
225
UVAtlas/UVAtlas_2015.vcxproj
Normal file
@ -0,0 +1,225 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="14.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="Debug|x64">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|x64">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="geodesics\ApproximateOneToAll.h" />
|
||||
<ClInclude Include="geodesics\datatypes.h" />
|
||||
<ClInclude Include="geodesics\ExactOneToAll.h" />
|
||||
<ClInclude Include="geodesics\mathutils.h" />
|
||||
<ClInclude Include="geodesics\minheap.hpp" />
|
||||
<ClInclude Include="inc\UVAtlas.h" />
|
||||
<ClInclude Include="isochart\basemeshinfo.h" />
|
||||
<ClInclude Include="isochart\callbackschemer.h" />
|
||||
<ClInclude Include="isochart\graphcut.h" />
|
||||
<ClInclude Include="isochart\isochart.h" />
|
||||
<ClInclude Include="isochart\isochartconfig.h" />
|
||||
<ClInclude Include="isochart\isochartengine.h" />
|
||||
<ClInclude Include="isochart\isochartmesh.h" />
|
||||
<ClInclude Include="isochart\isochartutil.h" />
|
||||
<ClInclude Include="isochart\isomap.h" />
|
||||
<ClInclude Include="isochart\progressivemesh.h" />
|
||||
<ClInclude Include="isochart\sparsematrix.hpp" />
|
||||
<ClInclude Include="isochart\SymmetricMatrix.hpp" />
|
||||
<ClInclude Include="isochart\UVAtlasRepacker.h" />
|
||||
<ClInclude Include="isochart\vertiter.h" />
|
||||
<ClInclude Include="isochart\Vis_Maxflow.h" />
|
||||
<ClInclude Include="maxheap.hpp" />
|
||||
<ClInclude Include="pch.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="geodesics\ApproximateOneToAll.cpp" />
|
||||
<ClCompile Include="geodesics\ExactOneToAll.cpp" />
|
||||
<ClCompile Include="geodesics\mathutils.cpp" />
|
||||
<ClCompile Include="isochart\barycentricparam.cpp" />
|
||||
<ClCompile Include="isochart\basemeshinfo.cpp" />
|
||||
<ClCompile Include="isochart\graphcut.cpp" />
|
||||
<ClCompile Include="isochart\imtcomputation.cpp" />
|
||||
<ClCompile Include="isochart\isochart.cpp" />
|
||||
<ClCompile Include="isochart\isochartengine.cpp" />
|
||||
<ClCompile Include="isochart\isochartmesh.cpp" />
|
||||
<ClCompile Include="isochart\isochartutil.cpp" />
|
||||
<ClCompile Include="isochart\isomap.cpp" />
|
||||
<ClCompile Include="isochart\lscmparam.cpp" />
|
||||
<ClCompile Include="isochart\mergecharts.cpp" />
|
||||
<ClCompile Include="isochart\meshapplyisomap.cpp" />
|
||||
<ClCompile Include="isochart\meshoptimizeboundaries.cpp" />
|
||||
<ClCompile Include="isochart\meshoptimizestretch.cpp" />
|
||||
<ClCompile Include="isochart\meshpartitionchart.cpp" />
|
||||
<ClCompile Include="isochart\packingcharts.cpp" />
|
||||
<ClCompile Include="isochart\progressivemesh.cpp" />
|
||||
<ClCompile Include="isochart\UVAtlas.cpp">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="isochart\UVAtlasRepacker.cpp" />
|
||||
<ClCompile Include="isochart\vertiter.cpp" />
|
||||
<ClCompile Include="isochart\Vis_Maxflow.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="isochart\meshcommon.inl" />
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{10359E70-6A7F-4433-8EF1-B0FB688D830E}</ProjectGuid>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
<RootNamespace>UVAtlas</RootNamespace>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v140</PlatformToolset>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v140</PlatformToolset>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<PlatformToolset>v140</PlatformToolset>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<PlatformToolset>v140</PlatformToolset>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings">
|
||||
</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 Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
|
||||
<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 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" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<OutDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</OutDir>
|
||||
<IntDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</IntDir>
|
||||
<TargetName>UVAtlas</TargetName>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<OutDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</OutDir>
|
||||
<IntDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</IntDir>
|
||||
<TargetName>UVAtlas</TargetName>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<OutDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</OutDir>
|
||||
<IntDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</IntDir>
|
||||
<TargetName>UVAtlas</TargetName>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<OutDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</OutDir>
|
||||
<IntDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</IntDir>
|
||||
<TargetName>UVAtlas</TargetName>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<WarningLevel>Level4</WarningLevel>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<PreprocessorDefinitions>_WIN32_WINNT=0x0600;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<FloatingPointModel>Fast</FloatingPointModel>
|
||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Inc;$(ProjectDir)geodesics;$(ProjectDir)isochart;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<WarningLevel>Level4</WarningLevel>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<PreprocessorDefinitions>_WIN32_WINNT=0x0600;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<FloatingPointModel>Fast</FloatingPointModel>
|
||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Inc;$(ProjectDir)geodesics;$(ProjectDir)isochart;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ClCompile>
|
||||
<WarningLevel>Level4</WarningLevel>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<PreprocessorDefinitions>_WIN32_WINNT=0x0600;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<FloatingPointModel>Fast</FloatingPointModel>
|
||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Inc;$(ProjectDir)geodesics;$(ProjectDir)isochart;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<ClCompile>
|
||||
<WarningLevel>Level4</WarningLevel>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<PreprocessorDefinitions>_WIN32_WINNT=0x0600;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<FloatingPointModel>Fast</FloatingPointModel>
|
||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)Inc;$(ProjectDir)geodesics;$(ProjectDir)isochart;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
166
UVAtlas/UVAtlas_2015.vcxproj.filters
Normal file
166
UVAtlas/UVAtlas_2015.vcxproj.filters
Normal file
@ -0,0 +1,166 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup>
|
||||
<Filter Include="Header Files">
|
||||
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
|
||||
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
|
||||
</Filter>
|
||||
<Filter Include="Geodesics">
|
||||
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
|
||||
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
|
||||
</Filter>
|
||||
<Filter Include="Isochart">
|
||||
<UniqueIdentifier>{3b2d5702-57fc-4310-a36b-3d3130661b87}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="maxheap.hpp">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="pch.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="geodesics\ApproximateOneToAll.h">
|
||||
<Filter>Geodesics</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="geodesics\datatypes.h">
|
||||
<Filter>Geodesics</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="geodesics\ExactOneToAll.h">
|
||||
<Filter>Geodesics</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="geodesics\mathutils.h">
|
||||
<Filter>Geodesics</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="geodesics\minheap.hpp">
|
||||
<Filter>Geodesics</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="isochart\basemeshinfo.h">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="isochart\callbackschemer.h">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="isochart\graphcut.h">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="isochart\isochart.h">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="isochart\isochartconfig.h">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="isochart\isochartengine.h">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="isochart\isochartmesh.h">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="isochart\isochartutil.h">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="isochart\isomap.h">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="isochart\progressivemesh.h">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="isochart\sparsematrix.hpp">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="isochart\SymmetricMatrix.hpp">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="isochart\UVAtlasRepacker.h">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="isochart\vertiter.h">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="isochart\Vis_Maxflow.h">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="inc\UVAtlas.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="geodesics\ApproximateOneToAll.cpp">
|
||||
<Filter>Geodesics</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="geodesics\ExactOneToAll.cpp">
|
||||
<Filter>Geodesics</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="geodesics\mathutils.cpp">
|
||||
<Filter>Geodesics</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="isochart\barycentricparam.cpp">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="isochart\basemeshinfo.cpp">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="isochart\graphcut.cpp">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="isochart\imtcomputation.cpp">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="isochart\isochart.cpp">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="isochart\isochartengine.cpp">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="isochart\isochartmesh.cpp">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="isochart\isochartutil.cpp">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="isochart\isomap.cpp">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="isochart\lscmparam.cpp">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="isochart\mergecharts.cpp">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="isochart\meshapplyisomap.cpp">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="isochart\meshoptimizeboundaries.cpp">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="isochart\meshoptimizestretch.cpp">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="isochart\meshpartitionchart.cpp">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="isochart\packingcharts.cpp">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="isochart\progressivemesh.cpp">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="isochart\UVAtlas.cpp">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="isochart\UVAtlasRepacker.cpp">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="isochart\vertiter.cpp">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="isochart\Vis_Maxflow.cpp">
|
||||
<Filter>Isochart</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="isochart\meshcommon.inl">
|
||||
<Filter>Isochart</Filter>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
@ -175,21 +175,21 @@ void CApproximateOneToAll::CutHeapTopData( EdgeWindow &EdgeWindowOut )
|
||||
|
||||
case 4:
|
||||
{
|
||||
double A = SQR(spie.y) - SQR(pWindowLeft->dv2Src.y) ;
|
||||
double B = 2 * (spie.x * SQR(pWindowLeft->dv2Src.y) - pWindowLeft->dv2Src.x * SQR(spie.y)) ;
|
||||
double C = SQR(pWindowLeft->dv2Src.x) * SQR(spie.y) - SQR(spie.x) * SQR(pWindowLeft->dv2Src.y) ;
|
||||
double A0 = SQR(spie.y) - SQR(pWindowLeft->dv2Src.y) ;
|
||||
double B0 = 2 * (spie.x * SQR(pWindowLeft->dv2Src.y) - pWindowLeft->dv2Src.x * SQR(spie.y)) ;
|
||||
double C0 = SQR(pWindowLeft->dv2Src.x) * SQR(spie.y) - SQR(spie.x) * SQR(pWindowLeft->dv2Src.y) ;
|
||||
|
||||
if ( A > FLT_EPSILON || A < -FLT_EPSILON )
|
||||
if ( A0 > FLT_EPSILON || A0 < -FLT_EPSILON )
|
||||
{
|
||||
double discriminant = SQR(B)-4*A*C ;
|
||||
double discriminant = SQR(B0)-4*A0*C0;
|
||||
|
||||
if ( discriminant > 0 )
|
||||
{
|
||||
tmpp.x = (-B+SqrtMin0(discriminant))/(2*A) ;
|
||||
tmpp.x = (-B0+SqrtMin0(discriminant))/(2*A0) ;
|
||||
|
||||
if ( tmpp.x < pWindowLeft->b0 || tmpp.x > pWindowLeft->b1 )
|
||||
{
|
||||
tmpp.x = (-B-SqrtMin0(discriminant))/(2*A) ;
|
||||
tmpp.x = (-B0-SqrtMin0(discriminant))/(2*A0) ;
|
||||
|
||||
if ( tmpp.x < pWindowLeft->b0 || tmpp.x > pWindowLeft->b1 )
|
||||
{
|
||||
@ -202,9 +202,9 @@ void CApproximateOneToAll::CutHeapTopData( EdgeWindow &EdgeWindowOut )
|
||||
}
|
||||
} else
|
||||
{
|
||||
if ( B != 0 )
|
||||
if ( B0 != 0 )
|
||||
{
|
||||
tmpp.x = -C/B ;
|
||||
tmpp.x = -C0/B0 ;
|
||||
|
||||
if ( tmpp.x < pWindowLeft->b0 || tmpp.x > pWindowLeft->b1 )
|
||||
{
|
||||
@ -223,21 +223,21 @@ void CApproximateOneToAll::CutHeapTopData( EdgeWindow &EdgeWindowOut )
|
||||
|
||||
case 5:
|
||||
{
|
||||
double A = SQR(spie.y) - SQR(pWindowRight->dv2Src.y) ;
|
||||
double B = 2 * (spie.x * SQR(pWindowRight->dv2Src.y) - pWindowRight->dv2Src.x * SQR(spie.y)) ;
|
||||
double C = SQR(pWindowRight->dv2Src.x) * SQR(spie.y) - SQR(spie.x) * SQR(pWindowRight->dv2Src.y) ;
|
||||
double A0 = SQR(spie.y) - SQR(pWindowRight->dv2Src.y) ;
|
||||
double B0 = 2 * (spie.x * SQR(pWindowRight->dv2Src.y) - pWindowRight->dv2Src.x * SQR(spie.y)) ;
|
||||
double C0 = SQR(pWindowRight->dv2Src.x) * SQR(spie.y) - SQR(spie.x) * SQR(pWindowRight->dv2Src.y) ;
|
||||
|
||||
if ( A > FLT_EPSILON || A < -FLT_EPSILON )
|
||||
if ( A0 > FLT_EPSILON || A0 < -FLT_EPSILON )
|
||||
{
|
||||
double discriminant = SQR(B)-4*A*C ;
|
||||
double discriminant = SQR(B0)-4*A0*C0;
|
||||
|
||||
if ( discriminant > 0 )
|
||||
{
|
||||
tmpp.x = (-B+SqrtMin0(discriminant))/(2*A) ;
|
||||
tmpp.x = (-B0+SqrtMin0(discriminant))/(2*A0) ;
|
||||
|
||||
if ( tmpp.x < pWindowRight->b0 || tmpp.x > pWindowRight->b1 )
|
||||
{
|
||||
tmpp.x = (-B-SqrtMin0(discriminant))/(2*A) ;
|
||||
tmpp.x = (-B0-SqrtMin0(discriminant))/(2*A0) ;
|
||||
|
||||
if ( tmpp.x < pWindowRight->b0 || tmpp.x > pWindowRight->b1 )
|
||||
{
|
||||
@ -250,9 +250,9 @@ void CApproximateOneToAll::CutHeapTopData( EdgeWindow &EdgeWindowOut )
|
||||
}
|
||||
} else
|
||||
{
|
||||
if ( B != 0 )
|
||||
if ( B0 != 0 )
|
||||
{
|
||||
tmpp.x = -C/B ;
|
||||
tmpp.x = -C0/B0 ;
|
||||
|
||||
if ( tmpp.x < pWindowRight->b0 || tmpp.x > pWindowRight->b1 )
|
||||
{
|
||||
|
||||
@ -1065,7 +1065,7 @@ void CExactOneToAll::IntersectWindow( EdgeWindow *pExistingWindow,
|
||||
}
|
||||
}
|
||||
|
||||
void CExactOneToAll::GenerateWindowsAroundSaddleOrBoundaryVertex( const EdgeWindow &WindowToBePropagated,
|
||||
void CExactOneToAll::GenerateWindowsAroundSaddleOrBoundaryVertex( const EdgeWindow &iwindow,
|
||||
const uint32_t dwSaddleOrBoundaryVertexId,
|
||||
std::vector<EdgeWindow> &WindowsOut)
|
||||
{
|
||||
@ -1083,12 +1083,12 @@ void CExactOneToAll::GenerateWindowsAroundSaddleOrBoundaryVertex( const EdgeWind
|
||||
tmpWindow.b1 = tmpWindow.pEdge->dEdgeLength ;
|
||||
tmpWindow.d0 = sqrt( SquredD3Dist(*tmpWindow.pEdge->pVertex0, m_VertexList[dwSaddleOrBoundaryVertexId]) ) ;
|
||||
tmpWindow.d1 = sqrt( SquredD3Dist(*tmpWindow.pEdge->pVertex1, m_VertexList[dwSaddleOrBoundaryVertexId]) ) ;
|
||||
tmpWindow.dPseuSrcToSrcDistance = (WindowToBePropagated.dwMarkFromEdgeVertexIdx == dwSaddleOrBoundaryVertexId ? WindowToBePropagated.d0 : WindowToBePropagated.d1)
|
||||
+ WindowToBePropagated.dPseuSrcToSrcDistance ;
|
||||
tmpWindow.dPseuSrcToSrcDistance = (iwindow.dwMarkFromEdgeVertexIdx == dwSaddleOrBoundaryVertexId ? iwindow.d0 : iwindow.d1)
|
||||
+ iwindow.dPseuSrcToSrcDistance ;
|
||||
ParameterizePt3ToPt2( *tmpWindow.pEdge->pVertex0, *tmpWindow.pEdge->pVertex1, m_VertexList[dwSaddleOrBoundaryVertexId], tmpWindow.dv2Src ) ;
|
||||
|
||||
tmpWindow.ksi = WindowToBePropagated.ksi ;
|
||||
tmpWindow.pEdgePropagatedFrom = WindowToBePropagated.pEdge ;
|
||||
tmpWindow.ksi = iwindow.ksi ;
|
||||
tmpWindow.pEdgePropagatedFrom = iwindow.pEdge ;
|
||||
|
||||
tmpWindow.dwTag = 1 ;
|
||||
|
||||
|
||||
@ -142,25 +142,25 @@ namespace GeodesicDist
|
||||
}
|
||||
|
||||
// setting an index also assigns appropriate pointer to the corresponding pointer field
|
||||
void SetEdgeIdx(TypeEdgeList &EdgeList, const uint32_t dwEdgeIdx)
|
||||
void SetEdgeIdx(TypeEdgeList &EdgeList, const uint32_t index)
|
||||
{
|
||||
this->dwEdgeIdx = dwEdgeIdx ;
|
||||
this->pEdge = &(EdgeList[dwEdgeIdx]) ;
|
||||
this->dwEdgeIdx = index;
|
||||
this->pEdge = &(EdgeList[index]) ;
|
||||
}
|
||||
void SetPseuSrcVertexIdx(TypeVertexList &VertexList, const uint32_t dwPseuSrcVertexIdx)
|
||||
void SetPseuSrcVertexIdx(TypeVertexList &VertexList, const uint32_t index)
|
||||
{
|
||||
this->dwPseuSrcVertexIdx = dwPseuSrcVertexIdx ;
|
||||
this->pPseuSrcVertex = (dwPseuSrcVertexIdx < VertexList.size()) ? &(VertexList[dwPseuSrcVertexIdx]) : nullptr;
|
||||
this->dwPseuSrcVertexIdx = index;
|
||||
this->pPseuSrcVertex = (index < VertexList.size()) ? &(VertexList[index]) : nullptr;
|
||||
}
|
||||
void SetMarkFromEdgeVertexIdx(TypeVertexList &VertexList, const uint32_t dwMarkFromEdgeVertexIdx)
|
||||
void SetMarkFromEdgeVertexIdx(TypeVertexList &VertexList, const uint32_t index)
|
||||
{
|
||||
this->dwMarkFromEdgeVertexIdx = dwMarkFromEdgeVertexIdx ;
|
||||
this->pMarkFromEdgeVertex = &(VertexList[dwMarkFromEdgeVertexIdx]) ;
|
||||
this->dwMarkFromEdgeVertexIdx = index;
|
||||
this->pMarkFromEdgeVertex = &(VertexList[index]) ;
|
||||
}
|
||||
void SetFaceIdxPropagatedFrom(TypeFaceList &FaceList, const uint32_t dwFaceIdxPropagatedFrom)
|
||||
void SetFaceIdxPropagatedFrom(TypeFaceList &FaceList, const uint32_t index)
|
||||
{
|
||||
this->dwFaceIdxPropagatedFrom = dwFaceIdxPropagatedFrom ;
|
||||
this->pFacePropagatedFrom = &(FaceList[dwFaceIdxPropagatedFrom]) ;
|
||||
this->dwFaceIdxPropagatedFrom = index;
|
||||
this->pFacePropagatedFrom = &(FaceList[index]) ;
|
||||
}
|
||||
} ;
|
||||
|
||||
|
||||
@ -92,11 +92,11 @@ namespace Isochart
|
||||
}
|
||||
|
||||
// 2. allocate memory resouce
|
||||
std::unique_ptr<value_type[]> temp(new (std::nothrow) value_type[(dwDimension * dwDimension) + (3 * dwDimension)]);
|
||||
if (!temp)
|
||||
std::unique_ptr<value_type[]> tmp(new (std::nothrow) value_type[(dwDimension * dwDimension) + (3 * dwDimension)]);
|
||||
if (!tmp)
|
||||
return false;
|
||||
|
||||
value_type* pInitialMatrix = temp.get(); // dwDimension * dwDimension
|
||||
value_type* pInitialMatrix = tmp.get(); // dwDimension * dwDimension
|
||||
value_type* pSubDiagVec = pInitialMatrix + (dwDimension * dwDimension); // dwDimension
|
||||
value_type* pU = pSubDiagVec + dwDimension; // dwDimension
|
||||
value_type* pP = pU + dwDimension; // dwDimension
|
||||
|
||||
@ -1431,10 +1431,10 @@ namespace
|
||||
const float *C3 = &pTexDesc->pTexture[(j2 * pTexDesc->uWidth + i) * pTexDesc->uStride];
|
||||
const float *C4 = &pTexDesc->pTexture[(j2 * pTexDesc->uWidth + i2) * pTexDesc->uStride];
|
||||
|
||||
for (size_t i = 0; i < uSignalDimension; i++)
|
||||
for (size_t k = 0; k < uSignalDimension; k++)
|
||||
{
|
||||
pfSignalOut[i] = (C1[i] * (1.f - du) + C2[i] * du) * (1.f - dv) +
|
||||
(C3[i] * (1.f - du) + C4[i] * du) * dv;
|
||||
pfSignalOut[k] = (C1[k] * (1.f - du) + C2[k] * du) * (1.f - dv) +
|
||||
(C3[k] * (1.f - du) + C4[k] * du) * dv;
|
||||
}
|
||||
|
||||
return S_OK;
|
||||
@ -1496,10 +1496,10 @@ namespace
|
||||
const float *C3 = &pTexDesc->pTexture[(j2 * pTexDesc->uWidth + i) * pTexDesc->uStride];
|
||||
const float *C4 = &pTexDesc->pTexture[(j2 * pTexDesc->uWidth + i2) * pTexDesc->uStride];
|
||||
|
||||
for (size_t i = 0; i < uSignalDimension; i++)
|
||||
for (size_t k = 0; k < uSignalDimension; k++)
|
||||
{
|
||||
pfSignalOut[i] = (C1[i] * (1.f - du) + C2[i] * du) * (1.f - dv) +
|
||||
(C3[i] * (1.f - du) + C4[i] * du) * dv;
|
||||
pfSignalOut[k] = (C1[k] * (1.f - du) + C2[k] * du) * (1.f - dv) +
|
||||
(C3[k] * (1.f - du) + C4[k] * du) * dv;
|
||||
}
|
||||
|
||||
return S_OK;
|
||||
@ -1561,10 +1561,10 @@ namespace
|
||||
const float *C3 = &pTexDesc->pTexture[(j2 * pTexDesc->uWidth + i) * pTexDesc->uStride];
|
||||
const float *C4 = &pTexDesc->pTexture[(j2 * pTexDesc->uWidth + i2) * pTexDesc->uStride];
|
||||
|
||||
for (size_t i = 0; i < uSignalDimension; i++)
|
||||
for (size_t k = 0; k < uSignalDimension; k++)
|
||||
{
|
||||
pfSignalOut[i] = (C1[i] * (1.f - du) + C2[i] * du) * (1.f - dv) +
|
||||
(C3[i] * (1.f - du) + C4[i] * du) * dv;
|
||||
pfSignalOut[k] = (C1[k] * (1.f - du) + C2[k] * du) * (1.f - dv) +
|
||||
(C3[k] * (1.f - du) + C4[k] * du) * dv;
|
||||
}
|
||||
|
||||
return S_OK;
|
||||
@ -1629,10 +1629,10 @@ namespace
|
||||
const float *C3 = &pTexDesc->pTexture[(j2 * pTexDesc->uWidth + i) * pTexDesc->uStride];
|
||||
const float *C4 = &pTexDesc->pTexture[(j2 * pTexDesc->uWidth + i2) * pTexDesc->uStride];
|
||||
|
||||
for (size_t i = 0; i < uSignalDimension; i++)
|
||||
for (size_t k = 0; k < uSignalDimension; k++)
|
||||
{
|
||||
pfSignalOut[i] = (C1[i] * (1.f - du) + C2[i] * du) * (1.f - dv) +
|
||||
(C3[i] * (1.f - du) + C4[i] * du) * dv;
|
||||
pfSignalOut[k] = (C1[k] * (1.f - du) + C2[k] * du) * (1.f - dv) +
|
||||
(C3[k] * (1.f - du) + C4[k] * du) * dv;
|
||||
}
|
||||
|
||||
return S_OK;
|
||||
|
||||
@ -1112,22 +1112,22 @@ HRESULT CUVAtlasRepacker::PrepareChartsInfo()
|
||||
m_ChartsInfo[i].PosInfo[j].edges.clear();
|
||||
for (uint32_t t = 0; t < m_AttrTable[i].FaceCount; t++)
|
||||
{
|
||||
uint32_t Base = (t + m_AttrTable[i].FaceStart) * 3;
|
||||
uint32_t Base0 = (t + m_AttrTable[i].FaceStart) * 3;
|
||||
|
||||
int a = m_IndexPartition[m_IndexBuffer[Base]];
|
||||
int b = m_IndexPartition[m_IndexBuffer[Base + 1]];
|
||||
int c = m_IndexPartition[m_IndexBuffer[Base + 2]];
|
||||
int a0 = m_IndexPartition[m_IndexBuffer[Base0]];
|
||||
int b0 = m_IndexPartition[m_IndexBuffer[Base0 + 1]];
|
||||
int c0 = m_IndexPartition[m_IndexBuffer[Base0 + 2]];
|
||||
|
||||
int indexbase = m_AttrTable[i].VertexStart;
|
||||
int indexbase0 = m_AttrTable[i].VertexStart;
|
||||
|
||||
if (a >= indexbase && b >= indexbase && c >= indexbase)
|
||||
if (a0 >= indexbase0 && b0 >= indexbase0 && c0 >= indexbase0)
|
||||
{
|
||||
XMFLOAT2 &Vertex1 = *reinterpret_cast<XMFLOAT2*>(&OutVec[a - indexbase]);
|
||||
XMFLOAT2 &Vertex2 = *reinterpret_cast<XMFLOAT2*>(&OutVec[b - indexbase]);
|
||||
XMFLOAT2 &Vertex3 = *reinterpret_cast<XMFLOAT2*>(&OutVec[c - indexbase]);
|
||||
m_ChartsInfo[i].PosInfo[j].edges.push_back(_EDGE(Vertex1, Vertex2));
|
||||
m_ChartsInfo[i].PosInfo[j].edges.push_back(_EDGE(Vertex2, Vertex3));
|
||||
m_ChartsInfo[i].PosInfo[j].edges.push_back(_EDGE(Vertex3, Vertex1));
|
||||
XMFLOAT2 &vert1 = *reinterpret_cast<XMFLOAT2*>(&OutVec[a0 - indexbase0]);
|
||||
XMFLOAT2 &vert2 = *reinterpret_cast<XMFLOAT2*>(&OutVec[b0 - indexbase0]);
|
||||
XMFLOAT2 &vert3 = *reinterpret_cast<XMFLOAT2*>(&OutVec[c0 - indexbase0]);
|
||||
m_ChartsInfo[i].PosInfo[j].edges.push_back(_EDGE(vert1, vert2));
|
||||
m_ChartsInfo[i].PosInfo[j].edges.push_back(_EDGE(vert2, vert3));
|
||||
m_ChartsInfo[i].PosInfo[j].edges.push_back(_EDGE(vert3, vert1));
|
||||
}
|
||||
else
|
||||
return E_FAIL;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user