From 733d82ab5a01644d20391e7f824ee2949b78b9d8 Mon Sep 17 00:00:00 2001
From: Byurrer <byurrer@mail.ru>
Date: Sun, 19 Nov 2017 18:21:24 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
=?UTF-8?q?=D0=BB=20sxae,=20=D0=BE=D0=BD=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB?=
=?UTF-8?q?=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D0=BB=20=D1=81=D1=82=D0=B0=D1=80?=
=?UTF-8?q?=D1=8B=D0=B5=20=D0=B4=D0=B5=D1=84=D0=B0=D0=B9=D0=BD=D1=8B,=20?=
=?UTF-8?q?=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=8B=D0=B5=20=D1=81=D0=BD=D0=B5?=
=?UTF-8?q?=D1=81=D0=B5=D0=BD=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
build/sysconfig.cfg | 2 --
proj/sxwincreator/vs2013/sxwincreator.vcxproj | 14 +++++++++----
source/gcore/sxgcore.h | 6 ------
source/sxae/Editor.cpp | 20 +++++++++----------
source/sxwincreator/sxwincreator.cpp | 6 +++---
5 files changed, 23 insertions(+), 25 deletions(-)
diff --git a/build/sysconfig.cfg b/build/sysconfig.cfg
index 79acc33ec..2e4ed61a7 100644
--- a/build/sysconfig.cfg
+++ b/build/sysconfig.cfg
@@ -53,8 +53,6 @@ r_s_max_miplevel 0
main_rain_density 1
main_thunderbolt true
-r_default_fov 90
-
spawn
//cl_grab_cursor 0
diff --git a/proj/sxwincreator/vs2013/sxwincreator.vcxproj b/proj/sxwincreator/vs2013/sxwincreator.vcxproj
index 626a1bdd6..630822be6 100644
--- a/proj/sxwincreator/vs2013/sxwincreator.vcxproj
+++ b/proj/sxwincreator/vs2013/sxwincreator.vcxproj
@@ -25,9 +25,9 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v120_xp</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -49,6 +49,10 @@
</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>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -68,19 +72,21 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <WarningLevel>Level3</WarningLevel>
+ <WarningLevel>Level1</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <ProgramDatabaseFile>$(ProjectDir)$(TargetName).pdb</ProgramDatabaseFile>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/source/gcore/sxgcore.h b/source/gcore/sxgcore.h
index a6abec46f..adb7cd584 100644
--- a/source/gcore/sxgcore.h
+++ b/source/gcore/sxgcore.h
@@ -338,12 +338,6 @@ SX_LIB_API void SGCore_ShaderUpdateN(SHADER_TYPE type_shader, const char* name,
//! бинд шейдера по id
SX_LIB_API void SGCore_ShaderUpdate(SHADER_TYPE type_shader, ID id, D3DXMACRO macro[] = 0);
-//! установить абсолютный путь откуда брать шейдеры
-SX_LIB_API void SGCore_ShaderSetStdPath(const char* path);
-
-//! возвращает абсолютный путь откуда берутся шейдеры
-SX_LIB_API void SGCore_ShaderGetStdPath(char* path);
-
//! перезагрузить все шейдеры, с учетом макросов
SX_LIB_API void SGCore_ShaderReloadAll();
diff --git a/source/sxae/Editor.cpp b/source/sxae/Editor.cpp
index 2259a447b..962dbd89e 100644
--- a/source/sxae/Editor.cpp
+++ b/source/sxae/Editor.cpp
@@ -29,7 +29,7 @@ void msgbx(int level, const char* format, ...)
title = "Error";
flags |= MB_ICONSTOP;
break;
- case REPORT_MSG_LEVEL_WARRNING:
+ case REPORT_MSG_LEVEL_WARNING:
title = "Warning";
flags |= MB_ICONWARNING;
break;
@@ -1171,7 +1171,7 @@ void Editor::InitD3D()
char tmp[260];
sprintf(tmp, "%stextures/", m_szGamesourceDir);
- SGCore_LoadTexStdPath(tmp);
+ //SGCore_LoadTexStdPath(tmp);
sprintf(tmp, "%sshaders/", m_szGamesourceDir);
SGCore_ShaderSetStdPath(tmp);
@@ -1207,11 +1207,11 @@ void Editor::InitD3D()
*/
m_pd3dDevice->GetSwapChain(0, &m_pSwapChain);
- m_pVSH = SGCore_ShaderLoad(st_vertex, "stdr_skin.vs", "stdr_skin.vs", scd_path);
- m_pPSH = SGCore_ShaderLoad(st_pixel, "stdr_skin.ps", "stdr_skin.ps", scd_path);
+ m_pVSH = SGCore_ShaderLoad(SHADER_TYPE_VERTEX, "stdr_skin.vs", "stdr_skin.vs", SHADER_CHECKDOUBLE_PATH);
+ m_pPSH = SGCore_ShaderLoad(SHADER_TYPE_PIXEL, "stdr_skin.ps", "stdr_skin.ps", SHADER_CHECKDOUBLE_PATH);
- m_pVSHs = SGCore_ShaderLoad(st_vertex, "stdr_geom.vs", "stdr_geom.vs", scd_path);
- m_pPSHs = SGCore_ShaderLoad(st_pixel, "stdr_geom.ps", "stdr_geom.ps", scd_path);
+ m_pVSHs = SGCore_ShaderLoad(SHADER_TYPE_VERTEX, "stdr_geom.vs", "stdr_geom.vs", SHADER_CHECKDOUBLE_PATH);
+ m_pPSHs = SGCore_ShaderLoad(SHADER_TYPE_PIXEL, "stdr_geom.ps", "stdr_geom.ps", SHADER_CHECKDOUBLE_PATH);
m_mProjMat = SMMatrixPerspectiveFovLH(50.0f / 180.0f * SM_PI, (float)width / (float)height, 0.1f, 10000.0f);
@@ -1298,13 +1298,13 @@ void Editor::Update()
if(m_pCurAnim->m_pMdl && (m_pCurAnim->m_pMdl->m_hdr.iFlags & MODEL_FLAG_STATIC))
{
- SGCore_ShaderBind(st_vertex, m_pVSHs);
- SGCore_ShaderBind(st_pixel, m_pPSHs);
+ SGCore_ShaderBind(SHADER_TYPE_VERTEX, m_pVSHs);
+ SGCore_ShaderBind(SHADER_TYPE_PIXEL, m_pPSHs);
}
else
{
- SGCore_ShaderBind(st_vertex, m_pVSH);
- SGCore_ShaderBind(st_pixel, m_pPSH);
+ SGCore_ShaderBind(SHADER_TYPE_VERTEX, m_pVSH);
+ SGCore_ShaderBind(SHADER_TYPE_PIXEL, m_pPSH);
}
m_pAnimMgr->Render();
SGCore_ShaderUnBind();
diff --git a/source/sxwincreator/sxwincreator.cpp b/source/sxwincreator/sxwincreator.cpp
index 722890b0d..7bef348d7 100644
--- a/source/sxwincreator/sxwincreator.cpp
+++ b/source/sxwincreator/sxwincreator.cpp
@@ -17,7 +17,7 @@
#else
#pragma comment(lib, "sxcore.lib")
#endif
-#include <core\\sxcore.h>
+#include <core/sxcore.h>
#if defined(_DEBUG)
@@ -25,9 +25,9 @@
#else
#pragma comment(lib, "sxguiwinapi.lib")
#endif
-#include <SXGUIWinApi\\sxgui.h>
+#include <SXGUIWinApi/sxgui.h>
-#include <common\\Array.h>
+#include <common/Array.h>
#include <SXWinCreator/resource.h>
--
GitLab