Commit 00349888 authored by Byurrrer's avatar Byurrrer

Восстановил редакторы, перекомпоновал файлы в sxguiwinapi

parent b6199033
......@@ -13,83 +13,79 @@
<ItemGroup>
<ClCompile Include="..\..\..\source\SXGUIWinApi\sxguiwinapi_dll.cpp" />
<ClCompile Include="..\..\..\source\SXGUIWinApi\sxgui_base.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_base_wnd.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_button.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_check_box.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_combo_box.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_edit.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_group_box.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_hint.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\SXGUIWinApi\sxgui_img_button.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_list_box.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_memo.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\SXGUIWinApi\sxgui_menu.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_progress_bar.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_radio_button.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_static.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_status_bar.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_toolbar.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_toolbar_sx.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_track_bar.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_up_down.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
</ItemGroup>
......@@ -168,7 +164,7 @@
</PrecompiledHeader>
<WarningLevel>TurnOffAllWarnings</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SXGUIWINAPI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SXGUIWINAPI_EXPORTS;SX_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<CallingConvention>Cdecl</CallingConvention>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
......
......@@ -63,9 +63,6 @@
<ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_toolbar.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_toolbar_sx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\SXGUIWinApi\SXGUI_track_bar.cpp">
<Filter>Source Files</Filter>
</ClCompile>
......
......@@ -129,6 +129,7 @@
<ClInclude Include="..\..\..\source\sxleveleditor\resource.h" />
</ItemGroup>
<ItemGroup>
<Image Include="..\..\..\source\favicon.ico" />
<Image Include="..\..\..\source\SkyXEngine_preview.bmp" />
<Image Include="..\..\..\source\sxleveleditor\resource\aigrid_bound.bmp" />
<Image Include="..\..\..\source\sxleveleditor\resource\aigrid_graphpoint.bmp" />
......
......@@ -222,5 +222,8 @@
<Image Include="..\..\..\source\sxleveleditor\resource\sun.bmp">
<Filter>Resource Files</Filter>
</Image>
<Image Include="..\..\..\source\favicon.ico">
<Filter>Resource Files</Filter>
</Image>
</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_EXE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
......@@ -105,7 +105,15 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\sxmaterialeditor\sxmaterialeditor.cpp" />
<ClCompile Include="..\..\..\source\sxmaterialeditor\paraml_kit.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\sxmaterialeditor\shaders_kit.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\sxmaterialeditor\sxmaterialeditor.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\source\sxmaterialeditor\trackbars_callback.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
......@@ -115,9 +123,12 @@
<ResourceCompile Include="..\..\..\source\sxmaterialeditor\SXMaterialEditor.rc" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\sxmaterialeditor\paraml_kit.h" />
<ClInclude Include="..\..\..\source\sxmaterialeditor\resource.h" />
<ClInclude Include="..\..\..\source\sxmaterialeditor\shaders_kit.h" />
</ItemGroup>
<ItemGroup>
<Image Include="..\..\..\source\favicon.ico" />
<Image Include="..\..\..\source\SkyXEngine_preview.bmp" />
<Image Include="..\..\..\source\sxmaterialeditor\resource\cam.bmp" />
<Image Include="..\..\..\source\sxmaterialeditor\resource\open.bmp" />
......
......@@ -33,6 +33,12 @@
<ClCompile Include="..\..\..\source\sxmaterialeditor\material_editor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\sxmaterialeditor\shaders_kit.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\source\sxmaterialeditor\paraml_kit.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\..\source\sxmaterialeditor\SXMaterialEditor.rc">
......@@ -43,6 +49,12 @@
<ClInclude Include="..\..\..\source\sxmaterialeditor\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\sxmaterialeditor\paraml_kit.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\source\sxmaterialeditor\shaders_kit.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="resource\save.bmp">
......@@ -108,5 +120,8 @@
<Image Include="..\..\..\source\SkyXEngine_preview.bmp">
<Filter>Resource Files</Filter>
</Image>
<Image Include="..\..\..\source\favicon.ico">
<Filter>Resource Files</Filter>
</Image>
</ItemGroup>
</Project>
\ No newline at end of file
......@@ -113,6 +113,7 @@
<ResourceCompile Include="..\..\..\source\sxparticleseditor\sxparticleseditor.rc" />
</ItemGroup>
<ItemGroup>
<Image Include="..\..\..\source\favicon.ico" />
<Image Include="..\..\..\source\SkyXEngine_preview.bmp" />
<Image Include="..\..\..\source\sxparticleseditor\resource\axes.bmp" />
<Image Include="..\..\..\source\sxparticleseditor\resource\bound.bmp" />
......
......@@ -96,5 +96,8 @@
<Image Include="..\..\..\source\SkyXEngine_preview.bmp">
<Filter>Resource Files</Filter>
</Image>
<Image Include="..\..\..\source\favicon.ico">
<Filter>Resource Files</Filter>
</Image>
</ItemGroup>
</Project>
\ No newline at end of file
......@@ -2,15 +2,8 @@
#ifndef SXGUI_CHECK_BOX_H
#define SXGUI_CHECK_BOX_H
#include <SXGUIWinApi\SXGUI_base.h>
#pragma once
/*
BST_UNCHECKED
BST_CHECKED
BST_INDETERMINATE
*/
#include "SXGUI_base.h"
#include "SXGUI_button.h"
class SXGUICheckBox : public SXGUIButton, public virtual ISXGUICheckBox
{
......
#include <SXGUIWinApi\SXGUI_combo_box.h>
#pragma once
#include "SXGUI_combo_box.h"
SXGUIComboBox::SXGUIComboBox()
{
......
......@@ -2,9 +2,7 @@
#ifndef SXGUI_COMBO_BOX_H
#define SXGUI_COMBO_BOX_H
#include <SXGUIWinApi\SXGUI_base.h>
#pragma once
#include "SXGUI_base.h"
class SXGUIComboBox : public SXGUIComponent, public virtual ISXGUIComboBox
{
......
......@@ -5,9 +5,8 @@
#include <windows.h>
#include <commctrl.h>
#include <SXGUIWinApi\SXGUI_base.h>
#pragma once
#include "SXGUI_base.h"
#include "SXGUI.h"
class SXGUIHint : public virtual ISXGUIHint
{
......
#include <SXGUIWinApi\SXGUI_radio_button.h>
#include "SXGUI_radio_button.h"
#pragma once
......
......@@ -2,7 +2,8 @@
#ifndef SXGUI_RADIO_BUTTON_H
#define SXGUI_RADIO_BUTTON_H
#include <SXGUIWinApi\SXGUI_base.h>
#include "SXGUI_base.h"
#include "SXGUI_button.h"
#pragma once
......
#include <SXGUIWinApi\SXGUI_static.h>
#pragma once
#include "SXGUI_static.h"
SXGUIStatic::SXGUIStatic()
{
......
......@@ -2,9 +2,7 @@
#ifndef SXGUI_STATIC_H
#define SXGUI_STATIC_H
#include <SXGUIWinApi\SXGUI_base.h>
#pragma once
#include "SXGUI_base.h"
class SXGUIStatic : public SXGUITextual, public virtual ISXGUIStatic
{
......
#include <SXGUIWinApi\SXGUI_status_bar.h>
#pragma once
#include "SXGUI_status_bar.h"
SXGUIStatusBar::SXGUIStatusBar()
{
......
......@@ -2,9 +2,7 @@
#ifndef SXGUI_STATUS_BAR_H
#define SXGUI_STATUS_BAR_H
#include <SXGUIWinApi\SXGUI_base.h>
#pragma once
#include "SXGUI_base.h"
class SXGUIStatusBar : public SXGUIComponent, public virtual ISXGUIStatusBar
{
......
#include <SXGUIWinApi\SXGUI_toolbar.h>
#pragma once
#include "SXGUI_toolbar.h"
SXGUIToolBar::SXGUIToolBar()
{
......
......@@ -2,8 +2,7 @@
#ifndef SXGUI_TOOLBAR_H
#define SXGUI_TOOLBAR_H
#pragma once
#include "SXGUI_base.h"
class SXGUIToolBar : public SXGUIComponent, public virtual ISXGUIToolBar
{
......
#include <SXGUIWinApi\SXGUI_track_bar.h>
#pragma once
#include "SXGUI_track_bar.h"
SXGUITrackBar::SXGUITrackBar()
{
......
......@@ -2,9 +2,7 @@
#ifndef SXGUI_TRACK_BAR_H
#define SXGUI_TRACK_BAR_H
#include <SXGUIWinApi\SXGUI_base.h>
#pragma once
#include "SXGUI_base.h"
class SXGUITrackBar : public SXGUIComponent, public virtual ISXGUITrackBar
{
......
......@@ -9,7 +9,8 @@ See the license in LICENSE
extern class SXGUIButtonImg;
#include <SXGUIWinApi\SXGUI_hint.h>
#include "SXGUI_hint.h"
#include "SXGUI.h"
//первый базовый класс, единственным родителем не используется
//определяет объект как контрол, то есть содержит в себе минимум данных для
......
......@@ -4,12 +4,7 @@ Copyright © Vitaliy Buturlin, Evgeny Danilovich, 2017
See the license in LICENSE
******************************************************/
#define SX_DLL
#pragma once
#include <windows.h>
#include <gdefines.h>
#include <SXGUIWinApi\\sxgui.cpp>
BOOL APIENTRY DllMain( HMODULE hModule,
DWORD ul_reason_for_call,
......
......@@ -390,7 +390,6 @@ enum LoadTexType
};
SX_LIB_API bool SGCore_LoadTexFileExists(const char* name); //!< существует ил файл name в папке с текстурами
SX_LIB_API void SGCore_LoadTexStdPath(const char* path); //!< установить стандартный путь откуда брать текстуры
SX_LIB_API void SGCore_LoadTexClearLoaded(); //!< очистить список загружаемых текстур
SX_LIB_API void SGCore_LoadTexDelete(ID id); //!< удалить тектуру по id (независимо от типа)
SX_LIB_API ID SGCore_LoadTexAddName(const char* name, LoadTexType type);//!< добавляем имя текстуры, взамен получаем на нее ID (поставить в очередь)
......
......@@ -238,7 +238,7 @@ void SkyXEngine_InitPaths()
}
}
Core_RStringSet(G_RI_STRING_PATH_EXE, tmppath);
Core_RStringSet(G_RI_STRING_PATH_EXE, tmppathexe);
sprintf(tmppath, "%s%s", tmppathexe, "\\worktex\\");
Core_RStringSet(G_RI_STRING_PATH_WORKTEX, tmppath);
......
B// Microsoft Visual C++ generated resource script.
......
......@@ -40,7 +40,7 @@ void SXLevelEditor::LevelOpen()
char tmppath[1024];
tmppath[0] = 0;
char tmpname[1024];
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, GData::Pathes::Levels, FILE_FILTER_LEVEL);
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, Core_RStringGet(G_RI_STRING_PATH_GS_LEVELS), FILE_FILTER_LEVEL);
if (def_str_validate(tmppath))
{
StrCutNameNEx(tmppath, tmpname);
......@@ -89,7 +89,7 @@ void SXLevelEditor::LevelSaveAs()
char tmppath[1024];
tmppath[0] = 0;
char tmpname[1024];
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_SAVE, tmppath, 0, GData::Pathes::Levels, FILE_FILTER_LEVEL);
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_SAVE, tmppath, 0, Core_RStringGet(G_RI_STRING_PATH_GS_LEVELS), FILE_FILTER_LEVEL);
if (StrValidate(tmppath))
{
StrCutNameNEx(tmppath, tmpname);
......@@ -223,7 +223,7 @@ LRESULT ComMenuId(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
if (SXLevelEditor::MenuWeatherCurrID >= 0)
{
char tmppath[1024];
sprintf(tmppath, "%s%s", GData::Pathes::ConfigWeather, SXLevelEditor::MenuWeatherArr[SXLevelEditor::MenuWeatherCurrID]);
sprintf(tmppath, "%sweather\\%s", Core_RStringGet(G_RI_STRING_PATH_GS_CONFIGS), SXLevelEditor::MenuWeatherArr[SXLevelEditor::MenuWeatherCurrID]);
SGame_WeatherLoad(tmppath);
}
else
......
......@@ -301,10 +301,10 @@ LRESULT SXLevelEditor_ButtonGameValue_Click(HWND hwnd, UINT msg, WPARAM wParam,
char tmppath[1024];
tmppath[0] = 0;
char tmpname[1024];
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, GData::Pathes::GameSource, txtfmt);
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, Core_RStringGet(G_RI_STRING_PATH_GAMESOURCE), txtfmt);
if (def_str_validate(tmppath))
{
String tmpstr = tmppath + strlen(GData::Pathes::GameSource);
String tmpstr = tmppath + strlen(Core_RStringGet(G_RI_STRING_PATH_GAMESOURCE));
tmpstr.ReplaceAll("\\", "/");
sprintf(tmpname, "%s", tmpstr.c_str());
SXLevelEditor::EditGameValue->SetText(tmpname);
......
......@@ -116,7 +116,7 @@ LRESULT SXLevelEditor_ButtonGreenModel_Click(HWND hwnd, UINT msg, WPARAM wParam,
char tmppath[1024];
tmppath[0] = 0;
char tmpname[1024];
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, GData::Pathes::Meshes, FILE_FILTER_MODEL);
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, Core_RStringGet(G_RI_STRING_PATH_GS_MESHES), FILE_FILTER_MODEL);
if (def_str_validate(tmppath))
{
StrCutMesh(tmppath, tmpname);
......@@ -136,7 +136,7 @@ LRESULT SXLevelEditor_ButtonGreenLod1_Click(HWND hwnd, UINT msg, WPARAM wParam,
char tmppath[1024];
tmppath[0] = 0;
char tmpname[1024];
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, GData::Pathes::Meshes, FILE_FILTER_MODEL);
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, Core_RStringGet(G_RI_STRING_PATH_GS_MESHES), FILE_FILTER_MODEL);
if (def_str_validate(tmppath))
{
StrCutMesh(tmppath, tmpname);
......@@ -156,7 +156,7 @@ LRESULT SXLevelEditor_ButtonGreenLod2_Click(HWND hwnd, UINT msg, WPARAM wParam,
char tmppath[1024];
tmppath[0] = 0;
char tmpname[1024];
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, GData::Pathes::Meshes, FILE_FILTER_MODEL);
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, Core_RStringGet(G_RI_STRING_PATH_GS_MESHES), FILE_FILTER_MODEL);
if (def_str_validate(tmppath))
{
StrCutMesh(tmppath, tmpname);
......@@ -185,7 +185,7 @@ LRESULT SXLevelEditor_ButtonGreenMask_Click(HWND hwnd, UINT msg, WPARAM wParam,
char tmppath[1024];
tmppath[0] = 0;
char tmpname[1024];
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, GData::Pathes::Textures, FILE_FILTER_TEXTURE);
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, Core_RStringGet(G_RI_STRING_PATH_GS_MESHES), FILE_FILTER_TEXTURE);
if (def_str_validate(tmppath))
{
StrCutName(tmppath, tmpname);
......@@ -199,7 +199,7 @@ LRESULT SXLevelEditor_ButtonGreenNav_Click(HWND hwnd, UINT msg, WPARAM wParam, L
char tmppath[1024];
tmppath[0] = 0;
char tmpname[1024];
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, GData::Pathes::Meshes, FILE_FILTER_MODEL);
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, Core_RStringGet(G_RI_STRING_PATH_GS_MESHES), FILE_FILTER_MODEL);
if (def_str_validate(tmppath))
{
StrCutMesh(tmppath, tmpname);
......@@ -260,19 +260,19 @@ LRESULT SXLevelEditor_ButtonGreenGenerate_Click(HWND hwnd, UINT msg, WPARAM wPar
greentype = GeomGreenType::ggt_grass;
if (tmp_tex[0] != 0)
sprintf(path_tex,"%s%s",GData::Pathes::Textures,tmp_tex);
sprintf(path_tex, "%s%s", Core_RStringGet(G_RI_STRING_PATH_GS_TEXTURES), tmp_tex);
if (tmp_model[0] != 0)
sprintf(path_model, "%s%s", GData::Pathes::Meshes, tmp_model);
sprintf(path_model, "%s%s", Core_RStringGet(G_RI_STRING_PATH_GS_MESHES), tmp_model);
if (tmp_lod1[0] != 0)
sprintf(path_lod1, "%s%s", GData::Pathes::Meshes, tmp_lod1);
sprintf(path_lod1, "%s%s", Core_RStringGet(G_RI_STRING_PATH_GS_MESHES), tmp_lod1);
if (tmp_lod2[0] != 0)
sprintf(path_lod2, "%s%s", GData::Pathes::Meshes, tmp_lod2);
sprintf(path_lod2, "%s%s", Core_RStringGet(G_RI_STRING_PATH_GS_MESHES), tmp_lod2);
if (tmp_navmesh[0] != 0)
sprintf(path_navmesh, "%s%s", GData::Pathes::Meshes, tmp_navmesh);
sprintf(path_navmesh, "%s%s", Core_RStringGet(G_RI_STRING_PATH_GS_MESHES), tmp_navmesh);
/*if (!Core_0FileExists(path_tex))
{
......
......@@ -131,7 +131,7 @@ LRESULT SXLevelEditor_ButtonGeomModel_Click(HWND hwnd, UINT msg, WPARAM wParam,
char tmppath[1024];
tmppath[0] = 0;
char tmpname[1024];
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, GData::Pathes::Meshes, FILE_FILTER_MODEL);
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, Core_RStringGet(G_RI_STRING_PATH_GS_MESHES), FILE_FILTER_MODEL);
if (def_str_validate(tmppath))
{
StrCutMesh(tmppath, tmpname);
......@@ -145,7 +145,7 @@ LRESULT SXLevelEditor_ButtonGeomLod1_Click(HWND hwnd, UINT msg, WPARAM wParam, L
char tmppath[1024];
tmppath[0] = 0;
char tmpname[1024];
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, GData::Pathes::Meshes, FILE_FILTER_MODEL);
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, Core_RStringGet(G_RI_STRING_PATH_GS_MESHES), FILE_FILTER_MODEL);
if (def_str_validate(tmppath))
{
StrCutMesh(tmppath, tmpname);
......@@ -180,7 +180,7 @@ LRESULT SXLevelEditor_ButtonGeomFinish_Click(HWND hwnd, UINT msg, WPARAM wParam,
}
char tmppath[1024];
sprintf(tmppath, "%s%s", GData::Pathes::Meshes, path_model);
sprintf(tmppath, "%s%s", Core_RStringGet(G_RI_STRING_PATH_GS_MESHES), path_model);
if (!Core_0FileExists(tmppath))
{
char tmpstr[2048];
......@@ -189,7 +189,7 @@ LRESULT SXLevelEditor_ButtonGeomFinish_Click(HWND hwnd, UINT msg, WPARAM wParam,
return 0;
}
sprintf(tmppath, "%s%s", GData::Pathes::Meshes, path_model_lod);
sprintf(tmppath, "%s%s", Core_RStringGet(G_RI_STRING_PATH_GS_MESHES), path_model_lod);
if (def_str_validate(path_model_lod) && !Core_0FileExists(tmppath))
{
char tmpstr[2048];
......
......@@ -36,7 +36,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLin
HANDLE hf;
SXLevelEditor::MenuWeatherCount = 1;
char tpath[1024];
sprintf(tpath, "%sweather\\*.cfg", GData::Pathes::Config);
sprintf(tpath, "%sweather\\*.cfg", Core_RStringGet(G_RI_STRING_PATH_GS_CONFIGS));
hf = FindFirstFile(tpath, &FindFileData);
if (hf != INVALID_HANDLE_VALUE){
do{
......@@ -62,7 +62,6 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLin
SGCore_LoadTexLoadTextures();
GData::IDSelectTex = SGCore_LoadTexCreate("select_material__", SelectMaterial);
SGCore_LoadTexStdPath(GData::Pathes::Textures);
SGCore_LoadTexLoadTextures();
int countgc = SXGame_EntGetClassListCount();
......
B// Microsoft Visual C++ generated resource script.
......
......@@ -3,11 +3,11 @@ LRESULT SXMaterialEditor_ButtonSkyBox_Click(HWND hwnd, UINT msg, WPARAM wParam,
{
char tmppath[1024];
tmppath[0] = 0;
char tmpname[1024];
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, GData::Pathes::Textures, FILE_FILTER_TEXTURE);
char* tmpname = 0;
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, Core_RStringGet(G_RI_STRING_PATH_GS_TEXTURES), FILE_FILTER_TEXTURE);
if (def_str_validate(tmppath))
{
StrCutName(tmppath, tmpname);
tmpname = tmppath + strlen(Core_RStringGet(G_RI_STRING_PATH_GS_TEXTURES));
SXMaterialEditor::EditSkyBox->SetText(tmpname);
SGCore_SkyBoxLoadTex(tmpname);
......@@ -26,7 +26,7 @@ LRESULT SXMaterialEditor_ButtonTex_Click(HWND hwnd, UINT msg, WPARAM wParam, LPA
char tmppath[1024];
tmppath[0] = 0;
char tmpname[1024];
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, GData::Pathes::Textures, FILE_FILTER_TEXTURE);
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, Core_RStringGet(G_RI_STRING_PATH_GS_TEXTURES), FILE_FILTER_TEXTURE);
if (def_str_validate(tmppath))
{
StrCutName(tmppath, tmpname);
......@@ -42,7 +42,7 @@ LRESULT SXMaterialEditor_ButtonVS_Click(HWND hwnd, UINT msg, WPARAM wParam, LPAR
char tmppath[1024];
tmppath[0] = 0;
char tmpname[1024];
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, GData::Pathes::Shaders, FILE_FILTER_VS);
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, Core_RStringGet(G_RI_STRING_PATH_GS_SHADERS), FILE_FILTER_VS);
if (def_str_validate(tmppath))
{
StrCutName(tmppath, tmpname);
......@@ -58,7 +58,7 @@ LRESULT SXMaterialEditor_ButtonPS_Click(HWND hwnd, UINT msg, WPARAM wParam, LPAR
char tmppath[1024];
tmppath[0] = 0;
char tmpname[1024];
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, GData::Pathes::Shaders, FILE_FILTER_PS);
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, Core_RStringGet(G_RI_STRING_PATH_GS_SHADERS), FILE_FILTER_PS);
if (def_str_validate(tmppath))
{
StrCutName(tmppath, tmpname);
......@@ -74,7 +74,7 @@ LRESULT SXMaterialEditor_ButtonTexLighting_Click(HWND hwnd, UINT msg, WPARAM wPa
char tmppath[1024];
tmppath[0] = 0;
char tmpname[1024];
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, GData::Pathes::Textures, FILE_FILTER_TEXTURE);
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, Core_RStringGet(G_RI_STRING_PATH_GS_TEXTURES), FILE_FILTER_TEXTURE);
if (def_str_validate(tmppath))
{
StrCutName(tmppath, tmpname);
......@@ -90,7 +90,7 @@ LRESULT SXMaterialEditor_ButtonMask_Click(HWND hwnd, UINT msg, WPARAM wParam, LP
char tmppath[1024];
tmppath[0] = 0;
char tmpname[1024];
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, GData::Pathes::Textures, FILE_FILTER_TEXTURE);
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, Core_RStringGet(G_RI_STRING_PATH_GS_TEXTURES), FILE_FILTER_TEXTURE);
if (def_str_validate(tmppath))
{
StrCutName(tmppath, tmpname);
......@@ -106,7 +106,7 @@ LRESULT SXMaterialEditor_ButtonMR_Click(HWND hwnd, UINT msg, WPARAM wParam, LPAR
char tmppath[1024];
tmppath[0] = 0;
char tmpname[1024];
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, GData::Pathes::Textures, FILE_FILTER_TEXTURE);
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, Core_RStringGet(G_RI_STRING_PATH_GS_TEXTURES), FILE_FILTER_TEXTURE);
if (def_str_validate(tmppath))
{
StrCutName(tmppath, tmpname);
......@@ -122,7 +122,7 @@ LRESULT SXMaterialEditor_ButtonMG_Click(HWND hwnd, UINT msg, WPARAM wParam, LPAR
char tmppath[1024];
tmppath[0] = 0;
char tmpname[1024];
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, GData::Pathes::Textures, FILE_FILTER_TEXTURE);
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, Core_RStringGet(G_RI_STRING_PATH_GS_TEXTURES), FILE_FILTER_TEXTURE);
if (def_str_validate(tmppath))
{
StrCutName(tmppath, tmpname);
......@@ -138,7 +138,7 @@ LRESULT SXMaterialEditor_ButtonMB_Click(HWND hwnd, UINT msg, WPARAM wParam, LPAR
char tmppath[1024];
tmppath[0] = 0;
char tmpname[1024];
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, GData::Pathes::Textures, FILE_FILTER_TEXTURE);
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, Core_RStringGet(G_RI_STRING_PATH_GS_TEXTURES), FILE_FILTER_TEXTURE);
if (def_str_validate(tmppath))
{
StrCutName(tmppath, tmpname);
......@@ -154,7 +154,7 @@ LRESULT SXMaterialEditor_ButtonMA_Click(HWND hwnd, UINT msg, WPARAM wParam, LPAR
char tmppath[1024];
tmppath[0] = 0;
char tmpname[1024];
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, GData::Pathes::Textures, FILE_FILTER_TEXTURE);
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, Core_RStringGet(G_RI_STRING_PATH_GS_TEXTURES), FILE_FILTER_TEXTURE);
if (def_str_validate(tmppath))
{
StrCutName(tmppath, tmpname);
......@@ -171,7 +171,7 @@ LRESULT SXMaterialEditor_ButtonDR_Click(HWND hwnd, UINT msg, WPARAM wParam, LPAR
char tmppath[1024];
tmppath[0] = 0;
char tmpname[1024];
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, GData::Pathes::Textures, FILE_FILTER_TEXTURE);
SXGUIDialogs::SelectFile(SXGUI_DIALOG_FILE_OPEN, tmppath, 0, Core_RStringGet(G_RI_STRING_PATH_GS_TEXTURES), FILE_FILTER_TEXTURE);
if (def_str_validate(tmppath))