mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
VizFwk housekeeping (#11026)
Housekeeping in VizFwk in preparation for introducing support for QOpenGLWidget and Qt6 * Adjusted unit tests to changes in source code * Use Qt5 as default and removed copying of Qt DLLs * Removed support for Qt4 * Removed the CVF_OPENGL_ES define. If we ever want to re-introduce support fro OpenGLES/Angle it should be handled differently. *Added include of <locale.h> * Added target for running Glsl2Include in order to build cvfShaderSourceStrings.h * Removed all usage of CVF_USING_CMAKE * Removed visual studio project files
This commit is contained in:
Sigurd Pettersen
GitHub
@@ -24,8 +24,6 @@ else()
|
|||||||
qt5_add_resources(QRC_FILES_CPP ${QRC_FILES})
|
qt5_add_resources(QRC_FILES_CPP ${QRC_FILES})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_definitions(-DCVF_USING_CMAKE)
|
|
||||||
|
|
||||||
add_library(
|
add_library(
|
||||||
${PROJECT_NAME}
|
${PROJECT_NAME}
|
||||||
cafPdmCoreColor3f.h
|
cafPdmCoreColor3f.h
|
||||||
|
|||||||
@@ -30,8 +30,6 @@ else()
|
|||||||
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
|
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_definitions(-DCVF_USING_CMAKE)
|
|
||||||
|
|
||||||
set(PROJECT_FILES
|
set(PROJECT_FILES
|
||||||
cafInternalPdmFieldTypeSpecializations.h
|
cafInternalPdmFieldTypeSpecializations.h
|
||||||
cafInternalPdmUiFieldCapability.h
|
cafInternalPdmUiFieldCapability.h
|
||||||
|
|||||||
@@ -1,30 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup Label="ProjectConfigurations">
|
|
||||||
<ProjectConfiguration Include="NotBuildable|Win32">
|
|
||||||
<Configuration>NotBuildable</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
</ItemGroup>
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{FB015304-89D5-4093-B01A-0E7F642971DC}</ProjectGuid>
|
|
||||||
<RootNamespace>CMake</RootNamespace>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
||||||
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='NotBuildable|Win32'">
|
|
||||||
<ConfigurationType>Utility</ConfigurationType>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
||||||
<ImportGroup Label="ExtensionSettings">
|
|
||||||
</ImportGroup>
|
|
||||||
<PropertyGroup Label="UserMacros" />
|
|
||||||
<PropertyGroup />
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="..\CMakeLists.txt" />
|
|
||||||
<None Include="..\Tests\CMakeLists.txt" />
|
|
||||||
<None Include="Utils\ceeDetermineCompilerFlags.cmake" />
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
||||||
<ImportGroup Label="ExtensionTargets">
|
|
||||||
</ImportGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="..\CMakeLists.txt">
|
|
||||||
<Filter>for CeeViz</Filter>
|
|
||||||
</None>
|
|
||||||
<None Include="..\Tests\CMakeLists.txt">
|
|
||||||
<Filter>for UnitTests</Filter>
|
|
||||||
</None>
|
|
||||||
<None Include="Utils\ceeDetermineCompilerFlags.cmake">
|
|
||||||
<Filter>Utils</Filter>
|
|
||||||
</None>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Filter Include="for CeeViz">
|
|
||||||
<UniqueIdentifier>{3e72b0a1-06b6-459f-9607-d9fa896d7f8c}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="for UnitTests">
|
|
||||||
<UniqueIdentifier>{51e511a3-e51f-4744-bff6-f658fccf0863}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="Utils">
|
|
||||||
<UniqueIdentifier>{8764f605-13cc-4037-9f2b-fcae94e99ae9}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -47,7 +47,7 @@ add_subdirectory(LibUtilities)
|
|||||||
|
|
||||||
option(CEE_BUILD_GUI_QT "Build GUI library for Qt" ON)
|
option(CEE_BUILD_GUI_QT "Build GUI library for Qt" ON)
|
||||||
if (CEE_BUILD_GUI_QT)
|
if (CEE_BUILD_GUI_QT)
|
||||||
option(CEE_USE_QT5 "Use Qt5" OFF)
|
option(CEE_USE_QT5 "Use Qt5" ON)
|
||||||
add_subdirectory(LibGuiQt)
|
add_subdirectory(LibGuiQt)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@@ -62,14 +62,18 @@ if (CEE_STAND_ALONE)
|
|||||||
|
|
||||||
option(CEE_BUILD_TEST_APPS "Build test apps" ON)
|
option(CEE_BUILD_TEST_APPS "Build test apps" ON)
|
||||||
if (CEE_BUILD_TEST_APPS)
|
if (CEE_BUILD_TEST_APPS)
|
||||||
if (CEE_BUILD_GUI_QT)
|
# For now, build the snippet libs here
|
||||||
# For now, build the snippet libs here
|
add_subdirectory(Tests/SnippetsBasis)
|
||||||
add_subdirectory(Tests/SnippetsBasis)
|
|
||||||
|
|
||||||
|
if (CEE_BUILD_GUI_QT)
|
||||||
add_subdirectory(TestApps/Qt/QtMinimal)
|
add_subdirectory(TestApps/Qt/QtMinimal)
|
||||||
add_subdirectory(TestApps/Qt/QtMultiView)
|
add_subdirectory(TestApps/Qt/QtMultiView)
|
||||||
add_subdirectory(TestApps/Qt/QtSnippetRunner)
|
add_subdirectory(TestApps/Qt/QtSnippetRunner)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if (WIN32)
|
||||||
|
add_subdirectory(TestApps/Win32/Win32SnippetRunner)
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
@@ -1,44 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup Label="ProjectConfigurations">
|
|
||||||
<ProjectConfiguration Include="Doxygen|Win32">
|
|
||||||
<Configuration>Doxygen</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
</ItemGroup>
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{F5FA2496-1AD3-4569-8EA1-5B5F01450B03}</ProjectGuid>
|
|
||||||
<RootNamespace>Doxygen</RootNamespace>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
||||||
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Doxygen|Win32'">
|
|
||||||
<ConfigurationType>Utility</ConfigurationType>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
||||||
<ImportGroup Label="ExtensionSettings">
|
|
||||||
</ImportGroup>
|
|
||||||
<PropertyGroup Label="UserMacros" />
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Doxygen|Win32'">
|
|
||||||
<OutDir>$(ProjectDir)\html\</OutDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Doxygen|Win32'">
|
|
||||||
<IntDir>$(ProjectDir)\html\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Doxygen|Win32'">
|
|
||||||
<ExtensionsToDeleteOnClean>*.html;*.css;*.map;*.md5;*.dot;*.png;*.gif;*.js;installdox</ExtensionsToDeleteOnClean>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="CeetronDoxygenGuidelines.txt" />
|
|
||||||
<None Include="html\index.html" />
|
|
||||||
<CustomBuild Include="RunDoxygen.bat">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Doxygen|Win32'">RunDoxygen.bat</Command>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Doxygen|Win32'">Running Doxygen...</Message>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Doxygen|Win32'">html/ToForceRebuildEveryTime.html</Outputs>
|
|
||||||
</CustomBuild>
|
|
||||||
<None Include="VizDoxygenSetup" />
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
||||||
<ImportGroup Label="ExtensionTargets">
|
|
||||||
</ImportGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="CeetronDoxygenGuidelines.txt" />
|
|
||||||
<None Include="html\index.html" />
|
|
||||||
<None Include="VizDoxygenSetup" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<CustomBuild Include="RunDoxygen.bat" />
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,326 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup Label="ProjectConfigurations">
|
|
||||||
<ProjectConfiguration Include="Debug MD TBB|Win32">
|
|
||||||
<Configuration>Debug MD TBB</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug MD TBB|x64">
|
|
||||||
<Configuration>Debug MD TBB</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug MD|Win32">
|
|
||||||
<Configuration>Debug MD</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug MD|x64">
|
|
||||||
<Configuration>Debug MD</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD TBB|Win32">
|
|
||||||
<Configuration>Release MD TBB</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD TBB|x64">
|
|
||||||
<Configuration>Release MD TBB</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD|Win32">
|
|
||||||
<Configuration>Release MD</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD|x64">
|
|
||||||
<Configuration>Release MD</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
</ItemGroup>
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{A9C7A239-B761-A892-BF34-5AECA0D9EE88}</ProjectGuid>
|
|
||||||
<RootNamespace>LibCore</RootNamespace>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
||||||
<ImportGroup Label="ExtensionSettings">
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|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 MD|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="cvfArray.h" />
|
|
||||||
<ClInclude Include="cvfArrayWrapperConst.h" />
|
|
||||||
<ClInclude Include="cvfArrayWrapperToEdit.h" />
|
|
||||||
<ClInclude Include="cvfAssert.h" />
|
|
||||||
<ClInclude Include="cvfAtomicCounter.h" />
|
|
||||||
<ClInclude Include="cvfBase.h" />
|
|
||||||
<ClInclude Include="cvfBase64.h" />
|
|
||||||
<ClInclude Include="cvfCharArray.h" />
|
|
||||||
<ClInclude Include="cvfCodeLocation.h" />
|
|
||||||
<ClInclude Include="cvfCollection.h" />
|
|
||||||
<ClInclude Include="cvfColor3.h" />
|
|
||||||
<ClInclude Include="cvfColor4.h" />
|
|
||||||
<ClInclude Include="cvfConfigCore.h" />
|
|
||||||
<ClInclude Include="cvfDebugTimer.h" />
|
|
||||||
<ClInclude Include="cvfFlags.h" />
|
|
||||||
<ClInclude Include="cvfFunctorRange.h" />
|
|
||||||
<ClInclude Include="cvfLibCore.h" />
|
|
||||||
<ClInclude Include="cvfLogDestination.h" />
|
|
||||||
<ClInclude Include="cvfLogDestinationConsole.h" />
|
|
||||||
<ClInclude Include="cvfLogDestinationFile.h" />
|
|
||||||
<ClInclude Include="cvfLogEvent.h" />
|
|
||||||
<ClInclude Include="cvfLogger.h" />
|
|
||||||
<ClInclude Include="cvfLogManager.h" />
|
|
||||||
<ClInclude Include="cvfMath.h" />
|
|
||||||
<ClInclude Include="cvfMatrix3.h" />
|
|
||||||
<ClInclude Include="cvfMatrix4.h" />
|
|
||||||
<ClInclude Include="cvfMutex.h" />
|
|
||||||
<ClInclude Include="cvfObject.h" />
|
|
||||||
<ClInclude Include="cvfPlane.h" />
|
|
||||||
<ClInclude Include="cvfProgramOptions.h" />
|
|
||||||
<ClInclude Include="cvfPropertySet.h" />
|
|
||||||
<ClInclude Include="cvfPropertySetCollection.h" />
|
|
||||||
<ClInclude Include="cvfQuat.h" />
|
|
||||||
<ClInclude Include="cvfRect.h" />
|
|
||||||
<ClInclude Include="cvfString.h" />
|
|
||||||
<ClInclude Include="cvfSystem.h" />
|
|
||||||
<ClInclude Include="cvfTBBControl.h" />
|
|
||||||
<ClInclude Include="cvfTimer.h" />
|
|
||||||
<ClInclude Include="cvfTrace.h" />
|
|
||||||
<ClInclude Include="cvfValueArray.h" />
|
|
||||||
<ClInclude Include="cvfVariant.h" />
|
|
||||||
<ClInclude Include="cvfVector2.h" />
|
|
||||||
<ClInclude Include="cvfVector3.h" />
|
|
||||||
<ClInclude Include="cvfVector4.h" />
|
|
||||||
<ClInclude Include="cvfVersion.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="CMakeLists.txt" />
|
|
||||||
<None Include="cvfArray.inl" />
|
|
||||||
<None Include="cvfCollection.inl" />
|
|
||||||
<None Include="cvfFlags.inl" />
|
|
||||||
<None Include="cvfMath.inl" />
|
|
||||||
<None Include="cvfMatrix3.inl" />
|
|
||||||
<None Include="cvfMatrix4.inl" />
|
|
||||||
<None Include="cvfObject.inl" />
|
|
||||||
<None Include="cvfQuat.inl" />
|
|
||||||
<None Include="cvfRect.inl" />
|
|
||||||
<None Include="cvfVector2.inl" />
|
|
||||||
<None Include="cvfVector3.inl" />
|
|
||||||
<None Include="cvfVector4.inl" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="cvfAssert.cpp" />
|
|
||||||
<ClCompile Include="cvfAtomicCounter.cpp" />
|
|
||||||
<ClCompile Include="cvfBase64.cpp" />
|
|
||||||
<ClCompile Include="cvfCharArray.cpp" />
|
|
||||||
<ClCompile Include="cvfCodeLocation.cpp" />
|
|
||||||
<ClCompile Include="cvfColor3.cpp" />
|
|
||||||
<ClCompile Include="cvfColor4.cpp" />
|
|
||||||
<ClCompile Include="cvfDebugTimer.cpp" />
|
|
||||||
<ClCompile Include="cvfLogDestinationConsole.cpp" />
|
|
||||||
<ClCompile Include="cvfLogDestinationFile.cpp" />
|
|
||||||
<ClCompile Include="cvfLogEvent.cpp" />
|
|
||||||
<ClCompile Include="cvfLogger.cpp" />
|
|
||||||
<ClCompile Include="cvfLogManager.cpp" />
|
|
||||||
<ClCompile Include="cvfMath.cpp" />
|
|
||||||
<ClCompile Include="cvfMutex.cpp" />
|
|
||||||
<ClCompile Include="cvfObject.cpp" />
|
|
||||||
<ClCompile Include="cvfPlane.cpp" />
|
|
||||||
<ClCompile Include="cvfProgramOptions.cpp" />
|
|
||||||
<ClCompile Include="cvfPropertySet.cpp" />
|
|
||||||
<ClCompile Include="cvfPropertySetCollection.cpp" />
|
|
||||||
<ClCompile Include="cvfString.cpp" />
|
|
||||||
<ClCompile Include="cvfSystem.cpp" />
|
|
||||||
<ClCompile Include="cvfTBBControl.cpp" />
|
|
||||||
<ClCompile Include="cvfTimer.cpp" />
|
|
||||||
<ClCompile Include="cvfTrace.cpp" />
|
|
||||||
<ClCompile Include="cvfVariant.cpp" />
|
|
||||||
<ClCompile Include="cvfVector2.cpp" />
|
|
||||||
<ClCompile Include="cvfVector3.cpp" />
|
|
||||||
<ClCompile Include="cvfVector4.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
||||||
<ImportGroup Label="ExtensionTargets">
|
|
||||||
</ImportGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,96 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="cvfArray.h" />
|
|
||||||
<ClInclude Include="cvfVersion.h" />
|
|
||||||
<ClInclude Include="cvfAssert.h" />
|
|
||||||
<ClInclude Include="cvfBase.h" />
|
|
||||||
<ClInclude Include="cvfCharArray.h" />
|
|
||||||
<ClInclude Include="cvfCollection.h" />
|
|
||||||
<ClInclude Include="cvfColor3.h" />
|
|
||||||
<ClInclude Include="cvfColor4.h" />
|
|
||||||
<ClInclude Include="cvfConfigCore.h" />
|
|
||||||
<ClInclude Include="cvfDebugTimer.h" />
|
|
||||||
<ClInclude Include="cvfFlags.h" />
|
|
||||||
<ClInclude Include="cvfLibCore.h" />
|
|
||||||
<ClInclude Include="cvfMath.h" />
|
|
||||||
<ClInclude Include="cvfMatrix3.h" />
|
|
||||||
<ClInclude Include="cvfMatrix4.h" />
|
|
||||||
<ClInclude Include="cvfObject.h" />
|
|
||||||
<ClInclude Include="cvfPlane.h" />
|
|
||||||
<ClInclude Include="cvfQuat.h" />
|
|
||||||
<ClInclude Include="cvfRect.h" />
|
|
||||||
<ClInclude Include="cvfString.h" />
|
|
||||||
<ClInclude Include="cvfSystem.h" />
|
|
||||||
<ClInclude Include="cvfTimer.h" />
|
|
||||||
<ClInclude Include="cvfTrace.h" />
|
|
||||||
<ClInclude Include="cvfVector2.h" />
|
|
||||||
<ClInclude Include="cvfVector3.h" />
|
|
||||||
<ClInclude Include="cvfVector4.h" />
|
|
||||||
<ClInclude Include="cvfValueArray.h" />
|
|
||||||
<ClInclude Include="cvfBase64.h" />
|
|
||||||
<ClInclude Include="cvfTBBControl.h" />
|
|
||||||
<ClInclude Include="cvfFunctorRange.h" />
|
|
||||||
<ClInclude Include="cvfLogger.h" />
|
|
||||||
<ClInclude Include="cvfVariant.h" />
|
|
||||||
<ClInclude Include="cvfPropertySet.h" />
|
|
||||||
<ClInclude Include="cvfPropertySetCollection.h" />
|
|
||||||
<ClInclude Include="cvfLogEvent.h" />
|
|
||||||
<ClInclude Include="cvfCodeLocation.h" />
|
|
||||||
<ClInclude Include="cvfMutex.h" />
|
|
||||||
<ClInclude Include="cvfLogManager.h" />
|
|
||||||
<ClInclude Include="cvfLogDestination.h" />
|
|
||||||
<ClInclude Include="cvfLogDestinationConsole.h" />
|
|
||||||
<ClInclude Include="cvfLogDestinationFile.h" />
|
|
||||||
<ClInclude Include="cvfArrayWrapperConst.h" />
|
|
||||||
<ClInclude Include="cvfArrayWrapperToEdit.h" />
|
|
||||||
<ClInclude Include="cvfProgramOptions.h" />
|
|
||||||
<ClInclude Include="cvfAtomicCounter.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="cvfArray.inl" />
|
|
||||||
<None Include="cvfCollection.inl" />
|
|
||||||
<None Include="cvfFlags.inl" />
|
|
||||||
<None Include="cvfMath.inl" />
|
|
||||||
<None Include="cvfMatrix3.inl" />
|
|
||||||
<None Include="cvfMatrix4.inl" />
|
|
||||||
<None Include="cvfObject.inl" />
|
|
||||||
<None Include="cvfQuat.inl" />
|
|
||||||
<None Include="cvfRect.inl" />
|
|
||||||
<None Include="cvfVector2.inl" />
|
|
||||||
<None Include="cvfVector3.inl" />
|
|
||||||
<None Include="cvfVector4.inl" />
|
|
||||||
<None Include="CMakeLists.txt" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="cvfAssert.cpp" />
|
|
||||||
<ClCompile Include="cvfVector4.cpp" />
|
|
||||||
<ClCompile Include="cvfCharArray.cpp" />
|
|
||||||
<ClCompile Include="cvfColor3.cpp" />
|
|
||||||
<ClCompile Include="cvfColor4.cpp" />
|
|
||||||
<ClCompile Include="cvfDebugTimer.cpp" />
|
|
||||||
<ClCompile Include="cvfMath.cpp" />
|
|
||||||
<ClCompile Include="cvfObject.cpp" />
|
|
||||||
<ClCompile Include="cvfPlane.cpp" />
|
|
||||||
<ClCompile Include="cvfString.cpp" />
|
|
||||||
<ClCompile Include="cvfSystem.cpp" />
|
|
||||||
<ClCompile Include="cvfTimer.cpp" />
|
|
||||||
<ClCompile Include="cvfTrace.cpp" />
|
|
||||||
<ClCompile Include="cvfVector2.cpp" />
|
|
||||||
<ClCompile Include="cvfVector3.cpp" />
|
|
||||||
<ClCompile Include="cvfBase64.cpp" />
|
|
||||||
<ClCompile Include="cvfTBBControl.cpp" />
|
|
||||||
<ClCompile Include="cvfLogger.cpp" />
|
|
||||||
<ClCompile Include="cvfVariant.cpp" />
|
|
||||||
<ClCompile Include="cvfPropertySet.cpp" />
|
|
||||||
<ClCompile Include="cvfPropertySetCollection.cpp" />
|
|
||||||
<ClCompile Include="cvfLogEvent.cpp" />
|
|
||||||
<ClCompile Include="cvfCodeLocation.cpp" />
|
|
||||||
<ClCompile Include="cvfMutex.cpp" />
|
|
||||||
<ClCompile Include="cvfLogManager.cpp" />
|
|
||||||
<ClCompile Include="cvfLogDestinationConsole.cpp" />
|
|
||||||
<ClCompile Include="cvfLogDestinationFile.cpp" />
|
|
||||||
<ClCompile Include="cvfProgramOptions.cpp" />
|
|
||||||
<ClCompile Include="cvfAtomicCounter.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,244 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup Label="ProjectConfigurations">
|
|
||||||
<ProjectConfiguration Include="Debug MD TBB|Win32">
|
|
||||||
<Configuration>Debug MD TBB</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug MD TBB|x64">
|
|
||||||
<Configuration>Debug MD TBB</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug MD|Win32">
|
|
||||||
<Configuration>Debug MD</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug MD|x64">
|
|
||||||
<Configuration>Debug MD</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD TBB|Win32">
|
|
||||||
<Configuration>Release MD TBB</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD TBB|x64">
|
|
||||||
<Configuration>Release MD TBB</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD|Win32">
|
|
||||||
<Configuration>Release MD</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD|x64">
|
|
||||||
<Configuration>Release MD</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
</ItemGroup>
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{2667AC1D-CA80-42F8-8644-DDB58D342FF2}</ProjectGuid>
|
|
||||||
<RootNamespace>LibFreeType</RootNamespace>
|
|
||||||
<ProjectName>LibFreeType</ProjectName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
||||||
<ImportGroup Label="ExtensionSettings">
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|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 MD|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level4</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibIo;../LibRender;../LibUtilities;../ThirdParty/FreeType/include</AdditionalIncludeDirectories>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level4</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibIo;../LibRender;../LibUtilities;../ThirdParty/FreeType/include</AdditionalIncludeDirectories>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level4</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibIo;../LibRender;../LibUtilities;../ThirdParty/FreeType/include</AdditionalIncludeDirectories>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level4</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibIo;../LibRender;../LibUtilities;../ThirdParty/FreeType/include</AdditionalIncludeDirectories>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level4</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibIo;../LibRender;../LibUtilities;../ThirdParty/FreeType/include</AdditionalIncludeDirectories>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level4</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibIo;../LibRender;../LibUtilities;../ThirdParty/FreeType/include</AdditionalIncludeDirectories>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level4</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibIo;../LibRender;../LibUtilities;../ThirdParty/FreeType/include</AdditionalIncludeDirectories>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level4</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibIo;../LibRender;../LibUtilities;../ThirdParty/FreeType/include</AdditionalIncludeDirectories>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="CMakeLists.txt" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="cvfFreeTypeFont.h" />
|
|
||||||
<ClInclude Include="cvfLibFreeType.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="cvfFreeTypeFont.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
||||||
<ImportGroup Label="ExtensionTargets">
|
|
||||||
</ImportGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="CMakeLists.txt" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="cvfLibFreeType.h" />
|
|
||||||
<ClInclude Include="cvfFreeTypeFont.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="cvfFreeTypeFont.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,287 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup Label="ProjectConfigurations">
|
|
||||||
<ProjectConfiguration Include="Debug MD TBB|Win32">
|
|
||||||
<Configuration>Debug MD TBB</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug MD TBB|x64">
|
|
||||||
<Configuration>Debug MD TBB</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug MD|Win32">
|
|
||||||
<Configuration>Debug MD</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug MD|x64">
|
|
||||||
<Configuration>Debug MD</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD TBB|Win32">
|
|
||||||
<Configuration>Release MD TBB</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD TBB|x64">
|
|
||||||
<Configuration>Release MD TBB</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD|Win32">
|
|
||||||
<Configuration>Release MD</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD|x64">
|
|
||||||
<Configuration>Release MD</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
</ItemGroup>
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{EFD5C9AC-8988-F190-AA2C-E36EBE361E90}</ProjectGuid>
|
|
||||||
<RootNamespace>LibGeometry</RootNamespace>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
||||||
<ImportGroup Label="ExtensionSettings">
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|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 MD|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="CMakeLists.txt" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="cvfArrowGenerator.h" />
|
|
||||||
<ClInclude Include="cvfBoundingBox.h" />
|
|
||||||
<ClInclude Include="cvfBoundingBoxTree.h" />
|
|
||||||
<ClInclude Include="cvfBoxGenerator.h" />
|
|
||||||
<ClInclude Include="cvfEdgeKey.h" />
|
|
||||||
<ClInclude Include="cvfFrustum.h" />
|
|
||||||
<ClInclude Include="cvfGeometryBuilder.h" />
|
|
||||||
<ClInclude Include="cvfGeometryBuilderFaceList.h" />
|
|
||||||
<ClInclude Include="cvfGeometryBuilderTriangles.h" />
|
|
||||||
<ClInclude Include="cvfGeometryUtils.h" />
|
|
||||||
<ClInclude Include="cvfLibGeometry.h" />
|
|
||||||
<ClInclude Include="cvfMeshEdgeExtractor.h" />
|
|
||||||
<ClInclude Include="cvfOutlineEdgeExtractor.h" />
|
|
||||||
<ClInclude Include="cvfPatchGenerator.h" />
|
|
||||||
<ClInclude Include="cvfPrimitiveTests.h" />
|
|
||||||
<ClInclude Include="cvfRay.h" />
|
|
||||||
<ClInclude Include="cvfTriangleMeshEdgeExtractor.h" />
|
|
||||||
<ClInclude Include="cvfTriangleVertexSplitter.h" />
|
|
||||||
<ClInclude Include="cvfVertexCompactor.h" />
|
|
||||||
<ClInclude Include="cvfVertexWelder.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="cvfArrowGenerator.cpp" />
|
|
||||||
<ClCompile Include="cvfBoundingBox.cpp" />
|
|
||||||
<ClCompile Include="cvfBoundingBoxTree.cpp" />
|
|
||||||
<ClCompile Include="cvfBoxGenerator.cpp" />
|
|
||||||
<ClCompile Include="cvfEdgeKey.cpp" />
|
|
||||||
<ClCompile Include="cvfFrustum.cpp" />
|
|
||||||
<ClCompile Include="cvfGeometryBuilder.cpp" />
|
|
||||||
<ClCompile Include="cvfGeometryBuilderFaceList.cpp" />
|
|
||||||
<ClCompile Include="cvfGeometryBuilderTriangles.cpp" />
|
|
||||||
<ClCompile Include="cvfGeometryUtils.cpp" />
|
|
||||||
<ClCompile Include="cvfMeshEdgeExtractor.cpp" />
|
|
||||||
<ClCompile Include="cvfOutlineEdgeExtractor.cpp" />
|
|
||||||
<ClCompile Include="cvfPatchGenerator.cpp" />
|
|
||||||
<ClCompile Include="cvfPrimitiveTests.cpp" />
|
|
||||||
<ClCompile Include="cvfRay.cpp" />
|
|
||||||
<ClCompile Include="cvfTriangleMeshEdgeExtractor.cpp" />
|
|
||||||
<ClCompile Include="cvfTriangleVertexSplitter.cpp" />
|
|
||||||
<ClCompile Include="cvfVertexCompactor.cpp" />
|
|
||||||
<ClCompile Include="cvfVertexWelder.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
||||||
<ImportGroup Label="ExtensionTargets">
|
|
||||||
</ImportGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="cvfArrowGenerator.h" />
|
|
||||||
<ClInclude Include="cvfBoundingBox.h" />
|
|
||||||
<ClInclude Include="cvfBoxGenerator.h" />
|
|
||||||
<ClInclude Include="cvfEdgeKey.h" />
|
|
||||||
<ClInclude Include="cvfFrustum.h" />
|
|
||||||
<ClInclude Include="cvfGeometryBuilder.h" />
|
|
||||||
<ClInclude Include="cvfGeometryBuilderFaceList.h" />
|
|
||||||
<ClInclude Include="cvfGeometryBuilderTriangles.h" />
|
|
||||||
<ClInclude Include="cvfGeometryUtils.h" />
|
|
||||||
<ClInclude Include="cvfLibGeometry.h" />
|
|
||||||
<ClInclude Include="cvfMeshEdgeExtractor.h" />
|
|
||||||
<ClInclude Include="cvfOutlineEdgeExtractor.h" />
|
|
||||||
<ClInclude Include="cvfPatchGenerator.h" />
|
|
||||||
<ClInclude Include="cvfRay.h" />
|
|
||||||
<ClInclude Include="cvfVertexWelder.h" />
|
|
||||||
<ClInclude Include="cvfTriangleVertexSplitter.h" />
|
|
||||||
<ClInclude Include="cvfVertexCompactor.h" />
|
|
||||||
<ClInclude Include="cvfTriangleMeshEdgeExtractor.h" />
|
|
||||||
<ClInclude Include="cvfBoundingBoxTree.h" />
|
|
||||||
<ClInclude Include="cvfPrimitiveTests.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="CMakeLists.txt" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="cvfArrowGenerator.cpp" />
|
|
||||||
<ClCompile Include="cvfBoundingBox.cpp" />
|
|
||||||
<ClCompile Include="cvfBoxGenerator.cpp" />
|
|
||||||
<ClCompile Include="cvfEdgeKey.cpp" />
|
|
||||||
<ClCompile Include="cvfFrustum.cpp" />
|
|
||||||
<ClCompile Include="cvfGeometryBuilder.cpp" />
|
|
||||||
<ClCompile Include="cvfGeometryBuilderFaceList.cpp" />
|
|
||||||
<ClCompile Include="cvfGeometryBuilderTriangles.cpp" />
|
|
||||||
<ClCompile Include="cvfGeometryUtils.cpp" />
|
|
||||||
<ClCompile Include="cvfMeshEdgeExtractor.cpp" />
|
|
||||||
<ClCompile Include="cvfOutlineEdgeExtractor.cpp" />
|
|
||||||
<ClCompile Include="cvfPatchGenerator.cpp" />
|
|
||||||
<ClCompile Include="cvfRay.cpp" />
|
|
||||||
<ClCompile Include="cvfVertexWelder.cpp" />
|
|
||||||
<ClCompile Include="cvfTriangleVertexSplitter.cpp" />
|
|
||||||
<ClCompile Include="cvfVertexCompactor.cpp" />
|
|
||||||
<ClCompile Include="cvfTriangleMeshEdgeExtractor.cpp" />
|
|
||||||
<ClCompile Include="cvfBoundingBoxTree.cpp" />
|
|
||||||
<ClCompile Include="cvfPrimitiveTests.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,146 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup Label="ProjectConfigurations">
|
|
||||||
<ProjectConfiguration Include="Debug MD|Win32">
|
|
||||||
<Configuration>Debug MD</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug MD|x64">
|
|
||||||
<Configuration>Debug MD</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD|Win32">
|
|
||||||
<Configuration>Release MD</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD|x64">
|
|
||||||
<Configuration>Release MD</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
</ItemGroup>
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{FBFAC173-30FE-2C09-3F2E-D54477B433DE}</ProjectGuid>
|
|
||||||
<RootNamespace>LibGuiQt</RootNamespace>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
||||||
<ImportGroup Label="ExtensionSettings">
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|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 MD|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;QT_THREAD_SUPPORT;QT_CORE_LIB;QT_GUI_LIB;QT_OPENGL_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>$(QTDIR)/include;$(QTDIR)/include/QtCore;$(QTDIR)/include/QtGui;$(QTDIR)/include/QtOpenGL;../LibCore;../LibGeometry;../LibRender;../LibViewing</AdditionalIncludeDirectories>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;QT_THREAD_SUPPORT;QT_CORE_LIB;QT_GUI_LIB;QT_OPENGL_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>$(QTDIR)/include;$(QTDIR)/include/QtCore;$(QTDIR)/include/QtGui;$(QTDIR)/include/QtOpenGL;../LibCore;../LibGeometry;../LibRender;../LibViewing</AdditionalIncludeDirectories>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;QT_NO_DEBUG;QT_THREAD_SUPPORT;QT_CORE_LIB;QT_GUI_LIB;QT_OPENGL_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>$(QTDIR)/include;$(QTDIR)/include/QtCore;$(QTDIR)/include/QtGui;$(QTDIR)/include/QtOpenGL;../LibCore;../LibGeometry;../LibRender;../LibViewing</AdditionalIncludeDirectories>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;QT_NO_DEBUG;QT_THREAD_SUPPORT;QT_CORE_LIB;QT_GUI_LIB;QT_OPENGL_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>$(QTDIR)/include;$(QTDIR)/include/QtCore;$(QTDIR)/include/QtGui;$(QTDIR)/include/QtOpenGL;../LibCore;../LibGeometry;../LibRender;../LibViewing</AdditionalIncludeDirectories>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="cvfqtBasicAboutDialog.cpp" />
|
|
||||||
<ClCompile Include="cvfqtCvfBoundQGLContext.cpp" />
|
|
||||||
<ClCompile Include="cvfqtMouseState.cpp" />
|
|
||||||
<ClCompile Include="cvfqtOpenGLContext.cpp" />
|
|
||||||
<ClCompile Include="cvfqtPerformanceInfoHud.cpp" />
|
|
||||||
<ClCompile Include="cvfqtUtils.cpp" />
|
|
||||||
<ClCompile Include="cvfqtOpenGLWidget.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="cvfqtBasicAboutDialog.h" />
|
|
||||||
<ClInclude Include="cvfqtCvfBoundQGLContext.h" />
|
|
||||||
<ClInclude Include="cvfqtMouseState.h" />
|
|
||||||
<ClInclude Include="cvfqtOpenGLContext.h" />
|
|
||||||
<ClInclude Include="cvfqtOpenGLWidget.h" />
|
|
||||||
<ClInclude Include="cvfqtPerformanceInfoHud.h" />
|
|
||||||
<ClInclude Include="cvfqtUtils.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="CMakeLists.txt" />
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
||||||
<ImportGroup Label="ExtensionTargets">
|
|
||||||
</ImportGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="cvfqtBasicAboutDialog.cpp" />
|
|
||||||
<ClCompile Include="cvfqtPerformanceInfoHud.cpp" />
|
|
||||||
<ClCompile Include="cvfqtUtils.cpp" />
|
|
||||||
<ClCompile Include="cvfqtOpenGLWidget.cpp" />
|
|
||||||
<ClCompile Include="cvfqtCvfBoundQGLContext.cpp" />
|
|
||||||
<ClCompile Include="cvfqtOpenGLContext.cpp" />
|
|
||||||
<ClCompile Include="cvfqtMouseState.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="cvfqtPerformanceInfoHud.h" />
|
|
||||||
<ClInclude Include="cvfqtUtils.h" />
|
|
||||||
<ClInclude Include="cvfqtCvfBoundQGLContext.h" />
|
|
||||||
<ClInclude Include="cvfqtOpenGLContext.h" />
|
|
||||||
<ClInclude Include="cvfqtMouseState.h" />
|
|
||||||
<ClInclude Include="cvfqtBasicAboutDialog.h" />
|
|
||||||
<ClInclude Include="cvfqtOpenGLWidget.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="CMakeLists.txt" />
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -40,12 +40,12 @@
|
|||||||
|
|
||||||
#include "cvfqtBasicAboutDialog.h"
|
#include "cvfqtBasicAboutDialog.h"
|
||||||
|
|
||||||
#include <QtCore/QVariant>
|
#include <QVariant>
|
||||||
#include <QtCore/QString>
|
#include <QString>
|
||||||
|
|
||||||
#include <QVBoxLayout>
|
#include <QVBoxLayout>
|
||||||
#include <QLabel>
|
#include <QLabel>
|
||||||
#include <QPushButton>
|
#include <QPushButton>
|
||||||
|
|
||||||
namespace cvfqt {
|
namespace cvfqt {
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -37,7 +37,7 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <QtCore/QString>
|
#include <QString>
|
||||||
#include <QDialog>
|
#include <QDialog>
|
||||||
|
|
||||||
class QGridLayout;
|
class QGridLayout;
|
||||||
|
|||||||
@@ -40,7 +40,7 @@
|
|||||||
class QMouseEvent;
|
class QMouseEvent;
|
||||||
class QGraphicsSceneMouseEvent;
|
class QGraphicsSceneMouseEvent;
|
||||||
|
|
||||||
#include <QtCore/Qt>
|
#include <Qt>
|
||||||
|
|
||||||
|
|
||||||
namespace cvfqt {
|
namespace cvfqt {
|
||||||
|
|||||||
@@ -42,7 +42,7 @@
|
|||||||
#include "cvfqtPerformanceInfoHud.h"
|
#include "cvfqtPerformanceInfoHud.h"
|
||||||
#include "cvfOpenGLResourceManager.h"
|
#include "cvfOpenGLResourceManager.h"
|
||||||
|
|
||||||
#include <QtCore/QString>
|
#include <QString>
|
||||||
#include <QPainter>
|
#include <QPainter>
|
||||||
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|||||||
@@ -37,7 +37,7 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <QtCore/QStringList>
|
#include <QStringList>
|
||||||
|
|
||||||
namespace cvf {
|
namespace cvf {
|
||||||
class PerformanceInfo;
|
class PerformanceInfo;
|
||||||
|
|||||||
@@ -39,7 +39,7 @@
|
|||||||
#include "cvfVector2.h"
|
#include "cvfVector2.h"
|
||||||
#include "cvfqtUtils.h"
|
#include "cvfqtUtils.h"
|
||||||
|
|
||||||
#include <QtCore/QStringList>
|
#include <QStringList>
|
||||||
|
|
||||||
namespace cvfqt {
|
namespace cvfqt {
|
||||||
|
|
||||||
|
|||||||
@@ -40,7 +40,7 @@
|
|||||||
#include "cvfString.h"
|
#include "cvfString.h"
|
||||||
#include "cvfTextureImage.h"
|
#include "cvfTextureImage.h"
|
||||||
|
|
||||||
#include <QtCore/QString>
|
#include <QString>
|
||||||
#include <QImage>
|
#include <QImage>
|
||||||
|
|
||||||
namespace cvfqt {
|
namespace cvfqt {
|
||||||
|
|||||||
@@ -1,258 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup Label="ProjectConfigurations">
|
|
||||||
<ProjectConfiguration Include="Debug MD TBB|Win32">
|
|
||||||
<Configuration>Debug MD TBB</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug MD TBB|x64">
|
|
||||||
<Configuration>Debug MD TBB</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug MD|Win32">
|
|
||||||
<Configuration>Debug MD</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug MD|x64">
|
|
||||||
<Configuration>Debug MD</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD TBB|Win32">
|
|
||||||
<Configuration>Release MD TBB</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD TBB|x64">
|
|
||||||
<Configuration>Release MD TBB</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD|Win32">
|
|
||||||
<Configuration>Release MD</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD|x64">
|
|
||||||
<Configuration>Release MD</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
</ItemGroup>
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{181472EE-4B37-01E8-49D5-6213678FE4F8}</ProjectGuid>
|
|
||||||
<RootNamespace>LibIo</RootNamespace>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
||||||
<ImportGroup Label="ExtensionSettings">
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|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 MD|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="CMakeLists.txt" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="cvfFile.h" />
|
|
||||||
<ClInclude Include="cvfLibIo.h" />
|
|
||||||
<ClInclude Include="cvfMemoryFile.h" />
|
|
||||||
<ClInclude Include="cvfPropertyXmlSerializer.h" />
|
|
||||||
<ClInclude Include="cvfTinyXmlFused.hpp" />
|
|
||||||
<ClInclude Include="cvfXml.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="cvfFile.cpp" />
|
|
||||||
<ClCompile Include="cvfMemoryFile.cpp" />
|
|
||||||
<ClCompile Include="cvfPropertyXmlSerializer.cpp" />
|
|
||||||
<ClCompile Include="cvfXml.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
||||||
<ImportGroup Label="ExtensionTargets">
|
|
||||||
</ImportGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="CMakeLists.txt" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="cvfLibIo.h" />
|
|
||||||
<ClInclude Include="cvfTinyXmlFused.hpp" />
|
|
||||||
<ClInclude Include="cvfXml.h" />
|
|
||||||
<ClInclude Include="cvfMemoryFile.h" />
|
|
||||||
<ClInclude Include="cvfFile.h" />
|
|
||||||
<ClInclude Include="cvfPropertyXmlSerializer.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="cvfXml.cpp" />
|
|
||||||
<ClCompile Include="cvfMemoryFile.cpp" />
|
|
||||||
<ClCompile Include="cvfFile.cpp" />
|
|
||||||
<ClCompile Include="cvfPropertyXmlSerializer.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,257 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup Label="ProjectConfigurations">
|
|
||||||
<ProjectConfiguration Include="Debug MD TBB|Win32">
|
|
||||||
<Configuration>Debug MD TBB</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug MD TBB|x64">
|
|
||||||
<Configuration>Debug MD TBB</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug MD|Win32">
|
|
||||||
<Configuration>Debug MD</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug MD|x64">
|
|
||||||
<Configuration>Debug MD</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD TBB|Win32">
|
|
||||||
<Configuration>Release MD TBB</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD TBB|x64">
|
|
||||||
<Configuration>Release MD TBB</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD|Win32">
|
|
||||||
<Configuration>Release MD</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD|x64">
|
|
||||||
<Configuration>Release MD</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
</ItemGroup>
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{7AEF1888-268C-3BEF-4080-743645180A59}</ProjectGuid>
|
|
||||||
<RootNamespace>LibRegGrid2D</RootNamespace>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
||||||
<ImportGroup Label="ExtensionSettings">
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|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 MD|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibRender;../LibGeometry;../LibIo</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibRender;../LibGeometry;../LibIo</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibRender;../LibGeometry;../LibIo</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibRender;../LibGeometry;../LibIo</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibRender;../LibGeometry;../LibIo</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibRender;../LibGeometry;../LibIo</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibRender;../LibGeometry;../LibIo</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibRender;../LibGeometry;../LibIo</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="CMakeLists.txt" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="cvfLibRegGrid2D.h" />
|
|
||||||
<ClInclude Include="cvfRegGrid2D.h" />
|
|
||||||
<ClInclude Include="cvfRegGrid2DExportXml.h" />
|
|
||||||
<ClInclude Include="cvfRegGrid2DGeometry.h" />
|
|
||||||
<ClInclude Include="cvfRegGrid2DImportXml.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="cvfRegGrid2D.cpp" />
|
|
||||||
<ClCompile Include="cvfRegGrid2DExportXml.cpp" />
|
|
||||||
<ClCompile Include="cvfRegGrid2DGeometry.cpp" />
|
|
||||||
<ClCompile Include="cvfRegGrid2DImportXml.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
||||||
<ImportGroup Label="ExtensionTargets">
|
|
||||||
</ImportGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="CMakeLists.txt" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="cvfLibRegGrid2D.h" />
|
|
||||||
<ClInclude Include="cvfRegGrid2D.h" />
|
|
||||||
<ClInclude Include="cvfRegGrid2DGeometry.h" />
|
|
||||||
<ClInclude Include="cvfRegGrid2DExportXml.h" />
|
|
||||||
<ClInclude Include="cvfRegGrid2DImportXml.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="cvfRegGrid2D.cpp" />
|
|
||||||
<ClCompile Include="cvfRegGrid2DGeometry.cpp" />
|
|
||||||
<ClCompile Include="cvfRegGrid2DExportXml.cpp" />
|
|
||||||
<ClCompile Include="cvfRegGrid2DImportXml.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -199,3 +199,17 @@ if (CMAKE_UNITY_BUILD)
|
|||||||
set_source_files_properties (cvfOpenGL.cpp PROPERTIES SKIP_UNITY_BUILD_INCLUSION TRUE)
|
set_source_files_properties (cvfOpenGL.cpp PROPERTIES SKIP_UNITY_BUILD_INCLUSION TRUE)
|
||||||
set_source_files_properties (cvfOpenGLContextGroup.cpp PROPERTIES SKIP_UNITY_BUILD_INCLUSION TRUE)
|
set_source_files_properties (cvfOpenGLContextGroup.cpp PROPERTIES SKIP_UNITY_BUILD_INCLUSION TRUE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
# Create a target for building the cvfShaderSourceStrings.h file from our GLSL files (currently Win only)
|
||||||
|
if (WIN32)
|
||||||
|
FILE(GLOB CEE_ALL_GLSL_FILES "${CMAKE_CURRENT_SOURCE_DIR}/glsl/*.glsl")
|
||||||
|
add_custom_target(run_Glsl2Include
|
||||||
|
COMMAND ../Tools/Glsl2Include/Glsl2Include glsl/ cvfShaderSourceStrings.h
|
||||||
|
COMMAND ${CMAKE_COMMAND} -E remove cvfShaderSourceStrings.h.temp
|
||||||
|
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
|
||||||
|
COMMENT "Launching Glsl2Include tool..."
|
||||||
|
VERBATIM
|
||||||
|
SOURCES ${CEE_ALL_GLSL_FILES}
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|||||||
@@ -1,589 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup Label="ProjectConfigurations">
|
|
||||||
<ProjectConfiguration Include="Debug MD TBB|Win32">
|
|
||||||
<Configuration>Debug MD TBB</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug MD TBB|x64">
|
|
||||||
<Configuration>Debug MD TBB</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug MD|Win32">
|
|
||||||
<Configuration>Debug MD</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug MD|x64">
|
|
||||||
<Configuration>Debug MD</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD TBB|Win32">
|
|
||||||
<Configuration>Release MD TBB</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD TBB|x64">
|
|
||||||
<Configuration>Release MD TBB</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD|Win32">
|
|
||||||
<Configuration>Release MD</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD|x64">
|
|
||||||
<Configuration>Release MD</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
</ItemGroup>
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{C07ADE80-5C4F-E6E3-DD1A-5A619403FA9F}</ProjectGuid>
|
|
||||||
<RootNamespace>LibRender</RootNamespace>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
||||||
<ImportGroup Label="ExtensionSettings">
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|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 MD|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
<CustomBuildAfterTargets>PrepareForBuild</CustomBuildAfterTargets>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
<CustomBuildAfterTargets>PrepareForBuild</CustomBuildAfterTargets>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
<CustomBuildAfterTargets>PrepareForBuild</CustomBuildAfterTargets>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
<CustomBuildAfterTargets>PrepareForBuild</CustomBuildAfterTargets>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
<CustomBuildAfterTargets>PrepareForBuild</CustomBuildAfterTargets>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
<CustomBuildAfterTargets>PrepareForBuild</CustomBuildAfterTargets>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
<CustomBuildAfterTargets>PrepareForBuild</CustomBuildAfterTargets>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
<CustomBuildAfterTargets>PrepareForBuild</CustomBuildAfterTargets>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibGeometry;../LibIo;../ThirdParty/FreeType/include</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
<CustomBuildStep>
|
|
||||||
<Command>..\Tools\Glsl2Include\Glsl2Include.exe glsl\ cvfShaderSourceStrings.h</Command>
|
|
||||||
</CustomBuildStep>
|
|
||||||
<CustomBuildStep>
|
|
||||||
<Message>Building shader source strings</Message>
|
|
||||||
</CustomBuildStep>
|
|
||||||
<CustomBuildStep>
|
|
||||||
<Outputs>cvfShaderSourceStrings.h</Outputs>
|
|
||||||
<Inputs>FileWillNeverExist.txt</Inputs>
|
|
||||||
</CustomBuildStep>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibGeometry;../LibIo;../ThirdParty/FreeType/include</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
<CustomBuildStep>
|
|
||||||
<Command>..\Tools\Glsl2Include\Glsl2Include.exe glsl\ cvfShaderSourceStrings.h</Command>
|
|
||||||
</CustomBuildStep>
|
|
||||||
<CustomBuildStep>
|
|
||||||
<Message>Building shader source strings</Message>
|
|
||||||
</CustomBuildStep>
|
|
||||||
<CustomBuildStep>
|
|
||||||
<Outputs>cvfShaderSourceStrings.h</Outputs>
|
|
||||||
<Inputs>FileWillNeverExist.txt</Inputs>
|
|
||||||
</CustomBuildStep>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibGeometry;../LibIo;../ThirdParty/FreeType/include</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
<CustomBuildStep>
|
|
||||||
<Command>..\Tools\Glsl2Include\Glsl2Include.exe glsl\ cvfShaderSourceStrings.h</Command>
|
|
||||||
</CustomBuildStep>
|
|
||||||
<CustomBuildStep>
|
|
||||||
<Message>Building shader source strings</Message>
|
|
||||||
</CustomBuildStep>
|
|
||||||
<CustomBuildStep>
|
|
||||||
<Outputs>cvfShaderSourceStrings.h</Outputs>
|
|
||||||
<Inputs>FileWillNeverExist.txt</Inputs>
|
|
||||||
</CustomBuildStep>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibGeometry;../LibIo;../ThirdParty/FreeType/include</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
<CustomBuildStep>
|
|
||||||
<Command>..\Tools\Glsl2Include\Glsl2Include.exe glsl\ cvfShaderSourceStrings.h</Command>
|
|
||||||
</CustomBuildStep>
|
|
||||||
<CustomBuildStep>
|
|
||||||
<Message>Building shader source strings</Message>
|
|
||||||
</CustomBuildStep>
|
|
||||||
<CustomBuildStep>
|
|
||||||
<Outputs>cvfShaderSourceStrings.h</Outputs>
|
|
||||||
<Inputs>FileWillNeverExist.txt</Inputs>
|
|
||||||
</CustomBuildStep>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibGeometry;../LibIo;../ThirdParty/FreeType/include</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
<CustomBuildStep>
|
|
||||||
<Command>..\Tools\Glsl2Include\Glsl2Include.exe glsl\ cvfShaderSourceStrings.h</Command>
|
|
||||||
</CustomBuildStep>
|
|
||||||
<CustomBuildStep>
|
|
||||||
<Message>Building shader source strings</Message>
|
|
||||||
</CustomBuildStep>
|
|
||||||
<CustomBuildStep>
|
|
||||||
<Outputs>cvfShaderSourceStrings.h</Outputs>
|
|
||||||
<Inputs>FileWillNeverExist.txt</Inputs>
|
|
||||||
</CustomBuildStep>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibGeometry;../LibIo;../ThirdParty/FreeType/include</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
<CustomBuildStep>
|
|
||||||
<Command>..\Tools\Glsl2Include\Glsl2Include.exe glsl\ cvfShaderSourceStrings.h</Command>
|
|
||||||
</CustomBuildStep>
|
|
||||||
<CustomBuildStep>
|
|
||||||
<Message>Building shader source strings</Message>
|
|
||||||
</CustomBuildStep>
|
|
||||||
<CustomBuildStep>
|
|
||||||
<Outputs>cvfShaderSourceStrings.h</Outputs>
|
|
||||||
<Inputs>FileWillNeverExist.txt</Inputs>
|
|
||||||
</CustomBuildStep>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibGeometry;../LibIo;../ThirdParty/FreeType/include</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
<CustomBuildStep>
|
|
||||||
<Command>..\Tools\Glsl2Include\Glsl2Include.exe glsl\ cvfShaderSourceStrings.h</Command>
|
|
||||||
</CustomBuildStep>
|
|
||||||
<CustomBuildStep>
|
|
||||||
<Message>Building shader source strings</Message>
|
|
||||||
</CustomBuildStep>
|
|
||||||
<CustomBuildStep>
|
|
||||||
<Outputs>cvfShaderSourceStrings.h</Outputs>
|
|
||||||
<Inputs>FileWillNeverExist.txt</Inputs>
|
|
||||||
</CustomBuildStep>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibGeometry;../LibIo;../ThirdParty/FreeType/include</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
<CustomBuildStep>
|
|
||||||
<Command>..\Tools\Glsl2Include\Glsl2Include.exe glsl\ cvfShaderSourceStrings.h</Command>
|
|
||||||
</CustomBuildStep>
|
|
||||||
<CustomBuildStep>
|
|
||||||
<Message>Building shader source strings</Message>
|
|
||||||
</CustomBuildStep>
|
|
||||||
<CustomBuildStep>
|
|
||||||
<Outputs>cvfShaderSourceStrings.h</Outputs>
|
|
||||||
<Inputs>FileWillNeverExist.txt</Inputs>
|
|
||||||
</CustomBuildStep>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="cvfCameraAnimation.h" />
|
|
||||||
<ClInclude Include="cvfFramebufferObject.h" />
|
|
||||||
<ClInclude Include="cvfHitDetail.h" />
|
|
||||||
<ClInclude Include="cvfOglRc.h" />
|
|
||||||
<ClInclude Include="cvfOpenGLCapabilities.h" />
|
|
||||||
<ClInclude Include="cvfOpenGLContextGroup.h" />
|
|
||||||
<ClInclude Include="cvfOverlayImage.h" />
|
|
||||||
<ClInclude Include="cvfOverlayItem.h" />
|
|
||||||
<ClInclude Include="cvfOverlayNavigationCube.h" />
|
|
||||||
<ClInclude Include="cvfOverlayTextBox.h" />
|
|
||||||
<ClInclude Include="cvfPrimitiveSetDirect.h" />
|
|
||||||
<ClInclude Include="cvfPrimitiveSetIndexedUShortScoped.h" />
|
|
||||||
<ClInclude Include="cvfRenderbufferObject.h" />
|
|
||||||
<ClInclude Include="cvfRenderStateBlending.h" />
|
|
||||||
<ClInclude Include="cvfRenderStateColorMask.h" />
|
|
||||||
<ClInclude Include="cvfRenderStateCullFace.h" />
|
|
||||||
<ClInclude Include="cvfRenderStateDepth.h" />
|
|
||||||
<ClInclude Include="cvfRenderStateFrontFace.h" />
|
|
||||||
<ClInclude Include="cvfRenderStateLine.h" />
|
|
||||||
<ClInclude Include="cvfRenderStatePoint.h" />
|
|
||||||
<ClInclude Include="cvfRenderStatePolygonMode.h" />
|
|
||||||
<ClInclude Include="cvfRenderStatePolygonOffset.h" />
|
|
||||||
<ClInclude Include="cvfRenderStateStencil.h" />
|
|
||||||
<ClInclude Include="cvfRenderStateTextureBindings.h" />
|
|
||||||
<ClInclude Include="cvfVertexAttribute.h" />
|
|
||||||
<ClInclude Include="cvfVertexBundle.h" />
|
|
||||||
<ClInclude Include="glsl\fs_CenterLitSpherePoints.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\fs_FixedColorMagenta.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\fs_Shadow_v33.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\fs_Standard.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\fs_Text.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\fs_Unlit.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\fs_VectorDrawer.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\fs_Void.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\gs_PassThroughTriangle_v33.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\light_Phong.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\light_PhongDual.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\light_SimpleHeadlight.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\src_Color.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\src_Texture.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\src_TextureGlobalAlpha.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\src_TextureFromPointCoord.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\src_TextureRectFromFragCoord_v33.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\vs_DistanceScaledPoints.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\vs_EnvironmentMapping.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\vs_FullScreenQuad.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\vs_Minimal.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\vs_MinimalTexture.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\vs_Standard.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\vs_VectorDrawer.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<None Include="CMakeLists.txt" />
|
|
||||||
<None Include="glsl\!AddingAndModifyingGlslFiles.txt" />
|
|
||||||
<ClInclude Include="glsl\fs_GradientTopBottom.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\calcClipDistances.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\calcShadowCoord.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\checkDiscard_ClipDistances.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\fs_GradientTopMiddleBottom.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\fs_ParticleTraceComets.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\vs_ParticleTraceComets.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\light_Headlight.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\fs_HighlightStencilBlur_v33.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\fs_HighlightStencilDraw.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\fs_HighlightStencilMix_v33.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\fs_GaussianBlur.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\fs_HighlightMix.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\src_TwoSidedColor.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\src_VaryingColorGlobalAlpha.glsl">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
</ClInclude>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="cvfBufferObjectManaged.h" />
|
|
||||||
<ClInclude Include="cvfCamera.h" />
|
|
||||||
<ClInclude Include="cvfDrawable.h" />
|
|
||||||
<ClInclude Include="cvfDrawableGeo.h" />
|
|
||||||
<ClInclude Include="cvfDrawableText.h" />
|
|
||||||
<ClInclude Include="cvfDrawableVectors.h" />
|
|
||||||
<ClInclude Include="cvfFixedAtlasFont.h" />
|
|
||||||
<ClInclude Include="cvfFont.h" />
|
|
||||||
<ClInclude Include="cvfGeometryBuilderDrawableGeo.h" />
|
|
||||||
<ClInclude Include="cvfGlyph.h" />
|
|
||||||
<ClInclude Include="cvfLibRender.h" />
|
|
||||||
<ClInclude Include="cvfMatrixState.h" />
|
|
||||||
<ClInclude Include="cvfOpenGL.h" />
|
|
||||||
<ClInclude Include="cvfOpenGLContext.h" />
|
|
||||||
<ClInclude Include="cvfOpenGLResourceManager.h" />
|
|
||||||
<ClInclude Include="cvfOpenGLTypes.h" />
|
|
||||||
<ClInclude Include="cvfOverlayAxisCross.h" />
|
|
||||||
<ClInclude Include="cvfOverlayColorLegend.h" />
|
|
||||||
<ClInclude Include="cvfPrimitiveSet.h" />
|
|
||||||
<ClInclude Include="cvfPrimitiveSetIndexedUInt.h" />
|
|
||||||
<ClInclude Include="cvfPrimitiveSetIndexedUIntScoped.h" />
|
|
||||||
<ClInclude Include="cvfPrimitiveSetIndexedUShort.h" />
|
|
||||||
<ClInclude Include="cvfRenderState.h" />
|
|
||||||
<ClInclude Include="cvfRenderStateSet.h" />
|
|
||||||
<ClInclude Include="cvfRenderStateTracker.h" />
|
|
||||||
<ClInclude Include="cvfRenderState_FF.h" />
|
|
||||||
<ClInclude Include="cvfSampler.h" />
|
|
||||||
<ClInclude Include="cvfScalarMapper.h" />
|
|
||||||
<ClInclude Include="cvfScalarMapperUniformLevels.h" />
|
|
||||||
<ClInclude Include="cvfShader.h" />
|
|
||||||
<ClInclude Include="cvfShaderSourceProvider.h" />
|
|
||||||
<ClInclude Include="cvfShaderProgram.h" />
|
|
||||||
<ClInclude Include="cvfShaderProgramGenerator.h" />
|
|
||||||
<ClInclude Include="cvfShaderSourceRepository.h" />
|
|
||||||
<ClInclude Include="cvfShaderSourceRepositoryFile.h" />
|
|
||||||
<ClInclude Include="cvfShaderSourceStrings.h" />
|
|
||||||
<ClInclude Include="cvfTextDrawer.h" />
|
|
||||||
<ClInclude Include="cvfTexture.h" />
|
|
||||||
<ClInclude Include="cvfTexture2D_FF.h" />
|
|
||||||
<ClInclude Include="cvfTextureImage.h" />
|
|
||||||
<ClInclude Include="cvfUniform.h" />
|
|
||||||
<ClInclude Include="cvfUniformSet.h" />
|
|
||||||
<ClInclude Include="cvfViewport.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="cvfBufferObjectManaged.cpp" />
|
|
||||||
<ClCompile Include="cvfCamera.cpp" />
|
|
||||||
<ClCompile Include="cvfCameraAnimation.cpp" />
|
|
||||||
<ClCompile Include="cvfDrawable.cpp" />
|
|
||||||
<ClCompile Include="cvfDrawableGeo.cpp" />
|
|
||||||
<ClCompile Include="cvfDrawableText.cpp" />
|
|
||||||
<ClCompile Include="cvfDrawableVectors.cpp" />
|
|
||||||
<ClCompile Include="cvfFixedAtlasFont.cpp" />
|
|
||||||
<ClCompile Include="cvfFont.cpp" />
|
|
||||||
<ClCompile Include="cvfFramebufferObject.cpp" />
|
|
||||||
<ClCompile Include="cvfGeometryBuilderDrawableGeo.cpp" />
|
|
||||||
<ClCompile Include="cvfGlyph.cpp" />
|
|
||||||
<ClCompile Include="cvfHitDetail.cpp" />
|
|
||||||
<ClCompile Include="cvfMatrixState.cpp" />
|
|
||||||
<ClCompile Include="cvfOglRc.cpp" />
|
|
||||||
<ClCompile Include="cvfOpenGL.cpp" />
|
|
||||||
<ClCompile Include="cvfOpenGLCapabilities.cpp" />
|
|
||||||
<ClCompile Include="cvfOpenGLContext.cpp" />
|
|
||||||
<ClCompile Include="cvfOpenGLContextGroup.cpp" />
|
|
||||||
<ClCompile Include="cvfOpenGLResourceManager.cpp" />
|
|
||||||
<ClCompile Include="cvfOverlayAxisCross.cpp" />
|
|
||||||
<ClCompile Include="cvfOverlayColorLegend.cpp" />
|
|
||||||
<ClCompile Include="cvfOverlayImage.cpp" />
|
|
||||||
<ClCompile Include="cvfOverlayItem.cpp" />
|
|
||||||
<ClCompile Include="cvfOverlayNavigationCube.cpp" />
|
|
||||||
<ClCompile Include="cvfOverlayTextBox.cpp" />
|
|
||||||
<ClCompile Include="cvfPrimitiveSet.cpp" />
|
|
||||||
<ClCompile Include="cvfPrimitiveSetDirect.cpp" />
|
|
||||||
<ClCompile Include="cvfPrimitiveSetIndexedUInt.cpp" />
|
|
||||||
<ClCompile Include="cvfPrimitiveSetIndexedUIntScoped.cpp" />
|
|
||||||
<ClCompile Include="cvfPrimitiveSetIndexedUShort.cpp" />
|
|
||||||
<ClCompile Include="cvfPrimitiveSetIndexedUShortScoped.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderbufferObject.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderState.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderStateBlending.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderStateColorMask.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderStateCullFace.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderStateDepth.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderStateFrontFace.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderStateLine.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderStatePoint.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderStatePolygonMode.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderStatePolygonOffset.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderStateSet.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderStateStencil.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderStateTextureBindings.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderStateTracker.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderState_FF.cpp" />
|
|
||||||
<ClCompile Include="cvfSampler.cpp" />
|
|
||||||
<ClCompile Include="cvfScalarMapper.cpp" />
|
|
||||||
<ClCompile Include="cvfScalarMapperUniformLevels.cpp" />
|
|
||||||
<ClCompile Include="cvfShader.cpp" />
|
|
||||||
<ClCompile Include="cvfShaderSourceProvider.cpp" />
|
|
||||||
<ClCompile Include="cvfShaderProgram.cpp" />
|
|
||||||
<ClCompile Include="cvfShaderProgramGenerator.cpp" />
|
|
||||||
<ClCompile Include="cvfShaderSourceRepository.cpp" />
|
|
||||||
<ClCompile Include="cvfShaderSourceRepositoryFile.cpp" />
|
|
||||||
<ClCompile Include="cvfTextDrawer.cpp" />
|
|
||||||
<ClCompile Include="cvfTexture.cpp" />
|
|
||||||
<ClCompile Include="cvfTexture2D_FF.cpp" />
|
|
||||||
<ClCompile Include="cvfTextureImage.cpp" />
|
|
||||||
<ClCompile Include="cvfUniform.cpp" />
|
|
||||||
<ClCompile Include="cvfUniformSet.cpp" />
|
|
||||||
<ClCompile Include="cvfVertexAttribute.cpp" />
|
|
||||||
<ClCompile Include="cvfVertexBundle.cpp" />
|
|
||||||
<ClCompile Include="cvfViewport.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
||||||
<ImportGroup Label="ExtensionTargets">
|
|
||||||
</ImportGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,270 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup>
|
|
||||||
<Filter Include="glsl">
|
|
||||||
<UniqueIdentifier>{90f89af3-6cfb-48ea-ae6f-d85a67b4b6cd}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="cvfCamera.h" />
|
|
||||||
<ClInclude Include="cvfDrawable.h" />
|
|
||||||
<ClInclude Include="cvfDrawableGeo.h" />
|
|
||||||
<ClInclude Include="cvfDrawableVectors.h" />
|
|
||||||
<ClInclude Include="cvfGeometryBuilderDrawableGeo.h" />
|
|
||||||
<ClInclude Include="cvfLibRender.h" />
|
|
||||||
<ClInclude Include="cvfOpenGL.h" />
|
|
||||||
<ClInclude Include="cvfOpenGLContext.h" />
|
|
||||||
<ClInclude Include="cvfOpenGLResourceManager.h" />
|
|
||||||
<ClInclude Include="cvfOpenGLTypes.h" />
|
|
||||||
<ClInclude Include="cvfOverlayAxisCross.h" />
|
|
||||||
<ClInclude Include="cvfOverlayColorLegend.h" />
|
|
||||||
<ClInclude Include="cvfPrimitiveSet.h" />
|
|
||||||
<ClInclude Include="cvfPrimitiveSetIndexedUInt.h" />
|
|
||||||
<ClInclude Include="cvfPrimitiveSetIndexedUShort.h" />
|
|
||||||
<ClInclude Include="cvfRenderState.h" />
|
|
||||||
<ClInclude Include="cvfRenderStateSet.h" />
|
|
||||||
<ClInclude Include="cvfSampler.h" />
|
|
||||||
<ClInclude Include="cvfScalarMapper.h" />
|
|
||||||
<ClInclude Include="cvfShader.h" />
|
|
||||||
<ClInclude Include="cvfShaderProgram.h" />
|
|
||||||
<ClInclude Include="cvfShaderSourceRepository.h" />
|
|
||||||
<ClInclude Include="cvfTexture.h" />
|
|
||||||
<ClInclude Include="cvfTextureImage.h" />
|
|
||||||
<ClInclude Include="cvfUniform.h" />
|
|
||||||
<ClInclude Include="cvfUniformSet.h" />
|
|
||||||
<ClInclude Include="cvfViewport.h" />
|
|
||||||
<ClInclude Include="cvfBufferObjectManaged.h" />
|
|
||||||
<ClInclude Include="cvfScalarMapperUniformLevels.h" />
|
|
||||||
<ClInclude Include="cvfRenderStateTracker.h" />
|
|
||||||
<ClInclude Include="cvfTexture2D_FF.h" />
|
|
||||||
<ClInclude Include="cvfRenderState_FF.h" />
|
|
||||||
<ClInclude Include="cvfMatrixState.h" />
|
|
||||||
<ClInclude Include="cvfShaderSourceRepositoryFile.h" />
|
|
||||||
<ClInclude Include="cvfFont.h" />
|
|
||||||
<ClInclude Include="cvfTextDrawer.h" />
|
|
||||||
<ClInclude Include="cvfGlyph.h" />
|
|
||||||
<ClInclude Include="cvfFixedAtlasFont.h" />
|
|
||||||
<ClInclude Include="cvfDrawableText.h" />
|
|
||||||
<ClInclude Include="cvfShaderProgramGenerator.h" />
|
|
||||||
<ClInclude Include="cvfShaderSourceProvider.h" />
|
|
||||||
<ClInclude Include="cvfPrimitiveSetIndexedUIntScoped.h" />
|
|
||||||
<ClInclude Include="cvfShaderSourceStrings.h" />
|
|
||||||
<ClInclude Include="glsl\vs_Standard.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\vs_MinimalTexture.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\vs_Minimal.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\vs_FullScreenQuad.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\vs_EnvironmentMapping.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\vs_DistanceScaledPoints.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\src_Texture.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\src_Color.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\light_SimpleHeadlight.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\light_PhongDual.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\light_Phong.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\gs_PassThroughTriangle_v33.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\fs_Void.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\fs_VectorDrawer.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\fs_Unlit.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\fs_Text.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\fs_Standard.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\fs_Shadow_v33.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\fs_FixedColorMagenta.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\vs_VectorDrawer.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\fs_CenterLitSpherePoints.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\fs_GradientTopBottom.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\calcShadowCoord.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\checkDiscard_ClipDistances.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\calcClipDistances.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="cvfPrimitiveSetIndexedUShortScoped.h" />
|
|
||||||
<ClInclude Include="cvfVertexAttribute.h" />
|
|
||||||
<ClInclude Include="glsl\vs_ParticleTraceComets.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\fs_ParticleTraceComets.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="cvfPrimitiveSetDirect.h" />
|
|
||||||
<ClInclude Include="cvfOverlayItem.h" />
|
|
||||||
<ClInclude Include="cvfHitDetail.h" />
|
|
||||||
<ClInclude Include="cvfOpenGLContextGroup.h" />
|
|
||||||
<ClInclude Include="cvfOglRc.h" />
|
|
||||||
<ClInclude Include="cvfFramebufferObject.h" />
|
|
||||||
<ClInclude Include="cvfRenderbufferObject.h" />
|
|
||||||
<ClInclude Include="cvfOpenGLCapabilities.h" />
|
|
||||||
<ClInclude Include="cvfOverlayTextBox.h" />
|
|
||||||
<ClInclude Include="glsl\src_TextureGlobalAlpha.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\src_TextureFromPointCoord.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\src_TextureRectFromFragCoord_v33.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="cvfVertexBundle.h" />
|
|
||||||
<ClInclude Include="glsl\light_Headlight.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="cvfRenderStateBlending.h" />
|
|
||||||
<ClInclude Include="cvfRenderStateColorMask.h" />
|
|
||||||
<ClInclude Include="cvfRenderStateCullFace.h" />
|
|
||||||
<ClInclude Include="cvfRenderStateDepth.h" />
|
|
||||||
<ClInclude Include="cvfRenderStateFrontFace.h" />
|
|
||||||
<ClInclude Include="cvfRenderStateLine.h" />
|
|
||||||
<ClInclude Include="cvfRenderStatePoint.h" />
|
|
||||||
<ClInclude Include="cvfRenderStatePolygonMode.h" />
|
|
||||||
<ClInclude Include="cvfRenderStatePolygonOffset.h" />
|
|
||||||
<ClInclude Include="cvfRenderStateTextureBindings.h" />
|
|
||||||
<ClInclude Include="cvfOverlayNavigationCube.h" />
|
|
||||||
<ClInclude Include="cvfRenderStateStencil.h" />
|
|
||||||
<ClInclude Include="glsl\fs_GradientTopMiddleBottom.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\fs_GaussianBlur.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\fs_HighlightStencilBlur_v33.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\fs_HighlightStencilMix_v33.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\fs_HighlightStencilDraw.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\fs_HighlightMix.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="cvfOverlayImage.h" />
|
|
||||||
<ClInclude Include="cvfCameraAnimation.h" />
|
|
||||||
<ClInclude Include="glsl\src_TwoSidedColor.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="glsl\src_VaryingColorGlobalAlpha.glsl">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="glsl\!AddingAndModifyingGlslFiles.txt">
|
|
||||||
<Filter>glsl</Filter>
|
|
||||||
</None>
|
|
||||||
<None Include="CMakeLists.txt" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="cvfCamera.cpp" />
|
|
||||||
<ClCompile Include="cvfDrawable.cpp" />
|
|
||||||
<ClCompile Include="cvfDrawableGeo.cpp" />
|
|
||||||
<ClCompile Include="cvfDrawableVectors.cpp" />
|
|
||||||
<ClCompile Include="cvfGeometryBuilderDrawableGeo.cpp" />
|
|
||||||
<ClCompile Include="cvfOpenGL.cpp" />
|
|
||||||
<ClCompile Include="cvfOpenGLContext.cpp" />
|
|
||||||
<ClCompile Include="cvfOpenGLResourceManager.cpp" />
|
|
||||||
<ClCompile Include="cvfOverlayAxisCross.cpp" />
|
|
||||||
<ClCompile Include="cvfOverlayColorLegend.cpp" />
|
|
||||||
<ClCompile Include="cvfPrimitiveSet.cpp" />
|
|
||||||
<ClCompile Include="cvfPrimitiveSetIndexedUInt.cpp" />
|
|
||||||
<ClCompile Include="cvfPrimitiveSetIndexedUShort.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderState.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderStateSet.cpp" />
|
|
||||||
<ClCompile Include="cvfSampler.cpp" />
|
|
||||||
<ClCompile Include="cvfScalarMapper.cpp" />
|
|
||||||
<ClCompile Include="cvfShader.cpp" />
|
|
||||||
<ClCompile Include="cvfShaderProgram.cpp" />
|
|
||||||
<ClCompile Include="cvfShaderSourceRepository.cpp" />
|
|
||||||
<ClCompile Include="cvfTexture.cpp" />
|
|
||||||
<ClCompile Include="cvfTextureImage.cpp" />
|
|
||||||
<ClCompile Include="cvfUniform.cpp" />
|
|
||||||
<ClCompile Include="cvfUniformSet.cpp" />
|
|
||||||
<ClCompile Include="cvfViewport.cpp" />
|
|
||||||
<ClCompile Include="cvfBufferObjectManaged.cpp" />
|
|
||||||
<ClCompile Include="cvfScalarMapperUniformLevels.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderStateTracker.cpp" />
|
|
||||||
<ClCompile Include="cvfTexture2D_FF.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderState_FF.cpp" />
|
|
||||||
<ClCompile Include="cvfMatrixState.cpp" />
|
|
||||||
<ClCompile Include="cvfShaderSourceRepositoryFile.cpp" />
|
|
||||||
<ClCompile Include="cvfFont.cpp" />
|
|
||||||
<ClCompile Include="cvfTextDrawer.cpp" />
|
|
||||||
<ClCompile Include="cvfGlyph.cpp" />
|
|
||||||
<ClCompile Include="cvfFixedAtlasFont.cpp" />
|
|
||||||
<ClCompile Include="cvfDrawableText.cpp" />
|
|
||||||
<ClCompile Include="cvfShaderProgramGenerator.cpp" />
|
|
||||||
<ClCompile Include="cvfShaderSourceProvider.cpp" />
|
|
||||||
<ClCompile Include="cvfPrimitiveSetIndexedUIntScoped.cpp" />
|
|
||||||
<ClCompile Include="cvfPrimitiveSetIndexedUShortScoped.cpp" />
|
|
||||||
<ClCompile Include="cvfVertexAttribute.cpp" />
|
|
||||||
<ClCompile Include="cvfPrimitiveSetDirect.cpp" />
|
|
||||||
<ClCompile Include="cvfHitDetail.cpp" />
|
|
||||||
<ClCompile Include="cvfOpenGLContextGroup.cpp" />
|
|
||||||
<ClCompile Include="cvfOglRc.cpp" />
|
|
||||||
<ClCompile Include="cvfFramebufferObject.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderbufferObject.cpp" />
|
|
||||||
<ClCompile Include="cvfOpenGLCapabilities.cpp" />
|
|
||||||
<ClCompile Include="cvfOverlayTextBox.cpp" />
|
|
||||||
<ClCompile Include="cvfVertexBundle.cpp" />
|
|
||||||
<ClCompile Include="cvfOverlayItem.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderStateBlending.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderStateColorMask.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderStateCullFace.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderStateDepth.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderStateFrontFace.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderStateLine.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderStatePoint.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderStatePolygonMode.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderStatePolygonOffset.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderStateTextureBindings.cpp" />
|
|
||||||
<ClCompile Include="cvfOverlayNavigationCube.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderStateStencil.cpp" />
|
|
||||||
<ClCompile Include="cvfOverlayImage.cpp" />
|
|
||||||
<ClCompile Include="cvfCameraAnimation.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1035,7 +1035,6 @@ Mat4d Camera::createLookAtMatrix(Vec3d eye, Vec3d vrp, Vec3d up)
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void Camera::applyOpenGL() const
|
void Camera::applyOpenGL() const
|
||||||
{
|
{
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
// apply the projection matrix
|
// apply the projection matrix
|
||||||
glMatrixMode(GL_PROJECTION);
|
glMatrixMode(GL_PROJECTION);
|
||||||
glLoadMatrixd(m_projectionMatrix.ptr());
|
glLoadMatrixd(m_projectionMatrix.ptr());
|
||||||
@@ -1043,7 +1042,6 @@ void Camera::applyOpenGL() const
|
|||||||
// apply the view matrix
|
// apply the view matrix
|
||||||
glMatrixMode(GL_MODELVIEW);
|
glMatrixMode(GL_MODELVIEW);
|
||||||
glLoadMatrixd(viewMatrix().ptr());
|
glLoadMatrixd(viewMatrix().ptr());
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace cvf
|
} // namespace cvf
|
||||||
|
|||||||
@@ -159,10 +159,6 @@ void DrawableGeo::renderFixedFunction(OpenGLContext* oglContext, const MatrixSta
|
|||||||
{
|
{
|
||||||
CVF_ASSERT(BufferObjectManaged::supportedOpenGL(oglContext));
|
CVF_ASSERT(BufferObjectManaged::supportedOpenGL(oglContext));
|
||||||
|
|
||||||
#ifdef CVF_OPENGL_ES
|
|
||||||
CVF_FAIL_MSG("Not supported on OpenGL ES");
|
|
||||||
#else
|
|
||||||
|
|
||||||
size_t numPrimitiveSets = m_primitiveSets.size();
|
size_t numPrimitiveSets = m_primitiveSets.size();
|
||||||
if (numPrimitiveSets == 0 || m_vertexBundle->vertexCount() == 0)
|
if (numPrimitiveSets == 0 || m_vertexBundle->vertexCount() == 0)
|
||||||
{
|
{
|
||||||
@@ -184,9 +180,7 @@ void DrawableGeo::renderFixedFunction(OpenGLContext* oglContext, const MatrixSta
|
|||||||
CVF_CHECK_OGL(oglContext);
|
CVF_CHECK_OGL(oglContext);
|
||||||
|
|
||||||
m_vertexBundle->finishUseBundle(oglContext, &bundleUsage);
|
m_vertexBundle->finishUseBundle(oglContext, &bundleUsage);
|
||||||
|
}
|
||||||
#endif // CVF_OPENGL_ES
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
@@ -247,9 +241,6 @@ void DrawableGeo::releaseBufferObjectsGPU()
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void DrawableGeo::renderImmediateMode(OpenGLContext* oglContext, const MatrixState&)
|
void DrawableGeo::renderImmediateMode(OpenGLContext* oglContext, const MatrixState&)
|
||||||
{
|
{
|
||||||
#ifdef CVF_OPENGL_ES
|
|
||||||
CVF_FAIL_MSG("Not supported on OpenGL ES");
|
|
||||||
#else
|
|
||||||
CVF_ASSERT(oglContext);
|
CVF_ASSERT(oglContext);
|
||||||
|
|
||||||
const Vec3fArray* vertexArr = m_vertexBundle->vertexArray();
|
const Vec3fArray* vertexArr = m_vertexBundle->vertexArray();
|
||||||
@@ -292,8 +283,6 @@ void DrawableGeo::renderImmediateMode(OpenGLContext* oglContext, const MatrixSta
|
|||||||
|
|
||||||
glEnd();
|
glEnd();
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // CVF_OPENGL_ES
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -55,10 +55,7 @@
|
|||||||
#include "cvfRenderStateDepth.h"
|
#include "cvfRenderStateDepth.h"
|
||||||
#include "cvfRenderStatePolygonOffset.h"
|
#include "cvfRenderStatePolygonOffset.h"
|
||||||
#include "cvfRenderStateBlending.h"
|
#include "cvfRenderStateBlending.h"
|
||||||
|
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
#include "cvfRenderState_FF.h"
|
#include "cvfRenderState_FF.h"
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace cvf {
|
namespace cvf {
|
||||||
|
|
||||||
@@ -344,13 +341,11 @@ void DrawableText::renderText(OpenGLContext* oglContext, ShaderProgram* shaderPr
|
|||||||
ShaderProgram::useNoProgram(oglContext);
|
ShaderProgram::useNoProgram(oglContext);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
RenderStateMaterial_FF mat;
|
RenderStateMaterial_FF mat;
|
||||||
mat.enableColorMaterial(true);
|
mat.enableColorMaterial(true);
|
||||||
|
|
||||||
RenderStateLighting_FF noLight(false);
|
RenderStateLighting_FF noLight(false);
|
||||||
noLight.applyOpenGL(oglContext);
|
noLight.applyOpenGL(oglContext);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
RenderStateDepth visibleCheckDepthRS(true, RenderStateDepth::LEQUAL, false);
|
RenderStateDepth visibleCheckDepthRS(true, RenderStateDepth::LEQUAL, false);
|
||||||
@@ -396,7 +391,6 @@ void DrawableText::renderText(OpenGLContext* oglContext, ShaderProgram* shaderPr
|
|||||||
RenderStateBlending resetBlend;
|
RenderStateBlending resetBlend;
|
||||||
resetBlend.applyOpenGL(oglContext);
|
resetBlend.applyOpenGL(oglContext);
|
||||||
|
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
if (!shaderProgram)
|
if (!shaderProgram)
|
||||||
{
|
{
|
||||||
RenderStateMaterial_FF mat;
|
RenderStateMaterial_FF mat;
|
||||||
@@ -405,7 +399,6 @@ void DrawableText::renderText(OpenGLContext* oglContext, ShaderProgram* shaderPr
|
|||||||
RenderStateLighting_FF light;
|
RenderStateLighting_FF light;
|
||||||
light.applyOpenGL(oglContext);
|
light.applyOpenGL(oglContext);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
TextDrawer drawer(m_font.p());
|
TextDrawer drawer(m_font.p());
|
||||||
@@ -454,13 +447,11 @@ bool DrawableText::labelAnchorVisible(OpenGLContext* oglContext, const Vec3d win
|
|||||||
|
|
||||||
if (softwareRendering)
|
if (softwareRendering)
|
||||||
{
|
{
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
glPointSize(3);
|
glPointSize(3);
|
||||||
glColor3f(0.02f, 0.02f, 0.02f);
|
glColor3f(0.02f, 0.02f, 0.02f);
|
||||||
glBegin(GL_POINTS);
|
glBegin(GL_POINTS);
|
||||||
glVertex3fv(worldCoord.ptr());
|
glVertex3fv(worldCoord.ptr());
|
||||||
glEnd();
|
glEnd();
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -46,10 +46,7 @@
|
|||||||
#include "cvfUniform.h"
|
#include "cvfUniform.h"
|
||||||
#include "cvfPrimitiveSetIndexedUShort.h"
|
#include "cvfPrimitiveSetIndexedUShort.h"
|
||||||
#include "cvfRay.h"
|
#include "cvfRay.h"
|
||||||
|
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
#include "cvfRenderState_FF.h"
|
#include "cvfRenderState_FF.h"
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace cvf {
|
namespace cvf {
|
||||||
|
|
||||||
@@ -219,10 +216,9 @@ void DrawableVectors::render(OpenGLContext* oglContext, ShaderProgram* shaderPro
|
|||||||
GLint colorUniformLocation = shaderProgram->uniformLocation(m_colorUniformName.toAscii().ptr());
|
GLint colorUniformLocation = shaderProgram->uniformLocation(m_colorUniformName.toAscii().ptr());
|
||||||
CVF_ASSERT(colorUniformLocation != -1);
|
CVF_ASSERT(colorUniformLocation != -1);
|
||||||
|
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
uint minIndex = m_vectorGlyphPrimSet->minIndex();
|
uint minIndex = m_vectorGlyphPrimSet->minIndex();
|
||||||
uint maxIndex = m_vectorGlyphPrimSet->maxIndex();
|
uint maxIndex = m_vectorGlyphPrimSet->maxIndex();
|
||||||
#endif
|
|
||||||
GLsizei indexCount = static_cast<GLsizei>(m_vectorGlyphPrimSet->indexCount());
|
GLsizei indexCount = static_cast<GLsizei>(m_vectorGlyphPrimSet->indexCount());
|
||||||
|
|
||||||
// Set the single color to use
|
// Set the single color to use
|
||||||
@@ -248,11 +244,7 @@ void DrawableVectors::render(OpenGLContext* oglContext, ShaderProgram* shaderPro
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Draw the arrow
|
// Draw the arrow
|
||||||
#ifdef CVF_OPENGL_ES
|
|
||||||
glDrawElements(GL_TRIANGLES, indexCount, GL_UNSIGNED_SHORT, ptrOrOffset);
|
|
||||||
#else
|
|
||||||
glDrawRangeElements(GL_TRIANGLES, minIndex, maxIndex, indexCount, GL_UNSIGNED_SHORT, ptrOrOffset);
|
glDrawRangeElements(GL_TRIANGLES, minIndex, maxIndex, indexCount, GL_UNSIGNED_SHORT, ptrOrOffset);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Cleanup
|
// Cleanup
|
||||||
@@ -277,9 +269,6 @@ void DrawableVectors::render(OpenGLContext* oglContext, ShaderProgram* shaderPro
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void DrawableVectors::renderFixedFunction(OpenGLContext* oglContext, const MatrixState& matrixState)
|
void DrawableVectors::renderFixedFunction(OpenGLContext* oglContext, const MatrixState& matrixState)
|
||||||
{
|
{
|
||||||
#ifdef CVF_OPENGL_ES
|
|
||||||
CVF_FAIL_MSG("Not supported on OpenGL ES");
|
|
||||||
#else
|
|
||||||
CVF_ASSERT(oglContext);
|
CVF_ASSERT(oglContext);
|
||||||
CVF_ASSERT(m_vertexArray->size() == m_vectorArray->size());
|
CVF_ASSERT(m_vertexArray->size() == m_vectorArray->size());
|
||||||
CVF_ASSERT(m_vectorGlyph.notNull());
|
CVF_ASSERT(m_vectorGlyph.notNull());
|
||||||
@@ -318,7 +307,6 @@ void DrawableVectors::renderFixedFunction(OpenGLContext* oglContext, const Matri
|
|||||||
glDisable(GL_NORMALIZE);
|
glDisable(GL_NORMALIZE);
|
||||||
|
|
||||||
CVF_CHECK_OGL(oglContext);
|
CVF_CHECK_OGL(oglContext);
|
||||||
#endif // CVF_OPENGL_ES
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -327,9 +315,6 @@ void DrawableVectors::renderFixedFunction(OpenGLContext* oglContext, const Matri
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void DrawableVectors::renderImmediateMode(OpenGLContext* oglContext, const MatrixState& matrixState)
|
void DrawableVectors::renderImmediateMode(OpenGLContext* oglContext, const MatrixState& matrixState)
|
||||||
{
|
{
|
||||||
#ifdef CVF_OPENGL_ES
|
|
||||||
CVF_FAIL_MSG("Not supported on OpenGL ES");
|
|
||||||
#else
|
|
||||||
CVF_ASSERT(oglContext);
|
CVF_ASSERT(oglContext);
|
||||||
CVF_ASSERT(m_vertexArray->size() == m_vectorArray->size());
|
CVF_ASSERT(m_vertexArray->size() == m_vectorArray->size());
|
||||||
CVF_ASSERT(m_vectorGlyph.notNull());
|
CVF_ASSERT(m_vectorGlyph.notNull());
|
||||||
@@ -368,7 +353,6 @@ void DrawableVectors::renderImmediateMode(OpenGLContext* oglContext, const Matri
|
|||||||
glDisable(GL_NORMALIZE);
|
glDisable(GL_NORMALIZE);
|
||||||
|
|
||||||
CVF_CHECK_OGL(oglContext);
|
CVF_CHECK_OGL(oglContext);
|
||||||
#endif // CVF_OPENGL_ES
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -308,11 +308,7 @@ void FramebufferObject::applyOpenGL(OpenGLContext* oglContext)
|
|||||||
{
|
{
|
||||||
if (texture->textureType() == Texture::TEXTURE_RECTANGLE)
|
if (texture->textureType() == Texture::TEXTURE_RECTANGLE)
|
||||||
{
|
{
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
glFramebufferTexture2D(GL_FRAMEBUFFER, static_cast<GLenum>(GL_COLOR_ATTACHMENT0 + i), GL_TEXTURE_RECTANGLE, texture->textureOglId(), 0);
|
glFramebufferTexture2D(GL_FRAMEBUFFER, static_cast<GLenum>(GL_COLOR_ATTACHMENT0 + i), GL_TEXTURE_RECTANGLE, texture->textureOglId(), 0);
|
||||||
#else
|
|
||||||
CVF_FAIL_MSG("Not supported on iOS");
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -327,7 +323,6 @@ void FramebufferObject::applyOpenGL(OpenGLContext* oglContext)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Setup draw buffers. Drawbuffer settings are stored in the FBO, so we only need to do this whenever the FBO attachments are changed.
|
// Setup draw buffers. Drawbuffer settings are stored in the FBO, so we only need to do this whenever the FBO attachments are changed.
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
if (attachmentsModified)
|
if (attachmentsModified)
|
||||||
{
|
{
|
||||||
size_t maxAttachmentIndex = CVF_MAX(m_colorRenderBuffers.size(), m_colorTextures.size());
|
size_t maxAttachmentIndex = CVF_MAX(m_colorRenderBuffers.size(), m_colorTextures.size());
|
||||||
@@ -369,7 +364,6 @@ void FramebufferObject::applyOpenGL(OpenGLContext* oglContext)
|
|||||||
glDrawBuffer(GL_NONE);
|
glDrawBuffer(GL_NONE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
// Depth attachment, can only have one
|
// Depth attachment, can only have one
|
||||||
CVF_ASSERT(!(m_depthTexture2d.notNull() && m_depthRenderBuffer.notNull()));
|
CVF_ASSERT(!(m_depthTexture2d.notNull() && m_depthRenderBuffer.notNull()));
|
||||||
@@ -410,11 +404,7 @@ void FramebufferObject::applyOpenGL(OpenGLContext* oglContext)
|
|||||||
}
|
}
|
||||||
else if (m_depthTexture2d->textureType() == Texture::TEXTURE_RECTANGLE)
|
else if (m_depthTexture2d->textureType() == Texture::TEXTURE_RECTANGLE)
|
||||||
{
|
{
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_RECTANGLE, m_depthTexture2d->textureOglId(), 0);
|
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_RECTANGLE, m_depthTexture2d->textureOglId(), 0);
|
||||||
#else
|
|
||||||
CVF_FAIL_MSG("Not supported on iOS");
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -437,11 +427,7 @@ void FramebufferObject::applyOpenGL(OpenGLContext* oglContext)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER, m_depthStencilRenderBuffer->renderbufferOglId());
|
glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER, m_depthStencilRenderBuffer->renderbufferOglId());
|
||||||
#else
|
|
||||||
CVF_FAIL_MSG("Not supported on iOS");
|
|
||||||
#endif
|
|
||||||
|
|
||||||
m_depthAttachmentVersionTick = m_depthStencilRenderBuffer->versionTick();
|
m_depthAttachmentVersionTick = m_depthStencilRenderBuffer->versionTick();
|
||||||
}
|
}
|
||||||
@@ -461,19 +447,11 @@ void FramebufferObject::applyOpenGL(OpenGLContext* oglContext)
|
|||||||
|
|
||||||
if (m_depthStencilTexture2d->textureType() == Texture::TEXTURE_2D)
|
if (m_depthStencilTexture2d->textureType() == Texture::TEXTURE_2D)
|
||||||
{
|
{
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, m_depthStencilTexture2d->textureOglId(), 0);
|
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, m_depthStencilTexture2d->textureOglId(), 0);
|
||||||
#else
|
|
||||||
CVF_FAIL_MSG("Not supported on iOS");
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
else if (m_depthStencilTexture2d->textureType() == Texture::TEXTURE_RECTANGLE)
|
else if (m_depthStencilTexture2d->textureType() == Texture::TEXTURE_RECTANGLE)
|
||||||
{
|
{
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_RECTANGLE, m_depthStencilTexture2d->textureOglId(), 0);
|
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_RECTANGLE, m_depthStencilTexture2d->textureOglId(), 0);
|
||||||
#else
|
|
||||||
CVF_FAIL_MSG("Not supported on iOS");
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -507,12 +485,8 @@ void FramebufferObject::useDefaultWindowFramebuffer(OpenGLContext* oglContext)
|
|||||||
{
|
{
|
||||||
CVF_CALLSITE_OPENGL(oglContext);
|
CVF_CALLSITE_OPENGL(oglContext);
|
||||||
|
|
||||||
#ifdef CVF_OPENGL_ES
|
|
||||||
CVF_FAIL_MSG("FrameBufferObject::useDefaultWindowFramebuffer() not supported on OpenGL ES");
|
|
||||||
#else
|
|
||||||
glBindFramebuffer(GL_FRAMEBUFFER, 0);
|
glBindFramebuffer(GL_FRAMEBUFFER, 0);
|
||||||
glDrawBuffer(GL_BACK);
|
glDrawBuffer(GL_BACK);
|
||||||
#endif
|
|
||||||
|
|
||||||
CVF_CHECK_OGL(oglContext);
|
CVF_CHECK_OGL(oglContext);
|
||||||
}
|
}
|
||||||
@@ -614,16 +588,11 @@ bool FramebufferObject::isFramebufferComplete(OpenGLContext* oglContext, String*
|
|||||||
case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT: *failReason = "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT is returned if any of the framebuffer attachment points are framebuffer incomplete."; break;
|
case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT: *failReason = "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT is returned if any of the framebuffer attachment points are framebuffer incomplete."; break;
|
||||||
case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT: *failReason = "GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT is returned if the framebuffer does not have at least one image attached to it."; break;
|
case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT: *failReason = "GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT is returned if the framebuffer does not have at least one image attached to it."; break;
|
||||||
case GL_FRAMEBUFFER_UNSUPPORTED: *failReason = "GL_FRAMEBUFFER_UNSUPPORTED is returned if the combination of internal formats of the attached images violates an implementation-dependent set of restrictions."; break;
|
case GL_FRAMEBUFFER_UNSUPPORTED: *failReason = "GL_FRAMEBUFFER_UNSUPPORTED is returned if the combination of internal formats of the attached images violates an implementation-dependent set of restrictions."; break;
|
||||||
|
|
||||||
#ifdef CVF_OPENGL_ES
|
|
||||||
case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS: *failReason = "GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS. Not all attached images has same width and height."; break;
|
|
||||||
#else
|
|
||||||
case GL_FRAMEBUFFER_UNDEFINED: *failReason = "GL_FRAMEBUFFER_UNDEFINED is returned if target is the default framebuffer, but the default framebuffer does not exist."; break;
|
case GL_FRAMEBUFFER_UNDEFINED: *failReason = "GL_FRAMEBUFFER_UNDEFINED is returned if target is the default framebuffer, but the default framebuffer does not exist."; break;
|
||||||
case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER: *failReason = "GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER is returned if the value of GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE is GL_NONE for any color attachment point(s) named by GL_DRAWBUFFERi."; break;
|
case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER: *failReason = "GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER is returned if the value of GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE is GL_NONE for any color attachment point(s) named by GL_DRAWBUFFERi."; break;
|
||||||
case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER: *failReason = "GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER is returned if GL_READ_BUFFER is not GL_NONE and the value of GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE is GL_NONE for the color attachment point named by GL_READ_BUFFER."; break;
|
case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER: *failReason = "GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER is returned if GL_READ_BUFFER is not GL_NONE and the value of GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE is GL_NONE for the color attachment point named by GL_READ_BUFFER."; break;
|
||||||
case GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE: *failReason = "GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE is returned if the value of GL_RENDERBUFFER_SAMPLES is not the same for all attached renderbuffers; if the value of GL_TEXTURE_SAMPLES is the not same for all attached textures; or, if the attached images are a mix of renderbuffers and textures, the value of GL_RENDERBUFFER_SAMPLES does not match the value of GL_TEXTURE_SAMPLES."; break;
|
case GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE: *failReason = "GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE is returned if the value of GL_RENDERBUFFER_SAMPLES is not the same for all attached renderbuffers; if the value of GL_TEXTURE_SAMPLES is the not same for all attached textures; or, if the attached images are a mix of renderbuffers and textures, the value of GL_RENDERBUFFER_SAMPLES does not match the value of GL_TEXTURE_SAMPLES."; break;
|
||||||
case GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS: *failReason = "GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS is returned if any framebuffer attachment is layered, and any populated attachment is not layered, or if all populated color attachments are not from textures of the same target."; break;
|
case GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS: *failReason = "GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS is returned if any framebuffer attachment is layered, and any populated attachment is not layered, or if all populated color attachments are not from textures of the same target."; break;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -43,11 +43,8 @@
|
|||||||
#include "cvfTexture.h"
|
#include "cvfTexture.h"
|
||||||
#include "cvfSampler.h"
|
#include "cvfSampler.h"
|
||||||
#include "cvfRenderStateTextureBindings.h"
|
#include "cvfRenderStateTextureBindings.h"
|
||||||
|
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
#include "cvfTexture2D_FF.h"
|
#include "cvfTexture2D_FF.h"
|
||||||
#include "cvfRenderState_FF.h"
|
#include "cvfRenderState_FF.h"
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace cvf {
|
namespace cvf {
|
||||||
|
|
||||||
@@ -267,7 +264,6 @@ void Glyph::setupAndBindTexture(OpenGLContext* oglContext, bool software)
|
|||||||
RenderState::Type renderStateType = m_textureBindings->type();
|
RenderState::Type renderStateType = m_textureBindings->type();
|
||||||
if (software)
|
if (software)
|
||||||
{
|
{
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
if (renderStateType == RenderState::TEXTURE_MAPPING_FF)
|
if (renderStateType == RenderState::TEXTURE_MAPPING_FF)
|
||||||
{
|
{
|
||||||
RenderStateTextureMapping_FF* texMapping = static_cast<RenderStateTextureMapping_FF*>(m_textureBindings.p());
|
RenderStateTextureMapping_FF* texMapping = static_cast<RenderStateTextureMapping_FF*>(m_textureBindings.p());
|
||||||
@@ -275,9 +271,6 @@ void Glyph::setupAndBindTexture(OpenGLContext* oglContext, bool software)
|
|||||||
texMapping->applyOpenGL(oglContext);
|
texMapping->applyOpenGL(oglContext);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
#else
|
|
||||||
CVF_FAIL_MSG("Not supported on OpenGL ES");
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -341,9 +334,6 @@ void Glyph::setupAndBindTexture(OpenGLContext* oglContext, bool software)
|
|||||||
|
|
||||||
if (software)
|
if (software)
|
||||||
{
|
{
|
||||||
#ifdef CVF_OPENGL_ES
|
|
||||||
CVF_FAIL_MSG("Not supported on OpenGL ES");
|
|
||||||
#else
|
|
||||||
// Use fixed function texture setup
|
// Use fixed function texture setup
|
||||||
ref<Texture2D_FF> texture = new Texture2D_FF(m_textureImage.p());
|
ref<Texture2D_FF> texture = new Texture2D_FF(m_textureImage.p());
|
||||||
texture->setWrapMode(Texture2D_FF::CLAMP);
|
texture->setWrapMode(Texture2D_FF::CLAMP);
|
||||||
@@ -370,7 +360,6 @@ void Glyph::setupAndBindTexture(OpenGLContext* oglContext, bool software)
|
|||||||
textureMapping->setupTexture(oglContext);
|
textureMapping->setupTexture(oglContext);
|
||||||
|
|
||||||
m_textureBindings = textureMapping;
|
m_textureBindings = textureMapping;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -108,9 +108,6 @@
|
|||||||
#include "cvfVertexAttribute.h"
|
#include "cvfVertexAttribute.h"
|
||||||
#include "cvfVertexBundle.h"
|
#include "cvfVertexBundle.h"
|
||||||
#include "cvfViewport.h"
|
#include "cvfViewport.h"
|
||||||
|
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
#include "cvfRenderState_FF.h"
|
#include "cvfRenderState_FF.h"
|
||||||
#include "cvfTexture2D_FF.h"
|
#include "cvfTexture2D_FF.h"
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|||||||
@@ -46,8 +46,6 @@
|
|||||||
|
|
||||||
CVF_GCC_DIAGNOSTIC_IGNORE("-Wconversion")
|
CVF_GCC_DIAGNOSTIC_IGNORE("-Wconversion")
|
||||||
|
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
|
|
||||||
#undef glewGetContext
|
#undef glewGetContext
|
||||||
|
|
||||||
extern "C"
|
extern "C"
|
||||||
@@ -55,7 +53,6 @@ extern "C"
|
|||||||
#include "glew/glew.c"
|
#include "glew/glew.c"
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // CVF_OPENGL_ES
|
|
||||||
|
|
||||||
namespace cvf {
|
namespace cvf {
|
||||||
|
|
||||||
@@ -133,10 +130,8 @@ String OpenGL::mapOpenGLErrorToString(cvfGLenum errorCode)
|
|||||||
case GL_INVALID_VALUE: errCodeStr = "GL_INVALID_VALUE"; break;
|
case GL_INVALID_VALUE: errCodeStr = "GL_INVALID_VALUE"; break;
|
||||||
case GL_INVALID_OPERATION: errCodeStr = "GL_INVALID_OPERATION"; break;
|
case GL_INVALID_OPERATION: errCodeStr = "GL_INVALID_OPERATION"; break;
|
||||||
case GL_OUT_OF_MEMORY: errCodeStr = "GL_OUT_OF_MEMORY"; break;
|
case GL_OUT_OF_MEMORY: errCodeStr = "GL_OUT_OF_MEMORY"; break;
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
case GL_STACK_OVERFLOW: errCodeStr = "GL_STACK_OVERFLOW"; break;
|
case GL_STACK_OVERFLOW: errCodeStr = "GL_STACK_OVERFLOW"; break;
|
||||||
case GL_STACK_UNDERFLOW: errCodeStr = "GL_STACK_UNDERFLOW"; break;
|
case GL_STACK_UNDERFLOW: errCodeStr = "GL_STACK_UNDERFLOW"; break;
|
||||||
#endif
|
|
||||||
case GL_NO_ERROR: errCodeStr = "GL_NO_ERROR"; break;
|
case GL_NO_ERROR: errCodeStr = "GL_NO_ERROR"; break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -38,10 +38,8 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
|
||||||
// Currently we utilize GLEW everywhere except for OpenGLES
|
// Currently we utilize GLEW everywhere
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
#define CVF_USE_GLEW
|
#define CVF_USE_GLEW
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef CVF_USE_GLEW
|
#ifdef CVF_USE_GLEW
|
||||||
|
|||||||
@@ -53,10 +53,7 @@
|
|||||||
#include "cvfArrowGenerator.h"
|
#include "cvfArrowGenerator.h"
|
||||||
#include "cvfBufferObjectManaged.h"
|
#include "cvfBufferObjectManaged.h"
|
||||||
#include "cvfDrawableText.h"
|
#include "cvfDrawableText.h"
|
||||||
|
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
#include "cvfRenderState_FF.h"
|
#include "cvfRenderState_FF.h"
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
namespace cvf {
|
namespace cvf {
|
||||||
@@ -250,9 +247,6 @@ void OverlayAxisCross::renderAxis(OpenGLContext* oglContext, const MatrixState&
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void OverlayAxisCross::renderAxisImmediateMode(OpenGLContext* oglContext, const MatrixState& matrixState)
|
void OverlayAxisCross::renderAxisImmediateMode(OpenGLContext* oglContext, const MatrixState& matrixState)
|
||||||
{
|
{
|
||||||
#ifdef CVF_OPENGL_ES
|
|
||||||
CVF_FAIL_MSG("Not supported on OpenGL ES");
|
|
||||||
#else
|
|
||||||
m_axis->renderImmediateMode(oglContext, matrixState);
|
m_axis->renderImmediateMode(oglContext, matrixState);
|
||||||
|
|
||||||
// Draw X axis triangle
|
// Draw X axis triangle
|
||||||
@@ -264,7 +258,6 @@ void OverlayAxisCross::renderAxisImmediateMode(OpenGLContext* oglContext, const
|
|||||||
RenderStateMaterial_FF yMaterial(RenderStateMaterial_FF::PURE_GREEN);
|
RenderStateMaterial_FF yMaterial(RenderStateMaterial_FF::PURE_GREEN);
|
||||||
yMaterial.applyOpenGL(oglContext);
|
yMaterial.applyOpenGL(oglContext);
|
||||||
m_yAxisTriangle->renderImmediateMode(oglContext, matrixState);
|
m_yAxisTriangle->renderImmediateMode(oglContext, matrixState);
|
||||||
#endif // CVF_OPENGL_ES
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -55,10 +55,7 @@
|
|||||||
#include "cvfGlyph.h"
|
#include "cvfGlyph.h"
|
||||||
#include "cvfRenderStateDepth.h"
|
#include "cvfRenderStateDepth.h"
|
||||||
#include "cvfRenderStateLine.h"
|
#include "cvfRenderStateLine.h"
|
||||||
|
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
#include "cvfRenderState_FF.h"
|
#include "cvfRenderState_FF.h"
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace cvf {
|
namespace cvf {
|
||||||
|
|
||||||
@@ -421,11 +418,7 @@ void OverlayColorLegend::renderLegend(OpenGLContext* oglContext, OverlayColorLeg
|
|||||||
UniformFloat uniformColor("u_color", Color4f(Color3f(clr)));
|
UniformFloat uniformColor("u_color", Color4f(Color3f(clr)));
|
||||||
shaderProgram->applyUniform(oglContext, uniformColor);
|
shaderProgram->applyUniform(oglContext, uniformColor);
|
||||||
|
|
||||||
#ifdef CVF_OPENGL_ES
|
|
||||||
glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, trianglesConnects);
|
|
||||||
#else
|
|
||||||
glDrawRangeElements(GL_TRIANGLES, 0, 4, 6, GL_UNSIGNED_SHORT, trianglesConnects);
|
glDrawRangeElements(GL_TRIANGLES, 0, 4, 6, GL_UNSIGNED_SHORT, trianglesConnects);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Draw legend lines
|
// Draw legend lines
|
||||||
@@ -435,11 +428,7 @@ void OverlayColorLegend::renderLegend(OpenGLContext* oglContext, OverlayColorLeg
|
|||||||
UniformFloat uniformColor("u_color", Color4f(m_lineColor));
|
UniformFloat uniformColor("u_color", Color4f(m_lineColor));
|
||||||
shaderProgram->applyUniform(oglContext, uniformColor);
|
shaderProgram->applyUniform(oglContext, uniformColor);
|
||||||
|
|
||||||
#ifdef CVF_OPENGL_ES
|
|
||||||
glDrawElements(GL_LINES, 8, GL_UNSIGNED_SHORT, linesConnects);
|
|
||||||
#else
|
|
||||||
glDrawRangeElements(GL_LINES, 0, 5, 8, GL_UNSIGNED_SHORT, linesConnects);
|
glDrawRangeElements(GL_LINES, 0, 5, 8, GL_UNSIGNED_SHORT, linesConnects);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -464,10 +453,6 @@ void OverlayColorLegend::renderLegend(OpenGLContext* oglContext, OverlayColorLeg
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void OverlayColorLegend::renderLegendImmediateMode(OpenGLContext* oglContext, OverlayColorLegendLayoutInfo* layout)
|
void OverlayColorLegend::renderLegendImmediateMode(OpenGLContext* oglContext, OverlayColorLegendLayoutInfo* layout)
|
||||||
{
|
{
|
||||||
#ifdef CVF_OPENGL_ES
|
|
||||||
CVF_UNUSED(layout);
|
|
||||||
CVF_FAIL_MSG("Not supported on OpenGL ES");
|
|
||||||
#else
|
|
||||||
CVF_TIGHT_ASSERT(layout);
|
CVF_TIGHT_ASSERT(layout);
|
||||||
CVF_TIGHT_ASSERT(layout->size.x() > 0);
|
CVF_TIGHT_ASSERT(layout->size.x() > 0);
|
||||||
CVF_TIGHT_ASSERT(layout->size.y() > 0);
|
CVF_TIGHT_ASSERT(layout->size.y() > 0);
|
||||||
@@ -551,7 +536,6 @@ void OverlayColorLegend::renderLegendImmediateMode(OpenGLContext* oglContext, Ov
|
|||||||
resetDepth.applyOpenGL(oglContext);
|
resetDepth.applyOpenGL(oglContext);
|
||||||
|
|
||||||
CVF_CHECK_OGL(oglContext);
|
CVF_CHECK_OGL(oglContext);
|
||||||
#endif // CVF_OPENGL_ES
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -54,10 +54,7 @@
|
|||||||
#include "cvfRenderStateDepth.h"
|
#include "cvfRenderStateDepth.h"
|
||||||
#include "cvfRenderStateTextureBindings.h"
|
#include "cvfRenderStateTextureBindings.h"
|
||||||
#include "cvfRenderStateBlending.h"
|
#include "cvfRenderStateBlending.h"
|
||||||
|
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
#include "cvfRenderState_FF.h"
|
#include "cvfRenderState_FF.h"
|
||||||
#endif
|
|
||||||
#include "cvfTexture2D_FF.h"
|
#include "cvfTexture2D_FF.h"
|
||||||
|
|
||||||
namespace cvf {
|
namespace cvf {
|
||||||
@@ -173,7 +170,6 @@ void OverlayImage::render(OpenGLContext* oglContext, const Vec2i& position, cons
|
|||||||
ShaderProgram::useNoProgram(oglContext);
|
ShaderProgram::useNoProgram(oglContext);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
RenderStateMaterial_FF mat;
|
RenderStateMaterial_FF mat;
|
||||||
mat.enableColorMaterial(true);
|
mat.enableColorMaterial(true);
|
||||||
mat.applyOpenGL(oglContext);
|
mat.applyOpenGL(oglContext);
|
||||||
@@ -196,7 +192,7 @@ void OverlayImage::render(OpenGLContext* oglContext, const Vec2i& position, cons
|
|||||||
|
|
||||||
m_textureBindings = textureMapping;
|
m_textureBindings = textureMapping;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
// Adjust texture coordinates
|
// Adjust texture coordinates
|
||||||
if (m_pow2Image.notNull())
|
if (m_pow2Image.notNull())
|
||||||
{
|
{
|
||||||
@@ -282,7 +278,6 @@ void OverlayImage::render(OpenGLContext* oglContext, const Vec2i& position, cons
|
|||||||
|
|
||||||
if (software)
|
if (software)
|
||||||
{
|
{
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
glColor4f(1.0f, 1.0f, 1.0f, m_blendMode == GLOBAL_ALPHA ? m_alpha : 1.0f);
|
glColor4f(1.0f, 1.0f, 1.0f, m_blendMode == GLOBAL_ALPHA ? m_alpha : 1.0f);
|
||||||
glBegin(GL_TRIANGLE_FAN);
|
glBegin(GL_TRIANGLE_FAN);
|
||||||
glTexCoord2f(textureCoords[0], textureCoords[1]);
|
glTexCoord2f(textureCoords[0], textureCoords[1]);
|
||||||
@@ -294,7 +289,6 @@ void OverlayImage::render(OpenGLContext* oglContext, const Vec2i& position, cons
|
|||||||
glTexCoord2f(textureCoords[6], textureCoords[7]);
|
glTexCoord2f(textureCoords[6], textureCoords[7]);
|
||||||
glVertex3fv(v4);
|
glVertex3fv(v4);
|
||||||
glEnd();
|
glEnd();
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -318,10 +312,8 @@ void OverlayImage::render(OpenGLContext* oglContext, const Vec2i& position, cons
|
|||||||
|
|
||||||
if (software)
|
if (software)
|
||||||
{
|
{
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
RenderStateTextureMapping_FF resetTextureMapping;
|
RenderStateTextureMapping_FF resetTextureMapping;
|
||||||
resetTextureMapping.applyOpenGL(oglContext);
|
resetTextureMapping.applyOpenGL(oglContext);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!software)
|
if (!software)
|
||||||
|
|||||||
@@ -64,11 +64,8 @@
|
|||||||
#include "cvfSampler.h"
|
#include "cvfSampler.h"
|
||||||
#include "cvfRenderStateTextureBindings.h"
|
#include "cvfRenderStateTextureBindings.h"
|
||||||
#include "cvfRect.h"
|
#include "cvfRect.h"
|
||||||
|
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
#include "cvfRenderState_FF.h"
|
#include "cvfRenderState_FF.h"
|
||||||
#include "cvfTexture2D_FF.h"
|
#include "cvfTexture2D_FF.h"
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
namespace cvf {
|
namespace cvf {
|
||||||
@@ -286,11 +283,7 @@ void OverlayNavigationCube::renderAxis(OpenGLContext* oglContext, const MatrixSt
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void OverlayNavigationCube::renderAxisImmediateMode(OpenGLContext* oglContext, const MatrixState& matrixState)
|
void OverlayNavigationCube::renderAxisImmediateMode(OpenGLContext* oglContext, const MatrixState& matrixState)
|
||||||
{
|
{
|
||||||
#ifdef CVF_OPENGL_ES
|
|
||||||
CVF_FAIL_MSG("Not supported on OpenGL ES");
|
|
||||||
#else
|
|
||||||
m_axis->renderImmediateMode(oglContext, matrixState);
|
m_axis->renderImmediateMode(oglContext, matrixState);
|
||||||
#endif // CVF_OPENGL_ES
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -367,7 +360,6 @@ void OverlayNavigationCube::updateTextureBindings(OpenGLContext* oglContext, boo
|
|||||||
{
|
{
|
||||||
if (software)
|
if (software)
|
||||||
{
|
{
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
// Use fixed function texture setup
|
// Use fixed function texture setup
|
||||||
ref<Texture2D_FF> texture = new Texture2D_FF(it->second.p());
|
ref<Texture2D_FF> texture = new Texture2D_FF(it->second.p());
|
||||||
texture->setWrapMode(Texture2D_FF::CLAMP);
|
texture->setWrapMode(Texture2D_FF::CLAMP);
|
||||||
@@ -380,10 +372,6 @@ void OverlayNavigationCube::updateTextureBindings(OpenGLContext* oglContext, boo
|
|||||||
textureMapping->setTextureFunction(RenderStateTextureMapping_FF::MODULATE);
|
textureMapping->setTextureFunction(RenderStateTextureMapping_FF::MODULATE);
|
||||||
|
|
||||||
m_faceTextureBindings[face] = textureMapping;
|
m_faceTextureBindings[face] = textureMapping;
|
||||||
#else
|
|
||||||
CVF_FAIL_MSG("Not supported on OpenGL ES");
|
|
||||||
#endif
|
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -420,14 +408,12 @@ void OverlayNavigationCube::renderCubeGeos(OpenGLContext* oglContext, bool softw
|
|||||||
|
|
||||||
if (software)
|
if (software)
|
||||||
{
|
{
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
RenderStateMaterial_FF mat;
|
RenderStateMaterial_FF mat;
|
||||||
mat.enableColorMaterial(true);
|
mat.enableColorMaterial(true);
|
||||||
mat.applyOpenGL(oglContext);
|
mat.applyOpenGL(oglContext);
|
||||||
|
|
||||||
RenderStateLighting_FF light;
|
RenderStateLighting_FF light;
|
||||||
light.applyOpenGL(oglContext);
|
light.applyOpenGL(oglContext);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for (size_t i = 0; i < 6; i++)
|
for (size_t i = 0; i < 6; i++)
|
||||||
@@ -485,12 +471,8 @@ void OverlayNavigationCube::renderCubeGeos(OpenGLContext* oglContext, bool softw
|
|||||||
|
|
||||||
if (software)
|
if (software)
|
||||||
{
|
{
|
||||||
#ifdef CVF_OPENGL_ES
|
|
||||||
CVF_FAIL_MSG("Not supported on OpenGL ES");
|
|
||||||
#else
|
|
||||||
glColor3fv(renderFaceColor.ptr());
|
glColor3fv(renderFaceColor.ptr());
|
||||||
m_cubeGeos[i]->renderImmediateMode(oglContext, matrixState);
|
m_cubeGeos[i]->renderImmediateMode(oglContext, matrixState);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -533,15 +515,11 @@ void OverlayNavigationCube::render2dItems(OpenGLContext* oglContext, const Vec2i
|
|||||||
|
|
||||||
if (software)
|
if (software)
|
||||||
{
|
{
|
||||||
#ifdef CVF_OPENGL_ES
|
|
||||||
CVF_FAIL_MSG("Not supported on OpenGL ES");
|
|
||||||
#else
|
|
||||||
RenderStateLighting_FF light(false);
|
RenderStateLighting_FF light(false);
|
||||||
light.applyOpenGL(oglContext);
|
light.applyOpenGL(oglContext);
|
||||||
glColor3fv(m_hightlightItem == NCI_HOME ? m_itemHighlightColor.ptr() : m_2dItemsColor.ptr());
|
glColor3fv(m_hightlightItem == NCI_HOME ? m_itemHighlightColor.ptr() : m_2dItemsColor.ptr());
|
||||||
|
|
||||||
m_homeGeo->renderImmediateMode(oglContext, matrixState);
|
m_homeGeo->renderImmediateMode(oglContext, matrixState);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -568,12 +546,8 @@ void OverlayNavigationCube::render2dItems(OpenGLContext* oglContext, const Vec2i
|
|||||||
|
|
||||||
if (software)
|
if (software)
|
||||||
{
|
{
|
||||||
#ifdef CVF_OPENGL_ES
|
|
||||||
CVF_FAIL_MSG("Not supported on OpenGL ES");
|
|
||||||
#else
|
|
||||||
glColor3fv(renderFaceColor.ptr());
|
glColor3fv(renderFaceColor.ptr());
|
||||||
m_2dGeos[i]->renderImmediateMode(oglContext, matrixState);
|
m_2dGeos[i]->renderImmediateMode(oglContext, matrixState);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -590,12 +564,8 @@ void OverlayNavigationCube::render2dItems(OpenGLContext* oglContext, const Vec2i
|
|||||||
|
|
||||||
if (software)
|
if (software)
|
||||||
{
|
{
|
||||||
#ifdef CVF_OPENGL_ES
|
|
||||||
CVF_FAIL_MSG("Not supported on OpenGL ES");
|
|
||||||
#else
|
|
||||||
RenderStateLighting_FF resetLight;
|
RenderStateLighting_FF resetLight;
|
||||||
resetLight.applyOpenGL(oglContext);
|
resetLight.applyOpenGL(oglContext);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -55,11 +55,7 @@
|
|||||||
#include "cvfGlyph.h"
|
#include "cvfGlyph.h"
|
||||||
#include "cvfRenderStateDepth.h"
|
#include "cvfRenderStateDepth.h"
|
||||||
#include "cvfRenderStateLine.h"
|
#include "cvfRenderStateLine.h"
|
||||||
|
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
#include "cvfRenderState_FF.h"
|
#include "cvfRenderState_FF.h"
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "cvfScalarMapper.h"
|
#include "cvfScalarMapper.h"
|
||||||
|
|
||||||
namespace cvf {
|
namespace cvf {
|
||||||
@@ -435,11 +431,7 @@ void OverlayScalarMapperLegend::renderLegend(OpenGLContext* oglContext, OverlayC
|
|||||||
UniformFloat uniformColor("u_color", Color4f(Color3f(clr)));
|
UniformFloat uniformColor("u_color", Color4f(Color3f(clr)));
|
||||||
shaderProgram->applyUniform(oglContext, uniformColor);
|
shaderProgram->applyUniform(oglContext, uniformColor);
|
||||||
|
|
||||||
#ifdef CVF_OPENGL_ES
|
|
||||||
glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, trianglesConnects);
|
|
||||||
#else
|
|
||||||
glDrawRangeElements(GL_TRIANGLES, 0, 4, 6, GL_UNSIGNED_SHORT, trianglesConnects);
|
glDrawRangeElements(GL_TRIANGLES, 0, 4, 6, GL_UNSIGNED_SHORT, trianglesConnects);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -459,11 +451,7 @@ void OverlayScalarMapperLegend::renderLegend(OpenGLContext* oglContext, OverlayC
|
|||||||
UniformFloat uniformColor("u_color", Color4f(m_lineColor));
|
UniformFloat uniformColor("u_color", Color4f(m_lineColor));
|
||||||
shaderProgram->applyUniform(oglContext, uniformColor);
|
shaderProgram->applyUniform(oglContext, uniformColor);
|
||||||
|
|
||||||
#ifdef CVF_OPENGL_ES
|
|
||||||
glDrawElements(GL_LINES, 8, GL_UNSIGNED_SHORT, frameConnects);
|
|
||||||
#else
|
|
||||||
glDrawRangeElements(GL_LINES, 0, 3, 8, GL_UNSIGNED_SHORT, frameConnects);
|
glDrawRangeElements(GL_LINES, 0, 3, 8, GL_UNSIGNED_SHORT, frameConnects);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Render tickmarks
|
// Render tickmarks
|
||||||
@@ -502,11 +490,7 @@ void OverlayScalarMapperLegend::renderLegend(OpenGLContext* oglContext, OverlayC
|
|||||||
linesConnects = tickLinesWoLabel;
|
linesConnects = tickLinesWoLabel;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CVF_OPENGL_ES
|
|
||||||
glDrawElements(GL_LINES, 2, GL_UNSIGNED_SHORT, linesConnects);
|
|
||||||
#else
|
|
||||||
glDrawRangeElements(GL_LINES, 0, 4, 2, GL_UNSIGNED_SHORT, linesConnects);
|
glDrawRangeElements(GL_LINES, 0, 4, 2, GL_UNSIGNED_SHORT, linesConnects);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -531,10 +515,6 @@ void OverlayScalarMapperLegend::renderLegend(OpenGLContext* oglContext, OverlayC
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void OverlayScalarMapperLegend::renderLegendImmediateMode(OpenGLContext* oglContext, OverlayColorLegendLayoutInfo* layout)
|
void OverlayScalarMapperLegend::renderLegendImmediateMode(OpenGLContext* oglContext, OverlayColorLegendLayoutInfo* layout)
|
||||||
{
|
{
|
||||||
#ifdef CVF_OPENGL_ES
|
|
||||||
CVF_UNUSED(layout);
|
|
||||||
CVF_FAIL_MSG("Not supported on OpenGL ES");
|
|
||||||
#else
|
|
||||||
CVF_TIGHT_ASSERT(layout);
|
CVF_TIGHT_ASSERT(layout);
|
||||||
CVF_TIGHT_ASSERT(layout->size.x() > 0);
|
CVF_TIGHT_ASSERT(layout->size.x() > 0);
|
||||||
CVF_TIGHT_ASSERT(layout->size.y() > 0);
|
CVF_TIGHT_ASSERT(layout->size.y() > 0);
|
||||||
@@ -661,7 +641,6 @@ void OverlayScalarMapperLegend::renderLegendImmediateMode(OpenGLContext* oglCont
|
|||||||
resetDepth.applyOpenGL(oglContext);
|
resetDepth.applyOpenGL(oglContext);
|
||||||
|
|
||||||
CVF_CHECK_OGL(oglContext);
|
CVF_CHECK_OGL(oglContext);
|
||||||
#endif // CVF_OPENGL_ES
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -49,10 +49,7 @@
|
|||||||
#include "cvfFont.h"
|
#include "cvfFont.h"
|
||||||
#include "cvfGlyph.h"
|
#include "cvfGlyph.h"
|
||||||
#include "cvfRenderStateLine.h"
|
#include "cvfRenderStateLine.h"
|
||||||
|
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
#include "cvfRenderState_FF.h"
|
#include "cvfRenderState_FF.h"
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace cvf {
|
namespace cvf {
|
||||||
|
|
||||||
@@ -183,14 +180,13 @@ void OverlayTextBox::renderBackgroundAndBorder(OpenGLContext* oglContext, const
|
|||||||
ShaderProgram::useNoProgram(oglContext);
|
ShaderProgram::useNoProgram(oglContext);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
RenderStateMaterial_FF mat;
|
RenderStateMaterial_FF mat;
|
||||||
mat.enableColorMaterial(true);
|
mat.enableColorMaterial(true);
|
||||||
mat.applyOpenGL(oglContext);
|
mat.applyOpenGL(oglContext);
|
||||||
|
|
||||||
RenderStateLighting_FF light(false);
|
RenderStateLighting_FF light(false);
|
||||||
light.applyOpenGL(oglContext);
|
light.applyOpenGL(oglContext);
|
||||||
#endif
|
|
||||||
projCam.applyOpenGL();
|
projCam.applyOpenGL();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -225,7 +221,6 @@ void OverlayTextBox::renderBackgroundAndBorder(OpenGLContext* oglContext, const
|
|||||||
{
|
{
|
||||||
if (software)
|
if (software)
|
||||||
{
|
{
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
glColor4fv(m_backgroundColor.ptr());
|
glColor4fv(m_backgroundColor.ptr());
|
||||||
glBegin(GL_TRIANGLE_FAN);
|
glBegin(GL_TRIANGLE_FAN);
|
||||||
glVertex3fv(v1);
|
glVertex3fv(v1);
|
||||||
@@ -233,7 +228,6 @@ void OverlayTextBox::renderBackgroundAndBorder(OpenGLContext* oglContext, const
|
|||||||
glVertex3fv(v3);
|
glVertex3fv(v3);
|
||||||
glVertex3fv(v4);
|
glVertex3fv(v4);
|
||||||
glEnd();
|
glEnd();
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -248,7 +242,6 @@ void OverlayTextBox::renderBackgroundAndBorder(OpenGLContext* oglContext, const
|
|||||||
{
|
{
|
||||||
if (software)
|
if (software)
|
||||||
{
|
{
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
glColor3fv(m_borderColor.ptr());
|
glColor3fv(m_borderColor.ptr());
|
||||||
glBegin(GL_LINE_LOOP);
|
glBegin(GL_LINE_LOOP);
|
||||||
glVertex3fv(v1);
|
glVertex3fv(v1);
|
||||||
@@ -256,7 +249,6 @@ void OverlayTextBox::renderBackgroundAndBorder(OpenGLContext* oglContext, const
|
|||||||
glVertex3fv(v3);
|
glVertex3fv(v3);
|
||||||
glVertex3fv(v4);
|
glVertex3fv(v4);
|
||||||
glEnd();
|
glEnd();
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -122,11 +122,7 @@ void PrimitiveSetIndexedUInt::render(OpenGLContext* oglContext) const
|
|||||||
ptrOrOffset = m_indices->ptr();
|
ptrOrOffset = m_indices->ptr();
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CVF_OPENGL_ES
|
|
||||||
glDrawElements(primitiveTypeOpenGL(), numIndices, GL_UNSIGNED_INT, ptrOrOffset);
|
|
||||||
#else
|
|
||||||
glDrawRangeElements(primitiveTypeOpenGL(), m_minIndex, m_maxIndex, numIndices, GL_UNSIGNED_INT, ptrOrOffset);
|
glDrawRangeElements(primitiveTypeOpenGL(), m_minIndex, m_maxIndex, numIndices, GL_UNSIGNED_INT, ptrOrOffset);
|
||||||
#endif
|
|
||||||
|
|
||||||
CVF_CHECK_OGL(oglContext);
|
CVF_CHECK_OGL(oglContext);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -121,11 +121,7 @@ void PrimitiveSetIndexedUShort::render(OpenGLContext* oglContext) const
|
|||||||
ptrOrOffset = m_indices->ptr();
|
ptrOrOffset = m_indices->ptr();
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CVF_OPENGL_ES
|
|
||||||
glDrawElements(primitiveTypeOpenGL(), numIndices, GL_UNSIGNED_SHORT, ptrOrOffset);
|
|
||||||
#else
|
|
||||||
glDrawRangeElements(primitiveTypeOpenGL(), m_minIndex, m_maxIndex, numIndices, GL_UNSIGNED_SHORT, ptrOrOffset);
|
glDrawRangeElements(primitiveTypeOpenGL(), m_minIndex, m_maxIndex, numIndices, GL_UNSIGNED_SHORT, ptrOrOffset);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -66,13 +66,11 @@ public:
|
|||||||
STENCIL,
|
STENCIL,
|
||||||
TEXTURE_BINDINGS,
|
TEXTURE_BINDINGS,
|
||||||
|
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
LIGHTING_FF, //Fixed function
|
LIGHTING_FF, //Fixed function
|
||||||
MATERIAL_FF, //Fixed function
|
MATERIAL_FF, //Fixed function
|
||||||
NORMALIZE_FF, //Fixed function
|
NORMALIZE_FF, //Fixed function
|
||||||
TEXTURE_MAPPING_FF, //Fixed function
|
TEXTURE_MAPPING_FF, //Fixed function
|
||||||
CLIP_PLANES_FF, //Fixed function
|
CLIP_PLANES_FF, //Fixed function
|
||||||
#endif
|
|
||||||
|
|
||||||
COUNT // Must be the last entry
|
COUNT // Must be the last entry
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -229,10 +229,8 @@ cvfGLenum RenderStateBlending::blendEquationOpenGL(Equation eq) const
|
|||||||
case FUNC_ADD: return GL_FUNC_ADD;
|
case FUNC_ADD: return GL_FUNC_ADD;
|
||||||
case FUNC_SUBTRACT: return GL_FUNC_SUBTRACT;
|
case FUNC_SUBTRACT: return GL_FUNC_SUBTRACT;
|
||||||
case FUNC_REVERSE_SUBTRACT: return GL_FUNC_REVERSE_SUBTRACT;
|
case FUNC_REVERSE_SUBTRACT: return GL_FUNC_REVERSE_SUBTRACT;
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
case MIN: return GL_MIN;
|
case MIN: return GL_MIN;
|
||||||
case MAX: return GL_MAX;
|
case MAX: return GL_MAX;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
CVF_FAIL_MSG("Unhandled blend equation");
|
CVF_FAIL_MSG("Unhandled blend equation");
|
||||||
|
|||||||
@@ -110,7 +110,6 @@ void RenderStateLine::applyOpenGL(OpenGLContext* oglContext) const
|
|||||||
|
|
||||||
glLineWidth(m_lineWidth);
|
glLineWidth(m_lineWidth);
|
||||||
|
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
if (m_smooth)
|
if (m_smooth)
|
||||||
{
|
{
|
||||||
glEnable(GL_LINE_SMOOTH);
|
glEnable(GL_LINE_SMOOTH);
|
||||||
@@ -119,7 +118,6 @@ void RenderStateLine::applyOpenGL(OpenGLContext* oglContext) const
|
|||||||
{
|
{
|
||||||
glDisable(GL_LINE_SMOOTH);
|
glDisable(GL_LINE_SMOOTH);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -128,9 +128,7 @@ void RenderStatePoint::applyOpenGL(OpenGLContext* oglContext) const
|
|||||||
{
|
{
|
||||||
CVF_CALLSITE_OPENGL(oglContext);
|
CVF_CALLSITE_OPENGL(oglContext);
|
||||||
|
|
||||||
// OpenGL ES does not support fixed point size
|
|
||||||
// Point size is always specified using GLSL's gl_PointSize
|
// Point size is always specified using GLSL's gl_PointSize
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
bool openGL2Support = oglContext->capabilities()->supportsOpenGL2();
|
bool openGL2Support = oglContext->capabilities()->supportsOpenGL2();
|
||||||
|
|
||||||
if (m_sizeMode == FIXED_SIZE)
|
if (m_sizeMode == FIXED_SIZE)
|
||||||
@@ -173,7 +171,6 @@ void RenderStatePoint::applyOpenGL(OpenGLContext* oglContext) const
|
|||||||
CVF_LOG_RENDER_ERROR(oglContext, "Context does not support point sprites.");
|
CVF_LOG_RENDER_ERROR(oglContext, "Context does not support point sprites.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
CVF_CHECK_OGL(oglContext);
|
CVF_CHECK_OGL(oglContext);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -114,7 +114,6 @@ RenderStatePolygonMode::Mode RenderStatePolygonMode::backFace() const
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void RenderStatePolygonMode::applyOpenGL(OpenGLContext* oglContext) const
|
void RenderStatePolygonMode::applyOpenGL(OpenGLContext* oglContext) const
|
||||||
{
|
{
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
if (m_frontFaceMode == m_backFaceMode)
|
if (m_frontFaceMode == m_backFaceMode)
|
||||||
{
|
{
|
||||||
glPolygonMode(GL_FRONT_AND_BACK, polygonModeOpenGL(m_frontFaceMode));
|
glPolygonMode(GL_FRONT_AND_BACK, polygonModeOpenGL(m_frontFaceMode));
|
||||||
@@ -124,7 +123,6 @@ void RenderStatePolygonMode::applyOpenGL(OpenGLContext* oglContext) const
|
|||||||
glPolygonMode(GL_FRONT, polygonModeOpenGL(m_frontFaceMode));
|
glPolygonMode(GL_FRONT, polygonModeOpenGL(m_frontFaceMode));
|
||||||
glPolygonMode(GL_BACK, polygonModeOpenGL(m_backFaceMode));
|
glPolygonMode(GL_BACK, polygonModeOpenGL(m_backFaceMode));
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
CVF_CHECK_OGL(oglContext);
|
CVF_CHECK_OGL(oglContext);
|
||||||
}
|
}
|
||||||
@@ -137,12 +135,10 @@ cvfGLenum RenderStatePolygonMode::polygonModeOpenGL(Mode mode)
|
|||||||
{
|
{
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
case FILL: return GL_FILL;
|
case FILL: return GL_FILL;
|
||||||
case LINE: return GL_LINE;
|
case LINE: return GL_LINE;
|
||||||
case POINT: return GL_POINT;
|
case POINT: return GL_POINT;
|
||||||
default: CVF_FAIL_MSG("Unhandled polygon mode");
|
default: CVF_FAIL_MSG("Unhandled polygon mode");
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
@@ -197,13 +197,11 @@ void RenderStatePolygonOffset::applyOpenGL(OpenGLContext* oglContext) const
|
|||||||
if (m_enableFillMode) glEnable(GL_POLYGON_OFFSET_FILL);
|
if (m_enableFillMode) glEnable(GL_POLYGON_OFFSET_FILL);
|
||||||
else glDisable(GL_POLYGON_OFFSET_FILL);
|
else glDisable(GL_POLYGON_OFFSET_FILL);
|
||||||
|
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
if (m_enableLineMode) glEnable(GL_POLYGON_OFFSET_LINE);
|
if (m_enableLineMode) glEnable(GL_POLYGON_OFFSET_LINE);
|
||||||
else glDisable(GL_POLYGON_OFFSET_LINE);
|
else glDisable(GL_POLYGON_OFFSET_LINE);
|
||||||
|
|
||||||
if (m_enablePointMode) glEnable(GL_POLYGON_OFFSET_POINT);
|
if (m_enablePointMode) glEnable(GL_POLYGON_OFFSET_POINT);
|
||||||
else glDisable(GL_POLYGON_OFFSET_POINT);
|
else glDisable(GL_POLYGON_OFFSET_POINT);
|
||||||
#endif
|
|
||||||
|
|
||||||
CVF_CHECK_OGL(oglContext);
|
CVF_CHECK_OGL(oglContext);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -51,10 +51,7 @@
|
|||||||
#include "cvfRenderStateTextureBindings.h"
|
#include "cvfRenderStateTextureBindings.h"
|
||||||
#include "cvfOpenGLContext.h"
|
#include "cvfOpenGLContext.h"
|
||||||
#include "cvfOpenGLCapabilities.h"
|
#include "cvfOpenGLCapabilities.h"
|
||||||
|
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
#include "cvfRenderState_FF.h"
|
#include "cvfRenderState_FF.h"
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <memory.h>
|
#include <memory.h>
|
||||||
|
|
||||||
@@ -100,13 +97,11 @@ void RenderStateTracker::setupDefaultRenderStates()
|
|||||||
m_defaultRenderStates[RenderState::STENCIL] = new RenderStateStencil;
|
m_defaultRenderStates[RenderState::STENCIL] = new RenderStateStencil;
|
||||||
m_defaultRenderStates[RenderState::TEXTURE_BINDINGS] = new RenderStateTextureBindings;
|
m_defaultRenderStates[RenderState::TEXTURE_BINDINGS] = new RenderStateTextureBindings;
|
||||||
|
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
m_defaultRenderStates[RenderState::LIGHTING_FF] = new RenderStateLighting_FF;
|
m_defaultRenderStates[RenderState::LIGHTING_FF] = new RenderStateLighting_FF;
|
||||||
m_defaultRenderStates[RenderState::MATERIAL_FF] = new RenderStateMaterial_FF;
|
m_defaultRenderStates[RenderState::MATERIAL_FF] = new RenderStateMaterial_FF;
|
||||||
m_defaultRenderStates[RenderState::NORMALIZE_FF] = new RenderStateNormalize_FF(false);
|
m_defaultRenderStates[RenderState::NORMALIZE_FF] = new RenderStateNormalize_FF(false);
|
||||||
m_defaultRenderStates[RenderState::TEXTURE_MAPPING_FF] = new RenderStateTextureMapping_FF;
|
m_defaultRenderStates[RenderState::TEXTURE_MAPPING_FF] = new RenderStateTextureMapping_FF;
|
||||||
m_defaultRenderStates[RenderState::CLIP_PLANES_FF] = new RenderStateClipPlanes_FF;
|
m_defaultRenderStates[RenderState::CLIP_PLANES_FF] = new RenderStateClipPlanes_FF;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -165,11 +165,9 @@ cvfGLenum RenderbufferObject::intenalFormatOpenGL() const
|
|||||||
{
|
{
|
||||||
case RGBA: return GL_RGBA;
|
case RGBA: return GL_RGBA;
|
||||||
case DEPTH_COMPONENT16: return GL_DEPTH_COMPONENT16;
|
case DEPTH_COMPONENT16: return GL_DEPTH_COMPONENT16;
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
case DEPTH_COMPONENT24: return GL_DEPTH_COMPONENT24;
|
case DEPTH_COMPONENT24: return GL_DEPTH_COMPONENT24;
|
||||||
case DEPTH_COMPONENT32: return GL_DEPTH_COMPONENT32;
|
case DEPTH_COMPONENT32: return GL_DEPTH_COMPONENT32;
|
||||||
case DEPTH24_STENCIL8: return GL_DEPTH24_STENCIL8;
|
case DEPTH24_STENCIL8: return GL_DEPTH24_STENCIL8;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
CVF_FAIL_MSG("Illegal renderbuffer format");
|
CVF_FAIL_MSG("Illegal renderbuffer format");
|
||||||
|
|||||||
@@ -139,9 +139,7 @@ void RenderingScissor::applyOpenGL(OpenGLContext* oglContext, Viewport::ClearMod
|
|||||||
if ( clearFlags & GL_DEPTH_BUFFER_BIT )
|
if ( clearFlags & GL_DEPTH_BUFFER_BIT )
|
||||||
{
|
{
|
||||||
glDepthMask(GL_TRUE);
|
glDepthMask(GL_TRUE);
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
glClearDepth(1.0f);
|
glClearDepth(1.0f);
|
||||||
#endif // CVF_OPENGL_ES
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( clearFlags & GL_STENCIL_BUFFER_BIT )
|
if ( clearFlags & GL_STENCIL_BUFFER_BIT )
|
||||||
|
|||||||
@@ -141,9 +141,7 @@ bool Shader::compile(OpenGLContext* oglContext)
|
|||||||
{
|
{
|
||||||
case VERTEX_SHADER: glShaderType = GL_VERTEX_SHADER; break;
|
case VERTEX_SHADER: glShaderType = GL_VERTEX_SHADER; break;
|
||||||
case FRAGMENT_SHADER: glShaderType = GL_FRAGMENT_SHADER; break;
|
case FRAGMENT_SHADER: glShaderType = GL_FRAGMENT_SHADER; break;
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
case GEOMETRY_SHADER: glShaderType = GL_GEOMETRY_SHADER; break;
|
case GEOMETRY_SHADER: glShaderType = GL_GEOMETRY_SHADER; break;
|
||||||
#endif
|
|
||||||
default: CVF_FAIL_MSG("Unhandled shader type"); break;
|
default: CVF_FAIL_MSG("Unhandled shader type"); break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -241,10 +241,6 @@ String ShaderSourceCombiner::combinedSource() const
|
|||||||
combinedSource = String("#version %1\n\n").arg(maxVersion);
|
combinedSource = String("#version %1\n\n").arg(maxVersion);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CVF_OPENGL_ES
|
|
||||||
combinedSource += "#define CVF_OPENGL_ES\n";
|
|
||||||
#endif
|
|
||||||
|
|
||||||
for (i = 0; i < m_shaderCodes.size(); i++)
|
for (i = 0; i < m_shaderCodes.size(); i++)
|
||||||
{
|
{
|
||||||
if (m_enableDebugComments)
|
if (m_enableDebugComments)
|
||||||
|
|||||||
@@ -82,17 +82,12 @@ String ShaderSourceRepository::shaderSource(ShaderIdent shaderIdent)
|
|||||||
{
|
{
|
||||||
if (rawSource.size() > 0)
|
if (rawSource.size() > 0)
|
||||||
{
|
{
|
||||||
#ifdef CVF_OPENGL_ES
|
|
||||||
// Always version 100 on OpenGL ES
|
|
||||||
shaderProg = "#version 100\nprecision highp float;\n";
|
|
||||||
#else
|
|
||||||
// Default on desktop is GLSL 1.2 (OpenGL 2.1) unless the shader explicitly specifies a version
|
// Default on desktop is GLSL 1.2 (OpenGL 2.1) unless the shader explicitly specifies a version
|
||||||
if (rawSource[0] != '#')
|
if (rawSource[0] != '#')
|
||||||
{
|
{
|
||||||
shaderProg = "#version 120\n";
|
shaderProg = "#version 120\n";
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
shaderProg += rawSource.ptr();
|
shaderProg += rawSource.ptr();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,11 +7,7 @@
|
|||||||
//#############################################################################################################################
|
//#############################################################################################################################
|
||||||
static const char calcClipDistances_inl[] =
|
static const char calcClipDistances_inl[] =
|
||||||
" \n"
|
" \n"
|
||||||
"#ifdef CVF_OPENGL_ES \n"
|
|
||||||
"uniform mediump int u_clipPlaneCount; \n"
|
|
||||||
"#else \n"
|
|
||||||
"uniform int u_clipPlaneCount; \n"
|
"uniform int u_clipPlaneCount; \n"
|
||||||
"#endif \n"
|
|
||||||
" \n"
|
" \n"
|
||||||
"uniform vec4 u_ecClipPlanes[6]; \n"
|
"uniform vec4 u_ecClipPlanes[6]; \n"
|
||||||
" \n"
|
" \n"
|
||||||
@@ -1066,10 +1062,6 @@ static const char vs_Minimal_inl[] =
|
|||||||
" vec3 ecPosition = (cvfu_modelViewMatrix * cvfa_vertex).xyz; \n"
|
" vec3 ecPosition = (cvfu_modelViewMatrix * cvfa_vertex).xyz; \n"
|
||||||
" calcClipDistances(vec4(ecPosition, 1)); \n"
|
" calcClipDistances(vec4(ecPosition, 1)); \n"
|
||||||
"#endif \n"
|
"#endif \n"
|
||||||
" \n"
|
|
||||||
"#ifdef CVF_OPENGL_ES \n"
|
|
||||||
" gl_PointSize = 1.0; \n"
|
|
||||||
"#endif \n"
|
|
||||||
"} \n";
|
"} \n";
|
||||||
|
|
||||||
|
|
||||||
@@ -1100,10 +1092,6 @@ static const char vs_MinimalTexture_inl[] =
|
|||||||
" vec3 ecPosition = (cvfu_modelViewMatrix * cvfa_vertex).xyz; \n"
|
" vec3 ecPosition = (cvfu_modelViewMatrix * cvfa_vertex).xyz; \n"
|
||||||
" calcClipDistances(vec4(ecPosition, 1)); \n"
|
" calcClipDistances(vec4(ecPosition, 1)); \n"
|
||||||
"#endif \n"
|
"#endif \n"
|
||||||
" \n"
|
|
||||||
"#ifdef CVF_OPENGL_ES \n"
|
|
||||||
" gl_PointSize = 1.0; \n"
|
|
||||||
"#endif \n"
|
|
||||||
"} \n";
|
"} \n";
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -54,10 +54,7 @@
|
|||||||
#include "cvfRenderStateBlending.h"
|
#include "cvfRenderStateBlending.h"
|
||||||
#include "cvfRenderStatePolygonOffset.h"
|
#include "cvfRenderStatePolygonOffset.h"
|
||||||
#include "cvfOpenGLCapabilities.h"
|
#include "cvfOpenGLCapabilities.h"
|
||||||
|
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
#include "cvfRenderState_FF.h"
|
#include "cvfRenderState_FF.h"
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace cvf {
|
namespace cvf {
|
||||||
|
|
||||||
@@ -309,7 +306,6 @@ void TextDrawer::doRender2d(OpenGLContext* oglContext, const MatrixState& matrix
|
|||||||
ShaderProgram::useNoProgram(oglContext);
|
ShaderProgram::useNoProgram(oglContext);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
RenderStateMaterial_FF mat;
|
RenderStateMaterial_FF mat;
|
||||||
mat.enableColorMaterial(true);
|
mat.enableColorMaterial(true);
|
||||||
mat.applyOpenGL(oglContext);
|
mat.applyOpenGL(oglContext);
|
||||||
@@ -329,7 +325,6 @@ void TextDrawer::doRender2d(OpenGLContext* oglContext, const MatrixState& matrix
|
|||||||
glDisable(GL_TEXTURE_2D);
|
glDisable(GL_TEXTURE_2D);
|
||||||
|
|
||||||
projCam.applyOpenGL();
|
projCam.applyOpenGL();
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -390,7 +385,6 @@ void TextDrawer::doRender2d(OpenGLContext* oglContext, const MatrixState& matrix
|
|||||||
{
|
{
|
||||||
if (softwareRendering)
|
if (softwareRendering)
|
||||||
{
|
{
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
glEnable(GL_COLOR_MATERIAL);
|
glEnable(GL_COLOR_MATERIAL);
|
||||||
glDisable(GL_TEXTURE_2D);
|
glDisable(GL_TEXTURE_2D);
|
||||||
glColor3fv(m_backgroundColor.ptr());
|
glColor3fv(m_backgroundColor.ptr());
|
||||||
@@ -400,7 +394,6 @@ void TextDrawer::doRender2d(OpenGLContext* oglContext, const MatrixState& matrix
|
|||||||
glVertex3fv(vertices[v]);
|
glVertex3fv(vertices[v]);
|
||||||
}
|
}
|
||||||
glEnd();
|
glEnd();
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -416,7 +409,6 @@ void TextDrawer::doRender2d(OpenGLContext* oglContext, const MatrixState& matrix
|
|||||||
{
|
{
|
||||||
if (softwareRendering)
|
if (softwareRendering)
|
||||||
{
|
{
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
glColor3fv(m_borderColor.ptr());
|
glColor3fv(m_borderColor.ptr());
|
||||||
glBegin(GL_LINE_LOOP);
|
glBegin(GL_LINE_LOOP);
|
||||||
for (size_t v = 0; v < vertices.size(); ++v)
|
for (size_t v = 0; v < vertices.size(); ++v)
|
||||||
@@ -424,7 +416,6 @@ void TextDrawer::doRender2d(OpenGLContext* oglContext, const MatrixState& matrix
|
|||||||
glVertex3fv(vertices[v]);
|
glVertex3fv(vertices[v]);
|
||||||
}
|
}
|
||||||
glEnd();
|
glEnd();
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -448,10 +439,8 @@ void TextDrawer::doRender2d(OpenGLContext* oglContext, const MatrixState& matrix
|
|||||||
// -------------------------------------------------------------------------
|
// -------------------------------------------------------------------------
|
||||||
if (softwareRendering)
|
if (softwareRendering)
|
||||||
{
|
{
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
glEnable(GL_TEXTURE_2D);
|
glEnable(GL_TEXTURE_2D);
|
||||||
glColor3fv(m_textColor.ptr());
|
glColor3fv(m_textColor.ptr());
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -547,7 +536,6 @@ void TextDrawer::doRender2d(OpenGLContext* oglContext, const MatrixState& matrix
|
|||||||
|
|
||||||
if (softwareRendering)
|
if (softwareRendering)
|
||||||
{
|
{
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
glBegin(GL_TRIANGLES);
|
glBegin(GL_TRIANGLES);
|
||||||
|
|
||||||
// First triangle in quad
|
// First triangle in quad
|
||||||
@@ -567,7 +555,6 @@ void TextDrawer::doRender2d(OpenGLContext* oglContext, const MatrixState& matrix
|
|||||||
glVertex3fv(vertices[3]);
|
glVertex3fv(vertices[3]);
|
||||||
|
|
||||||
glEnd();
|
glEnd();
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -590,7 +577,6 @@ void TextDrawer::doRender2d(OpenGLContext* oglContext, const MatrixState& matrix
|
|||||||
|
|
||||||
if (softwareRendering)
|
if (softwareRendering)
|
||||||
{
|
{
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
// apply the projection matrix
|
// apply the projection matrix
|
||||||
glMatrixMode(GL_PROJECTION);
|
glMatrixMode(GL_PROJECTION);
|
||||||
glLoadMatrixf(matrixState.projectionMatrix().ptr());
|
glLoadMatrixf(matrixState.projectionMatrix().ptr());
|
||||||
@@ -604,7 +590,6 @@ void TextDrawer::doRender2d(OpenGLContext* oglContext, const MatrixState& matrix
|
|||||||
|
|
||||||
RenderStateLighting_FF light;
|
RenderStateLighting_FF light;
|
||||||
light.applyOpenGL(oglContext);
|
light.applyOpenGL(oglContext);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -261,18 +261,12 @@ bool Texture::setupTexture(OpenGLContext* oglContext)
|
|||||||
}
|
}
|
||||||
else if (m_internalFormat == DEPTH24_STENCIL8)
|
else if (m_internalFormat == DEPTH24_STENCIL8)
|
||||||
{
|
{
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
|
|
||||||
CVF_ASSERT(m_image.isNull());
|
CVF_ASSERT(m_image.isNull());
|
||||||
CVF_ASSERT(!m_enableMipmapGeneration);
|
CVF_ASSERT(!m_enableMipmapGeneration);
|
||||||
glTexImage2D(GL_TEXTURE_2D, 0, internalFormatOpenGL(), static_cast<GLsizei>(m_width), static_cast<GLsizei>(m_height), 0, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, 0);
|
glTexImage2D(GL_TEXTURE_2D, 0, internalFormatOpenGL(), static_cast<GLsizei>(m_width), static_cast<GLsizei>(m_height), 0, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, 0);
|
||||||
#else
|
|
||||||
CVF_FAIL_MSG("Not supported on IOS");
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
if (!supportsGenerateMipmapFunc)
|
if (!supportsGenerateMipmapFunc)
|
||||||
{
|
{
|
||||||
// Explicit mipmap generation not supported so must configure before specifying texture image
|
// Explicit mipmap generation not supported so must configure before specifying texture image
|
||||||
@@ -286,7 +280,6 @@ bool Texture::setupTexture(OpenGLContext* oglContext)
|
|||||||
glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_FALSE);
|
glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_FALSE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
glTexImage2D(GL_TEXTURE_2D, 0, internalFormatOpenGL(), static_cast<GLsizei>(m_width), static_cast<GLsizei>(m_height), 0, GL_RGBA, GL_UNSIGNED_BYTE, m_image.notNull() ? m_image->ptr() : 0);
|
glTexImage2D(GL_TEXTURE_2D, 0, internalFormatOpenGL(), static_cast<GLsizei>(m_width), static_cast<GLsizei>(m_height), 0, GL_RGBA, GL_UNSIGNED_BYTE, m_image.notNull() ? m_image->ptr() : 0);
|
||||||
|
|
||||||
@@ -302,7 +295,6 @@ bool Texture::setupTexture(OpenGLContext* oglContext)
|
|||||||
|
|
||||||
case TEXTURE_RECTANGLE:
|
case TEXTURE_RECTANGLE:
|
||||||
{
|
{
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
CVF_ASSERT(!m_enableMipmapGeneration);
|
CVF_ASSERT(!m_enableMipmapGeneration);
|
||||||
|
|
||||||
if (m_internalFormat == DEPTH_COMPONENT16 || m_internalFormat == DEPTH_COMPONENT24 || m_internalFormat == DEPTH_COMPONENT32)
|
if (m_internalFormat == DEPTH_COMPONENT16 || m_internalFormat == DEPTH_COMPONENT24 || m_internalFormat == DEPTH_COMPONENT32)
|
||||||
@@ -314,9 +306,7 @@ bool Texture::setupTexture(OpenGLContext* oglContext)
|
|||||||
{
|
{
|
||||||
glTexImage2D(GL_TEXTURE_RECTANGLE, 0, internalFormatOpenGL(), static_cast<GLsizei>(m_width), static_cast<GLsizei>(m_height), 0, GL_RGBA, GL_UNSIGNED_BYTE, m_image.notNull() ? m_image->ptr() : 0);
|
glTexImage2D(GL_TEXTURE_RECTANGLE, 0, internalFormatOpenGL(), static_cast<GLsizei>(m_width), static_cast<GLsizei>(m_height), 0, GL_RGBA, GL_UNSIGNED_BYTE, m_image.notNull() ? m_image->ptr() : 0);
|
||||||
}
|
}
|
||||||
#else
|
|
||||||
CVF_FAIL_MSG("Not supported on iOS");
|
|
||||||
#endif
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -332,7 +322,6 @@ bool Texture::setupTexture(OpenGLContext* oglContext)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
if (!supportsGenerateMipmapFunc)
|
if (!supportsGenerateMipmapFunc)
|
||||||
{
|
{
|
||||||
if (m_enableMipmapGeneration)
|
if (m_enableMipmapGeneration)
|
||||||
@@ -345,7 +334,6 @@ bool Texture::setupTexture(OpenGLContext* oglContext)
|
|||||||
glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_GENERATE_MIPMAP, GL_FALSE);
|
glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_GENERATE_MIPMAP, GL_FALSE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
CVF_ASSERT(m_cubeMapImages.size() == 6);
|
CVF_ASSERT(m_cubeMapImages.size() == 6);
|
||||||
uint i;
|
uint i;
|
||||||
@@ -400,12 +388,7 @@ bool Texture::isBound(OpenGLContext* /*oglContext*/) const
|
|||||||
switch (m_textureType)
|
switch (m_textureType)
|
||||||
{
|
{
|
||||||
case TEXTURE_2D: glGetIntegerv(GL_TEXTURE_BINDING_2D, ¤tTextureBinding); break;
|
case TEXTURE_2D: glGetIntegerv(GL_TEXTURE_BINDING_2D, ¤tTextureBinding); break;
|
||||||
case TEXTURE_RECTANGLE:
|
case TEXTURE_RECTANGLE: glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE, ¤tTextureBinding); break;
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE, ¤tTextureBinding); break;
|
|
||||||
#else
|
|
||||||
CVF_FAIL_MSG("Not supported on iOS"); break;
|
|
||||||
#endif
|
|
||||||
case TEXTURE_CUBE_MAP: glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP, ¤tTextureBinding); break;
|
case TEXTURE_CUBE_MAP: glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP, ¤tTextureBinding); break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -438,12 +421,7 @@ void Texture::setupTextureParamsFromSampler(OpenGLContext* oglContext, const Sam
|
|||||||
{
|
{
|
||||||
case Sampler::CLAMP_TO_EDGE: oglWrapS = GL_CLAMP_TO_EDGE; break;
|
case Sampler::CLAMP_TO_EDGE: oglWrapS = GL_CLAMP_TO_EDGE; break;
|
||||||
case Sampler::REPEAT: oglWrapS = GL_REPEAT; break;
|
case Sampler::REPEAT: oglWrapS = GL_REPEAT; break;
|
||||||
case Sampler::CLAMP_TO_BORDER:
|
case Sampler::CLAMP_TO_BORDER: oglWrapS = GL_CLAMP_TO_BORDER; break;
|
||||||
#ifdef CVF_OPENGL_ES
|
|
||||||
CVF_FAIL_MSG("CLAMP_TO_BORDER not supported"); break;
|
|
||||||
#else
|
|
||||||
oglWrapS = GL_CLAMP_TO_BORDER; break;
|
|
||||||
#endif
|
|
||||||
case Sampler::MIRRORED_REPEAT: oglWrapS = GL_MIRRORED_REPEAT; break;
|
case Sampler::MIRRORED_REPEAT: oglWrapS = GL_MIRRORED_REPEAT; break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -451,11 +429,7 @@ void Texture::setupTextureParamsFromSampler(OpenGLContext* oglContext, const Sam
|
|||||||
{
|
{
|
||||||
case Sampler::CLAMP_TO_EDGE: oglWrapT = GL_CLAMP_TO_EDGE; break;
|
case Sampler::CLAMP_TO_EDGE: oglWrapT = GL_CLAMP_TO_EDGE; break;
|
||||||
case Sampler::REPEAT: oglWrapT = GL_REPEAT; break;
|
case Sampler::REPEAT: oglWrapT = GL_REPEAT; break;
|
||||||
#ifdef CVF_OPENGL_ES
|
|
||||||
case Sampler::CLAMP_TO_BORDER: CVF_FAIL_MSG("CLAMP_TO_BORDER not supported"); break;
|
|
||||||
#else
|
|
||||||
case Sampler::CLAMP_TO_BORDER: oglWrapT = GL_CLAMP_TO_BORDER; break;
|
case Sampler::CLAMP_TO_BORDER: oglWrapT = GL_CLAMP_TO_BORDER; break;
|
||||||
#endif
|
|
||||||
case Sampler::MIRRORED_REPEAT: oglWrapT = GL_MIRRORED_REPEAT; break;
|
case Sampler::MIRRORED_REPEAT: oglWrapT = GL_MIRRORED_REPEAT; break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -486,13 +460,11 @@ void Texture::setupTextureParamsFromSampler(OpenGLContext* oglContext, const Sam
|
|||||||
glTexParameteri(textureType, GL_TEXTURE_MAG_FILTER, oglMagFilter);
|
glTexParameteri(textureType, GL_TEXTURE_MAG_FILTER, oglMagFilter);
|
||||||
|
|
||||||
// HACK
|
// HACK
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
if (m_internalFormat == DEPTH_COMPONENT16 || m_internalFormat == DEPTH_COMPONENT24 || m_internalFormat == DEPTH_COMPONENT32)
|
if (m_internalFormat == DEPTH_COMPONENT16 || m_internalFormat == DEPTH_COMPONENT24 || m_internalFormat == DEPTH_COMPONENT32)
|
||||||
{
|
{
|
||||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_REF_TO_TEXTURE);
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_REF_TO_TEXTURE);
|
||||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL);
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
// Set these to openGL
|
// Set these to openGL
|
||||||
// TODO TEXTURE_WRAP_R, TEXTURE_BORDER_COLOR, TEXTURE_MIN_LOD, TEXTURE_MAX_LOD, TEXTURE_LOD_BIAS,
|
// TODO TEXTURE_WRAP_R, TEXTURE_BORDER_COLOR, TEXTURE_MIN_LOD, TEXTURE_MAX_LOD, TEXTURE_LOD_BIAS,
|
||||||
@@ -664,13 +636,11 @@ cvfGLint Texture::internalFormatOpenGL() const
|
|||||||
{
|
{
|
||||||
case RGBA: return GL_RGBA;
|
case RGBA: return GL_RGBA;
|
||||||
case DEPTH_COMPONENT16: return GL_DEPTH_COMPONENT16;
|
case DEPTH_COMPONENT16: return GL_DEPTH_COMPONENT16;
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
case RGBA32F: return GL_RGBA32F;
|
case RGBA32F: return GL_RGBA32F;
|
||||||
case R32F: return GL_R32F;
|
case R32F: return GL_R32F;
|
||||||
case DEPTH_COMPONENT24: return GL_DEPTH_COMPONENT24;
|
case DEPTH_COMPONENT24: return GL_DEPTH_COMPONENT24;
|
||||||
case DEPTH_COMPONENT32: return GL_DEPTH_COMPONENT32;
|
case DEPTH_COMPONENT32: return GL_DEPTH_COMPONENT32;
|
||||||
case DEPTH24_STENCIL8: return GL_DEPTH24_STENCIL8;
|
case DEPTH24_STENCIL8: return GL_DEPTH24_STENCIL8;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
CVF_FAIL_MSG("Illegal texture internal format");
|
CVF_FAIL_MSG("Illegal texture internal format");
|
||||||
@@ -686,9 +656,7 @@ cvfGLenum Texture::textureTypeOpenGL() const
|
|||||||
switch(m_textureType)
|
switch(m_textureType)
|
||||||
{
|
{
|
||||||
case TEXTURE_2D: return GL_TEXTURE_2D;
|
case TEXTURE_2D: return GL_TEXTURE_2D;
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
case TEXTURE_RECTANGLE: return GL_TEXTURE_RECTANGLE;
|
case TEXTURE_RECTANGLE: return GL_TEXTURE_RECTANGLE;
|
||||||
#endif
|
|
||||||
case TEXTURE_CUBE_MAP: return GL_TEXTURE_CUBE_MAP;
|
case TEXTURE_CUBE_MAP: return GL_TEXTURE_CUBE_MAP;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -175,9 +175,7 @@ void AttribSetupStrategyInt::setupFromBufferObject(OpenGLContext* oglContext, ui
|
|||||||
|
|
||||||
if (oglContext->capabilities()->supportsOpenGLVer(3))
|
if (oglContext->capabilities()->supportsOpenGLVer(3))
|
||||||
{
|
{
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
glVertexAttribIPointer(static_cast<GLuint>(vertexAttributeIndex), static_cast<GLint>(compCount), compTypeOpenGL, static_cast<GLsizei>(strideInBytes), CVF_OGL_BUFFER_OFFSET(bufferOffsetInBytes));
|
glVertexAttribIPointer(static_cast<GLuint>(vertexAttributeIndex), static_cast<GLint>(compCount), compTypeOpenGL, static_cast<GLsizei>(strideInBytes), CVF_OGL_BUFFER_OFFSET(bufferOffsetInBytes));
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -197,9 +195,7 @@ void AttribSetupStrategyInt::setupFromClientMemory(OpenGLContext* oglContext, ui
|
|||||||
|
|
||||||
if (oglContext->capabilities()->supportsOpenGLVer(3))
|
if (oglContext->capabilities()->supportsOpenGLVer(3))
|
||||||
{
|
{
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
glVertexAttribIPointer(static_cast<GLuint>(vertexAttributeIndex), static_cast<GLint>(compCount), compTypeOpenGL, 0, ptr);
|
glVertexAttribIPointer(static_cast<GLuint>(vertexAttributeIndex), static_cast<GLint>(compCount), compTypeOpenGL, 0, ptr);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -581,10 +581,6 @@ void VertexBundle::useBundleFixedFunction(OpenGLContext* oglContext, VertexBundl
|
|||||||
|
|
||||||
bundleUsage->setFixedFunction(true);
|
bundleUsage->setFixedFunction(true);
|
||||||
|
|
||||||
#ifdef CVF_OPENGL_ES
|
|
||||||
CVF_FAIL_MSG("Not supported on OpenGL ES");
|
|
||||||
#else
|
|
||||||
|
|
||||||
if (m_attribVertices.notNull())
|
if (m_attribVertices.notNull())
|
||||||
{
|
{
|
||||||
if (m_boVertices.notNull() && m_boVertices->isUploaded())
|
if (m_boVertices.notNull() && m_boVertices->isUploaded())
|
||||||
@@ -658,8 +654,6 @@ void VertexBundle::useBundleFixedFunction(OpenGLContext* oglContext, VertexBundl
|
|||||||
}
|
}
|
||||||
|
|
||||||
CVF_CHECK_OGL(oglContext);
|
CVF_CHECK_OGL(oglContext);
|
||||||
|
|
||||||
#endif // CVF_OPENGL_ES
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -672,16 +666,12 @@ void VertexBundle::finishUseBundle(OpenGLContext* oglContext, VertexBundleUsage*
|
|||||||
|
|
||||||
if (bundleUsage->fixedFunction())
|
if (bundleUsage->fixedFunction())
|
||||||
{
|
{
|
||||||
#ifdef CVF_OPENGL_ES
|
|
||||||
CVF_FAIL_MSG("Not supported on OpenGL ES");
|
|
||||||
#else
|
|
||||||
CVF_TIGHT_ASSERT(oglContext->capabilities()->supportsFixedFunction());
|
CVF_TIGHT_ASSERT(oglContext->capabilities()->supportsFixedFunction());
|
||||||
|
|
||||||
if (m_vertexCount > 0) glDisableClientState(GL_VERTEX_ARRAY);
|
if (m_vertexCount > 0) glDisableClientState(GL_VERTEX_ARRAY);
|
||||||
if (m_hasNormals) glDisableClientState(GL_NORMAL_ARRAY);
|
if (m_hasNormals) glDisableClientState(GL_NORMAL_ARRAY);
|
||||||
if (m_hasTexCoords) glDisableClientState(GL_TEXTURE_COORD_ARRAY);
|
if (m_hasTexCoords) glDisableClientState(GL_TEXTURE_COORD_ARRAY);
|
||||||
if (m_hasColors) glDisableClientState(GL_COLOR_ARRAY);
|
if (m_hasColors) glDisableClientState(GL_COLOR_ARRAY);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -206,9 +206,7 @@ void Viewport::applyOpenGL(OpenGLContext* oglContext, ClearMode clearMode)
|
|||||||
if (clearFlags & GL_DEPTH_BUFFER_BIT)
|
if (clearFlags & GL_DEPTH_BUFFER_BIT)
|
||||||
{
|
{
|
||||||
glDepthMask(GL_TRUE);
|
glDepthMask(GL_TRUE);
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
glClearDepth(m_clearDepth);
|
glClearDepth(m_clearDepth);
|
||||||
#endif // CVF_OPENGL_ES
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (clearFlags & GL_STENCIL_BUFFER_BIT)
|
if (clearFlags & GL_STENCIL_BUFFER_BIT)
|
||||||
|
|||||||
@@ -1,9 +1,5 @@
|
|||||||
|
|
||||||
#ifdef CVF_OPENGL_ES
|
|
||||||
uniform mediump int u_clipPlaneCount;
|
|
||||||
#else
|
|
||||||
uniform int u_clipPlaneCount;
|
uniform int u_clipPlaneCount;
|
||||||
#endif
|
|
||||||
|
|
||||||
uniform vec4 u_ecClipPlanes[6];
|
uniform vec4 u_ecClipPlanes[6];
|
||||||
|
|
||||||
|
|||||||
@@ -18,8 +18,4 @@ void main ()
|
|||||||
vec3 ecPosition = (cvfu_modelViewMatrix * cvfa_vertex).xyz;
|
vec3 ecPosition = (cvfu_modelViewMatrix * cvfa_vertex).xyz;
|
||||||
calcClipDistances(vec4(ecPosition, 1));
|
calcClipDistances(vec4(ecPosition, 1));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CVF_OPENGL_ES
|
|
||||||
gl_PointSize = 1.0;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,8 +21,4 @@ void main ()
|
|||||||
vec3 ecPosition = (cvfu_modelViewMatrix * cvfa_vertex).xyz;
|
vec3 ecPosition = (cvfu_modelViewMatrix * cvfa_vertex).xyz;
|
||||||
calcClipDistances(vec4(ecPosition, 1));
|
calcClipDistances(vec4(ecPosition, 1));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CVF_OPENGL_ES
|
|
||||||
gl_PointSize = 1.0;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,259 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup Label="ProjectConfigurations">
|
|
||||||
<ProjectConfiguration Include="Debug MD TBB|Win32">
|
|
||||||
<Configuration>Debug MD TBB</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug MD TBB|x64">
|
|
||||||
<Configuration>Debug MD TBB</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug MD|Win32">
|
|
||||||
<Configuration>Debug MD</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug MD|x64">
|
|
||||||
<Configuration>Debug MD</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD TBB|Win32">
|
|
||||||
<Configuration>Release MD TBB</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD TBB|x64">
|
|
||||||
<Configuration>Release MD TBB</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD|Win32">
|
|
||||||
<Configuration>Release MD</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD|x64">
|
|
||||||
<Configuration>Release MD</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
</ItemGroup>
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{C22D8A0D-2318-3353-F75A-E83B82A3B29F}</ProjectGuid>
|
|
||||||
<RootNamespace>LibStructGrid</RootNamespace>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
||||||
<ImportGroup Label="ExtensionSettings">
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|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 MD|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibRender;../LibGeometry</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibRender;../LibGeometry</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibRender;../LibGeometry</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibRender;../LibGeometry</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibRender;../LibGeometry</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibRender;../LibGeometry</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibRender;../LibGeometry</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibRender;../LibGeometry</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="CMakeLists.txt" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="cvfLibStructGrid.h" />
|
|
||||||
<ClInclude Include="cvfRectilinearGrid.h" />
|
|
||||||
<ClInclude Include="cvfStructGridCutPlane.h" />
|
|
||||||
<ClInclude Include="cvfStructGridGeometry.h" />
|
|
||||||
<ClInclude Include="cvfStructGridImport.h" />
|
|
||||||
<ClInclude Include="cvfStructGridIsosurface.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="cvfRectilinearGrid.cpp" />
|
|
||||||
<ClCompile Include="cvfStructGridCutPlane.cpp" />
|
|
||||||
<ClCompile Include="cvfStructGridGeometry.cpp" />
|
|
||||||
<ClCompile Include="cvfStructGridImport.cpp" />
|
|
||||||
<ClCompile Include="cvfStructGridIsosurface.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
||||||
<ImportGroup Label="ExtensionTargets">
|
|
||||||
</ImportGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="CMakeLists.txt" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="cvfLibStructGrid.h" />
|
|
||||||
<ClInclude Include="cvfRectilinearGrid.h" />
|
|
||||||
<ClInclude Include="cvfStructGridCutPlane.h" />
|
|
||||||
<ClInclude Include="cvfStructGridGeometry.h" />
|
|
||||||
<ClInclude Include="cvfStructGridImport.h" />
|
|
||||||
<ClInclude Include="cvfStructGridIsosurface.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="cvfRectilinearGrid.cpp" />
|
|
||||||
<ClCompile Include="cvfStructGridCutPlane.cpp" />
|
|
||||||
<ClCompile Include="cvfStructGridGeometry.cpp" />
|
|
||||||
<ClCompile Include="cvfStructGridImport.cpp" />
|
|
||||||
<ClCompile Include="cvfStructGridIsosurface.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,272 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup Label="ProjectConfigurations">
|
|
||||||
<ProjectConfiguration Include="Debug MD TBB|Win32">
|
|
||||||
<Configuration>Debug MD TBB</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug MD TBB|x64">
|
|
||||||
<Configuration>Debug MD TBB</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug MD|Win32">
|
|
||||||
<Configuration>Debug MD</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug MD|x64">
|
|
||||||
<Configuration>Debug MD</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD TBB|Win32">
|
|
||||||
<Configuration>Release MD TBB</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD TBB|x64">
|
|
||||||
<Configuration>Release MD TBB</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD|Win32">
|
|
||||||
<Configuration>Release MD</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD|x64">
|
|
||||||
<Configuration>Release MD</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
</ItemGroup>
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{ECF1BECD-E624-F971-C70A-F84686A36084}</ProjectGuid>
|
|
||||||
<RootNamespace>LibUtilities</RootNamespace>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
||||||
<ImportGroup Label="ExtensionSettings">
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|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 MD|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibRender;../LibGeometry;../LibViewing;../LibIo</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibRender;../LibGeometry;../LibViewing;../LibIo</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibRender;../LibGeometry;../LibViewing;../LibIo</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibRender;../LibGeometry;../LibViewing;../LibIo</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibRender;../LibGeometry;../LibViewing;../LibIo</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibRender;../LibGeometry;../LibViewing;../LibIo</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibRender;../LibGeometry;../LibViewing;../LibIo</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibRender;../LibGeometry;../LibViewing;../LibIo</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="CMakeLists.txt" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="cvfuImageJpeg.cpp" />
|
|
||||||
<ClCompile Include="cvfuImageTga.cpp" />
|
|
||||||
<ClCompile Include="cvfuInputEvents.cpp" />
|
|
||||||
<ClCompile Include="cvfuPartCompoundGenerator.cpp" />
|
|
||||||
<ClCompile Include="cvfuPointLight.cpp" />
|
|
||||||
<ClCompile Include="cvfuProperty.cpp" />
|
|
||||||
<ClCompile Include="cvfuSampleFactory.cpp" />
|
|
||||||
<ClCompile Include="cvfuSnippetFactory.cpp" />
|
|
||||||
<ClCompile Include="cvfuSnippetPropertyPublisher.cpp" />
|
|
||||||
<ClCompile Include="cvfuTestSnippet.cpp" />
|
|
||||||
<ClCompile Include="cvfuWavefrontObjImport.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="cvfuImageJpeg.h" />
|
|
||||||
<ClInclude Include="cvfuImageTga.h" />
|
|
||||||
<ClInclude Include="cvfuInputEvents.h" />
|
|
||||||
<ClInclude Include="cvfuInputTypes.h" />
|
|
||||||
<ClInclude Include="cvfuLibUtilities.h" />
|
|
||||||
<ClInclude Include="cvfuPartCompoundGenerator.h" />
|
|
||||||
<ClInclude Include="cvfuPointLight.h" />
|
|
||||||
<ClInclude Include="cvfuProperty.h" />
|
|
||||||
<ClInclude Include="cvfuSampleFactory.h" />
|
|
||||||
<ClInclude Include="cvfuSnippetFactory.h" />
|
|
||||||
<ClInclude Include="cvfuSnippetPropertyPublisher.h" />
|
|
||||||
<ClInclude Include="cvfuTestSnippet.h" />
|
|
||||||
<ClInclude Include="cvfuWavefrontObjImport.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
||||||
<ImportGroup Label="ExtensionTargets">
|
|
||||||
</ImportGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="cvfuInputEvents.cpp" />
|
|
||||||
<ClCompile Include="cvfuSnippetFactory.cpp" />
|
|
||||||
<ClCompile Include="cvfuTestSnippet.cpp" />
|
|
||||||
<ClCompile Include="cvfuSampleFactory.cpp" />
|
|
||||||
<ClCompile Include="cvfuImageJpeg.cpp" />
|
|
||||||
<ClCompile Include="cvfuWavefrontObjImport.cpp" />
|
|
||||||
<ClCompile Include="cvfuProperty.cpp" />
|
|
||||||
<ClCompile Include="cvfuSnippetPropertyPublisher.cpp" />
|
|
||||||
<ClCompile Include="cvfuPointLight.cpp" />
|
|
||||||
<ClCompile Include="cvfuPartCompoundGenerator.cpp" />
|
|
||||||
<ClCompile Include="cvfuImageTga.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="CMakeLists.txt" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="cvfuInputEvents.h" />
|
|
||||||
<ClInclude Include="cvfuInputTypes.h" />
|
|
||||||
<ClInclude Include="cvfuSnippetFactory.h" />
|
|
||||||
<ClInclude Include="cvfuTestSnippet.h" />
|
|
||||||
<ClInclude Include="cvfuSampleFactory.h" />
|
|
||||||
<ClInclude Include="cvfuImageJpeg.h" />
|
|
||||||
<ClInclude Include="cvfuWavefrontObjImport.h" />
|
|
||||||
<ClInclude Include="cvfuLibUtilities.h" />
|
|
||||||
<ClInclude Include="cvfuProperty.h" />
|
|
||||||
<ClInclude Include="cvfuSnippetPropertyPublisher.h" />
|
|
||||||
<ClInclude Include="cvfuPointLight.h" />
|
|
||||||
<ClInclude Include="cvfuPartCompoundGenerator.h" />
|
|
||||||
<ClInclude Include="cvfuImageTga.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,305 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup Label="ProjectConfigurations">
|
|
||||||
<ProjectConfiguration Include="Debug MD TBB|Win32">
|
|
||||||
<Configuration>Debug MD TBB</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug MD TBB|x64">
|
|
||||||
<Configuration>Debug MD TBB</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug MD|Win32">
|
|
||||||
<Configuration>Debug MD</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug MD|x64">
|
|
||||||
<Configuration>Debug MD</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD TBB|Win32">
|
|
||||||
<Configuration>Release MD TBB</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD TBB|x64">
|
|
||||||
<Configuration>Release MD TBB</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD|Win32">
|
|
||||||
<Configuration>Release MD</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD|x64">
|
|
||||||
<Configuration>Release MD</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
</ItemGroup>
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{122D4663-11D6-D12F-8748-629A34E9075E}</ProjectGuid>
|
|
||||||
<RootNamespace>LibViewing</RootNamespace>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
||||||
<ImportGroup Label="ExtensionSettings">
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|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 MD|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibRender;../LibGeometry</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibRender;../LibGeometry;../ThirdParty/TBB/include</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibRender;../LibGeometry</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD TBB|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibRender;../LibGeometry;../ThirdParty/TBB/include</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibRender;../LibGeometry</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibRender;../LibGeometry;../ThirdParty/TBB/include</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibRender;../LibGeometry</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD TBB|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>EnableAllWarnings</WarningLevel>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;CVF_USE_TBB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<AdditionalIncludeDirectories>../LibCore;../LibRender;../LibGeometry;../ThirdParty/TBB/include</AdditionalIncludeDirectories>
|
|
||||||
<TreatWarningAsError>true</TreatWarningAsError>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="CMakeLists.txt" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="cvfClipPlaneSet.h" />
|
|
||||||
<ClInclude Include="cvfConstantFrameRate.h" />
|
|
||||||
<ClInclude Include="cvfCullSettings.h" />
|
|
||||||
<ClInclude Include="cvfDynamicUniformSet.h" />
|
|
||||||
<ClInclude Include="cvfEffect.h" />
|
|
||||||
<ClInclude Include="cvfFixedSizeTransform.h" />
|
|
||||||
<ClInclude Include="cvfGaussianBlur.h" />
|
|
||||||
<ClInclude Include="cvfHitItem.h" />
|
|
||||||
<ClInclude Include="cvfHitItemCollection.h" />
|
|
||||||
<ClInclude Include="cvfLibViewing.h" />
|
|
||||||
<ClInclude Include="cvfLocators.h" />
|
|
||||||
<ClInclude Include="cvfManipulatorTrackball.h" />
|
|
||||||
<ClInclude Include="cvfModel.h" />
|
|
||||||
<ClInclude Include="cvfModelBasicList.h" />
|
|
||||||
<ClInclude Include="cvfModelBasicTree.h" />
|
|
||||||
<ClInclude Include="cvfPart.h" />
|
|
||||||
<ClInclude Include="cvfPartHighlighter.h" />
|
|
||||||
<ClInclude Include="cvfPartRenderHintCollection.h" />
|
|
||||||
<ClInclude Include="cvfPerformanceInfo.h" />
|
|
||||||
<ClInclude Include="cvfRayIntersectSpec.h" />
|
|
||||||
<ClInclude Include="cvfRenderEngine.h" />
|
|
||||||
<ClInclude Include="cvfRendering.h" />
|
|
||||||
<ClInclude Include="cvfRenderQueue.h" />
|
|
||||||
<ClInclude Include="cvfRenderQueueBuilder.h" />
|
|
||||||
<ClInclude Include="cvfRenderQueueSorter.h" />
|
|
||||||
<ClInclude Include="cvfScene.h" />
|
|
||||||
<ClInclude Include="cvfSingleQuadRenderingGenerator.h" />
|
|
||||||
<ClInclude Include="cvfTransform.h" />
|
|
||||||
<ClInclude Include="cvfRenderSequence.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="cvfClipPlaneSet.cpp" />
|
|
||||||
<ClCompile Include="cvfConstantFrameRate.cpp" />
|
|
||||||
<ClCompile Include="cvfCullSettings.cpp" />
|
|
||||||
<ClCompile Include="cvfDynamicUniformSet.cpp" />
|
|
||||||
<ClCompile Include="cvfEffect.cpp" />
|
|
||||||
<ClCompile Include="cvfFixedSizeTransform.cpp" />
|
|
||||||
<ClCompile Include="cvfGaussianBlur.cpp" />
|
|
||||||
<ClCompile Include="cvfHitItem.cpp" />
|
|
||||||
<ClCompile Include="cvfHitItemCollection.cpp" />
|
|
||||||
<ClCompile Include="cvfLocators.cpp" />
|
|
||||||
<ClCompile Include="cvfManipulatorTrackball.cpp" />
|
|
||||||
<ClCompile Include="cvfModel.cpp" />
|
|
||||||
<ClCompile Include="cvfModelBasicList.cpp" />
|
|
||||||
<ClCompile Include="cvfModelBasicTree.cpp" />
|
|
||||||
<ClCompile Include="cvfPart.cpp" />
|
|
||||||
<ClCompile Include="cvfPartHighlighter.cpp" />
|
|
||||||
<ClCompile Include="cvfPartRenderHintCollection.cpp" />
|
|
||||||
<ClCompile Include="cvfPerformanceInfo.cpp" />
|
|
||||||
<ClCompile Include="cvfRayIntersectSpec.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderEngine.cpp" />
|
|
||||||
<ClCompile Include="cvfRendering.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderQueue.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderQueueBuilder.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderQueueSorter.cpp" />
|
|
||||||
<ClCompile Include="cvfScene.cpp" />
|
|
||||||
<ClCompile Include="cvfSingleQuadRenderingGenerator.cpp" />
|
|
||||||
<ClCompile Include="cvfTransform.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderSequence.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
||||||
<ImportGroup Label="ExtensionTargets">
|
|
||||||
</ImportGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,67 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="cvfConstantFrameRate.h" />
|
|
||||||
<ClInclude Include="cvfCullSettings.h" />
|
|
||||||
<ClInclude Include="cvfEffect.h" />
|
|
||||||
<ClInclude Include="cvfLibViewing.h" />
|
|
||||||
<ClInclude Include="cvfLocators.h" />
|
|
||||||
<ClInclude Include="cvfManipulatorTrackball.h" />
|
|
||||||
<ClInclude Include="cvfModel.h" />
|
|
||||||
<ClInclude Include="cvfModelBasicList.h" />
|
|
||||||
<ClInclude Include="cvfModelBasicTree.h" />
|
|
||||||
<ClInclude Include="cvfPart.h" />
|
|
||||||
<ClInclude Include="cvfPartRenderHintCollection.h" />
|
|
||||||
<ClInclude Include="cvfPerformanceInfo.h" />
|
|
||||||
<ClInclude Include="cvfRenderEngine.h" />
|
|
||||||
<ClInclude Include="cvfRendering.h" />
|
|
||||||
<ClInclude Include="cvfRenderQueue.h" />
|
|
||||||
<ClInclude Include="cvfRenderQueueBuilder.h" />
|
|
||||||
<ClInclude Include="cvfRenderQueueSorter.h" />
|
|
||||||
<ClInclude Include="cvfScene.h" />
|
|
||||||
<ClInclude Include="cvfTransform.h" />
|
|
||||||
<ClInclude Include="cvfSingleQuadRenderingGenerator.h" />
|
|
||||||
<ClInclude Include="cvfDynamicUniformSet.h" />
|
|
||||||
<ClInclude Include="cvfRayIntersectSpec.h" />
|
|
||||||
<ClInclude Include="cvfHitItemCollection.h" />
|
|
||||||
<ClInclude Include="cvfHitItem.h" />
|
|
||||||
<ClInclude Include="cvfRenderSequence.h" />
|
|
||||||
<ClInclude Include="cvfClipPlaneSet.h" />
|
|
||||||
<ClInclude Include="cvfPartHighlighter.h" />
|
|
||||||
<ClInclude Include="cvfGaussianBlur.h" />
|
|
||||||
<ClInclude Include="cvfFixedSizeTransform.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="CMakeLists.txt" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="cvfConstantFrameRate.cpp" />
|
|
||||||
<ClCompile Include="cvfCullSettings.cpp" />
|
|
||||||
<ClCompile Include="cvfEffect.cpp" />
|
|
||||||
<ClCompile Include="cvfLocators.cpp" />
|
|
||||||
<ClCompile Include="cvfManipulatorTrackball.cpp" />
|
|
||||||
<ClCompile Include="cvfModel.cpp" />
|
|
||||||
<ClCompile Include="cvfModelBasicList.cpp" />
|
|
||||||
<ClCompile Include="cvfModelBasicTree.cpp" />
|
|
||||||
<ClCompile Include="cvfPart.cpp" />
|
|
||||||
<ClCompile Include="cvfPartRenderHintCollection.cpp" />
|
|
||||||
<ClCompile Include="cvfPerformanceInfo.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderEngine.cpp" />
|
|
||||||
<ClCompile Include="cvfRendering.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderQueue.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderQueueBuilder.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderQueueSorter.cpp" />
|
|
||||||
<ClCompile Include="cvfScene.cpp" />
|
|
||||||
<ClCompile Include="cvfTransform.cpp" />
|
|
||||||
<ClCompile Include="cvfSingleQuadRenderingGenerator.cpp" />
|
|
||||||
<ClCompile Include="cvfDynamicUniformSet.cpp" />
|
|
||||||
<ClCompile Include="cvfRayIntersectSpec.cpp" />
|
|
||||||
<ClCompile Include="cvfHitItemCollection.cpp" />
|
|
||||||
<ClCompile Include="cvfHitItem.cpp" />
|
|
||||||
<ClCompile Include="cvfRenderSequence.cpp" />
|
|
||||||
<ClCompile Include="cvfClipPlaneSet.cpp" />
|
|
||||||
<ClCompile Include="cvfPartHighlighter.cpp" />
|
|
||||||
<ClCompile Include="cvfGaussianBlur.cpp" />
|
|
||||||
<ClCompile Include="cvfFixedSizeTransform.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -42,11 +42,8 @@
|
|||||||
#include "cvfUniformSet.h"
|
#include "cvfUniformSet.h"
|
||||||
#include "cvfRenderStateSet.h"
|
#include "cvfRenderStateSet.h"
|
||||||
#include "cvfRenderStateTextureBindings.h"
|
#include "cvfRenderStateTextureBindings.h"
|
||||||
|
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
#include "cvfRenderState_FF.h"
|
#include "cvfRenderState_FF.h"
|
||||||
#include "cvfTexture2D_FF.h"
|
#include "cvfTexture2D_FF.h"
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace cvf {
|
namespace cvf {
|
||||||
|
|
||||||
@@ -286,7 +283,6 @@ void Effect::deleteOrReleaseOpenGLResources(OpenGLContext* oglContext)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
RenderStateTextureMapping_FF* textureMapping = static_cast<RenderStateTextureMapping_FF*>(m_renderStateSet->renderStateOfType(RenderState::TEXTURE_MAPPING_FF));
|
RenderStateTextureMapping_FF* textureMapping = static_cast<RenderStateTextureMapping_FF*>(m_renderStateSet->renderStateOfType(RenderState::TEXTURE_MAPPING_FF));
|
||||||
if (textureMapping)
|
if (textureMapping)
|
||||||
{
|
{
|
||||||
@@ -296,7 +292,6 @@ void Effect::deleteOrReleaseOpenGLResources(OpenGLContext* oglContext)
|
|||||||
texture->deleteTexture(oglContext);
|
texture->deleteTexture(oglContext);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -262,13 +262,11 @@ void RenderEngine::render(OpenGLContext* oglContext, RenderQueue* renderQueue, s
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
if (lastAppliedMatrixStateVersionTickFixedFunction != matrixState.versionTick())
|
if (lastAppliedMatrixStateVersionTickFixedFunction != matrixState.versionTick())
|
||||||
{
|
{
|
||||||
glLoadMatrixf(matrixState.modelViewMatrix().ptr());
|
glLoadMatrixf(matrixState.modelViewMatrix().ptr());
|
||||||
lastAppliedMatrixStateVersionTickFixedFunction = matrixState.versionTick();
|
lastAppliedMatrixStateVersionTickFixedFunction = matrixState.versionTick();
|
||||||
}
|
}
|
||||||
#endif // CVF_OPENGL_ES
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -48,10 +48,7 @@
|
|||||||
#include "cvfBufferObjectManaged.h"
|
#include "cvfBufferObjectManaged.h"
|
||||||
#include "cvfCamera.h"
|
#include "cvfCamera.h"
|
||||||
#include "cvfRenderStateTextureBindings.h"
|
#include "cvfRenderStateTextureBindings.h"
|
||||||
|
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
#include "cvfRenderState_FF.h"
|
#include "cvfRenderState_FF.h"
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace cvf {
|
namespace cvf {
|
||||||
|
|
||||||
@@ -198,13 +195,11 @@ void RenderQueueBuilder::populateRenderQueue(RenderQueue* renderQueue)
|
|||||||
textureBindings->setupTextures(m_oglContext.p());
|
textureBindings->setupTextures(m_oglContext.p());
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
RenderStateTextureMapping_FF* textureMapping = static_cast<RenderStateTextureMapping_FF*>(effect->renderStateOfType(RenderState::TEXTURE_MAPPING_FF));
|
RenderStateTextureMapping_FF* textureMapping = static_cast<RenderStateTextureMapping_FF*>(effect->renderStateOfType(RenderState::TEXTURE_MAPPING_FF));
|
||||||
if (textureMapping && canAddToQueue)
|
if (textureMapping && canAddToQueue)
|
||||||
{
|
{
|
||||||
textureMapping->setupTexture(m_oglContext.p());
|
textureMapping->setupTexture(m_oglContext.p());
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
if (canAddToQueue)
|
if (canAddToQueue)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -335,7 +335,6 @@ void RenderSequence::preRenderApplyExpectedOpenGLState(OpenGLContext* oglContext
|
|||||||
|
|
||||||
CVF_CHECK_OGL(oglContext);
|
CVF_CHECK_OGL(oglContext);
|
||||||
|
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
if (oglCaps->supportsFixedFunction())
|
if (oglCaps->supportsFixedFunction())
|
||||||
{
|
{
|
||||||
glMatrixMode(GL_TEXTURE);
|
glMatrixMode(GL_TEXTURE);
|
||||||
@@ -385,7 +384,6 @@ void RenderSequence::preRenderApplyExpectedOpenGLState(OpenGLContext* oglContext
|
|||||||
|
|
||||||
CVF_CHECK_OGL(oglContext);
|
CVF_CHECK_OGL(oglContext);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -205,12 +205,10 @@ void Rendering::render(OpenGLContext* oglContext)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
#ifndef CVF_OPENGL_ES
|
|
||||||
if (FramebufferObject::supportedOpenGL(oglContext))
|
if (FramebufferObject::supportedOpenGL(oglContext))
|
||||||
{
|
{
|
||||||
FramebufferObject::useDefaultWindowFramebuffer(oglContext);
|
FramebufferObject::useDefaultWindowFramebuffer(oglContext);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Setup camera and view
|
// Setup camera and view
|
||||||
|
|||||||
@@ -33,16 +33,12 @@ QMWidget.h
|
|||||||
|
|
||||||
# Qt
|
# Qt
|
||||||
if (CEE_USE_QT5)
|
if (CEE_USE_QT5)
|
||||||
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets OpenGL)
|
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets OpenGL)
|
||||||
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL)
|
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL)
|
||||||
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
|
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
|
||||||
else()
|
else()
|
||||||
find_package(Qt4 COMPONENTS QtCore QtGui QtOpenGl REQUIRED)
|
message(FATAL_ERROR "No supported Qt version selected for build")
|
||||||
include(${QT_USE_FILE})
|
endif()
|
||||||
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
|
|
||||||
endif(CEE_USE_QT5)
|
|
||||||
|
|
||||||
add_definitions(-DCVF_USING_CMAKE)
|
|
||||||
|
|
||||||
set(SYSTEM_LIBRARIES)
|
set(SYSTEM_LIBRARIES)
|
||||||
if (CMAKE_COMPILER_IS_GNUCXX)
|
if (CMAKE_COMPILER_IS_GNUCXX)
|
||||||
@@ -52,20 +48,3 @@ endif(CMAKE_COMPILER_IS_GNUCXX)
|
|||||||
add_executable(${PROJECT_NAME} ${CEE_SOURCE_FILES} ${MOC_SOURCE_FILES})
|
add_executable(${PROJECT_NAME} ${CEE_SOURCE_FILES} ${MOC_SOURCE_FILES})
|
||||||
target_link_libraries(${PROJECT_NAME} ${CEE_LIBS} ${OPENGL_LIBRARIES} ${QT_LIBRARIES} ${SYSTEM_LIBRARIES})
|
target_link_libraries(${PROJECT_NAME} ${CEE_LIBS} ${OPENGL_LIBRARIES} ${QT_LIBRARIES} ${SYSTEM_LIBRARIES})
|
||||||
|
|
||||||
if (CEE_USE_QT5)
|
|
||||||
foreach (qtlib ${QT_LIBRARIES})
|
|
||||||
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
|
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:${PROJECT_NAME}>
|
|
||||||
)
|
|
||||||
endforeach(qtlib)
|
|
||||||
else()
|
|
||||||
# Copy Qt Dlls
|
|
||||||
if (MSVC)
|
|
||||||
set (QTLIBLIST QtCore QtGui QtOpenGl)
|
|
||||||
foreach (qtlib ${QTLIBLIST})
|
|
||||||
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
|
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${QT_BINARY_DIR}/$<IF:$<CONFIG:Debug>,${qtlib}d4.dll,${qtlib}4.dll> $<TARGET_FILE_DIR:${PROJECT_NAME}>
|
|
||||||
)
|
|
||||||
endforeach( qtlib )
|
|
||||||
endif(MSVC)
|
|
||||||
endif(CEE_USE_QT5)
|
|
||||||
|
|||||||
@@ -40,11 +40,9 @@
|
|||||||
#include "QMMainWindow.h"
|
#include "QMMainWindow.h"
|
||||||
|
|
||||||
#include <QtGlobal>
|
#include <QtGlobal>
|
||||||
#if QT_VERSION >= 0x050000
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#else
|
|
||||||
#include <QtGui/QApplication>
|
#include <locale.h>
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -42,19 +42,13 @@
|
|||||||
|
|
||||||
#include "QMMainWindow.h"
|
#include "QMMainWindow.h"
|
||||||
#include "QMWidget.h"
|
#include "QMWidget.h"
|
||||||
#if QT_VERSION >= 0x050000
|
|
||||||
#include <QFrame>
|
#include <QFrame>
|
||||||
#include <QHBoxLayout>
|
#include <QHBoxLayout>
|
||||||
#include <QAction>
|
#include <QAction>
|
||||||
#include <QMenu>
|
#include <QMenu>
|
||||||
#include <QMenuBar>
|
#include <QMenuBar>
|
||||||
#else
|
|
||||||
#include <QtGui/QFrame>
|
|
||||||
#include <QtGui/QHBoxLayout>
|
|
||||||
#include <QtGui/QAction>
|
|
||||||
#include <QtGui/QMenu>
|
|
||||||
#include <QtGui/QMenuBar>
|
|
||||||
#endif
|
|
||||||
using cvf::ref;
|
using cvf::ref;
|
||||||
|
|
||||||
|
|
||||||
@@ -158,10 +152,3 @@ void QMMainWindow::closeEvent(QCloseEvent* /*event*/)
|
|||||||
// Deletes all OpenGL resources and removes context from context group
|
// Deletes all OpenGL resources and removes context from context group
|
||||||
m_vizWidget->cvfShutdownOpenGLContext();
|
m_vizWidget->cvfShutdownOpenGLContext();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#ifndef CVF_USING_CMAKE
|
|
||||||
//########################################################
|
|
||||||
#include "qt-generated/moc_QMMainWindow.cpp"
|
|
||||||
//########################################################
|
|
||||||
#endif
|
|
||||||
|
|||||||
@@ -41,11 +41,7 @@
|
|||||||
#include "cvfOpenGLContextGroup.h"
|
#include "cvfOpenGLContextGroup.h"
|
||||||
|
|
||||||
#include <QtGlobal>
|
#include <QtGlobal>
|
||||||
#if QT_VERSION >= 0x050000
|
|
||||||
#include <QMainWindow>
|
#include <QMainWindow>
|
||||||
#else
|
|
||||||
#include <QtGui/QMainWindow>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
class QMWidget;
|
class QMWidget;
|
||||||
|
|
||||||
|
|||||||
@@ -44,11 +44,7 @@
|
|||||||
|
|
||||||
#include "cvfqtOpenGLContext.h"
|
#include "cvfqtOpenGLContext.h"
|
||||||
|
|
||||||
#if QT_VERSION >= 0x050000
|
|
||||||
#include <QMouseEvent>
|
#include <QMouseEvent>
|
||||||
#else
|
|
||||||
#include <QtGui/QMouseEvent>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
using cvf::ref;
|
using cvf::ref;
|
||||||
|
|
||||||
@@ -132,9 +128,7 @@ void QMWidget::paintEvent(QPaintEvent* /*event*/)
|
|||||||
CVF_ASSERT(currentOglContext);
|
CVF_ASSERT(currentOglContext);
|
||||||
CVF_CHECK_OGL(currentOglContext);
|
CVF_CHECK_OGL(currentOglContext);
|
||||||
|
|
||||||
#if QT_VERSION >= 0x040600
|
|
||||||
painter.beginNativePainting();
|
painter.beginNativePainting();
|
||||||
#endif
|
|
||||||
|
|
||||||
cvfqt::OpenGLContext::saveOpenGLState(currentOglContext);
|
cvfqt::OpenGLContext::saveOpenGLState(currentOglContext);
|
||||||
|
|
||||||
@@ -145,9 +139,7 @@ void QMWidget::paintEvent(QPaintEvent* /*event*/)
|
|||||||
|
|
||||||
cvfqt::OpenGLContext::restoreOpenGLState(currentOglContext);
|
cvfqt::OpenGLContext::restoreOpenGLState(currentOglContext);
|
||||||
|
|
||||||
#if QT_VERSION >= 0x040600
|
|
||||||
painter.endNativePainting();
|
painter.endNativePainting();
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -223,12 +215,3 @@ void QMWidget::mouseReleaseEvent(QMouseEvent* /*event*/)
|
|||||||
{
|
{
|
||||||
m_trackball->endNavigation();
|
m_trackball->endNavigation();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef CVF_USING_CMAKE
|
|
||||||
//########################################################
|
|
||||||
#include "qt-generated/moc_QMWidget.cpp"
|
|
||||||
//########################################################
|
|
||||||
#endif
|
|
||||||
|
|||||||
@@ -1,206 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup Label="ProjectConfigurations">
|
|
||||||
<ProjectConfiguration Include="Debug MD|Win32">
|
|
||||||
<Configuration>Debug MD</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug MD|x64">
|
|
||||||
<Configuration>Debug MD</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD|Win32">
|
|
||||||
<Configuration>Release MD</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD|x64">
|
|
||||||
<Configuration>Release MD</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
</ItemGroup>
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{9EDEF87F-EC72-4422-8CB7-33DD68E5F2A9}</ProjectGuid>
|
|
||||||
<RootNamespace>QtMinimal</RootNamespace>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
||||||
<ImportGroup Label="ExtensionSettings">
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|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 MD|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'">
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<Optimization>Disabled</Optimization>
|
|
||||||
<AdditionalIncludeDirectories>$(QTDIR)/include;$(QTDIR)/include/Qt;../../../LibCore;../../../LibRender;../../../LibGeometry;../../../LibViewing;../../../LibGuiQt;.</AdditionalIncludeDirectories>
|
|
||||||
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<AdditionalDependencies>qtmaind.lib;QtCored4.lib;QtGuid4.lib;QtOpenGLd4.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<AdditionalLibraryDirectories>$(QTDIR)\lib</AdditionalLibraryDirectories>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<Optimization>Disabled</Optimization>
|
|
||||||
<AdditionalIncludeDirectories>$(QTDIR)/include;$(QTDIR)/include/Qt;../../../LibCore;../../../LibRender;../../../LibGeometry;../../../LibViewing;../../../LibGuiQt;.</AdditionalIncludeDirectories>
|
|
||||||
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<AdditionalDependencies>qtmaind.lib;QtCored4.lib;QtGuid4.lib;QtOpenGLd4.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<AdditionalLibraryDirectories>$(QTDIR)\lib</AdditionalLibraryDirectories>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<Optimization>MaxSpeed</Optimization>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<AdditionalIncludeDirectories>$(QTDIR)/include;$(QTDIR)/include/Qt;../../../LibCore;../../../LibRender;../../../LibGeometry;../../../LibViewing;../../../LibGuiQt;.</AdditionalIncludeDirectories>
|
|
||||||
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
<AdditionalDependencies>qtmain.lib;QtCore4.lib;QtGui4.lib;QtOpenGL4.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<AdditionalLibraryDirectories>$(QTDIR)\lib</AdditionalLibraryDirectories>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<Optimization>MaxSpeed</Optimization>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<AdditionalIncludeDirectories>$(QTDIR)/include;$(QTDIR)/include/Qt;../../../LibCore;../../../LibRender;../../../LibGeometry;../../../LibViewing;../../../LibGuiQt;.</AdditionalIncludeDirectories>
|
|
||||||
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
<AdditionalDependencies>qtmain.lib;QtCore4.lib;QtGui4.lib;QtOpenGL4.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<AdditionalLibraryDirectories>$(QTDIR)\lib</AdditionalLibraryDirectories>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="QMMain.cpp" />
|
|
||||||
<ClCompile Include="QMMainWindow.cpp" />
|
|
||||||
<ClCompile Include="QMWidget.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<CustomBuild Include="QMMainWindow.h">
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">%QTDIR%\bin\moc.exe %(FullPath) -o Qt-Generated\moc_%(Filename).cpp</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'">%QTDIR%\bin\moc.exe %(FullPath) -o Qt-Generated\moc_%(Filename).cpp</Command>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">MOCing %(FullPath)...</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'">MOCing %(FullPath)...</Message>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">Qt-Generated\moc_%(FileName).cpp</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'">Qt-Generated\moc_%(FileName).cpp</Outputs>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">%QTDIR%\bin\moc.exe %(FullPath) -o Qt-Generated\moc_%(Filename).cpp</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">%QTDIR%\bin\moc.exe %(FullPath) -o Qt-Generated\moc_%(Filename).cpp</Command>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">MOCing %(FullPath)...</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">MOCing %(FullPath)...</Message>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">Qt-Generated\moc_%(FileName).cpp</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">Qt-Generated\moc_%(FileName).cpp</Outputs>
|
|
||||||
</CustomBuild>
|
|
||||||
<CustomBuild Include="QMWidget.h">
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">%QTDIR%\bin\moc.exe %(FullPath) -o Qt-Generated\moc_%(Filename).cpp</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'">%QTDIR%\bin\moc.exe %(FullPath) -o Qt-Generated\moc_%(Filename).cpp</Command>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">MOCing %(FullPath)...</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'">MOCing %(FullPath)...</Message>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">Qt-Generated\moc_%(FileName).cpp</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'">Qt-Generated\moc_%(FileName).cpp</Outputs>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">%QTDIR%\bin\moc.exe %(FullPath) -o Qt-Generated\moc_%(Filename).cpp</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">%QTDIR%\bin\moc.exe %(FullPath) -o Qt-Generated\moc_%(Filename).cpp</Command>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">MOCing %(FullPath)...</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">MOCing %(FullPath)...</Message>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">Qt-Generated\moc_%(FileName).cpp</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">Qt-Generated\moc_%(FileName).cpp</Outputs>
|
|
||||||
</CustomBuild>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="..\..\..\LibViewing\LibViewing.vcxproj">
|
|
||||||
<Project>{122d4663-11d6-d12f-8748-629a34e9075e}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\..\..\LibCore\LibCore.vcxproj">
|
|
||||||
<Project>{a9c7a239-b761-a892-bf34-5aeca0d9ee88}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\..\..\LibGeometry\LibGeometry.vcxproj">
|
|
||||||
<Project>{efd5c9ac-8988-f190-aa2c-e36ebe361e90}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\..\..\LibGuiQt\LibGuiQt.vcxproj">
|
|
||||||
<Project>{fbfac173-30fe-2c09-3f2e-d54477b433de}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\..\..\LibRender\LibRender.vcxproj">
|
|
||||||
<Project>{c07ade80-5c4f-e6e3-dd1a-5a619403fa9f}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="CMakeLists.txt" />
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
||||||
<ImportGroup Label="ExtensionTargets">
|
|
||||||
</ImportGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="QMMain.cpp" />
|
|
||||||
<ClCompile Include="QMMainWindow.cpp" />
|
|
||||||
<ClCompile Include="QMWidget.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<CustomBuild Include="QMWidget.h" />
|
|
||||||
<CustomBuild Include="QMMainWindow.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="CMakeLists.txt" />
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -35,17 +35,12 @@ QMVWidget.h
|
|||||||
|
|
||||||
# Qt
|
# Qt
|
||||||
if (CEE_USE_QT5)
|
if (CEE_USE_QT5)
|
||||||
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets OpenGL)
|
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets OpenGL)
|
||||||
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL)
|
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL)
|
||||||
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
|
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
|
||||||
else()
|
else()
|
||||||
find_package(Qt4 COMPONENTS QtCore QtGui QtOpenGl REQUIRED)
|
message(FATAL_ERROR "No supported Qt version selected for build")
|
||||||
include(${QT_USE_FILE})
|
endif()
|
||||||
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
|
|
||||||
endif(CEE_USE_QT5)
|
|
||||||
|
|
||||||
# Run MOC on the headers
|
|
||||||
add_definitions(-DCVF_USING_CMAKE)
|
|
||||||
|
|
||||||
set(SYSTEM_LIBRARIES)
|
set(SYSTEM_LIBRARIES)
|
||||||
if (CMAKE_COMPILER_IS_GNUCXX)
|
if (CMAKE_COMPILER_IS_GNUCXX)
|
||||||
@@ -54,21 +49,3 @@ endif(CMAKE_COMPILER_IS_GNUCXX)
|
|||||||
|
|
||||||
add_executable(${PROJECT_NAME} ${CEE_SOURCE_FILES} ${MOC_SOURCE_FILES})
|
add_executable(${PROJECT_NAME} ${CEE_SOURCE_FILES} ${MOC_SOURCE_FILES})
|
||||||
target_link_libraries(${PROJECT_NAME} ${CEE_LIBS} ${OPENGL_LIBRARIES} ${QT_LIBRARIES} ${SYSTEM_LIBRARIES})
|
target_link_libraries(${PROJECT_NAME} ${CEE_LIBS} ${OPENGL_LIBRARIES} ${QT_LIBRARIES} ${SYSTEM_LIBRARIES})
|
||||||
|
|
||||||
if (CEE_USE_QT5)
|
|
||||||
foreach (qtlib ${QT_LIBRARIES})
|
|
||||||
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
|
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:${PROJECT_NAME}>
|
|
||||||
)
|
|
||||||
endforeach(qtlib)
|
|
||||||
else()
|
|
||||||
# Copy Qt Dlls
|
|
||||||
if (MSVC)
|
|
||||||
set (QTLIBLIST QtCore QtGui QtOpenGl)
|
|
||||||
foreach (qtlib ${QTLIBLIST})
|
|
||||||
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
|
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${QT_BINARY_DIR}/$<IF:$<CONFIG:Debug>,${qtlib}d4.dll,${qtlib}4.dll> $<TARGET_FILE_DIR:${PROJECT_NAME}>
|
|
||||||
)
|
|
||||||
endforeach( qtlib )
|
|
||||||
endif(MSVC)
|
|
||||||
endif(CEE_USE_QT5)
|
|
||||||
|
|||||||
@@ -39,13 +39,11 @@
|
|||||||
|
|
||||||
#include "QMVMainWindow.h"
|
#include "QMVMainWindow.h"
|
||||||
|
|
||||||
#if QT_VERSION >= 0x050000
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#else
|
|
||||||
#include <QtGui/QApplication>
|
|
||||||
#endif
|
|
||||||
#include "QtOpenGL/qgl.h"
|
#include "QtOpenGL/qgl.h"
|
||||||
|
|
||||||
|
#include <locale.h>
|
||||||
|
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
|
|||||||
@@ -44,8 +44,7 @@
|
|||||||
#include "QMVWidget.h"
|
#include "QMVWidget.h"
|
||||||
#include "QMVFactory.h"
|
#include "QMVFactory.h"
|
||||||
|
|
||||||
#include <QtCore/QTimer>
|
#include <QTimer>
|
||||||
#if QT_VERSION >= 0x050000
|
|
||||||
#include <QFrame>
|
#include <QFrame>
|
||||||
#include <QHBoxLayout>
|
#include <QHBoxLayout>
|
||||||
#include <QAction>
|
#include <QAction>
|
||||||
@@ -53,15 +52,6 @@
|
|||||||
#include <QMenuBar>
|
#include <QMenuBar>
|
||||||
#include <QStatusBar>
|
#include <QStatusBar>
|
||||||
#include <QLabel>
|
#include <QLabel>
|
||||||
#else
|
|
||||||
#include <QtGui/QFrame>
|
|
||||||
#include <QtGui/QHBoxLayout>
|
|
||||||
#include <QtGui/QAction>
|
|
||||||
#include <QtGui/QMenu>
|
|
||||||
#include <QtGui/QMenuBar>
|
|
||||||
#include <QtGui/QStatusBar>
|
|
||||||
#include <QtGui/QLabel>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
using cvf::ref;
|
using cvf::ref;
|
||||||
|
|
||||||
@@ -661,11 +651,3 @@ void QMVMainWindow::slotUpdateStatusbar()
|
|||||||
QStatusBar* sb = statusBar();
|
QStatusBar* sb = statusBar();
|
||||||
sb->showMessage(msg);
|
sb->showMessage(msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//########################################################
|
|
||||||
#ifndef CVF_USING_CMAKE
|
|
||||||
#include "qt-generated/moc_QMVMainWindow.cpp"
|
|
||||||
#endif
|
|
||||||
//########################################################
|
|
||||||
|
|
||||||
|
|||||||
@@ -42,11 +42,7 @@
|
|||||||
#include "cvfDrawableGeo.h"
|
#include "cvfDrawableGeo.h"
|
||||||
|
|
||||||
#include <QtGlobal>
|
#include <QtGlobal>
|
||||||
#if QT_VERSION >= 0x050000
|
|
||||||
#include <QMainWindow>
|
#include <QMainWindow>
|
||||||
#else
|
|
||||||
#include <QtGui/QMainWindow>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
class QMVWidget;
|
class QMVWidget;
|
||||||
|
|
||||||
|
|||||||
@@ -44,11 +44,7 @@
|
|||||||
|
|
||||||
#include "cvfqtOpenGLContext.h"
|
#include "cvfqtOpenGLContext.h"
|
||||||
|
|
||||||
#if QT_VERSION >= 0x050000
|
|
||||||
#include <QMouseEvent>
|
#include <QMouseEvent>
|
||||||
#else
|
|
||||||
#include <QtGui/QMouseEvent>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
using cvf::ref;
|
using cvf::ref;
|
||||||
|
|
||||||
@@ -251,11 +247,3 @@ void QMVWidget::mouseReleaseEvent(QMouseEvent* /*event*/)
|
|||||||
{
|
{
|
||||||
m_trackball->endNavigation();
|
m_trackball->endNavigation();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//########################################################
|
|
||||||
#ifndef CVF_USING_CMAKE
|
|
||||||
#include "qt-generated/moc_QMVWidget.cpp"
|
|
||||||
#endif
|
|
||||||
//########################################################
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,212 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup Label="ProjectConfigurations">
|
|
||||||
<ProjectConfiguration Include="Debug MD|Win32">
|
|
||||||
<Configuration>Debug MD</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug MD|x64">
|
|
||||||
<Configuration>Debug MD</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD|Win32">
|
|
||||||
<Configuration>Release MD</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release MD|x64">
|
|
||||||
<Configuration>Release MD</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
</ItemGroup>
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{2DCDF259-11B5-431F-94FE-C323E2D27AB1}</ProjectGuid>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
||||||
<ImportGroup Label="ExtensionSettings">
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|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 MD|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'">
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">
|
|
||||||
<OutDir>$(Platform)_VS2010\$(Configuration)\</OutDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">
|
|
||||||
<IntDir>$(Platform)_VS2010\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<Optimization>Disabled</Optimization>
|
|
||||||
<AdditionalIncludeDirectories>$(QTDIR)/include;$(QTDIR)/include/Qt;../../../LibCore;../../../LibRender;../../../LibGeometry;../../../LibViewing;../../../LibUtilities;../../../LibGuiQt;.</AdditionalIncludeDirectories>
|
|
||||||
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<AdditionalDependencies>qtmaind.lib;QtCored4.lib;QtGuid4.lib;QtOpenGLd4.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<AdditionalLibraryDirectories>$(QTDIR)\lib</AdditionalLibraryDirectories>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<Optimization>Disabled</Optimization>
|
|
||||||
<AdditionalIncludeDirectories>$(QTDIR)/include;$(QTDIR)/include/Qt;../../../LibCore;../../../LibRender;../../../LibGeometry;../../../LibViewing;../../../LibUtilities;../../../LibGuiQt;.</AdditionalIncludeDirectories>
|
|
||||||
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<AdditionalDependencies>qtmaind.lib;QtCored4.lib;QtGuid4.lib;QtOpenGLd4.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<AdditionalLibraryDirectories>$(QTDIR)\lib</AdditionalLibraryDirectories>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<Optimization>MaxSpeed</Optimization>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<AdditionalIncludeDirectories>$(QTDIR)/include;$(QTDIR)/include/Qt;../../../LibCore;../../../LibRender;../../../LibGeometry;../../../LibViewing;../../../LibUtilities;../../../LibGuiQt;.</AdditionalIncludeDirectories>
|
|
||||||
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
<AdditionalDependencies>qtmain.lib;QtCore4.lib;QtGui4.lib;QtOpenGL4.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<AdditionalLibraryDirectories>$(QTDIR)\lib</AdditionalLibraryDirectories>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<Optimization>MaxSpeed</Optimization>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<AdditionalIncludeDirectories>$(QTDIR)/include;$(QTDIR)/include/Qt;../../../LibCore;../../../LibRender;../../../LibGeometry;../../../LibViewing;../../../LibUtilities;../../../LibGuiQt;.</AdditionalIncludeDirectories>
|
|
||||||
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
<AdditionalDependencies>qtmain.lib;QtCore4.lib;QtGui4.lib;QtOpenGL4.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
||||||
<AdditionalLibraryDirectories>$(QTDIR)\lib</AdditionalLibraryDirectories>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="QMVFactory.cpp" />
|
|
||||||
<ClCompile Include="QMVMain.cpp" />
|
|
||||||
<ClCompile Include="QMVMainWindow.cpp" />
|
|
||||||
<ClCompile Include="QMVWidget.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<CustomBuild Include="QMVMainWindow.h">
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">%QTDIR%\bin\moc.exe %(FullPath) -o Qt-Generated\moc_%(Filename).cpp</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'">%QTDIR%\bin\moc.exe %(FullPath) -o Qt-Generated\moc_%(Filename).cpp</Command>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">MOCing %(FullPath)...</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'">MOCing %(FullPath)...</Message>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">Qt-Generated\moc_%(FileName).cpp</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'">Qt-Generated\moc_%(FileName).cpp</Outputs>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">%QTDIR%\bin\moc.exe %(FullPath) -o Qt-Generated\moc_%(Filename).cpp</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">%QTDIR%\bin\moc.exe %(FullPath) -o Qt-Generated\moc_%(Filename).cpp</Command>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">MOCing %(FullPath)...</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">MOCing %(FullPath)...</Message>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">Qt-Generated\moc_%(FileName).cpp</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">Qt-Generated\moc_%(FileName).cpp</Outputs>
|
|
||||||
</CustomBuild>
|
|
||||||
<CustomBuild Include="QMVWidget.h">
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">%QTDIR%\bin\moc.exe %(FullPath) -o Qt-Generated\moc_%(Filename).cpp</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'">%QTDIR%\bin\moc.exe %(FullPath) -o Qt-Generated\moc_%(Filename).cpp</Command>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">MOCing %(FullPath)...</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'">MOCing %(FullPath)...</Message>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug MD|Win32'">Qt-Generated\moc_%(FileName).cpp</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug MD|x64'">Qt-Generated\moc_%(FileName).cpp</Outputs>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">%QTDIR%\bin\moc.exe %(FullPath) -o Qt-Generated\moc_%(Filename).cpp</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">%QTDIR%\bin\moc.exe %(FullPath) -o Qt-Generated\moc_%(Filename).cpp</Command>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">MOCing %(FullPath)...</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">MOCing %(FullPath)...</Message>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release MD|Win32'">Qt-Generated\moc_%(FileName).cpp</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release MD|x64'">Qt-Generated\moc_%(FileName).cpp</Outputs>
|
|
||||||
</CustomBuild>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="..\..\..\LibUtilities\LibUtilities.vcxproj">
|
|
||||||
<Project>{ecf1becd-e624-f971-c70a-f84686a36084}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\..\..\LibViewing\LibViewing.vcxproj">
|
|
||||||
<Project>{122d4663-11d6-d12f-8748-629a34e9075e}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\..\..\LibCore\LibCore.vcxproj">
|
|
||||||
<Project>{a9c7a239-b761-a892-bf34-5aeca0d9ee88}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\..\..\LibGeometry\LibGeometry.vcxproj">
|
|
||||||
<Project>{efd5c9ac-8988-f190-aa2c-e36ebe361e90}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\..\..\LibGuiQt\LibGuiQt.vcxproj">
|
|
||||||
<Project>{fbfac173-30fe-2c09-3f2e-d54477b433de}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\..\..\LibRender\LibRender.vcxproj">
|
|
||||||
<Project>{c07ade80-5c4f-e6e3-dd1a-5a619403fa9f}</Project>
|
|
||||||
</ProjectReference>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="QMVFactory.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="CMakeLists.txt" />
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
||||||
<ImportGroup Label="ExtensionTargets">
|
|
||||||
</ImportGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="QMVMain.cpp" />
|
|
||||||
<ClCompile Include="QMVMainWindow.cpp" />
|
|
||||||
<ClCompile Include="QMVWidget.cpp" />
|
|
||||||
<ClCompile Include="QMVFactory.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<CustomBuild Include="QMVWidget.h" />
|
|
||||||
<CustomBuild Include="QMVMainWindow.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="QMVFactory.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="CMakeLists.txt" />
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -45,16 +45,12 @@ QSRSnippetWidget.h
|
|||||||
|
|
||||||
# Qt
|
# Qt
|
||||||
if (CEE_USE_QT5)
|
if (CEE_USE_QT5)
|
||||||
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets OpenGL)
|
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets OpenGL)
|
||||||
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL)
|
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL)
|
||||||
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
|
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
|
||||||
else()
|
else()
|
||||||
find_package(Qt4 COMPONENTS QtCore QtGui QtOpenGl REQUIRED)
|
message(FATAL_ERROR "No supported Qt version selected for build")
|
||||||
include(${QT_USE_FILE})
|
endif()
|
||||||
qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
|
|
||||||
endif(CEE_USE_QT5)
|
|
||||||
|
|
||||||
add_definitions(-DCVF_USING_CMAKE)
|
|
||||||
|
|
||||||
set(SYSTEM_LIBRARIES)
|
set(SYSTEM_LIBRARIES)
|
||||||
if (CMAKE_COMPILER_IS_GNUCXX)
|
if (CMAKE_COMPILER_IS_GNUCXX)
|
||||||
@@ -63,22 +59,3 @@ endif(CMAKE_COMPILER_IS_GNUCXX)
|
|||||||
|
|
||||||
add_executable(${PROJECT_NAME} ${CEE_SOURCE_FILES} ${MOC_SOURCE_FILES})
|
add_executable(${PROJECT_NAME} ${CEE_SOURCE_FILES} ${MOC_SOURCE_FILES})
|
||||||
target_link_libraries(${PROJECT_NAME} ${CEE_LIBS} ${OPENGL_LIBRARIES} ${QT_LIBRARIES} ${SYSTEM_LIBRARIES})
|
target_link_libraries(${PROJECT_NAME} ${CEE_LIBS} ${OPENGL_LIBRARIES} ${QT_LIBRARIES} ${SYSTEM_LIBRARIES})
|
||||||
|
|
||||||
|
|
||||||
if (CEE_USE_QT5)
|
|
||||||
foreach (qtlib ${QT_LIBRARIES})
|
|
||||||
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
|
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:${PROJECT_NAME}>
|
|
||||||
)
|
|
||||||
endforeach(qtlib)
|
|
||||||
else()
|
|
||||||
# Copy Qt Dlls
|
|
||||||
if (MSVC)
|
|
||||||
set (QTLIBLIST QtCore QtGui QtOpenGl)
|
|
||||||
foreach (qtlib ${QTLIBLIST})
|
|
||||||
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
|
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${QT_BINARY_DIR}/$<IF:$<CONFIG:Debug>,${qtlib}d4.dll,${qtlib}4.dll> $<TARGET_FILE_DIR:${PROJECT_NAME}>
|
|
||||||
)
|
|
||||||
endforeach( qtlib )
|
|
||||||
endif(MSVC)
|
|
||||||
endif(CEE_USE_QT5)
|
|
||||||
|
|||||||
@@ -47,6 +47,8 @@
|
|||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
|
|
||||||
|
#include <locale.h>
|
||||||
|
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
|
|||||||
@@ -753,7 +753,6 @@ void QSRMainWindow::slotShowHelp()
|
|||||||
|
|
||||||
QGLFormat currrentFormat = m_currentSnippetWidget->format();
|
QGLFormat currrentFormat = m_currentSnippetWidget->format();
|
||||||
|
|
||||||
#if QT_VERSION >= 0x040700
|
|
||||||
oglInfo += QString("\nOpenGL version:\t%1.%2").arg(currrentFormat.majorVersion()).arg(currrentFormat.minorVersion());
|
oglInfo += QString("\nOpenGL version:\t%1.%2").arg(currrentFormat.majorVersion()).arg(currrentFormat.minorVersion());
|
||||||
|
|
||||||
switch (currrentFormat.profile())
|
switch (currrentFormat.profile())
|
||||||
@@ -762,7 +761,6 @@ void QSRMainWindow::slotShowHelp()
|
|||||||
case QGLFormat::CoreProfile: oglInfo += "\nProfile:\t\tCoreProfile"; break;
|
case QGLFormat::CoreProfile: oglInfo += "\nProfile:\t\tCoreProfile"; break;
|
||||||
case QGLFormat::CompatibilityProfile: oglInfo += "\nProfile:\t\tCompatibilityProfile"; break;
|
case QGLFormat::CompatibilityProfile: oglInfo += "\nProfile:\t\tCompatibilityProfile"; break;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
oglInfo += QString("\nColor buffer size:\t<%1 %2 %3 %4>").arg(currrentFormat.redBufferSize()).arg(currrentFormat.greenBufferSize()).arg(currrentFormat.blueBufferSize()).arg(currrentFormat.alphaBufferSize());
|
oglInfo += QString("\nColor buffer size:\t<%1 %2 %3 %4>").arg(currrentFormat.redBufferSize()).arg(currrentFormat.greenBufferSize()).arg(currrentFormat.blueBufferSize()).arg(currrentFormat.alphaBufferSize());
|
||||||
oglInfo += QString("\nDepth buffer size:\t%1").arg(currrentFormat.depthBufferSize());
|
oglInfo += QString("\nDepth buffer size:\t%1").arg(currrentFormat.depthBufferSize());
|
||||||
@@ -832,9 +830,3 @@ void QSRMainWindow::slotUpdateViewMenu()
|
|||||||
|
|
||||||
m_showHUDAction->blockSignals(false);
|
m_showHUDAction->blockSignals(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// -------------------------------------------------------
|
|
||||||
#ifndef CVF_USING_CMAKE
|
|
||||||
#include "qt-generated/moc_QSRMainWindow.cpp"
|
|
||||||
#endif
|
|
||||||
|
|||||||
@@ -46,11 +46,7 @@
|
|||||||
#include "cvfuSnippetFactory.h"
|
#include "cvfuSnippetFactory.h"
|
||||||
|
|
||||||
#include <QtGlobal>
|
#include <QtGlobal>
|
||||||
#if QT_VERSION >= 0x050000
|
|
||||||
#include <QMainWindow>
|
#include <QMainWindow>
|
||||||
#else
|
|
||||||
#include <QtGui/QMainWindow>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
class QAction;
|
class QAction;
|
||||||
class QSRSnippetWidget;
|
class QSRSnippetWidget;
|
||||||
|
|||||||
@@ -42,7 +42,6 @@
|
|||||||
#include "cvfuSnippetPropertyPublisher.h"
|
#include "cvfuSnippetPropertyPublisher.h"
|
||||||
#include "cvfqtUtils.h"
|
#include "cvfqtUtils.h"
|
||||||
|
|
||||||
#if QT_VERSION >= 0x050000
|
|
||||||
#include <QComboBox>
|
#include <QComboBox>
|
||||||
#include <QSpinBox>
|
#include <QSpinBox>
|
||||||
#include <QTextBrowser>
|
#include <QTextBrowser>
|
||||||
@@ -54,17 +53,6 @@
|
|||||||
#include <QDataWidgetMapper>
|
#include <QDataWidgetMapper>
|
||||||
#include <QLabel>
|
#include <QLabel>
|
||||||
#include <QDockWidget>
|
#include <QDockWidget>
|
||||||
#else
|
|
||||||
#include <QtGui/QTextBrowser>
|
|
||||||
#include <QtGui/QListWidget>
|
|
||||||
#include <QtGui/QVBoxLayout>
|
|
||||||
#include <QtGui/QFormLayout>
|
|
||||||
#include <QtGui/QLineEdit>
|
|
||||||
#include <QtGui/QCheckBox>
|
|
||||||
#include <QtGui/QDataWidgetMapper>
|
|
||||||
#include <QtGui/QLabel>
|
|
||||||
#include <QtGui/QDockWidget>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
//==================================================================================================
|
//==================================================================================================
|
||||||
@@ -626,10 +614,3 @@ void QSRPropertiesPanel::onPropertyValueChangedBySnippet(cvfu::Property* propert
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// -------------------------------------------------------
|
|
||||||
#ifndef CVF_USING_CMAKE
|
|
||||||
#include "qt-generated/moc_QSRPropertiesPanel.cpp"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|||||||
@@ -44,12 +44,8 @@
|
|||||||
#include "cvfuProperty.h"
|
#include "cvfuProperty.h"
|
||||||
#include "cvfuSnippetPropertyPublisher.h"
|
#include "cvfuSnippetPropertyPublisher.h"
|
||||||
|
|
||||||
#include <QtCore/QPointer>
|
#include <QPointer>
|
||||||
#if QT_VERSION >= 0x050000
|
|
||||||
#include <QWidget>
|
#include <QWidget>
|
||||||
#else
|
|
||||||
#include <QtGui/QWidget>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
class QSRSnippetWidget;
|
class QSRSnippetWidget;
|
||||||
class QComboBox;
|
class QComboBox;
|
||||||
|
|||||||
@@ -43,7 +43,6 @@
|
|||||||
#include "cvfuTestSnippet.h"
|
#include "cvfuTestSnippet.h"
|
||||||
#include "cvfqtUtils.h"
|
#include "cvfqtUtils.h"
|
||||||
|
|
||||||
#if QT_VERSION >= 0x050000
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QComboBox>
|
#include <QComboBox>
|
||||||
#include <QDockWidget>
|
#include <QDockWidget>
|
||||||
@@ -52,13 +51,7 @@
|
|||||||
#include <QPushButton>
|
#include <QPushButton>
|
||||||
#include <QSpacerItem>
|
#include <QSpacerItem>
|
||||||
#include <QLineEdit>
|
#include <QLineEdit>
|
||||||
#else
|
|
||||||
#include <QtGui/QGridLayout>
|
|
||||||
#include <QtGui/QLabel>
|
|
||||||
#include <QtGui/QPushButton>
|
|
||||||
#include <QtGui/QSpacerItem>
|
|
||||||
#include <QtGui/QLineEdit>
|
|
||||||
#endif
|
|
||||||
using cvfu::TestSnippet;
|
using cvfu::TestSnippet;
|
||||||
using cvfu::SnippetInfo;
|
using cvfu::SnippetInfo;
|
||||||
using cvfu::SnippetRegistry;
|
using cvfu::SnippetRegistry;
|
||||||
@@ -232,10 +225,3 @@ void QSRRunPanel::slotPrevButtonClicked()
|
|||||||
executeCurrentSnippet();
|
executeCurrentSnippet();
|
||||||
updateCurrSnippetInfoWidgets();
|
updateCurrSnippetInfoWidgets();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// -------------------------------------------------------
|
|
||||||
#ifndef CVF_USING_CMAKE
|
|
||||||
#include "qt-generated/moc_QSRRunPanel.cpp"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|||||||
@@ -44,11 +44,7 @@
|
|||||||
#include "cvfuSnippetFactory.h"
|
#include "cvfuSnippetFactory.h"
|
||||||
|
|
||||||
#include <QtGlobal>
|
#include <QtGlobal>
|
||||||
#if QT_VERSION >= 0x050000
|
|
||||||
#include <QWidget>
|
#include <QWidget>
|
||||||
#else
|
|
||||||
#include <QtGui/QWidget>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
class QDockWidget;
|
class QDockWidget;
|
||||||
class QLabel;
|
class QLabel;
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user