Commit 9409b605 authored by Byurrrer's avatar Byurrrer

поправил ошибки при компиляции в релизе, навел небольшой порядок в sx хидерах...

поправил ошибки при компиляции в релизе, навел небольшой порядок в sx хидерах библиотек, навел немного порядок в managed render, несколько enumов переименовал как надо
parent 62d5280a
......@@ -438,7 +438,4 @@ Global
{CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC} = {BE976610-EE71-4D57-8733-2FE43BF602F5}
{3A214E06-B95E-4D61-A291-1F8DF2EC10FD} = {BE976610-EE71-4D57-8733-2FE43BF602F5}
EndGlobalSection
GlobalSection(Performance) = preSolution
HasPerformanceSessions = true
EndGlobalSection
EndGlobal
......@@ -60,7 +60,7 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;SX_GAME;SX_EXE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
......@@ -81,7 +81,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;SX_GAME;SX_EXE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
......@@ -93,39 +93,50 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\managed_render\camera_update.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\managed_render\gdata.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\managed_render\handler_out_log.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\managed_render\handler_log.cpp" />
<ClCompile Include="..\..\..\source\managed_render\level.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\managed_render\model_sim.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\managed_render\redefined_func.cpp" />
<ClCompile Include="..\..\..\source\managed_render\render_func.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<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" />
<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>
......
......@@ -4,9 +4,6 @@
<ClCompile Include="..\..\..\source\managed_render\gdata.cpp">
<Filter>Source\managed_render</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\managed_render\handler_out_log.cpp">
<Filter>Source\managed_render</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\managed_render\level.cpp">
<Filter>Source\managed_render</Filter>
</ClCompile>
......@@ -22,6 +19,21 @@
<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">
......@@ -65,6 +77,21 @@
<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">
......
......@@ -61,7 +61,7 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SXANIM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SXANIM_EXPORTS;SX_DLL%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
......
......@@ -66,7 +66,7 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>SX_DLL;WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;_USRDLL;SXDECALS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;_USRDLL;SXDECALS_EXPORTS;SX_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
......
......@@ -81,7 +81,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SGCORE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SGCORE_EXPORTS;SX_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
......@@ -98,29 +98,29 @@
<ClCompile Include="..\..\..\source\gcore\bound.cpp" />
<ClCompile Include="..\..\..\source\gcore\camera.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\gcore\CreatorTextures.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\gcore\GeomOptimize.cpp" />
<ClCompile Include="..\..\..\source\gcore\LoaderTextures.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\gcore\loader_static.cpp" />
<ClCompile Include="..\..\..\source\gcore\shader.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\gcore\sky.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\gcore\sxgcore.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\gcore\sxgcore_dll.cpp" />
</ItemGroup>
......
......@@ -14,15 +14,15 @@
<ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\geom\green.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\geom\static_geom.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\geom\sxgeom.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\geom\sxgeom_dll.cpp" />
</ItemGroup>
......
......@@ -80,7 +80,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SXINPUT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SXINPUT_EXPORTS;SX_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
......@@ -95,11 +95,11 @@
<ItemGroup>
<ClCompile Include="..\..\..\source\input\input.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\input\sxinput.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\input\sxinput_dll.cpp" />
</ItemGroup>
......
......@@ -80,7 +80,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SXMTLLIGHT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SXMTLLIGHT_EXPORTS;SX_EXE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
......@@ -96,27 +96,27 @@
<ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\mtllight\light.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\mtllight\material.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\mtllight\ml_data.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\mtllight\reflection.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\mtllight\shadow.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\mtllight\sxmtllight.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\mtllight\sxmtllight_dll.cpp" />
</ItemGroup>
......
......@@ -80,7 +80,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SXPARTICLES_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SXPARTICLES_EXPORTS;SX_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
......@@ -96,16 +96,16 @@
<ClCompile Include="..\..\..\source\common\string.cpp" />
<ClCompile Include="..\..\..\source\particles\effect.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\particles\emitter.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\particles\PESet.cpp" />
<ClCompile Include="..\..\..\source\particles\sxparticles.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\particles\sxparticles_dll.cpp" />
</ItemGroup>
......
......@@ -83,7 +83,7 @@
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<GenerateDebugInformation>false</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<ImportLibrary>../../../libs/$(TargetName).lib</ImportLibrary>
......
......@@ -81,7 +81,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SXPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SXPP_EXPORTS;SX_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
......
......@@ -89,7 +89,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SXSCORE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SXSCORE_EXPORTS;SX_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
......
......@@ -9,11 +9,12 @@ See the license in LICENSE
Зарезервированные (именованые) номера регистров
*/
#ifndef G_RI
#define G_RI
#ifndef __G_RI
#define __G_RI
/*! \name float4x4 register
@{*/
/*! @name float4x4 register */
//! @{
#define G_RI_MATRIX_WORLD 0 /*!< текущая мировая матрица */
#define G_RI_MATRIX_VIEW 1 /*!< текущая видовая матрица */
#define G_RI_MATRIX_PROJECTION 2 /*!< текущая матрица проекции */
......@@ -22,33 +23,49 @@ See the license in LICENSE
#define G_RI_MATRIX_OBSERVER_VIEW 5 /*!< матрица вида камеры наблюдателя */
#define G_RI_MATRIX_OBSERVER_PROJ 6 /*!< матрица проекции камеры наблюдателя */
#define G_RI_MATRIX_LIGHT_PROJ 7 /*!< матрица проекции для света */
//! @}
/*! @name bool register */
//! @{
//!@}
//##########################################################################
/*! \name bool register
@{*/
#define G_RI_BOOL_CLIPPLANE0 0 /*!< использовать ли плоскость отсечения */
#define G_RI_BOOL_RENDER_WINDOWED 1 /*!< оконный рендер - true, полноэкранный - false */
//! @}
/*! @name float register */
//! @{
//!@}
//##########################################################################
/*! \name float register
@{*/
#define G_RI_FLOAT_OBSERVER_NEAR 0 /*!< ближняя плоскость отсечения наблюдателя */
#define G_RI_FLOAT_OBSERVER_FAR 1 /*!< дальняя плоскость отсечения наблюдателя или дальность видимости */
#define G_RI_FLOAT_OBSERVER_FOV 2 /*!< fov наблюдателя */
#define G_RI_FLOAT_WINSIZE_WIDTH 3 /*!< ширина окна рендера */
#define G_RI_FLOAT_WINSIZE_HEIGHT 4 /*!< высота окна рендера */
//! @}
/*! @name float3 register */
//! @{
//!@}
//##########################################################################
/*! \name float3 register
@{*/
#define G_RI_FLOAT3_CLIPPLANE0_NORMAL 0 /*!< нормаль плоскости отсечения */
#define G_RI_FLOAT3_CLIPPLANE0_POINT 1 /*!< точка на плоскости отсчения */
#define G_RI_FLOAT3_OBSERVER_POSITION 2 /*!< позиция наблюдателя */
#define G_RI_FLOAT3_OBSERVER_DIRECTION 3 /*!< направление взгляда наблюдателя */
//! @}
/*! @name int register */
//! @{
//##########################################################################
/*! \name int register
@{*/
#define G_RI_INT_COUNT_POLY 0 /*!< общее количество полигонов */
#define G_RI_INT_COUNT_DIP 1 /*!< количество вызовов draw indexed primitive */
#define G_RI_INT_CURRIDLIGHT 2 /*!< текущий идентификатор источнкиа света */
......@@ -58,10 +75,14 @@ See the license in LICENSE
#define G_RI_INT_TIMER_GAME 5 /*!< время для игры */
#define G_RI_INT_TIME_DELTA 6 /*!< время рендера кадра */
//! @}
/*! @name string register */
//! @{
//##########################################################################
/*! \name string register
@{*/
#define G_RI_STRING_PATH_EXE 0 /*!< путь до исполняемого файла */
#define G_RI_STRING_PATH_WORKTEX 1 /*!< путь до сохранения рабочих текстур */
#define G_RI_STRING_PATH_SCREENSHOTS 2 /*!< путь до скриншотов */
......@@ -78,6 +99,6 @@ See the license in LICENSE
#define G_RI_STRING_PATH_GS_MTRLS 12 /*!< путь до материалов */
#define G_RI_STRING_PATH_GS_GUI 13 /*!< путь до gui */
//! @}
//!@}
#endif
......@@ -223,11 +223,14 @@ QT стиль документирования (!) и QT_AUTOBRIEF - корот
//#############################################################################
#ifndef __SKYXENGINE_H
#define __SKYXENGINE_H
#include <windows.h>
#include <ctime>
#include <gdefines.h>
#include <common\\array.h>
#include <common\\string.cpp>
#include <common/array.h>
#include <common/string.h>
//ЗАГРУЗКА БИБЛИОТЕК
//{
......@@ -236,14 +239,14 @@ QT стиль документирования (!) и QT_AUTOBRIEF - корот
#else
#pragma comment(lib, "sxcore.lib")
#endif
#include <core\\sxcore.h>
#include <core/sxcore.h>
#if defined(_DEBUG)
#pragma comment(lib, "sxinput_d.lib")
#else
#pragma comment(lib, "sxinput.lib")
#endif
#include <input\\sxinput.h>
#include <input/sxinput.h>
#if defined(_DEBUG)
#pragma comment(lib, "sxscore_d.lib")
......@@ -257,35 +260,35 @@ QT стиль документирования (!) и QT_AUTOBRIEF - корот
#else
#pragma comment(lib, "sxgcore.lib")
#endif
#include <gcore\\sxgcore.h>
#include <gcore/sxgcore.h>
#if defined(_DEBUG)
#pragma comment(lib, "sxgeom_d.lib")
#else
#pragma comment(lib, "sxgeom.lib")
#endif
#include <geom\\sxgeom.h>
#include <geom/sxgeom.h>
#if defined(_DEBUG)
#pragma comment(lib, "sxmtllight_d.lib")
#else
#pragma comment(lib, "sxmtllight.lib")
#endif
#include <mtllight\\sxmtllight.h>
#include <mtllight/sxmtllight.h>
#if defined(_DEBUG)
#pragma comment(lib, "sxparticles_d.lib")
#else
#pragma comment(lib, "sxparticles.lib")
#endif
#include <particles\\sxparticles.h>
#include <particles/sxparticles.h>
#if defined(_DEBUG)
#pragma comment(lib, "sxpp_d.lib")
#else
#pragma comment(lib, "sxpp.lib")
#endif
#include <pp\\sxpp.h>
#include <pp/sxpp.h>
#if defined(_DEBUG)
#pragma comment(lib, "sxanim_d.lib")
......@@ -328,43 +331,40 @@ QT стиль документирования (!) и QT_AUTOBRIEF - корот
#else
#pragma comment(lib, "sxguiwinapi.lib")
#endif
#include <sxguiwinapi\\sxgui.h>
#include <sxguiwinapi/sxgui.h>
#endif
//}
//#############################################################################
#include <managed_render\\handler_out_log.cpp>
#include <managed_render\\gdata.h>
#include <managed_render\\camera_update.h>
#include <managed_render\\render_func.h>
#include <managed_render\\level.h>
#include <managed_render/handler_log.h>
#include <managed_render/gdata.h>
#include <managed_render/camera_update.h>
#include <managed_render/render_func.h>
#include <managed_render/level.h>
#if defined(SX_GAME)
/*#if defined(SX_GAME)
#include <SkyXEngine_Build/resource.h>
#endif
#endif*/
#if defined(SX_LEVEL_EDITOR)
#include <SXLevelEditor/resource.h>
#include <SXLevelEditor\\level_editor.cpp>
#include <SXLevelEditor/level_editor.cpp>
#endif
#if defined(SX_MATERIAL_EDITOR)
#include <sxmaterialeditor/resource.h>
#include <sxmaterialeditor\\material_editor.cpp>
#include <sxmaterialeditor/material_editor.cpp>
#endif
#if defined(SX_PARTICLES_EDITOR)
#include <sxparticleseditor/resource.h>
#include <sxparticleseditor\\particles_editor.cpp>
#include <sxparticleseditor/particles_editor.cpp>
#endif
#include <managed_render\\render_func.h>
#include <managed_render\\gdata.cpp>
#include <managed_render\\camera_update.cpp>
#include <managed_render\\render_func.cpp>
#include <managed_render\\level.cpp>
#include <managed_render/redefined_func.h>
#include <managed_render/render_func.h>
//#############################################################################
......@@ -389,4 +389,6 @@ LRESULT CALLBACK SkyXEngine_PreviewWndProc(HWND hWnd, UINT message, WPARAM wPara
void SkyXEngine_PreviewCreate();
//! уничтожение превью окна
void SkyXEngine_PreviewKill();
\ No newline at end of file
void SkyXEngine_PreviewKill();
#endif
\ No newline at end of file
......@@ -10,7 +10,7 @@ See the license in LICENSE
#define SX_EXE
#define SX_GAME
#include <SkyXEngine.cpp>
#include <SkyXEngine.h>
int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow)
{
......
......@@ -951,8 +951,8 @@ void AIGrid::GraphicsInit()
Tex_AIGrid = SGCore_LoadTexAddName("decal_aigrid1.dds", LoadTexType::ltt_const);
IDVS = SGCore_ShaderLoad(ShaderType::st_vertex, "aigrid_quad.vs", "aigrid_quad", ShaderCheckDouble::scd_path);
IDPS = SGCore_ShaderLoad(ShaderType::st_pixel, "aigrid_quad.ps", "aigrid_quad", ShaderCheckDouble::scd_path);
IDVS = SGCore_ShaderLoad(SHADER_TYPE_VERTEX, "aigrid_quad.vs", "aigrid_quad", ShaderCheckDouble::scd_path);
IDPS = SGCore_ShaderLoad(SHADER_TYPE_PIXEL, "aigrid_quad.ps", "aigrid_quad", ShaderCheckDouble::scd_path);
IDirect3DTexture9* TexBB;
......@@ -2303,8 +2303,8 @@ void AIGrid::RenderQuads(const ISXFrustum * frustum, const float3 * viewpos, flo
DXDevice->SetTexture(0, SGCore_LoadTexGetTex(Tex_AIGrid));
SGCore_ShaderBind(ShaderType::st_vertex, IDVS);
SGCore_ShaderBind(ShaderType::st_pixel, IDPS);
SGCore_ShaderBind(SHADER_TYPE_VERTEX, IDVS);
SGCore_ShaderBind(SHADER_TYPE_PIXEL, IDPS);
D3DXMATRIX tmpview, tmpproj;
DXDevice->GetTransform(D3DTS_VIEW, &tmpview);
......@@ -2313,7 +2313,7 @@ void AIGrid::RenderQuads(const ISXFrustum * frustum, const float3 * viewpos, flo
float4x4 wvp = SMMatrixIdentity() * float4x4(tmpview) * float4x4(tmpproj);
wvp = SMMatrixTranspose(wvp);
SGCore_ShaderSetVRF(ShaderType::st_vertex, IDVS, "WorldViewProjection", &wvp);
SGCore_ShaderSetVRF(SHADER_TYPE_VERTEX, IDVS, "WorldViewProjection", &wvp);
DXDevice->DrawIndexedPrimitive(D3DPT_TRIANGLELIST, 0, 0, 4, 0, 2);
......@@ -2400,8 +2400,8 @@ void AIGrid::RenderGraphPoints(const float3 * viewpos, float dist)
DXDevice->SetTexture(0, SGCore_LoadTexGetTex(Tex_AIGrid));
SGCore_ShaderBind(ShaderType::st_vertex, IDVS);
SGCore_ShaderBind(ShaderType::st_pixel, IDPS);
SGCore_ShaderBind(SHADER_TYPE_VERTEX, IDVS);
SGCore_ShaderBind(SHADER_TYPE_PIXEL, IDPS);
D3DXMATRIX tmpview, tmpproj;
DXDevice->GetTransform(D3DTS_VIEW, &tmpview);
......@@ -2410,7 +2410,7 @@ void AIGrid::RenderGraphPoints(const float3 * viewpos, float dist)
float4x4 wvp = SMMatrixIdentity() * float4x4(tmpview) * float4x4(tmpproj);
wvp = SMMatrixTranspose(wvp);
SGCore_ShaderSetVRF(ShaderType::st_vertex, IDVS, "WorldViewProjection", &wvp);
SGCore_ShaderSetVRF(SHADER_TYPE_VERTEX, IDVS, "WorldViewProjection", &wvp);
DXDevice->DrawIndexedPrimitive(D3DPT_TRIANGLELIST, 0, 0, 4, 0, 2);
......
......@@ -18,8 +18,8 @@ AI сетка состоит из квадратов (квад), квады им
@{
*/
#ifndef __sxaigrid
#define __sxaigrid
#ifndef __SXAIGRID_H
#define __SXAIGRID_H
#include <gdefines.h>
......@@ -28,7 +28,13 @@ AI сетка состоит из квадратов (квад), квады им
#else
#pragma comment(lib, "sxgcore.lib")
#endif
#include <gcore\\sxgcore.h>
#define SX_LIB_API extern "C" __declspec (dllimport)
#include <gcore/sxgcore.h>
#ifdef SX_DLL
#define SX_LIB_API extern "C" __declspec (dllexport)
#endif
/*! \name Базовые функции библиотеки
@{*/
......
......@@ -14,9 +14,8 @@ See the license in LICENSE
*/
#ifndef _SXANIM_H_
#define _SXANIM_H_
#ifndef __SXANIM_H
#define __SXANIM_H
#include "ModelFile.h"
......@@ -30,6 +29,13 @@ See the license in LICENSE
#include <gdefines.h>
#define SX_LIB_API extern "C" __declspec (dllimport)
#include <gcore/sxgcore.h>
#ifdef SX_DLL
#define SX_LIB_API extern "C" __declspec (dllexport)
#endif
#ifdef _SERVER
# define IDirect3DDevice9 void
#else
......
......@@ -20,16 +20,23 @@ See the license in LICENSE
#include "Time.h"
//##########################################################################
char g_szCoreName[CORE_NAME_MAX_LEN];
#if !defined(DEF_STD_REPORT)
#define DEF_STD_REPORT
report_func g_fnReportf = DefReport;
#endif