Skip to content

GitLab

engine
engine
Commit 6194f41e authored by D-AIRY's avatar D-AIRY
Browse files
Options

Merge branch 'dev' of https://dev.ds-servers.com/sip/engine into dev

parents 705add06 6fe03e34
Hide whitespace changes
Inline Side-by-side
Showing with 114 additions and 119 deletions
proj/SkyXEngine/vs2013/SkyXEngine.vcxproj
View file @ 6194f41e
......@@ -68,7 +68,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<TargetName>$(ProjectName)_d</TargetName>
<IncludePath>../../../source;../../../sdks/bullet3/src;$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../sdks/dx9sdk/Include;../../../sdks/ogg/libvorbis/include/;../../../sdks/ogg/libogg/include/;</IncludePath>
<LibraryPath>../../../libs;$(LibraryPath);../../../sdks/dx9sdk/Lib</LibraryPath>
......@@ -84,7 +84,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<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>
......
proj/sxae/vs2013/sxae.vcxproj
View file @ 6194f41e
......@@ -41,13 +41,13 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<IncludePath>../../../source/;$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../sdks/dx9sdk/Include/;../../../sdks/bullet3/src</IncludePath>
<LibraryPath>../../../libs/;../../../sdks/dx9sdk/Lib/;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<IncludePath>../../../source/;$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../sdks/dx9sdk/Include/;../../../sdks/bullet3/src</IncludePath>
<LibraryPath>../../../libs/;../../../sdks/dx9sdk/Lib/;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);</LibraryPath>
</PropertyGroup>
......
proj/sxaigrid/vs2013/sxaigrid.vcxproj
View file @ 6194f41e
......@@ -41,7 +41,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<TargetName>$(ProjectName)_d</TargetName>
<IncludePath>../../../source;$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../sdks/dx9sdk/Include</IncludePath>
<LibraryPath>../../../libs;$(LibraryPath);$(WindowsSDK_LibraryPath_x86);../../../sdks/dx9sdk/Lib</LibraryPath>
......@@ -52,7 +52,7 @@
<IncludePath>../../../source;$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../sdks/dx9sdk/Include</IncludePath>
<LibraryPath>../../../libs;$(LibraryPath);$(WindowsSDK_LibraryPath_x86);../../../sdks/dx9sdk/Lib</LibraryPath>
<SourcePath>../../../source;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);../../../sdks/dx9sdk/Include</SourcePath>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
......
proj/sxanim/vs2013/sxanim.vcxproj
View file @ 6194f41e
......@@ -42,7 +42,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<TargetName>$(ProjectName)_d</TargetName>
<IncludePath>$(IncludePath);$(WindowsSdk_71A_IncludePath);../../../source;../../../sdks/dx9sdk/Include;</IncludePath>
<LibraryPath>../../../sdks/dx9sdk/Lib;../../../libs;$(LibraryPath)</LibraryPath>
......@@ -50,7 +50,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<IncludePath>$(IncludePath);$(WindowsSdk_71A_IncludePath);../../../source;../../../sdks/dx9sdk/Include;</IncludePath>
<LibraryPath>../../../sdks/dx9sdk/Lib;../../../libs;$(LibraryPath)</LibraryPath>
<SourcePath>../../../source;$(SourcePath);../../../sdks/dx9sdk/Include;</SourcePath>
......
proj/sxconsole/vs2013/sxconsole.vcxproj
View file @ 6194f41e
......@@ -41,12 +41,12 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<IncludePath>../../../source/;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<IncludePath>../../../source/;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);</IncludePath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
......
proj/sxcore/vs2013/sxcore.vcxproj
View file @ 6194f41e
......@@ -117,7 +117,7 @@
<IncludePath>../../../source;$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../sdks/dx9sdk/Include</IncludePath>
<LibraryPath>../../../libs;$(LibraryPath);$(WindowsSDK_LibraryPath_x86);../../../sdks/dx9sdk/Lib</LibraryPath>
<SourcePath>../../../source;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);../../../sdks/dx9sdk/Include</SourcePath>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">
<LinkIncremental>false</LinkIncremental>
......@@ -129,7 +129,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<IncludePath>../../../source;$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../sdks/dx9sdk/Include</IncludePath>
<LibraryPath>../../../libs;$(LibraryPath);$(WindowsSDK_LibraryPath_x86);../../../sdks/dx9sdk/Lib</LibraryPath>
<SourcePath>../../../source;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);../../../sdks/dx9sdk/Include</SourcePath>
......
proj/sxdecals/vs2013/sxdecals.vcxproj
View file @ 6194f41e
......@@ -50,14 +50,14 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<IncludePath>../../../source;../../../sdks/bullet3/src;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);../../../sdks/dx9sdk/Include;</IncludePath>
<LibraryPath>../../../sdks/dx9sdk/Lib;../../../sdks/bullet3/bin;../../../libs;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86);</LibraryPath>
<TargetName>$(ProjectName)_d</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<IncludePath>../../../source;../../../sdks/bullet3/src;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);../../../sdks/dx9sdk/Include;</IncludePath>
<LibraryPath>../../../sdks/dx9sdk/Lib;../../../sdks/bullet3/bin;../../../libs;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86);</LibraryPath>
</PropertyGroup>
......
proj/sxgame/vs2013/sxgame.vcxproj
View file @ 6194f41e
......@@ -41,14 +41,14 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<IncludePath>../../../source;../../../sdks/bullet3/src;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);;../../../sdks/dx9sdk/Include;</IncludePath>
<LibraryPath>../../../libs;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86);;../../../sdks/dx9sdk/Lib;</LibraryPath>
<TargetName>$(ProjectName)_d</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<IncludePath>../../../source;../../../sdks/bullet3/src;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);;../../../sdks/dx9sdk/Include;</IncludePath>
<LibraryPath>../../../libs;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86);;../../../sdks/dx9sdk/Lib;</LibraryPath>
</PropertyGroup>
......
proj/sxgcore/vs2013/sxgcore.vcxproj
View file @ 6194f41e
......@@ -42,7 +42,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<TargetName>$(ProjectName)_d</TargetName>
<IncludePath>$(IncludePath);$(WindowsSdk_71A_IncludePath);../../../source;../../../sdks/dx9sdk/Include;</IncludePath>
<LibraryPath>../../../sdks/dx9sdk/Lib;../../../libs;$(LibraryPath)</LibraryPath>
......@@ -50,7 +50,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<IncludePath>$(IncludePath);$(WindowsSdk_71A_IncludePath);../../../source;../../../sdks/dx9sdk/Include;</IncludePath>
<LibraryPath>../../../sdks/dx9sdk/Lib;../../../libs;$(LibraryPath)</LibraryPath>
<SourcePath>../../../source;$(SourcePath);../../../sdks/dx9sdk/Include;</SourcePath>
......
proj/sxgenpreview/vs2013/sxgenpreview.vcxproj
View file @ 6194f41e
......@@ -41,7 +41,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<TargetName>$(ProjectName)</TargetName>
<IncludePath>../../../source;../../../sdks/bullet3/src;$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../sdks/dx9sdk/Include;../../../sdks/ogg/libvorbis/include/;../../../sdks/ogg/libogg/include/;</IncludePath>
<LibraryPath>../../../libs;$(LibraryPath);../../../sdks/dx9sdk/Lib</LibraryPath>
......@@ -49,7 +49,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<IncludePath>../../../source;../../../sdks/bullet3/src;$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../sdks/dx9sdk/Include;../../../sdks/ogg/libvorbis/include/;../../../sdks/ogg/libogg/include/;</IncludePath>
<LibraryPath>../../../libs;$(LibraryPath);../../../sdks/dx9sdk/Lib</LibraryPath>
<SourcePath>../../../source;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);../../../sdks/dx9sdk/Include</SourcePath>
......
proj/sxgeom/vs2013/sxgeom.vcxproj
View file @ 6194f41e
......@@ -57,7 +57,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<TargetName>$(ProjectName)_d</TargetName>
<IncludePath>../../../source;$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../sdks/dx9sdk/Include</IncludePath>
<LibraryPath>../../../libs;$(LibraryPath);$(WindowsSDK_LibraryPath_x86);../../../sdks/dx9sdk/Lib</LibraryPath>
......@@ -65,7 +65,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<IncludePath>../../../source;$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../sdks/dx9sdk/Include</IncludePath>
<LibraryPath>../../../libs;$(LibraryPath);$(WindowsSDK_LibraryPath_x86);../../../sdks/dx9sdk/Lib</LibraryPath>
<SourcePath>../../../source;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);../../../sdks/dx9sdk/Include</SourcePath>
......
proj/sxgreen/sxgreen/sxgreen.vcxproj
View file @ 6194f41e
......@@ -41,7 +41,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<TargetName>$(ProjectName)_d</TargetName>
<IncludePath>../../../source;$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../sdks/dx9sdk/Include</IncludePath>
<LibraryPath>../../../libs;$(LibraryPath);$(WindowsSDK_LibraryPath_x86);../../../sdks/dx9sdk/Lib</LibraryPath>
......@@ -49,7 +49,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<TargetName>$(ProjectName)</TargetName>
<IncludePath>../../../source;$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../sdks/dx9sdk/Include</IncludePath>
<LibraryPath>../../../libs;$(LibraryPath);$(WindowsSDK_LibraryPath_x86);../../../sdks/dx9sdk/Lib</LibraryPath>
......
proj/sxgui/vs2013/sxgui.vcxproj
View file @ 6194f41e
......@@ -43,13 +43,13 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\..\sdks\freetype-2.6\include;../../../source/;..\..\..\sdks\dx9sdk\Include;</IncludePath>
<LibraryPath>..\..\..\libs;..\..\..\sdks\dx9sdk\Lib;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);..\..\..\sdks\freetype-2.6\objs\vc2010\Win32;</LibraryPath>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<TargetName>$(ProjectName)_d</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\..\sdks\freetype-2.6\include;../../../source/;..\..\..\sdks\dx9sdk\Include;</IncludePath>
<LibraryPath>..\..\..\libs;..\..\..\sdks\dx9sdk\Lib;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);..\..\..\sdks\freetype-2.6\objs\vc2010\Win32;</LibraryPath>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
......
proj/sxguiwinapi/vs2013/sxguiwinapi.vcxproj
View file @ 6194f41e
......@@ -98,7 +98,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<TargetName>$(ProjectName)_d</TargetName>
<IncludePath>../../../source;$(IncludePath)</IncludePath>
<LibraryPath>../../../libs;$(LibraryPath)</LibraryPath>
......@@ -106,7 +106,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<LibraryPath>../../../libs;$(LibraryPath)</LibraryPath>
<IncludePath>../../../source;$(IncludePath)</IncludePath>
<SourcePath>../../../source;$(VC_SourcePath);</SourcePath>
......
proj/sxinput/vs2013/sxinput.vcxproj
View file @ 6194f41e
......@@ -41,7 +41,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<TargetName>$(ProjectName)_d</TargetName>
<IncludePath>../../../source;$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../sdks/dx9sdk/Include</IncludePath>
<LibraryPath>../../../libs;$(LibraryPath);$(WindowsSDK_LibraryPath_x86);../../../sdks/dx9sdk/Lib</LibraryPath>
......@@ -49,7 +49,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<IncludePath>../../../source;$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../sdks/dx9sdk/Include</IncludePath>
<LibraryPath>../../../libs;$(LibraryPath);$(WindowsSDK_LibraryPath_x86);../../../sdks/dx9sdk/Lib</LibraryPath>
<SourcePath>../../../source;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);../../../sdks/dx9sdk/Include</SourcePath>
......
proj/sxlevel/vs2013/sxlevel.vcxproj
View file @ 6194f41e
......@@ -44,7 +44,7 @@
<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>
<OutDir>../../../build/bin/</OutDir>
<TargetName>$(ProjectName)_d</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
......@@ -52,7 +52,7 @@
<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>
<OutDir>../../../build/bin/</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
......
proj/sxleveleditor/vs2013/sxleveleditor.vcxproj
View file @ 6194f41e
......@@ -45,11 +45,11 @@
<IncludePath>../../../sdks/bullet3/src;$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../source;../../../sdks/dx9sdk/Include;</IncludePath>
<LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);../../../libs;../../../sdks/dx9sdk/lib;</LibraryPath>
<SourcePath>$(VC_SourcePath);../../../source;../../../sdks/dx9sdk/Include;</SourcePath>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<IncludePath>../../../sdks/bullet3/src;$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../source;../../../sdks/dx9sdk/Include;</IncludePath>
<LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);../../../libs;../../../sdks/dx9sdk/lib;</LibraryPath>
<SourcePath>$(VC_SourcePath);../../../source;../../../sdks/dx9sdk/Include;</SourcePath>
......
proj/sxlight/vs2013/sxlight.vcxproj
View file @ 6194f41e
......@@ -42,7 +42,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<TargetName>$(ProjectName)_d</TargetName>
<IncludePath>../../../source;$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../sdks/dx9sdk/Include</IncludePath>
<LibraryPath>../../../libs;$(LibraryPath);$(WindowsSDK_LibraryPath_x86);../../../sdks/dx9sdk/Lib</LibraryPath>
......@@ -50,7 +50,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<IncludePath>../../../source;$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../sdks/dx9sdk/Include</IncludePath>
<LibraryPath>../../../libs;$(LibraryPath);$(WindowsSDK_LibraryPath_x86);../../../sdks/dx9sdk/Lib</LibraryPath>
<SourcePath>../../../source;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);../../../sdks/dx9sdk/Include</SourcePath>
......
proj/sxmaterialeditor/vs2013/sxmaterialeditor.vcxproj
View file @ 6194f41e
......@@ -44,12 +44,12 @@
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../source;../../../sdks/dx9sdk/Include;../../../sdks/bullet3/src</IncludePath>
<LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);../../../libs;../../../sdks/dx9sdk/lib;</LibraryPath>
<SourcePath>$(VC_SourcePath);../../../source;../../../sdks/dx9sdk/Include;</SourcePath>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<TargetName>$(ProjectName)_d</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../source;../../../sdks/dx9sdk/Include;../../../sdks/bullet3/src</IncludePath>
<LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);../../../libs;../../../sdks/dx9sdk/lib;</LibraryPath>
<SourcePath>$(VC_SourcePath);../../../source;../../../sdks/dx9sdk/Include;</SourcePath>
......
proj/sxmtrl/vs2013/sxmtrl.vcxproj
View file @ 6194f41e
......@@ -41,7 +41,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<TargetName>$(ProjectName)_d</TargetName>
<IncludePath>../../../source;$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../sdks/dx9sdk/Include</IncludePath>
<LibraryPath>../../../libs;$(LibraryPath);$(WindowsSDK_LibraryPath_x86);../../../sdks/dx9sdk/Lib</LibraryPath>
......@@ -49,7 +49,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<IncludePath>../../../source;$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../sdks/dx9sdk/Include</IncludePath>
<LibraryPath>../../../libs;$(LibraryPath);$(WindowsSDK_LibraryPath_x86);../../../sdks/dx9sdk/Lib</LibraryPath>
<SourcePath>../../../source;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);../../../sdks/dx9sdk/Include</SourcePath>
......
proj/sxparticles/vs2013/sxparticles.vcxproj
View file @ 6194f41e
......@@ -44,12 +44,12 @@
<IncludePath>../../../source;$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../sdks/dx9sdk/Include</IncludePath>
<LibraryPath>../../../libs;$(LibraryPath);$(WindowsSDK_LibraryPath_x86);../../../sdks/dx9sdk/Lib</LibraryPath>
<SourcePath>../../../source;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);../../../sdks/dx9sdk/Include</SourcePath>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<TargetName>$(ProjectName)_d</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<IncludePath>../../../source;$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../sdks/dx9sdk/Include</IncludePath>
<LibraryPath>../../../libs;$(LibraryPath);$(WindowsSDK_LibraryPath_x86);../../../sdks/dx9sdk/Lib</LibraryPath>
<SourcePath>../../../source;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);../../../sdks/dx9sdk/Include</SourcePath>
......
proj/sxparticleseditor/vs2013/sxparticleseditor.vcxproj
View file @ 6194f41e
......@@ -41,7 +41,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<TargetName>$(ProjectName)_d</TargetName>
<IncludePath>../../../source;$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../sdks/dx9sdk/Include;../../../sdks/ogg/libvorbis/include/;../../../sdks/ogg/libogg/include/;../../../sdks/bullet3/src;</IncludePath>
<LibraryPath>../../../libs;$(LibraryPath);../../../sdks/dx9sdk/Lib</LibraryPath>
......@@ -49,7 +49,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<IncludePath>../../../source;$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../sdks/dx9sdk/Include;../../../sdks/ogg/libvorbis/include/;../../../sdks/ogg/libogg/include/;../../../sdks/bullet3/src;</IncludePath>
<LibraryPath>../../../libs;$(LibraryPath);../../../sdks/dx9sdk/Lib</LibraryPath>
<SourcePath>../../../source;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);../../../sdks/dx9sdk/Include</SourcePath>
......
proj/sxphysics/vs2013/sxphysics.vcxproj
View file @ 6194f41e
......@@ -41,14 +41,14 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<IncludePath>../../../source;../../../sdks/bullet3/src;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);../../../sdks/dx9sdk/Include;</IncludePath>
<LibraryPath>../../../sdks/dx9sdk/Lib;../../../sdks/bullet3/bin;../../../libs;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86);</LibraryPath>
<TargetName>$(ProjectName)_d</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<IncludePath>../../../source;../../../sdks/bullet3/src;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);../../../sdks/dx9sdk/Include;</IncludePath>
<LibraryPath>../../../sdks/dx9sdk/Lib;../../../sdks/bullet3/bin;../../../libs;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86);</LibraryPath>
</PropertyGroup>
......
proj/sxpp/vs2013/sxpp.vcxproj
View file @ 6194f41e
......@@ -44,12 +44,12 @@
<IncludePath>../../../source;$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../sdks/dx9sdk/Include</IncludePath>
<LibraryPath>../../../libs;$(LibraryPath);$(WindowsSDK_LibraryPath_x86);../../../sdks/dx9sdk/Lib</LibraryPath>
<SourcePath>../../../source;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);../../../sdks/dx9sdk/Include</SourcePath>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<TargetName>$(ProjectName)_d</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<TargetName>$(ProjectName)</TargetName>
<IncludePath>../../../source;$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../sdks/dx9sdk/Include</IncludePath>
<LibraryPath>../../../libs;$(LibraryPath);$(WindowsSDK_LibraryPath_x86);../../../sdks/dx9sdk/Lib</LibraryPath>
......
proj/sxrender/vs2013/sxrender.vcxproj
View file @ 6194f41e
......@@ -41,7 +41,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<TargetName>$(ProjectName)_d</TargetName>
<SourcePath>$(VC_SourcePath);../../../source;../../../sdks/dx9sdk/Include</SourcePath>
<LibraryPath>$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86);../../../libs;../../../sdks/dx9sdk/Lib</LibraryPath>
......@@ -49,7 +49,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../source;../../../sdks/bullet3/src;../../../sdks/dx9sdk/Include</IncludePath>
<LibraryPath>$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86);../../../libs;../../../sdks/dx9sdk/Lib</LibraryPath>
<SourcePath>$(VC_SourcePath);../../../source;../../../sdks/dx9sdk/Include</SourcePath>
......
proj/sxscore/vs2013/sxscore.vcxproj
View file @ 6194f41e
......@@ -58,7 +58,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<TargetName>$(ProjectName)_d</TargetName>
<IncludePath>../../../sdks/ogg/libogg/include/;../../../sdks/ogg/libvorbis/include/;../../../source;$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../sdks/dx9sdk/Include</IncludePath>
<LibraryPath>../../../libs;$(LibraryPath);$(WindowsSDK_LibraryPath_x86);../../../sdks/dx9sdk/Lib</LibraryPath>
......@@ -66,7 +66,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
<IncludePath>../../../sdks/ogg/libogg/include/;../../../sdks/ogg/libvorbis/include/;../../../source;$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../sdks/dx9sdk/Include</IncludePath>
<LibraryPath>../../../libs;$(LibraryPath);$(WindowsSDK_LibraryPath_x86);../../../sdks/dx9sdk/Lib</LibraryPath>
<SourcePath>../../../sdks/ogg/libogg/include/;../../../sdks/ogg/libvorbis/include/;../../../source;$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../sdks/dx9sdk/Include</SourcePath>
......
proj/sxwincreator/vs2013/sxwincreator.vcxproj
View file @ 6194f41e
......@@ -45,14 +45,14 @@
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../source;../../../sdks/dx9sdk/Include;</IncludePath>
<LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);../../../libs;../../../sdks/dx9sdk/Lib;</LibraryPath>
<SourcePath>$(VC_SourcePath);../../../source;../../../sdks/dx9sdk/Include;</SourcePath>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../source;../../../sdks/dx9sdk/Include;</IncludePath>
<LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);../../../libs;../../../sdks/dx9sdk/Lib;</LibraryPath>
<SourcePath>$(VC_SourcePath);../../../source;../../../sdks/dx9sdk/Include;</SourcePath>
<OutDir>../../../build/</OutDir>
<OutDir>../../../build/bin/</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
......
source/skyxengine.cpp
View file @ 6194f41e
......@@ -425,7 +425,10 @@ void SkyXEngine_Init(HWND hWnd3D, HWND hWndParent3D, const char * szCmdLine)
*/
SXAnim_UpdateSetThreadNum(Core_MGetThreadCount());
#ifndef SX_PARTICLES_EDITOR
SXGame_UpdateSetThreadNum(Core_MGetThreadCount());
#endif
LibReport(REPORT_MSG_LEVEL_NOTICE, "Engine initialized!\n");
}
......@@ -434,68 +437,58 @@ void SkyXEngine_Init(HWND hWnd3D, HWND hWndParent3D, const char * szCmdLine)
void SkyXEngine_InitPaths()
{
char tmppath[MAX_PATH];
char tmppathexe[MAX_PATH];
GetModuleFileName(NULL, tmppath, MAX_PATH);
int len = strlen(tmppath);
while (tmppath[len--] != '\\')
{
if (tmppath[len - 1] == '\\')
{
len--;
memcpy(tmppathexe, tmppath, len);
tmppathexe[len] = 0;
}
}
char szPath[MAX_PATH];
GetModuleFileName(NULL, szPath, MAX_PATH);
const char *szPathToExe = FileCanonizePath(tmppathexe);
String sPathExe = FileCanonizePathS(FileGetPrevDir(szPath).c_str());
Core_RStringSet(G_RI_STRING_PATH_EXE, sPathExe.c_str());
Core_RStringSet(G_RI_STRING_PATH_EXE, szPathToExe);
String sPrevPathExe = FileGetPrevDir(sPathExe.c_str());
sprintf(tmppath, "%s%s", szPathToExe, "/worktex/");
Core_RStringSet(G_RI_STRING_PATH_WORKTEX, tmppath);
FileCreateDir(tmppath);
sprintf(szPath, "%s%s", sPrevPathExe.c_str(), "/worktex/");
Core_RStringSet(G_RI_STRING_PATH_WORKTEX, szPath);
FileCreateDir(szPath);
sprintf(tmppath, "%s/%s/", szPathToExe, SKYXENGINE_RELPATH_GAMESOURCE);
Core_RStringSet(G_RI_STRING_PATH_GAMESOURCE, tmppath);
SetCurrentDirectoryA(tmppath);
sprintf(szPath, "%s/%s/", sPrevPathExe.c_str(), SKYXENGINE_RELPATH_GAMESOURCE);
Core_RStringSet(G_RI_STRING_PATH_GAMESOURCE, szPath);
SetCurrentDirectoryA(szPath);
sprintf(tmppath, "%s/%s/", szPathToExe, SKYXENGINE_RELPATH_EDITOR_CACHE);
Core_RStringSet(G_RI_STRING_PATH_EDITOR_CACHE, tmppath);
sprintf(szPath, "%s/%s/", sPrevPathExe.c_str(), SKYXENGINE_RELPATH_EDITOR_CACHE);
Core_RStringSet(G_RI_STRING_PATH_EDITOR_CACHE, szPath);
sprintf(tmppath, "%s%s", szPathToExe, "/screenshots/");
Core_RStringSet(G_RI_STRING_PATH_SCREENSHOTS, tmppath);
FileCreateDir(tmppath);
sprintf(szPath, "%s%s", sPrevPathExe.c_str(), "/screenshots/");
Core_RStringSet(G_RI_STRING_PATH_SCREENSHOTS, szPath);
FileCreateDir(szPath);
sprintf(tmppath, "%s%s/", Core_RStringGet(G_RI_STRING_PATH_GAMESOURCE), "config");
Core_RStringSet(G_RI_STRING_PATH_GS_CONFIGS, tmppath);
sprintf(szPath, "%s%s/", Core_RStringGet(G_RI_STRING_PATH_GAMESOURCE), "config");
Core_RStringSet(G_RI_STRING_PATH_GS_CONFIGS, szPath);
sprintf(tmppath, "%s%s/", Core_RStringGet(G_RI_STRING_PATH_GAMESOURCE), "levels");
Core_RStringSet(G_RI_STRING_PATH_GS_LEVELS, tmppath);
sprintf(szPath, "%s%s/", Core_RStringGet(G_RI_STRING_PATH_GAMESOURCE), "levels");
Core_RStringSet(G_RI_STRING_PATH_GS_LEVELS, szPath);
sprintf(tmppath, "%s%s/", Core_RStringGet(G_RI_STRING_PATH_GAMESOURCE), "meshes");
Core_RStringSet(G_RI_STRING_PATH_GS_MESHES, tmppath);
sprintf(szPath, "%s%s/", Core_RStringGet(G_RI_STRING_PATH_GAMESOURCE), "meshes");
Core_RStringSet(G_RI_STRING_PATH_GS_MESHES, szPath);
sprintf(tmppath, "%s%s/", Core_RStringGet(G_RI_STRING_PATH_GAMESOURCE), "models");
Core_RStringSet(G_RI_STRING_PATH_GS_MODELS, tmppath);
sprintf(szPath, "%s%s/", Core_RStringGet(G_RI_STRING_PATH_GAMESOURCE), "models");
Core_RStringSet(G_RI_STRING_PATH_GS_MODELS, szPath);
sprintf(tmppath, "%s%s/", Core_RStringGet(G_RI_STRING_PATH_GAMESOURCE), "shaders");
Core_RStringSet(G_RI_STRING_PATH_GS_SHADERS, tmppath);
sprintf(szPath, "%s%s/", Core_RStringGet(G_RI_STRING_PATH_GAMESOURCE), "shaders");
Core_RStringSet(G_RI_STRING_PATH_GS_SHADERS, szPath);
sprintf(tmppath, "%s%s/", Core_RStringGet(G_RI_STRING_PATH_GAMESOURCE), "sounds");
Core_RStringSet(G_RI_STRING_PATH_GS_SOUNDS, tmppath);
sprintf(szPath, "%s%s/", Core_RStringGet(G_RI_STRING_PATH_GAMESOURCE), "sounds");
Core_RStringSet(G_RI_STRING_PATH_GS_SOUNDS, szPath);
sprintf(tmppath, "%s%s/", Core_RStringGet(G_RI_STRING_PATH_GAMESOURCE), "scripts");
Core_RStringSet(G_RI_STRING_PATH_GS_SCRIPTS, tmppath);
sprintf(szPath, "%s%s/", Core_RStringGet(G_RI_STRING_PATH_GAMESOURCE), "scripts");
Core_RStringSet(G_RI_STRING_PATH_GS_SCRIPTS, szPath);
sprintf(tmppath, "%s%s/", Core_RStringGet(G_RI_STRING_PATH_GAMESOURCE), "textures");
Core_RStringSet(G_RI_STRING_PATH_GS_TEXTURES, tmppath);
sprintf(szPath, "%s%s/", Core_RStringGet(G_RI_STRING_PATH_GAMESOURCE), "textures");
Core_RStringSet(G_RI_STRING_PATH_GS_TEXTURES, szPath);
sprintf(tmppath, "%s%s/", Core_RStringGet(G_RI_STRING_PATH_GAMESOURCE), "materials");
Core_RStringSet(G_RI_STRING_PATH_GS_MTRLS, tmppath);
sprintf(szPath, "%s%s/", Core_RStringGet(G_RI_STRING_PATH_GAMESOURCE), "materials");
Core_RStringSet(G_RI_STRING_PATH_GS_MTRLS, szPath);
sprintf(tmppath, "%s%s/", Core_RStringGet(G_RI_STRING_PATH_GAMESOURCE), "resource");
Core_RStringSet(G_RI_STRING_PATH_GS_GUI, tmppath);
sprintf(szPath, "%s%s/", Core_RStringGet(G_RI_STRING_PATH_GAMESOURCE), "resource");
Core_RStringSet(G_RI_STRING_PATH_GS_GUI, szPath);
}
void SkyXEngine_CreateLoadCVar()
......
source/sxleveleditor/aigrid_callback.cpp
View file @ 6194f41e
......@@ -41,24 +41,26 @@ void level_editor::AIGridActivateAll(bool bf)
level_editor::AIGridEnableBB(!(SAIG_BBIsCreatedFinish()));
if (bf)
{
float3 vDimensions;
float3 vPosition;
float3 vDimensions;
float3 vPosition;
SAIG_BBGetDimensions(&vDimensions);
SAIG_BBGetPos(&vPosition);
SAIG_BBGetDimensions(&vDimensions);
SAIG_BBGetPos(&vPosition);
pEditAIBBDimensionsWidth->setText(String(vDimensions.x).c_str());
pEditAIBBDimensionsHeight->setText(String(vDimensions.y).c_str());
pEditAIBBDimensionsDepth->setText(String(vDimensions.z).c_str());
pEditAIBBDimensionsWidth->setText(String(vDimensions.x).c_str());
pEditAIBBDimensionsHeight->setText(String(vDimensions.y).c_str());
pEditAIBBDimensionsDepth->setText(String(vDimensions.z).c_str());
pEditAIBBPosX->setText(String(vPosition.x).c_str());
pEditAIBBPosY->setText(String(vPosition.y).c_str());
pEditAIBBPosZ->setText(String(vPosition.z).c_str());
pEditAIBBPosX->setText(String(vPosition.x).c_str());
pEditAIBBPosY->setText(String(vPosition.y).c_str());
pEditAIBBPosZ->setText(String(vPosition.z).c_str());
pEditAIStatsCountQuads->setText(String((DWORD)SAIG_GridGetCountQuads()).c_str());
pEditAIStatsCountGP->setText(String((DWORD)SAIG_GraphPointGetCount()).c_str());
pEditAIStatsCountSplits->setText(String((DWORD)SAIG_GridGetCountSplits()).c_str());
pEditAIStatsCountQuads->setText(String((DWORD)SAIG_GridGetCountQuads()).c_str());
pEditAIStatsCountGP->setText(String((DWORD)SAIG_GraphPointGetCount()).c_str());
pEditAIStatsCountSplits->setText(String((DWORD)SAIG_GridGetCountSplits()).c_str());
}
}
void level_editor::AIGridEnableBB(bool bf)
......
source/sxmaterialeditor/material_editor.cpp
View file @ 6194f41e
......@@ -462,21 +462,21 @@ void material_editor::InitAllElements()
material_editor::pCheckBoxLighting->setTransparentTextBk(true);
material_editor::pCheckBoxLighting->setColorBrush(RGB(220, 220, 220));
material_editor::pCheckBoxAlphaTest = SXGUICrCheckBox("AlphaTest", 70, 460, 90, 15, material_editor::pJobWindow->getHWND(), 0, 0, false);
material_editor::pCheckBoxAlphaTest = SXGUICrCheckBox("AlphaTest", 70, 460, 65, 15, material_editor::pJobWindow->getHWND(), 0, 0, false);
material_editor::pCheckBoxAlphaTest->setFont("MS Shell Dlg", -11, 0, 400, 0, 0, 0);
material_editor::pCheckBoxAlphaTest->setColorText(RGB(0, 0, 0));
material_editor::pCheckBoxAlphaTest->setColorTextBk(RGB(255, 255, 255));
material_editor::pCheckBoxAlphaTest->setTransparentTextBk(true);
material_editor::pCheckBoxAlphaTest->setColorBrush(RGB(220, 220, 220));
material_editor::pCheckBoxTransparent = SXGUICrCheckBox("Transparent", 145, 460, 90, 15, material_editor::pJobWindow->getHWND(), 0, 0, false);
material_editor::pCheckBoxTransparent = SXGUICrCheckBox("Transparent", 145, 460, 75, 15, material_editor::pJobWindow->getHWND(), 0, 0, false);
material_editor::pCheckBoxTransparent->setFont("MS Shell Dlg", -11, 0, 400, 0, 0, 0);
material_editor::pCheckBoxTransparent->setColorText(RGB(0, 0, 0));
material_editor::pCheckBoxTransparent->setColorTextBk(RGB(255, 255, 255));
material_editor::pCheckBoxTransparent->setTransparentTextBk(true);
material_editor::pCheckBoxTransparent->setColorBrush(RGB(220, 220, 220));
material_editor::pCheckBoxDestColor = SXGUICrCheckBox("DestColor", 230, 460, 90, 15, material_editor::pJobWindow->getHWND(), 0, 0, false);
material_editor::pCheckBoxDestColor = SXGUICrCheckBox("DestColor", 230, 460, 65, 15, material_editor::pJobWindow->getHWND(), 0, 0, false);
material_editor::pCheckBoxDestColor->setFont("MS Shell Dlg", -11, 0, 400, 0, 0, 0);
material_editor::pCheckBoxDestColor->setColorText(RGB(0, 0, 0));
material_editor::pCheckBoxDestColor->setColorTextBk(RGB(255, 255, 255));
......
source/sxmaterialeditor/sxmaterialeditor.cpp
View file @ 6194f41e
......@@ -43,7 +43,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLin
SRender_EditorCameraSetMove(material_editor::pCheckBoxTBCam->getCheck());
char shaderskitpath[1024];
sprintf(shaderskitpath, "%s%s", Core_RStringGet(G_RI_STRING_PATH_EXE), "\\shaders_kit.cfg");