Commit 1e310cdd authored by Byurrrer's avatar Byurrrer

вынес рендер в отдельную либу, реанимировал редакторы, поправил баг приочистке...

вынес рендер в отдельную либу, реанимировал редакторы, поправил баг приочистке уровня когда шло обращение к невалидному идентификатору массива просчетов видимости (геометрия, растительность), поправил имена еще нескольких enumов, добавил новые квары, провел небольшой рефакторинг в некоторых либах, и много чего по мелочам
parent 6ba6f21d
......@@ -29,7 +29,6 @@ ps_out_ds_mrt main(vs_out_refcube IN)
half MipmapIndex = GetTexLod4Ref(saturate(OUT.Param.r));
half4 reflection = texCUBElod(ReflectTex, half4(IN.CubePPos,MipmapIndex));
OUT.Color.xyz = lerp(OUT.Color.xyz,reflection.xyz,OUT.Param.y);
//OUT.Color.xyz = 2 * IN.CubePPos - 1;
OUT.Depth = GetDepthW(IN.Pos,NearFarIsUnlit.xy);
return OUT;
......
......@@ -23,6 +23,6 @@ vs_out_refcube main(vs_in_geom IN)
half3 viewVec= mul(IN.Position, WorldView);
OUT.CubePPos = mul((half3x3)(View),reflect(viewVec, mul(OUT.Normal, (half3x3)(View))));
//OUT.CubePPos.y = -OUT.CubePPos.y;
OUT.CubePPos.y = -OUT.CubePPos.y;
return OUT;
}
\ No newline at end of file
......@@ -8,6 +8,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SkyXEngine", "SkyXEngine.vc
{7C0C8205-BDD3-44A3-AA3A-7855C7EFC88E} = {7C0C8205-BDD3-44A3-AA3A-7855C7EFC88E}
{B9656841-7734-4D0B-8619-1BED5E2ED7AE} = {B9656841-7734-4D0B-8619-1BED5E2ED7AE}
{C1C1F046-C839-4602-AF70-923CDD237C1B} = {C1C1F046-C839-4602-AF70-923CDD237C1B}
{6FE14C5C-6052-4D96-A89F-0843D91F89AD} = {6FE14C5C-6052-4D96-A89F-0843D91F89AD}
{718C186E-9155-41DF-B8AB-74ED03E204CD} = {718C186E-9155-41DF-B8AB-74ED03E204CD}
{709D8A7A-D3E0-4070-A493-EFDF7A8E9D73} = {709D8A7A-D3E0-4070-A493-EFDF7A8E9D73}
{6A402480-C09B-4CBF-A6BD-115CE4BFF2D8} = {6A402480-C09B-4CBF-A6BD-115CE4BFF2D8}
......@@ -159,6 +160,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sxaigrid", "..\..\sxaigrid\
{AEECC2DB-C7C7-4089-9262-A69794DF834D} = {AEECC2DB-C7C7-4089-9262-A69794DF834D}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sxlevel", "..\..\sxlevel\vs2013\sxlevel.vcxproj", "{6FE14C5C-6052-4D96-A89F-0843D91F89AD}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sxrender", "..\..\sxrender\vs2013\sxrender.vcxproj", "{7F0ACED1-6E16-4DD3-800E-0C50150897C2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
......@@ -397,6 +402,18 @@ Global
{6A402480-C09B-4CBF-A6BD-115CE4BFF2D8}.Release|Win32.ActiveCfg = Release|Win32
{6A402480-C09B-4CBF-A6BD-115CE4BFF2D8}.Release|Win32.Build.0 = Release|Win32
{6A402480-C09B-4CBF-A6BD-115CE4BFF2D8}.Release|x64.ActiveCfg = Release|Win32
{6FE14C5C-6052-4D96-A89F-0843D91F89AD}.Debug|Win32.ActiveCfg = Debug|Win32
{6FE14C5C-6052-4D96-A89F-0843D91F89AD}.Debug|Win32.Build.0 = Debug|Win32
{6FE14C5C-6052-4D96-A89F-0843D91F89AD}.Debug|x64.ActiveCfg = Debug|Win32
{6FE14C5C-6052-4D96-A89F-0843D91F89AD}.Release|Win32.ActiveCfg = Release|Win32
{6FE14C5C-6052-4D96-A89F-0843D91F89AD}.Release|Win32.Build.0 = Release|Win32
{6FE14C5C-6052-4D96-A89F-0843D91F89AD}.Release|x64.ActiveCfg = Release|Win32
{7F0ACED1-6E16-4DD3-800E-0C50150897C2}.Debug|Win32.ActiveCfg = Debug|Win32
{7F0ACED1-6E16-4DD3-800E-0C50150897C2}.Debug|Win32.Build.0 = Debug|Win32
{7F0ACED1-6E16-4DD3-800E-0C50150897C2}.Debug|x64.ActiveCfg = Debug|Win32
{7F0ACED1-6E16-4DD3-800E-0C50150897C2}.Release|Win32.ActiveCfg = Release|Win32
{7F0ACED1-6E16-4DD3-800E-0C50150897C2}.Release|Win32.Build.0 = Release|Win32
{7F0ACED1-6E16-4DD3-800E-0C50150897C2}.Release|x64.ActiveCfg = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......@@ -418,6 +435,8 @@ Global
{718C186E-9155-41DF-B8AB-74ED03E204CD} = {13D5622C-8643-4BD8-A730-B5C919DAFDDC}
{B9656841-7734-4D0B-8619-1BED5E2ED7AE} = {13D5622C-8643-4BD8-A730-B5C919DAFDDC}
{6A402480-C09B-4CBF-A6BD-115CE4BFF2D8} = {13D5622C-8643-4BD8-A730-B5C919DAFDDC}
{6FE14C5C-6052-4D96-A89F-0843D91F89AD} = {13D5622C-8643-4BD8-A730-B5C919DAFDDC}
{7F0ACED1-6E16-4DD3-800E-0C50150897C2} = {13D5622C-8643-4BD8-A730-B5C919DAFDDC}
{6A3341BF-710B-4310-A7F8-810040D698DC} = {5128FBE9-1706-4255-B422-4A652320085E}
{AFBF200A-9260-4469-AE64-DCB42C796DD6} = {5128FBE9-1706-4255-B422-4A652320085E}
{A2B9EACA-69C1-4E9D-AF3C-704608DB57DE} = {5128FBE9-1706-4255-B422-4A652320085E}
......
......@@ -50,9 +50,9 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<IncludePath>../../../source;../../../sdks/bullet3/src;$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../sdks/dx9sdk/Include</IncludePath>
<LibraryPath>../../../libs;$(LibraryPath);../../../sdks/dx9sdk/Lib</LibraryPath>
<SourcePath>../../../source;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);../../../sdks/dx9sdk/Include</SourcePath>
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../source;../../../sdks/bullet3/src;../../../sdks/dx9sdk/Include</IncludePath>
<LibraryPath>$(LibraryPath);../../../libs;../../../sdks/dx9sdk/Lib</LibraryPath>
<SourcePath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);../../../source;../../../sdks/dx9sdk/Include</SourcePath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
......@@ -90,53 +90,17 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile>
<AdditionalOptions>/NODEFAULTLIB:LIBCMTD.lib %(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\managed_render\camera_update.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\managed_render\gdata.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\managed_render\handler_log.cpp" />
<ClCompile Include="..\..\..\source\managed_render\level.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\managed_render\model_sim.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\managed_render\redefined_func.cpp" />
<ClCompile Include="..\..\..\source\managed_render\render_func.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\render\sxrender.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\skyxengine.cpp" />
<ClCompile Include="..\..\..\source\SkyXEngine_Build\SkyXEngine_Build.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\common\string.h" />
<ClInclude Include="..\..\..\source\gdefines.h" />
<ClInclude Include="..\..\..\source\managed_render\camera_update.h" />
<ClInclude Include="..\..\..\source\managed_render\gdata.h" />
<ClInclude Include="..\..\..\source\managed_render\handler_log.h" />
<ClInclude Include="..\..\..\source\managed_render\level.h" />
<ClInclude Include="..\..\..\source\managed_render\model_sim.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="..\..\..\source\managed_render\redefined_func.h" />
<ClInclude Include="..\..\..\source\managed_render\render_def.h" />
<ClInclude Include="..\..\..\source\managed_render\render_func.h" />
<ClInclude Include="..\..\..\source\render\sxrender.h" />
<ClInclude Include="..\..\..\source\SkyXEngine.h" />
<ClInclude Include="..\..\..\source\SkyXEngine_Build\resource.h" />
</ItemGroup>
......
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="..\..\..\source\managed_render\gdata.cpp">
<Filter>Source\managed_render</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\managed_render\level.cpp">
<Filter>Source\managed_render</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\managed_render\model_sim.cpp">
<Filter>Source\managed_render</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\managed_render\render_func.cpp">
<Filter>Source\managed_render</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\managed_render\camera_update.cpp">
<Filter>Source\managed_render</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\SkyXEngine_Build\SkyXEngine_Build.cpp">
<Filter>Source</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\render\sxrender.cpp">
<Filter>Source</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\common\string.cpp">
<Filter>Source</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\managed_render\handler_log.cpp">
<Filter>Source\managed_render</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\skyxengine.cpp">
<Filter>Source</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\managed_render\redefined_func.cpp">
<Filter>Source\managed_render</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="Header">
......@@ -42,12 +18,6 @@
<Filter Include="Source">
<UniqueIdentifier>{1775ac6b-729a-4a5f-8916-d8d7b9fd4a6e}</UniqueIdentifier>
</Filter>
<Filter Include="Source\managed_render">
<UniqueIdentifier>{f3721427-a340-4107-b54b-a4ac928c80d2}</UniqueIdentifier>
</Filter>
<Filter Include="Header\managed_render">
<UniqueIdentifier>{f177015d-a4dd-4605-b11d-851b7ef2e4d4}</UniqueIdentifier>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{2c9feb65-a4b4-4815-9651-733058ec50a5}</UniqueIdentifier>
</Filter>
......@@ -59,39 +29,12 @@
<ClInclude Include="..\..\..\source\gdefines.h">
<Filter>Header</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\managed_render\gdata.h">
<Filter>Header\managed_render</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\managed_render\level.h">
<Filter>Header\managed_render</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\managed_render\model_sim.h">
<Filter>Header\managed_render</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\managed_render\render_func.h">
<Filter>Header\managed_render</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\managed_render\camera_update.h">
<Filter>Header\managed_render</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\SkyXEngine_Build\resource.h">
<Filter>Header</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\render\sxrender.h">
<Filter>Header</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\common\string.h">
<Filter>Header</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\managed_render\handler_log.h">
<Filter>Header\managed_render</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\managed_render\redefined_func.h">
<Filter>Header\managed_render</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\managed_render\render_def.h">
<Filter>Header\managed_render</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\..\source\SkyXEngine_Build\SkyXEngine.rc">
......
......@@ -99,7 +99,6 @@
<ClCompile Include="..\..\..\source\game\BaseTrigger.cpp" />
<ClCompile Include="..\..\..\source\game\crosshair.cpp" />
<ClCompile Include="..\..\..\source\game\CrosshairManager.cpp" />
<ClCompile Include="..\..\..\source\game\AmbientSounds.cpp" />
<ClCompile Include="..\..\..\source\game\EntityFactory.cpp" />
<ClCompile Include="..\..\..\source\game\EntityManager.cpp" />
<ClCompile Include="..\..\..\source\game\FuncTrain.cpp" />
......@@ -125,11 +124,9 @@
<ClCompile Include="..\..\..\source\game\SXplayerSpawn.cpp" />
<ClCompile Include="..\..\..\source\game\SXpointCamera.cpp" />
<ClCompile Include="..\..\..\source\game\SXpointEntity.cpp" />
<ClCompile Include="..\..\..\source\game\Weather.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\common\AAString.h" />
<ClInclude Include="..\..\..\source\game\ambient_sounds.h" />
<ClInclude Include="..\..\..\source\game\BaseHandle.h" />
<ClInclude Include="..\..\..\source\game\BaseMag.h" />
<ClInclude Include="..\..\..\source\game\BaseScope.h" />
......@@ -138,7 +135,6 @@
<ClInclude Include="..\..\..\source\game\BaseTrigger.h" />
<ClInclude Include="..\..\..\source\game\crosshair.h" />
<ClInclude Include="..\..\..\source\game\CrosshairManager.h" />
<ClInclude Include="..\..\..\source\game\AmbientSounds.h" />
<ClInclude Include="..\..\..\source\game\EntityFactory.h" />
<ClInclude Include="..\..\..\source\game\EntityManager.h" />
<ClInclude Include="..\..\..\source\game\FuncTrain.h" />
......@@ -166,7 +162,6 @@
<ClInclude Include="..\..\..\source\game\SXplayerSpawn.h" />
<ClInclude Include="..\..\..\source\game\SXpointCamera.h" />
<ClInclude Include="..\..\..\source\game\SXpointEntity.h" />
<ClInclude Include="..\..\..\source\game\Weather.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
......
......@@ -123,12 +123,6 @@
<ClCompile Include="..\..\..\source\game\LightPoint.cpp">
<Filter>Source Files\ents</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\game\AmbientSounds.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\game\Weather.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\game\crosshair.cpp">
<Filter>Source Files</Filter>
</ClCompile>
......@@ -239,12 +233,6 @@
<ClInclude Include="..\..\..\source\game\LightPoint.h">
<Filter>Header Files\ents</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\game\AmbientSounds.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\game\Weather.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\game\crosshair.h">
<Filter>Header Files</Filter>
</ClInclude>
......@@ -275,8 +263,5 @@
<ClInclude Include="..\..\..\source\game\BaseTrigger.h">
<Filter>Header Files\ents\triggers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\game\ambient_sounds.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{6FE14C5C-6052-4D96-A89F-0843D91F89AD}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>sxlevel</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120_xp</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120_xp</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../source;../../../sdks/bullet3/src;../../../sdks/dx9sdk/Include;</IncludePath>
<LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);../../../libs;../../../sdks/dx9sdk/Lib</LibraryPath>
<SourcePath>$(VC_SourcePath);../../../source;../../../sdks/bullet3/src;../../../sdks/dx9sdk/Include;</SourcePath>
<OutDir>../../../build/</OutDir>
<TargetName>$(ProjectName)_d</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../source;../../../sdks/bullet3/src;../../../sdks/dx9sdk/Include;</IncludePath>
<LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);../../../libs;../../../sdks/dx9sdk/Lib</LibraryPath>
<SourcePath>$(VC_SourcePath);../../../source;../../../sdks/bullet3/src;../../../sdks/dx9sdk/Include;</SourcePath>
<OutDir>../../../build/</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level1</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SXLEVEL_EXPORTS;SX_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile>
<ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level1</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SXLEVEL_EXPORTS;SX_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>false</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile>
<ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\level\AmbientSounds.cpp" />
<ClCompile Include="..\..\..\source\level\level.cpp" />
<ClCompile Include="..\..\..\source\level\sxlevel.cpp" />
<ClCompile Include="..\..\..\source\level\sxlevel_dll.cpp" />
<ClCompile Include="..\..\..\source\level\weather.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\common\string.h" />
<ClInclude Include="..\..\..\source\level\AmbientSounds.h" />
<ClInclude Include="..\..\..\source\level\level.h" />
<ClInclude Include="..\..\..\source\level\sxlevel.h" />
<ClInclude Include="..\..\..\source\level\Weather.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\level\sxlevel_dll.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\level\weather.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\level\AmbientSounds.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\level\level.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\level\sxlevel.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\common\string.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\level\Weather.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\level\AmbientSounds.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\level\level.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\level\sxlevel.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\common\string.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
......@@ -60,7 +60,7 @@
</PrecompiledHeader>
<WarningLevel>TurnOffAllWarnings</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;SX_LEVEL_EDITOR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
......@@ -78,7 +78,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;SX_LEVEL_EDITOR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
......@@ -90,33 +90,28 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\managed_render\editor\axes_helper.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\managed_render\editor\axes_static.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\managed_render\editor\grid.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\editors_utils\axes_helper.cpp" />
<ClCompile Include="..\..\..\source\skyxengine.cpp" />
<ClCompile Include="..\..\..\source\sxleveleditor\aigrid_callback.cpp" />
<ClCompile Include="..\..\..\source\sxleveleditor\common_callback.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\sxleveleditor\game_callback.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\sxleveleditor\green_callback.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\sxleveleditor\level_editor.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\sxleveleditor\model_callback.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\sxleveleditor\sxleveleditor.cpp" />
</ItemGroup>
......@@ -124,9 +119,16 @@
<ResourceCompile Include="..\..\..\source\sxleveleditor\SXLevelEditor.rc" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\managed_render\editor\axes_helper.h" />
<ClInclude Include="..\..\..\source\managed_render\editor\axes_static.h" />
<ClInclude Include="..\..\..\source\managed_render\editor\grid.h" />
<ClInclude Include="..\..\..\source\common\string.h" />
<ClInclude Include="..\..\..\source\editors_utils\axes_helper.h" />
<ClInclude Include="..\..\..\source\gdefines.h" />
<ClInclude Include="..\..\..\source\SkyXEngine.h" />
<ClInclude Include="..\..\..\source\sxleveleditor\aigrid_callback.h" />
<ClInclude Include="..\..\..\source\sxleveleditor\common_callback.h" />
<ClInclude Include="..\..\..\source\sxleveleditor\game_callback.h" />
<ClInclude Include="..\..\..\source\sxleveleditor\green_callback.h" />
<ClInclude Include="..\..\..\source\sxleveleditor\level_editor.h" />
<ClInclude Include="..\..\..\source\sxleveleditor\model_callback.h" />
<ClInclude Include="..\..\..\source\sxleveleditor\resource.h" />
</ItemGroup>
<ItemGroup>
......
......@@ -13,12 +13,6 @@
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
<Filter Include="Source Files\editor">
<UniqueIdentifier>{d221e1a3-f0c0-4d69-a1bc-41f4386723ac}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\editor">
<UniqueIdentifier>{88404b3f-18e0-4a10-b75c-5b366779626c}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\sxleveleditor\sxleveleditor.cpp">
......@@ -36,14 +30,20 @@
<ClCompile Include="..\..\..\source\sxleveleditor\common_callback.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\managed_render\editor\axes_static.cpp">
<Filter>Source Files\editor</Filter>
<ClCompile Include="..\..\..\source\sxleveleditor\aigrid_callback.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\managed_render\editor\grid.cpp">
<Filter>Source Files\editor</Filter>
<ClCompile Include="..\..\..\source\sxleveleditor\game_callback.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\managed_render\editor\axes_helper.cpp">
<Filter>Source Files\editor</Filter>
<ClCompile Include="..\..\..\source\skyxengine.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\editors_utils\axes_helper.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\common\string.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
......@@ -55,14 +55,35 @@
<ClInclude Include="..\..\..\source\sxleveleditor\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\managed_render\editor\grid.h">
<Filter>Header Files\editor</Filter>
<ClInclude Include="..\..\..\source\sxleveleditor\aigrid_callback.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\sxleveleditor\common_callback.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\sxleveleditor\game_callback.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\sxleveleditor\green_callback.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\managed_render\editor\axes_helper.h">
<Filter>Header Files\editor</Filter>
<ClInclude Include="..\..\..\source\sxleveleditor\level_editor.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\managed_render\editor\axes_static.h">
<Filter>Header Files\editor</Filter>
<ClInclude Include="..\..\..\source\sxleveleditor\model_callback.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\SkyXEngine.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\gdefines.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\editors_utils\axes_helper.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\common\string.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
......
......@@ -60,7 +60,7 @@
</PrecompiledHeader>
<WarningLevel>TurnOffAllWarnings</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;SX_EXE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;SX_MATERIAL_EDITOR;SX_EXE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
......@@ -72,13 +72,13 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level1</WarningLevel>
<WarningLevel>TurnOffAllWarnings</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>