From 05c4ec03659190be081742c2d7132403bd5a7f1d Mon Sep 17 00:00:00 2001 From: Ykkrosh Date: Mon, 27 Dec 2004 23:27:26 +0000 Subject: [PATCH] Alterations to ScEd, so that it almost works (except for saving/loading maps). Change the bottom of premake.lua if you want to build it. This was SVN commit r1580. --- binaries/data/mods/official/temp/terrain.png | 3 + build/premake/functions.lua | 15 +- build/premake/premake.lua | 309 ++-- build/workspaces/update-workspaces.bat | 16 +- source/graphics/LightEnv.h | 8 +- source/gui/GUIRenderer.cpp | 4 +- source/lib/sysdep/win/win.cpp | 10 +- source/ps/Font.h | 3 + source/renderer/Renderer.cpp | 7 +- source/tools/sced/AlterElevationCommand.cpp | 4 +- source/tools/sced/AlterLightEnvCommand.cpp | 3 + source/tools/sced/BrushShapeEditorTool.cpp | 2 + source/tools/sced/BrushTool.cpp | 6 +- source/tools/sced/CommandManager.cpp | 2 + source/tools/sced/EditorData.cpp | 77 +- source/tools/sced/InfoBox.cpp | 6 +- source/tools/sced/MiniMap.cpp | 3 +- source/tools/sced/NaviCam.cpp | 2 + source/tools/sced/PaintObjectCommand.cpp | 3 + source/tools/sced/PaintObjectTool.cpp | 2 + source/tools/sced/PaintTextureCommand.cpp | 4 +- source/tools/sced/PaintTextureTool.cpp | 2 + source/tools/sced/RaiseElevationCommand.cpp | 2 + source/tools/sced/RaiseElevationTool.cpp | 2 + source/tools/sced/ScEd.dep | 914 ++++++------ source/tools/sced/ScEd.dsp | 402 ++--- source/tools/sced/ScEd.mak | 38 +- source/tools/sced/SelectObjectTool.cpp | 2 + source/tools/sced/SmoothElevationCommand.cpp | 2 + source/tools/sced/SmoothElevationTool.cpp | 2 + source/tools/sced/ToolManager.cpp | 2 + source/tools/sced/UserConfig.cpp | 2 + source/tools/sced/main.cpp | 1311 +++++++++++++++++ .../tools/sced/ui/BrushShapeEditorDlgBar.cpp | 1 + source/tools/sced/ui/ColorButton.cpp | 1 + source/tools/sced/ui/DirectionButton.cpp | 1 + source/tools/sced/ui/ElevToolsDlgBar.cpp | 1 + source/tools/sced/ui/ElevationButton.cpp | 1 + source/tools/sced/ui/ImageListCtrl.cpp | 1 + source/tools/sced/ui/LightSettingsDlg.cpp | 1 + source/tools/sced/ui/MainFrameDlgBar.cpp | 1 + source/tools/sced/ui/MainFrm.cpp | 6 +- source/tools/sced/ui/MapSizeDlg.cpp | 1 + source/tools/sced/ui/NavigatePropPage.cpp | 1 + source/tools/sced/ui/OptionsDlg.cpp | 1 + source/tools/sced/ui/OptionsPropSheet.cpp | 1 + source/tools/sced/ui/ScEd.cpp | 8 +- source/tools/sced/ui/ScEdDoc.cpp | 1 + source/tools/sced/ui/ScEdView.cpp | 26 +- source/tools/sced/ui/ShadowsPropPage.cpp | 1 + source/tools/sced/ui/SimpleEdit.cpp | 1 + source/tools/sced/ui/StdAfx.h | 4 +- source/tools/sced/ui/TexToolsDlgBar.cpp | 1 + source/tools/sced/ui/UIGlobals.cpp | 1 + .../sced/ui/UnitPropertiesAnimationsTab.cpp | 1 + source/tools/sced/ui/UnitPropertiesDlgBar.cpp | 9 +- .../tools/sced/ui/UnitPropertiesTabCtrl.cpp | 1 + .../sced/ui/UnitPropertiesTexturesTab.cpp | 1 + source/tools/sced/ui/UnitToolsDlgBar.cpp | 3 +- source/tools/sced/ui/WebLinkButton.cpp | 1 + source/tools/sced/ui/res/0ad_logo.bmp | Bin 0 -> 31878 bytes source/tools/sced/ui/res/0ad_logo.bmp.ico | Bin 0 -> 35886 bytes source/tools/sced/ui/res/0ad_logo.ico | Bin 0 -> 35886 bytes source/tools/sced/ui/res/ScEd.ico | Bin 0 -> 3262 bytes source/tools/sced/ui/res/ScEd.rc2 | 13 + source/tools/sced/ui/res/ScEdDoc.ico | Bin 0 -> 1078 bytes source/tools/sced/ui/res/Toolbar.bmp | Bin 0 -> 1078 bytes source/tools/sced/ui/res/addunit.bmp | Bin 0 -> 2102 bytes source/tools/sced/ui/res/elevationtools.bmp | Bin 0 -> 2102 bytes source/tools/sced/ui/res/ico00001.ico | Bin 0 -> 766 bytes source/tools/sced/ui/res/ico00002.ico | Bin 0 -> 766 bytes source/tools/sced/ui/res/icon1.ico | Bin 0 -> 766 bytes source/tools/sced/ui/res/modeltools.bmp | Bin 0 -> 2102 bytes source/tools/sced/ui/res/select.bmp | Bin 0 -> 2102 bytes source/tools/sced/ui/res/selectunit.bmp | Bin 0 -> 2102 bytes source/tools/sced/ui/res/terraintools.bmp | Bin 0 -> 2102 bytes source/tools/sced/ui/res/texturetools.bmp | Bin 0 -> 2102 bytes 77 files changed, 2368 insertions(+), 892 deletions(-) create mode 100644 binaries/data/mods/official/temp/terrain.png create mode 100644 source/tools/sced/main.cpp create mode 100644 source/tools/sced/ui/res/0ad_logo.bmp create mode 100644 source/tools/sced/ui/res/0ad_logo.bmp.ico create mode 100644 source/tools/sced/ui/res/0ad_logo.ico create mode 100644 source/tools/sced/ui/res/ScEd.ico create mode 100644 source/tools/sced/ui/res/ScEd.rc2 create mode 100644 source/tools/sced/ui/res/ScEdDoc.ico create mode 100644 source/tools/sced/ui/res/Toolbar.bmp create mode 100644 source/tools/sced/ui/res/addunit.bmp create mode 100644 source/tools/sced/ui/res/elevationtools.bmp create mode 100644 source/tools/sced/ui/res/ico00001.ico create mode 100644 source/tools/sced/ui/res/ico00002.ico create mode 100644 source/tools/sced/ui/res/icon1.ico create mode 100644 source/tools/sced/ui/res/modeltools.bmp create mode 100644 source/tools/sced/ui/res/select.bmp create mode 100644 source/tools/sced/ui/res/selectunit.bmp create mode 100644 source/tools/sced/ui/res/terraintools.bmp create mode 100644 source/tools/sced/ui/res/texturetools.bmp diff --git a/binaries/data/mods/official/temp/terrain.png b/binaries/data/mods/official/temp/terrain.png new file mode 100644 index 0000000000..4dfa120840 --- /dev/null +++ b/binaries/data/mods/official/temp/terrain.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be0493a6e08619bf0d26dc3180e7a92d1f06f541aaa68ab878b701835c7220d2 +size 43135 diff --git a/build/premake/functions.lua b/build/premake/functions.lua index 26da9fec39..6f74a3a08b 100755 --- a/build/premake/functions.lua +++ b/build/premake/functions.lua @@ -1,7 +1,14 @@ -function sourcesfromdirs(root, ...) +function sourcesfromdirs(root, dirs) local res = {} - for i=1, getn(arg) do - res[i]=matchfiles(root..arg[i].."/*.cpp", root..arg[i].."/*.h") + for i=1, getn(dirs) do + local files = matchfiles(root..dirs[i].."/*.cpp", root..dirs[i].."/*.h") + tconcat(res, files) end return res -end \ No newline at end of file +end + +function tconcat(table, values) + for i=1, getn(values) do + tinsert(table, values[i]) + end +end diff --git a/build/premake/premake.lua b/build/premake/premake.lua index 5eac5573f2..9aeaa54a93 100755 --- a/build/premake/premake.lua +++ b/build/premake/premake.lua @@ -7,26 +7,44 @@ project.libdir = "../../../binaries/system" project.debugdir = "../../../binaries/data" project.configs = { "Debug", "Release", "Testing" } --- Start the package part -package = newpackage() -package.name = "pyrogenesis" --- Windowed executable on windows, "exe" on all other platforms -package.kind = "winexe" -package.language = "c++" +function setuppackage (projectname) --- Package target for debug and release build --- On Windows, ".exe" is added on the end, on unices the name is used directly -package.config["Debug"].target = "ps_dbg" -package.config["Release"].target = "ps" -package.config["Testing"].target = "ps_test" + -- Start the package part + package = newpackage() -sourceroot = "../../../source/" -librariesroot = "../../../libraries/" + if (projectname == "sced") then + package.name = "sced" + exename = "sced" + objdirprefix = "ScEd_" + else + package.name = "pyrogenesis" + exename = "ps" + objdirprefix = "" + end --- Files -package.files = { - sourcesfromdirs(sourceroot, - + -- Windowed executable on windows, "exe" on all other platforms + package.kind = "winexe" + package.language = "c++" + + -- Package target for debug and release build + -- On Windows, ".exe" is added on the end, on unices the name is used directly + package.config["Debug"].target = exename.."_dbg" + package.config["Release"].target = exename + package.config["Testing"].target = exename.."_test" + + -- TODO: Implement objdir in Premake + package.config["Debug"].objdir = objdirprefix.."Debug" + package.config["Release"].objdir = objdirprefix.."Release" + package.config["Testing"].objdir = objdirprefix.."Testing" + + + sourceroot = "../../../source/" + librariesroot = "../../../libraries/" + + + source_dirs = {} + + tconcat(source_dirs, { "ps", "ps/scripting", "ps/Network", @@ -44,11 +62,15 @@ package.files = { "maths", "maths/scripting", - "renderer", - + "renderer" + }) + + if (projectname ~= "sced") then tconcat(source_dirs, { "gui", - "gui/scripting", + "gui/scripting" + }) end + tconcat(source_dirs, { "terrain", "sound", @@ -58,122 +80,149 @@ package.files = { "i18n", "tests" - ), + }) + + if (projectname == "sced") then tconcat(source_dirs, { + "tools/sced", + "tools/sced/ui" + }) end - sourceroot.."main.cpp" -} + package.files = sourcesfromdirs(sourceroot, source_dirs) + + if (projectname ~= "sced") then + tinsert(package.files, sourceroot.."main.cpp") + end - -include_dirs = { - "ps", - "simulation", - "lib", - "graphics", - "maths", - "renderer", - "terrain", - "" -} - -package.includepaths = {} - -foreach(include_dirs, function (i,v) - tinsert(package.includepaths, sourceroot .. v) -end) - - -package.libpaths = {} - - -package.buildflags = { "no-rtti" } - -package.config["Testing"].buildflags = { "with-symbols", "no-runtime-checks", "no-edit-and-continue" } -package.config["Testing"].defines = { "TESTING" } - -package.config["Release"].defines = { "NDEBUG" } - --- Docs says that premake does this automatically - it doesn't (at least not for GCC/Linux) -package.config["Debug"].buildflags = { "with-symbols", "no-edit-and-continue" } - --- Platform Specifics -if (OS == "windows") then - - -- Directories under 'libraries', each containing 'lib' and 'include': - external_libraries = { - "misc", - "libpng", - "zlib", - "openal", - "spidermonkey", - "xerces", - "vorbis", - "boost" + + include_dirs = { + "ps", + "simulation", + "lib", + "graphics", + "maths", + "renderer", + "terrain", + "" } - - -- Add '//lib' and '/include' to the includepaths and libpaths - foreach(external_libraries, function (i,v) - tinsert(package.includepaths, librariesroot..v.."/include") - tinsert(package.libpaths, librariesroot..v.."/lib") + + if (projectname == "sced") then + tinsert(include_dirs, "tools/sced") + end + + package.includepaths = {} + + foreach(include_dirs, function (i,v) + tinsert(package.includepaths, sourceroot .. v) end) - - -- Libraries - package.links = { "opengl32" } - tinsert(package.files, sourcesfromdirs(sourceroot, "lib/sysdep/win")) - tinsert(package.files, {sourceroot.."lib/sysdep/win/assert_dlg.rc"}) - - package.linkoptions = { "/ENTRY:entry", - "/DELAYLOAD:opengl32.dll", - "/DELAYLOAD:advapi32.dll", - "/DELAYLOAD:gdi32.dll", - "/DELAYLOAD:user32.dll", - "/DELAYLOAD:ws2_32.dll", - "/DELAYLOAD:version.dll", - "/DELAYLOAD:ddraw.dll", - "/DELAYLOAD:dsound.dll", - "/DELAYLOAD:glu32.dll", - "/DELAYLOAD:openal32.dll", - "/DELAY:UNLOAD" -- allow manual unload of delay-loaded DLLs - } - - package.config["Debug"].linkoptions = { - "/DELAYLOAD:js32d.dll", - "/DELAYLOAD:zlib1d.dll", - "/DELAYLOAD:libpng13d.dll", - } - -- 'Testing' uses 'Debug' DLL's - package.config["Testing"].linkoptions = package.config["Debug"].linkoptions - package.config["Release"].linkoptions = { - "/DELAYLOAD:js32.dll", - "/DELAYLOAD:zlib1.dll", - "/DELAYLOAD:libpng13.dll", - } + package.libpaths = {} - tinsert(package.buildflags, { "no-main" }) - package.pchHeader = "precompiled.h" - package.pchSource = "precompiled.cpp" - -else -- Non-Windows, = Unix - - tinsert(package.files, sourcesfromdirs(sourceroot, "lib/sysdep/unix")) - - -- Libraries - package.links = { - -- OpenGL and X-Windows - "GL", "GLU", "X11", - "SDL", "png", - "fam", - -- Audio - "openal", "vorbisfile", - -- Utilities - "xerces-c", "z", "rt", "js" - } - tinsert(package.libpaths, { "/usr/X11R6/lib" } ) - -- Defines - package.defines = { - "__STDC_VERSION__=199901L" } - -- Includes - tinsert(package.includepaths, { "/usr/X11R6/include/X11" } ) + package.buildflags = { "no-rtti" } + + package.config["Testing"].buildflags = { "with-symbols", "no-runtime-checks", "no-edit-and-continue" } + package.config["Testing"].defines = { "TESTING" } + + package.config["Release"].defines = { "NDEBUG" } + + -- Docs says that premake does this automatically - it doesn't (at least not for GCC/Linux) + package.config["Debug"].buildflags = { "with-symbols", "no-edit-and-continue" } + + + if (projectname == "sced") then + tinsert(package.defines, "SCED") + tinsert(package.defines, "_AFXDLL") + tinsert(package.defines, "NO_GUI") + end + + -- Platform Specifics + if (OS == "windows") then + + -- Directories under 'libraries', each containing 'lib' and 'include': + external_libraries = { + "misc", + "libpng", + "zlib", + "openal", + "spidermonkey", + "xerces", + "vorbis", + "boost" + } + + -- Add '//lib' and '/include' to the includepaths and libpaths + foreach(external_libraries, function (i,v) + tinsert(package.includepaths, librariesroot..v.."/include") + tinsert(package.libpaths, librariesroot..v.."/lib") + end) + + -- Libraries + package.links = { "opengl32" } + tinsert(package.files, sourcesfromdirs(sourceroot, {"lib/sysdep/win"})) + tinsert(package.files, {sourceroot.."lib/sysdep/win/assert_dlg.rc"}) + + if (projectname == "sced") then + tinsert(package.files, {sourceroot.."tools/sced/ui/ScEd.rc"}) + end + + package.linkoptions = { "/ENTRY:entry", + "/DELAYLOAD:opengl32.dll", + "/DELAYLOAD:advapi32.dll", + "/DELAYLOAD:gdi32.dll", + "/DELAYLOAD:user32.dll", + "/DELAYLOAD:ws2_32.dll", + "/DELAYLOAD:version.dll", + "/DELAYLOAD:ddraw.dll", + "/DELAYLOAD:dsound.dll", + "/DELAYLOAD:glu32.dll", + "/DELAYLOAD:openal32.dll", + "/DELAY:UNLOAD" -- allow manual unload of delay-loaded DLLs + } + + package.config["Debug"].linkoptions = { + "/DELAYLOAD:js32d.dll", + "/DELAYLOAD:zlib1d.dll", + "/DELAYLOAD:libpng13d.dll", + } + + -- 'Testing' uses 'Debug' DLL's + package.config["Testing"].linkoptions = package.config["Debug"].linkoptions + + package.config["Release"].linkoptions = { + "/DELAYLOAD:js32.dll", + "/DELAYLOAD:zlib1.dll", + "/DELAYLOAD:libpng13.dll", + } + + tinsert(package.buildflags, { "no-main" }) + + package.pchHeader = "precompiled.h" + package.pchSource = "precompiled.cpp" + + else -- Non-Windows, = Unix + + tinsert(package.files, sourcesfromdirs(sourceroot, {"lib/sysdep/unix"})) + + -- Libraries + package.links = { + -- OpenGL and X-Windows + "GL", "GLU", "X11", + "SDL", "png", + "fam", + -- Audio + "openal", "vorbisfile", + -- Utilities + "xerces-c", "z", "rt", "js" + } + tinsert(package.libpaths, { "/usr/X11R6/lib" } ) + -- Defines + package.defines = { + "__STDC_VERSION__=199901L" } + -- Includes + tinsert(package.includepaths, { "/usr/X11R6/include/X11" } ) + end end + +setuppackage("pyrogenesis") +-- setuppackage("sced") \ No newline at end of file diff --git a/build/workspaces/update-workspaces.bat b/build/workspaces/update-workspaces.bat index dd2af3c037..c9dc383f96 100755 --- a/build/workspaces/update-workspaces.bat +++ b/build/workspaces/update-workspaces.bat @@ -3,7 +3,7 @@ REM Create Visual Studio Workspaces on Windows mkdir vc6 mkdir vc7 -mkdir vc2003 +mkdir vc2003b REM Change to the lua project name, this must correspond to the base file name REM of the created project files @@ -16,16 +16,18 @@ mkdir tmp copy premake.lua tmp cd tmp +REM Just copy *.sln/etc indiscriminately, because it might include both pyrogenesis.sln and sced.sln (or might not) + ..\premake --target vs6 -move %PROJECT%.dsw ..\..\workspaces\vc6 -move %PROJECT%.dsp ..\..\workspaces\vc6 +move *.dsw ..\..\workspaces\vc6 +move *.dsp ..\..\workspaces\vc6 ..\premake --target vs7 -move %PROJECT%.sln ..\..\workspaces\vc7 -move %PROJECT%.vcproj ..\..\workspaces\vc7 +move *.sln ..\..\workspaces\vc7 +move *.vcproj ..\..\workspaces\vc7 ..\premake --target vs2003 -move %PROJECT%.sln ..\..\workspaces\vc2003 -move %PROJECT%.vcproj ..\..\workspaces\vc2003 +move *.sln ..\..\workspaces\vc2003b +move *.vcproj ..\..\workspaces\vc2003b cd ..\..\workspaces diff --git a/source/graphics/LightEnv.h b/source/graphics/LightEnv.h index a836b456ad..3a7d4ae527 100755 --- a/source/graphics/LightEnv.h +++ b/source/graphics/LightEnv.h @@ -20,6 +20,9 @@ class CMapWriter; class CMapReader; +class CEditorData; +class CMainFrame; +class CLightSettingsDlg; /////////////////////////////////////////////////////////////////////////////// // CLightEnv: description of a lighting environment - contains all the @@ -28,7 +31,10 @@ class CLightEnv { friend class CMapWriter; friend class CMapReader; -// wierd accessor order to preserve memory layout of the class +friend class CEditorData; +friend class CMainFrame; +friend class CLightSettingsDlg; +// weird accessor order to preserve memory layout of the class public: RGBColor m_SunColor; private: diff --git a/source/gui/GUIRenderer.cpp b/source/gui/GUIRenderer.cpp index abc5510768..6046cb44ee 100644 --- a/source/gui/GUIRenderer.cpp +++ b/source/gui/GUIRenderer.cpp @@ -419,8 +419,9 @@ void GUIRenderer::UpdateDrawCallCache(DrawCalls &Calls, CStr &SpriteName, CRect // "real-texture-placement" overrides everything if (cit->m_TexturePlacementInFile != CRect()) + { BlockTex = cit->m_TexturePlacementInFile; - + } // Check whether this sprite has "cell-size" set else if (cit->m_CellSize != CSize()) { @@ -430,7 +431,6 @@ void GUIRenderer::UpdateDrawCallCache(DrawCalls &Calls, CStr &SpriteName, CRect BlockTex = CRect(cit->m_CellSize.cx*col, cit->m_CellSize.cy*row, cit->m_CellSize.cx*(col+1), cit->m_CellSize.cy*(row+1)); } - // Use the whole texture else BlockTex = CRect(0, 0, TexWidth, TexHeight); diff --git a/source/lib/sysdep/win/win.cpp b/source/lib/sysdep/win/win.cpp index 0e648d4e81..4c77e9f6ed 100755 --- a/source/lib/sysdep/win/win.cpp +++ b/source/lib/sysdep/win/win.cpp @@ -276,7 +276,6 @@ static inline void pre_libc_init() } - static inline void pre_main_init() { #ifdef HAVE_DEBUGALLOC @@ -333,8 +332,17 @@ PREVTSC=TSC; } +#ifdef SCED +void sced_init() +{ + pre_main_init(); +} +#endif + +#ifndef SCED int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int) { pre_main_init(); return main(__argc, __argv); } +#endif \ No newline at end of file diff --git a/source/ps/Font.h b/source/ps/Font.h index 4149f57669..ded1c62eb1 100755 --- a/source/ps/Font.h +++ b/source/ps/Font.h @@ -19,6 +19,9 @@ glwprintf(L"Hello world"); */ +// MFC has nicked all the good names :-( +#define CFont PS_CFont + class CFont { public: diff --git a/source/renderer/Renderer.cpp b/source/renderer/Renderer.cpp index 3a38dd14a3..5dd081b774 100755 --- a/source/renderer/Renderer.cpp +++ b/source/renderer/Renderer.cpp @@ -262,8 +262,10 @@ const RGBAColor& CRenderer::GetOptionColor(enum Option opt) const // BeginFrame: signal frame start void CRenderer::BeginFrame() { +#ifndef SCED if(!g_Game || !g_Game->IsGameStarted()) return; +#endif // bump frame counter m_FrameCounter++; @@ -875,9 +877,10 @@ struct SortModelsByTexture { // FlushFrame: force rendering of any batched objects void CRenderer::FlushFrame() { - +#ifndef SCED if(!g_Game || !g_Game->IsGameStarted()) return; +#endif oglCheck(); @@ -929,8 +932,10 @@ void CRenderer::FlushFrame() // EndFrame: signal frame end; implicitly flushes batched objects void CRenderer::EndFrame() { +#ifndef SCED if(!g_Game || !g_Game->IsGameStarted()) return; +#endif FlushFrame(); g_Renderer.SetTexture(0,0); diff --git a/source/tools/sced/AlterElevationCommand.cpp b/source/tools/sced/AlterElevationCommand.cpp index bda3b4a634..2aec645ea2 100755 --- a/source/tools/sced/AlterElevationCommand.cpp +++ b/source/tools/sced/AlterElevationCommand.cpp @@ -1,5 +1,7 @@ +#include "precompiled.h" + #include "AlterElevationCommand.h" -#include "UIGlobals.h" +#include "ui/UIGlobals.h" #include "MiniMap.h" #include "Terrain.h" diff --git a/source/tools/sced/AlterLightEnvCommand.cpp b/source/tools/sced/AlterLightEnvCommand.cpp index cde1f76f86..304ae4c893 100755 --- a/source/tools/sced/AlterLightEnvCommand.cpp +++ b/source/tools/sced/AlterLightEnvCommand.cpp @@ -1,7 +1,10 @@ +#include "precompiled.h" + #include "AlterLightEnvCommand.h" #include "UnitManager.h" #include "ObjectManager.h" #include "Model.h" +#include "Unit.h" #include "Terrain.h" extern CTerrain g_Terrain; diff --git a/source/tools/sced/BrushShapeEditorTool.cpp b/source/tools/sced/BrushShapeEditorTool.cpp index 3af169f1fb..4ed250ed63 100755 --- a/source/tools/sced/BrushShapeEditorTool.cpp +++ b/source/tools/sced/BrushShapeEditorTool.cpp @@ -1,3 +1,5 @@ +#include "precompiled.h" + #include #include #include "ogl.h" diff --git a/source/tools/sced/BrushTool.cpp b/source/tools/sced/BrushTool.cpp index 3ce0b6602f..43a1339a62 100755 --- a/source/tools/sced/BrushTool.cpp +++ b/source/tools/sced/BrushTool.cpp @@ -1,5 +1,7 @@ +#include "precompiled.h" + #include "BrushTool.h" -#include "UIGlobals.h" +#include "ui/UIGlobals.h" #include "HFTracer.h" #include "NaviCam.h" #include "TextureManager.h" @@ -133,7 +135,7 @@ void CBrushTool::OnMouseMove(unsigned int flags,int px,int py) // intersect with terrain CVector3D ipt; - CHFTracer hftracer(g_Terrain.GetHeightMap(),g_Terrain.GetVerticesPerSide(),float(CELL_SIZE),HEIGHT_SCALE); + CHFTracer hftracer(&g_Terrain); if (hftracer.RayIntersect(rayorigin,raydir,m_SelectionCentre[0],m_SelectionCentre[1],m_SelectionPoint)) { // drag trigger supported? if (SupportDragTrigger()) { diff --git a/source/tools/sced/CommandManager.cpp b/source/tools/sced/CommandManager.cpp index 9ba6980ba4..e3b6098b63 100755 --- a/source/tools/sced/CommandManager.cpp +++ b/source/tools/sced/CommandManager.cpp @@ -1,3 +1,5 @@ +#include "precompiled.h" + #include "Command.h" #include "CommandManager.h" diff --git a/source/tools/sced/EditorData.cpp b/source/tools/sced/EditorData.cpp index fede4660d6..c87842f733 100755 --- a/source/tools/sced/EditorData.cpp +++ b/source/tools/sced/EditorData.cpp @@ -1,11 +1,14 @@ +#include "precompiled.h" + #include "EditorData.h" -#include "UIGlobals.h" +#include "ui/UIGlobals.h" #include "ToolManager.h" #include "ObjectManager.h" #include "UnitManager.h" #include "TextureManager.h" #include "Model.h" #include "SkeletonAnimManager.h" +#include "Unit.h" #include "ogl.h" #include "res/tex.h" @@ -15,6 +18,8 @@ #include "Entity.h" #include "EntityHandles.h" #include "EntityManager.h" +#include "ConfigDB.h" +#include "Scheduler.h" #include "XML.h" @@ -22,7 +27,7 @@ const int NUM_ALPHA_MAPS = 14; Handle AlphaMaps[NUM_ALPHA_MAPS]; CTerrain g_Terrain; -CLightEnv g_LightEnv; +extern CLightEnv g_LightEnv; CMiniMap g_MiniMap; CEditorData g_EditorData; @@ -50,7 +55,7 @@ bool CEditorData::InitScene() g_Renderer.SetLightEnv(&g_LightEnv); // load the default - if (!LoadTerrain("terrain.raw")) return false; + if (!LoadTerrain("temp/terrain.png")) return false; // get default texture to apply to terrain CTextureEntry* texture=0; @@ -182,29 +187,29 @@ void CEditorData::InitResources() // InitSingletons: create and initialise required singletons void CEditorData::InitSingletons() { - // create terrain related stuff - new CTextureManager; - - // create actor related stuff - new CSkeletonAnimManager; - new CObjectManager; - new CUnitManager; - - // create entity related stuff - new CBaseEntityCollection; - new CEntityManager; - g_EntityTemplateCollection.loadTemplates(); +// // create terrain related stuff +// new CTextureManager; +// +// // create actor related stuff +// new CSkeletonAnimManager; +// new CObjectManager; +// new CUnitManager; +// +// // create entity related stuff +// new CBaseEntityCollection; +// new CEntityManager; +// g_EntityTemplateCollection.loadTemplates(); } ///////////////////////////////////////////////////////////////////////////////////////////////// // Init: perform one time initialisation of the editor bool CEditorData::Init() { - // start up Xerces - XMLPlatformUtils::Initialize(); - - // create and initialise singletons - InitSingletons(); +// // start up Xerces +// XMLPlatformUtils::Initialize(); +// +// // create and initialise singletons +// InitSingletons(); // load default textures InitResources(); @@ -225,20 +230,20 @@ bool CEditorData::Init() // Terminate: close down the editor (destroy singletons in reverse order to construction) void CEditorData::Terminate() { - // destroy entity related stuff - delete CEntityManager::GetSingletonPtr(); - delete CBaseEntityCollection::GetSingletonPtr(); - - // destroy actor related stuff - delete CUnitManager::GetSingletonPtr(); - delete CObjectManager::GetSingletonPtr(); - delete CSkeletonAnimManager::GetSingletonPtr(); - - // destroy terrain related stuff - delete CTextureManager::GetSingletonPtr(); +// // destroy entity related stuff +// delete CEntityManager::GetSingletonPtr(); +// delete CBaseEntityCollection::GetSingletonPtr(); +// +// // destroy actor related stuff +// delete CUnitManager::GetSingletonPtr(); +// delete CObjectManager::GetSingletonPtr(); +// delete CSkeletonAnimManager::GetSingletonPtr(); +// +// // destroy terrain related stuff +// delete CTextureManager::GetSingletonPtr(); // close down Xerces - XMLPlatformUtils::Terminate(); +// XMLPlatformUtils::Terminate(); } void CEditorData::InitCamera() @@ -332,7 +337,7 @@ void CEditorData::OnCameraChanged() void CEditorData::RenderTerrain() { - CFrustum frustum=g_NaviCam.GetCamera().GetFustum(); + CFrustum frustum=g_NaviCam.GetCamera().GetFrustum(); u32 patchesPerSide=g_Terrain.GetPatchesPerSide(); for (uint j=0; j& units=g_UnitMan.GetUnits(); uint i; @@ -495,7 +500,7 @@ void CEditorData::RenderObEdGrid() void CEditorData::OnDraw() { if (m_Mode==SCENARIO_EDIT || m_Mode==TEST_MODE) { - g_Renderer.SetClearColor(0); + g_Renderer.SetClearColor(0x00000000); g_Renderer.BeginFrame(); // setup camera @@ -649,7 +654,7 @@ void CEditorData::UpdateWorld(float time) void CEditorData::StartTestMode() { // initialise entities - g_EntityManager.dispatchAll( &CMessage( CMessage::EMSG_INIT ) ); + g_EntityManager.InitializeAll(); } void CEditorData::StopTestMode() diff --git a/source/tools/sced/InfoBox.cpp b/source/tools/sced/InfoBox.cpp index 5e5c23ad68..2f4a42c796 100755 --- a/source/tools/sced/InfoBox.cpp +++ b/source/tools/sced/InfoBox.cpp @@ -1,5 +1,7 @@ +#include "precompiled.h" + #include "InfoBox.h" -#include "UIGlobals.h" +#include "ui/UIGlobals.h" #include "types.h" #include "ogl.h" #include "timer.h" @@ -13,7 +15,7 @@ static const char* DefaultFontName="mods/official/fonts/verdana18.fnt"; CInfoBox::CInfoBox() : m_Font(0), m_Visible(false) { - m_LastFPSTime=get_time(); + m_LastFPSTime=0; m_Stats.Reset(); } diff --git a/source/tools/sced/MiniMap.cpp b/source/tools/sced/MiniMap.cpp index 5213d355c8..57681e5ed1 100755 --- a/source/tools/sced/MiniMap.cpp +++ b/source/tools/sced/MiniMap.cpp @@ -1,5 +1,6 @@ +#include "precompiled.h" #include "MiniMap.h" -#include "UIGlobals.h" +#include "ui/UIGlobals.h" #include "TextureManager.h" #include "Terrain.h" #include "Renderer.h" diff --git a/source/tools/sced/NaviCam.cpp b/source/tools/sced/NaviCam.cpp index 01f5d1ac69..054c47d3be 100755 --- a/source/tools/sced/NaviCam.cpp +++ b/source/tools/sced/NaviCam.cpp @@ -1,3 +1,5 @@ +#include "precompiled.h" + #include "NaviCam.h" #include "EditorData.h" #include diff --git a/source/tools/sced/PaintObjectCommand.cpp b/source/tools/sced/PaintObjectCommand.cpp index 0246f22823..de6e04786d 100755 --- a/source/tools/sced/PaintObjectCommand.cpp +++ b/source/tools/sced/PaintObjectCommand.cpp @@ -1,7 +1,10 @@ +#include "precompiled.h" + #include "PaintObjectCommand.h" #include "UnitManager.h" #include "ObjectEntry.h" #include "Model.h" +#include "Unit.h" #include "BaseEntity.h" #include "BaseEntityCollection.h" diff --git a/source/tools/sced/PaintObjectTool.cpp b/source/tools/sced/PaintObjectTool.cpp index 553ad744b9..f803fcaf29 100755 --- a/source/tools/sced/PaintObjectTool.cpp +++ b/source/tools/sced/PaintObjectTool.cpp @@ -1,3 +1,5 @@ +#include "precompiled.h" + #include "timer.h" #include "CommandManager.h" #include "ObjectEntry.h" diff --git a/source/tools/sced/PaintTextureCommand.cpp b/source/tools/sced/PaintTextureCommand.cpp index 1d3a71d49f..391404d105 100755 --- a/source/tools/sced/PaintTextureCommand.cpp +++ b/source/tools/sced/PaintTextureCommand.cpp @@ -1,5 +1,7 @@ +#include "precompiled.h" + #include "PaintTextureCommand.h" -#include "UIGlobals.h" +#include "ui/UIGlobals.h" #include "MiniMap.h" #include "textureEntry.h" #include "Terrain.h" diff --git a/source/tools/sced/PaintTextureTool.cpp b/source/tools/sced/PaintTextureTool.cpp index 67839a1cef..3b8bba0fda 100755 --- a/source/tools/sced/PaintTextureTool.cpp +++ b/source/tools/sced/PaintTextureTool.cpp @@ -1,3 +1,5 @@ +#include "precompiled.h" + #include "CommandManager.h" #include "TextureEntry.h" #include "PaintTextureTool.h" diff --git a/source/tools/sced/RaiseElevationCommand.cpp b/source/tools/sced/RaiseElevationCommand.cpp index 7805674a82..1b068e4ad2 100755 --- a/source/tools/sced/RaiseElevationCommand.cpp +++ b/source/tools/sced/RaiseElevationCommand.cpp @@ -1,3 +1,5 @@ +#include "precompiled.h" + #include "RaiseElevationCommand.h" #include "Terrain.h" diff --git a/source/tools/sced/RaiseElevationTool.cpp b/source/tools/sced/RaiseElevationTool.cpp index 4b192f7660..205a1ef9b2 100755 --- a/source/tools/sced/RaiseElevationTool.cpp +++ b/source/tools/sced/RaiseElevationTool.cpp @@ -1,3 +1,5 @@ +#include "precompiled.h" + #include "CommandManager.h" #include "RaiseElevationTool.h" #include "RaiseElevationCommand.h" diff --git a/source/tools/sced/ScEd.dep b/source/tools/sced/ScEd.dep index 7e7d00bdca..0952baddcb 100755 --- a/source/tools/sced/ScEd.dep +++ b/source/tools/sced/ScEd.dep @@ -1,11 +1,11 @@ # Microsoft Developer Studio Generated Dependency File, included by ScEd.mak .\ColorButton.cpp : \ - "..\lib\misc.h"\ - "..\lib\posix.h"\ - "..\lib\posix\aio.h"\ - "..\ps\CStr.h"\ - "..\ps\Prometheus.h"\ + "..\..\lib\misc.h"\ + "..\..\lib\posix.h"\ + "..\..\lib\posix\aio.h"\ + "..\..\ps\CStr.h"\ + "..\..\ps\Pyrogenesis.h"\ ".\ColorButton.h"\ ".\ScEd.h"\ ".\StdAfx.h"\ @@ -13,12 +13,12 @@ .\DirectionButton.cpp : \ - "..\lib\misc.h"\ - "..\lib\posix.h"\ - "..\lib\posix\aio.h"\ - "..\ps\CStr.h"\ - "..\ps\Prometheus.h"\ - "..\Terrain\MathUtil.h"\ + "..\..\lib\misc.h"\ + "..\..\lib\posix.h"\ + "..\..\lib\posix\aio.h"\ + "..\..\ps\CStr.h"\ + "..\..\ps\Pyrogenesis.h"\ + "..\..\Terrain\MathUtil.h"\ ".\DirectionButton.h"\ ".\ScEd.h"\ ".\StdAfx.h"\ @@ -26,12 +26,12 @@ .\ElevationButton.cpp : \ - "..\lib\misc.h"\ - "..\lib\posix.h"\ - "..\lib\posix\aio.h"\ - "..\ps\CStr.h"\ - "..\ps\Prometheus.h"\ - "..\Terrain\MathUtil.h"\ + "..\..\lib\misc.h"\ + "..\..\lib\posix.h"\ + "..\..\lib\posix\aio.h"\ + "..\..\ps\CStr.h"\ + "..\..\ps\Pyrogenesis.h"\ + "..\..\Terrain\MathUtil.h"\ ".\ElevationButton.h"\ ".\ScEd.h"\ ".\StdAfx.h"\ @@ -39,12 +39,12 @@ .\ElevToolsDlgBar.cpp : \ - "..\lib\misc.h"\ - "..\lib\posix.h"\ - "..\lib\posix\aio.h"\ - "..\lib\res.h"\ - "..\ps\CStr.h"\ - "..\ps\Prometheus.h"\ + "..\..\lib\misc.h"\ + "..\..\lib\posix.h"\ + "..\..\lib\posix\aio.h"\ + "..\..\lib\res.h"\ + "..\..\ps\CStr.h"\ + "..\..\ps\Pyrogenesis.h"\ ".\BrushTool.h"\ ".\ElevToolsDlgBar.h"\ ".\RaiseElevationTool.h"\ @@ -57,11 +57,11 @@ .\ImageListCtrl.cpp : \ - "..\lib\misc.h"\ - "..\lib\posix.h"\ - "..\lib\posix\aio.h"\ - "..\ps\CStr.h"\ - "..\ps\Prometheus.h"\ + "..\..\lib\misc.h"\ + "..\..\lib\posix.h"\ + "..\..\lib\posix\aio.h"\ + "..\..\ps\CStr.h"\ + "..\..\ps\Pyrogenesis.h"\ ".\ImageListCtrl.h"\ ".\ScEd.h"\ ".\StdAfx.h"\ @@ -69,27 +69,27 @@ .\LightSettingsDlg.cpp : \ - "..\lib\misc.h"\ - "..\lib\posix.h"\ - "..\lib\posix\aio.h"\ - "..\lib\res.h"\ - "..\ps\CStr.h"\ - "..\ps\Prometheus.h"\ - "..\Terrain\Bound.h"\ - "..\Terrain\Camera.h"\ - "..\Terrain\Color.h"\ - "..\Terrain\Frustum.h"\ - "..\Terrain\LightEnv.h"\ - "..\Terrain\MathUtil.h"\ - "..\Terrain\Matrix3D.h"\ - "..\Terrain\MiniPatch.h"\ - "..\Terrain\Patch.h"\ - "..\Terrain\Plane.h"\ - "..\Terrain\RenderableObject.h"\ - "..\Terrain\Terrain.h"\ - "..\Terrain\TerrGlobals.h"\ - "..\Terrain\Vector3D.h"\ - "..\Terrain\Vector4D.h"\ + "..\..\lib\misc.h"\ + "..\..\lib\posix.h"\ + "..\..\lib\posix\aio.h"\ + "..\..\lib\res.h"\ + "..\..\ps\CStr.h"\ + "..\..\ps\Pyrogenesis.h"\ + "..\..\Terrain\Bound.h"\ + "..\..\Terrain\Camera.h"\ + "..\..\Terrain\Color.h"\ + "..\..\Terrain\Frustum.h"\ + "..\..\Terrain\LightEnv.h"\ + "..\..\Terrain\MathUtil.h"\ + "..\..\Terrain\Matrix3D.h"\ + "..\..\Terrain\MiniPatch.h"\ + "..\..\Terrain\Patch.h"\ + "..\..\Terrain\Plane.h"\ + "..\..\Terrain\RenderableObject.h"\ + "..\..\Terrain\Terrain.h"\ + "..\..\Terrain\TerrGlobals.h"\ + "..\..\Terrain\Vector3D.h"\ + "..\..\Terrain\Vector4D.h"\ ".\ColorButton.h"\ ".\DirectionButton.h"\ ".\ElevationButton.h"\ @@ -100,37 +100,37 @@ .\MainFrm.cpp : \ - "..\lib\glext_funcs.h"\ - "..\lib\mem.h"\ - "..\lib\misc.h"\ - "..\lib\ogl.h"\ - "..\lib\posix.h"\ - "..\lib\posix\aio.h"\ - "..\lib\res.h"\ - "..\lib\tex.h"\ - "..\lib\vfs.h"\ - "..\ps\CStr.h"\ - "..\ps\Prometheus.h"\ - "..\Terrain\Bound.h"\ - "..\Terrain\Camera.h"\ - "..\Terrain\Color.h"\ - "..\Terrain\Frustum.h"\ - "..\Terrain\LightEnv.h"\ - "..\Terrain\MathUtil.h"\ - "..\Terrain\Matrix3D.h"\ - "..\Terrain\MiniPatch.h"\ - "..\Terrain\ModelDef.h"\ - "..\Terrain\ModelFile.h"\ - "..\Terrain\Patch.h"\ - "..\Terrain\PatchRData.h"\ - "..\Terrain\Plane.h"\ - "..\Terrain\RenderableObject.h"\ - "..\Terrain\Renderer.h"\ - "..\Terrain\SHCoeffs.h"\ - "..\Terrain\Terrain.h"\ - "..\Terrain\TerrGlobals.h"\ - "..\Terrain\Vector3D.h"\ - "..\Terrain\Vector4D.h"\ + "..\..\lib\glext_funcs.h"\ + "..\..\lib\mem.h"\ + "..\..\lib\misc.h"\ + "..\..\lib\ogl.h"\ + "..\..\lib\posix.h"\ + "..\..\lib\posix\aio.h"\ + "..\..\lib\res.h"\ + "..\..\lib\tex.h"\ + "..\..\lib\vfs.h"\ + "..\..\ps\CStr.h"\ + "..\..\ps\Pyrogenesis.h"\ + "..\..\Terrain\Bound.h"\ + "..\..\Terrain\Camera.h"\ + "..\..\Terrain\Color.h"\ + "..\..\Terrain\Frustum.h"\ + "..\..\Terrain\LightEnv.h"\ + "..\..\Terrain\MathUtil.h"\ + "..\..\Terrain\Matrix3D.h"\ + "..\..\Terrain\MiniPatch.h"\ + "..\..\Terrain\ModelDef.h"\ + "..\..\Terrain\ModelFile.h"\ + "..\..\Terrain\Patch.h"\ + "..\..\Terrain\PatchRData.h"\ + "..\..\Terrain\Plane.h"\ + "..\..\Terrain\RenderableObject.h"\ + "..\..\Terrain\Renderer.h"\ + "..\..\Terrain\SHCoeffs.h"\ + "..\..\Terrain\Terrain.h"\ + "..\..\Terrain\TerrGlobals.h"\ + "..\..\Terrain\Vector3D.h"\ + "..\..\Terrain\Vector4D.h"\ ".\BrushTool.h"\ ".\ColorButton.h"\ ".\CommandManager.h"\ @@ -164,11 +164,11 @@ .\MapSizeDlg.cpp : \ - "..\lib\misc.h"\ - "..\lib\posix.h"\ - "..\lib\posix\aio.h"\ - "..\ps\CStr.h"\ - "..\ps\Prometheus.h"\ + "..\..\lib\misc.h"\ + "..\..\lib\posix.h"\ + "..\..\lib\posix\aio.h"\ + "..\..\ps\CStr.h"\ + "..\..\ps\Pyrogenesis.h"\ ".\MapSizeDlg.h"\ ".\ScEd.h"\ ".\StdAfx.h"\ @@ -176,11 +176,11 @@ .\OptionsDlg.cpp : \ - "..\lib\misc.h"\ - "..\lib\posix.h"\ - "..\lib\posix\aio.h"\ - "..\ps\CStr.h"\ - "..\ps\Prometheus.h"\ + "..\..\lib\misc.h"\ + "..\..\lib\posix.h"\ + "..\..\lib\posix\aio.h"\ + "..\..\ps\CStr.h"\ + "..\..\ps\Pyrogenesis.h"\ ".\OptionsDlg.h"\ ".\ScEd.h"\ ".\StdAfx.h"\ @@ -188,15 +188,15 @@ .\ScEd.cpp : \ - "..\lib\misc.h"\ - "..\lib\posix.h"\ - "..\lib\posix\aio.h"\ - "..\lib\res.h"\ - "..\ps\CStr.h"\ - "..\ps\Prometheus.h"\ - "..\Terrain\Bound.h"\ - "..\Terrain\MathUtil.h"\ - "..\Terrain\Vector3D.h"\ + "..\..\lib\misc.h"\ + "..\..\lib\posix.h"\ + "..\..\lib\posix\aio.h"\ + "..\..\lib\res.h"\ + "..\..\ps\CStr.h"\ + "..\..\ps\Pyrogenesis.h"\ + "..\..\Terrain\Bound.h"\ + "..\..\Terrain\MathUtil.h"\ + "..\..\Terrain\Vector3D.h"\ ".\ElevToolsDlgBar.h"\ ".\MainFrm.h"\ ".\ObjectEntry.h"\ @@ -225,11 +225,11 @@ .\ScEdDoc.cpp : \ - "..\lib\misc.h"\ - "..\lib\posix.h"\ - "..\lib\posix\aio.h"\ - "..\ps\CStr.h"\ - "..\ps\Prometheus.h"\ + "..\..\lib\misc.h"\ + "..\..\lib\posix.h"\ + "..\..\lib\posix\aio.h"\ + "..\..\ps\CStr.h"\ + "..\..\ps\Pyrogenesis.h"\ ".\ScEd.h"\ ".\ScEdDoc.h"\ ".\StdAfx.h"\ @@ -237,33 +237,33 @@ .\ScEdView.cpp : \ - "..\lib\glext_funcs.h"\ - "..\lib\misc.h"\ - "..\lib\ogl.h"\ - "..\lib\posix.h"\ - "..\lib\posix\aio.h"\ - "..\lib\res.h"\ - "..\lib\vfs.h"\ - "..\ps\CStr.h"\ - "..\ps\Prometheus.h"\ - "..\Terrain\Bound.h"\ - "..\Terrain\Camera.h"\ - "..\Terrain\Color.h"\ - "..\Terrain\Frustum.h"\ - "..\Terrain\LightEnv.h"\ - "..\Terrain\MathUtil.h"\ - "..\Terrain\Matrix3D.h"\ - "..\Terrain\MiniPatch.h"\ - "..\Terrain\Patch.h"\ - "..\Terrain\PatchRData.h"\ - "..\Terrain\Plane.h"\ - "..\Terrain\RenderableObject.h"\ - "..\Terrain\Renderer.h"\ - "..\Terrain\SHCoeffs.h"\ - "..\Terrain\Terrain.h"\ - "..\Terrain\TerrGlobals.h"\ - "..\Terrain\Vector3D.h"\ - "..\Terrain\Vector4D.h"\ + "..\..\lib\glext_funcs.h"\ + "..\..\lib\misc.h"\ + "..\..\lib\ogl.h"\ + "..\..\lib\posix.h"\ + "..\..\lib\posix\aio.h"\ + "..\..\lib\res.h"\ + "..\..\lib\vfs.h"\ + "..\..\ps\CStr.h"\ + "..\..\ps\Pyrogenesis.h"\ + "..\..\Terrain\Bound.h"\ + "..\..\Terrain\Camera.h"\ + "..\..\Terrain\Color.h"\ + "..\..\Terrain\Frustum.h"\ + "..\..\Terrain\LightEnv.h"\ + "..\..\Terrain\MathUtil.h"\ + "..\..\Terrain\Matrix3D.h"\ + "..\..\Terrain\MiniPatch.h"\ + "..\..\Terrain\Patch.h"\ + "..\..\Terrain\PatchRData.h"\ + "..\..\Terrain\Plane.h"\ + "..\..\Terrain\RenderableObject.h"\ + "..\..\Terrain\Renderer.h"\ + "..\..\Terrain\SHCoeffs.h"\ + "..\..\Terrain\Terrain.h"\ + "..\..\Terrain\TerrGlobals.h"\ + "..\..\Terrain\Vector3D.h"\ + "..\..\Terrain\Vector4D.h"\ ".\BrushTool.h"\ ".\EditorData.h"\ ".\InfoBox.h"\ @@ -280,11 +280,11 @@ .\SimpleEdit.cpp : \ - "..\lib\misc.h"\ - "..\lib\posix.h"\ - "..\lib\posix\aio.h"\ - "..\ps\CStr.h"\ - "..\ps\Prometheus.h"\ + "..\..\lib\misc.h"\ + "..\..\lib\posix.h"\ + "..\..\lib\posix\aio.h"\ + "..\..\ps\CStr.h"\ + "..\..\ps\Pyrogenesis.h"\ ".\ScEd.h"\ ".\SimpleEdit.h"\ ".\StdAfx.h"\ @@ -292,16 +292,16 @@ .\TexToolsDlgBar.cpp : \ - "..\lib\glext_funcs.h"\ - "..\lib\misc.h"\ - "..\lib\ogl.h"\ - "..\lib\posix.h"\ - "..\lib\posix\aio.h"\ - "..\lib\res.h"\ - "..\lib\tex.h"\ - "..\lib\vfs.h"\ - "..\ps\CStr.h"\ - "..\ps\Prometheus.h"\ + "..\..\lib\glext_funcs.h"\ + "..\..\lib\misc.h"\ + "..\..\lib\ogl.h"\ + "..\..\lib\posix.h"\ + "..\..\lib\posix\aio.h"\ + "..\..\lib\res.h"\ + "..\..\lib\tex.h"\ + "..\..\lib\vfs.h"\ + "..\..\ps\CStr.h"\ + "..\..\ps\Pyrogenesis.h"\ ".\BrushTool.h"\ ".\PaintTextureTool.h"\ ".\StdAfx.h"\ @@ -314,15 +314,15 @@ .\UIGlobals.cpp : \ - "..\lib\misc.h"\ - "..\lib\posix.h"\ - "..\lib\posix\aio.h"\ - "..\lib\res.h"\ - "..\ps\CStr.h"\ - "..\ps\Prometheus.h"\ - "..\Terrain\Bound.h"\ - "..\Terrain\MathUtil.h"\ - "..\Terrain\Vector3D.h"\ + "..\..\lib\misc.h"\ + "..\..\lib\posix.h"\ + "..\..\lib\posix\aio.h"\ + "..\..\lib\res.h"\ + "..\..\ps\CStr.h"\ + "..\..\ps\Pyrogenesis.h"\ + "..\..\Terrain\Bound.h"\ + "..\..\Terrain\MathUtil.h"\ + "..\..\Terrain\Vector3D.h"\ ".\ElevToolsDlgBar.h"\ ".\MainFrm.h"\ ".\ObjectEntry.h"\ @@ -337,32 +337,32 @@ .\UnitPropertiesDlgBar.cpp : \ - "..\lib\glext_funcs.h"\ - "..\lib\misc.h"\ - "..\lib\ogl.h"\ - "..\lib\posix.h"\ - "..\lib\posix\aio.h"\ - "..\lib\res.h"\ - "..\ps\CStr.h"\ - "..\ps\Prometheus.h"\ - "..\Terrain\Bound.h"\ - "..\Terrain\Camera.h"\ - "..\Terrain\Color.h"\ - "..\Terrain\Frustum.h"\ - "..\Terrain\LightEnv.h"\ - "..\Terrain\MathUtil.h"\ - "..\Terrain\Matrix3D.h"\ - "..\Terrain\MiniPatch.h"\ - "..\Terrain\Patch.h"\ - "..\Terrain\PatchRData.h"\ - "..\Terrain\Plane.h"\ - "..\Terrain\RenderableObject.h"\ - "..\Terrain\Renderer.h"\ - "..\Terrain\SHCoeffs.h"\ - "..\Terrain\Terrain.h"\ - "..\Terrain\TerrGlobals.h"\ - "..\Terrain\Vector3D.h"\ - "..\Terrain\Vector4D.h"\ + "..\..\lib\glext_funcs.h"\ + "..\..\lib\misc.h"\ + "..\..\lib\ogl.h"\ + "..\..\lib\posix.h"\ + "..\..\lib\posix\aio.h"\ + "..\..\lib\res.h"\ + "..\..\ps\CStr.h"\ + "..\..\ps\Pyrogenesis.h"\ + "..\..\Terrain\Bound.h"\ + "..\..\Terrain\Camera.h"\ + "..\..\Terrain\Color.h"\ + "..\..\Terrain\Frustum.h"\ + "..\..\Terrain\LightEnv.h"\ + "..\..\Terrain\MathUtil.h"\ + "..\..\Terrain\Matrix3D.h"\ + "..\..\Terrain\MiniPatch.h"\ + "..\..\Terrain\Patch.h"\ + "..\..\Terrain\PatchRData.h"\ + "..\..\Terrain\Plane.h"\ + "..\..\Terrain\RenderableObject.h"\ + "..\..\Terrain\Renderer.h"\ + "..\..\Terrain\SHCoeffs.h"\ + "..\..\Terrain\Terrain.h"\ + "..\..\Terrain\TerrGlobals.h"\ + "..\..\Terrain\Vector3D.h"\ + "..\..\Terrain\Vector4D.h"\ ".\BrushTool.h"\ ".\EditorData.h"\ ".\ElevToolsDlgBar.h"\ @@ -384,15 +384,15 @@ .\UnitToolsDlgBar.cpp : \ - "..\lib\misc.h"\ - "..\lib\posix.h"\ - "..\lib\posix\aio.h"\ - "..\lib\res.h"\ - "..\ps\CStr.h"\ - "..\ps\Prometheus.h"\ - "..\Terrain\Bound.h"\ - "..\Terrain\MathUtil.h"\ - "..\Terrain\Vector3D.h"\ + "..\..\lib\misc.h"\ + "..\..\lib\posix.h"\ + "..\..\lib\posix\aio.h"\ + "..\..\lib\res.h"\ + "..\..\ps\CStr.h"\ + "..\..\ps\Pyrogenesis.h"\ + "..\..\Terrain\Bound.h"\ + "..\..\Terrain\MathUtil.h"\ + "..\..\Terrain\Vector3D.h"\ ".\ElevToolsDlgBar.h"\ ".\MainFrm.h"\ ".\ObjectEntry.h"\ @@ -407,11 +407,11 @@ .\WebLinkButton.cpp : \ - "..\lib\misc.h"\ - "..\lib\posix.h"\ - "..\lib\posix\aio.h"\ - "..\ps\CStr.h"\ - "..\ps\Prometheus.h"\ + "..\..\lib\misc.h"\ + "..\..\lib\posix.h"\ + "..\..\lib\posix\aio.h"\ + "..\..\ps\CStr.h"\ + "..\..\ps\Pyrogenesis.h"\ ".\ScEd.h"\ ".\StdAfx.h"\ ".\WebLinkButton.h"\ @@ -419,23 +419,23 @@ .\AlterElevationCommand.cpp : \ - "..\lib\res.h"\ - "..\Terrain\Bound.h"\ - "..\Terrain\Camera.h"\ - "..\Terrain\Color.h"\ - "..\Terrain\Frustum.h"\ - "..\Terrain\LightEnv.h"\ - "..\Terrain\MathUtil.h"\ - "..\Terrain\Matrix3D.h"\ - "..\Terrain\MiniPatch.h"\ - "..\Terrain\Patch.h"\ - "..\Terrain\Plane.h"\ - "..\Terrain\RenderableObject.h"\ - "..\Terrain\SHCoeffs.h"\ - "..\Terrain\Terrain.h"\ - "..\Terrain\TerrGlobals.h"\ - "..\Terrain\Vector3D.h"\ - "..\Terrain\Vector4D.h"\ + "..\..\lib\res.h"\ + "..\..\Terrain\Bound.h"\ + "..\..\Terrain\Camera.h"\ + "..\..\Terrain\Color.h"\ + "..\..\Terrain\Frustum.h"\ + "..\..\Terrain\LightEnv.h"\ + "..\..\Terrain\MathUtil.h"\ + "..\..\Terrain\Matrix3D.h"\ + "..\..\Terrain\MiniPatch.h"\ + "..\..\Terrain\Patch.h"\ + "..\..\Terrain\Plane.h"\ + "..\..\Terrain\RenderableObject.h"\ + "..\..\Terrain\SHCoeffs.h"\ + "..\..\Terrain\Terrain.h"\ + "..\..\Terrain\TerrGlobals.h"\ + "..\..\Terrain\Vector3D.h"\ + "..\..\Terrain\Vector4D.h"\ ".\AlterElevationCommand.h"\ ".\Array2D.h"\ ".\Command.h"\ @@ -444,10 +444,10 @@ .\PaintObjectCommand.cpp : \ - "..\Terrain\MathUtil.h"\ - "..\Terrain\Matrix3D.h"\ - "..\Terrain\Vector3D.h"\ - "..\Terrain\Vector4D.h"\ + "..\..\Terrain\MathUtil.h"\ + "..\..\Terrain\Matrix3D.h"\ + "..\..\Terrain\Vector3D.h"\ + "..\..\Terrain\Vector4D.h"\ ".\Command.h"\ ".\PaintObjectCommand.h"\ ".\UIGlobals.h"\ @@ -456,25 +456,25 @@ .\PaintTextureCommand.cpp : \ - "..\lib\misc.h"\ - "..\lib\posix.h"\ - "..\lib\posix\aio.h"\ - "..\lib\res.h"\ - "..\ps\CStr.h"\ - "..\ps\Prometheus.h"\ - "..\Terrain\Bound.h"\ - "..\Terrain\Camera.h"\ - "..\Terrain\Frustum.h"\ - "..\Terrain\MathUtil.h"\ - "..\Terrain\Matrix3D.h"\ - "..\Terrain\MiniPatch.h"\ - "..\Terrain\Patch.h"\ - "..\Terrain\Plane.h"\ - "..\Terrain\RenderableObject.h"\ - "..\Terrain\Terrain.h"\ - "..\Terrain\TerrGlobals.h"\ - "..\Terrain\Vector3D.h"\ - "..\Terrain\Vector4D.h"\ + "..\..\lib\misc.h"\ + "..\..\lib\posix.h"\ + "..\..\lib\posix\aio.h"\ + "..\..\lib\res.h"\ + "..\..\ps\CStr.h"\ + "..\..\ps\Pyrogenesis.h"\ + "..\..\Terrain\Bound.h"\ + "..\..\Terrain\Camera.h"\ + "..\..\Terrain\Frustum.h"\ + "..\..\Terrain\MathUtil.h"\ + "..\..\Terrain\Matrix3D.h"\ + "..\..\Terrain\MiniPatch.h"\ + "..\..\Terrain\Patch.h"\ + "..\..\Terrain\Plane.h"\ + "..\..\Terrain\RenderableObject.h"\ + "..\..\Terrain\Terrain.h"\ + "..\..\Terrain\TerrGlobals.h"\ + "..\..\Terrain\Vector3D.h"\ + "..\..\Terrain\Vector4D.h"\ ".\Array2D.h"\ ".\Command.h"\ ".\MiniMap.h"\ @@ -485,20 +485,20 @@ .\RaiseElevationCommand.cpp : \ - "..\lib\res.h"\ - "..\Terrain\Bound.h"\ - "..\Terrain\Camera.h"\ - "..\Terrain\Frustum.h"\ - "..\Terrain\MathUtil.h"\ - "..\Terrain\Matrix3D.h"\ - "..\Terrain\MiniPatch.h"\ - "..\Terrain\Patch.h"\ - "..\Terrain\Plane.h"\ - "..\Terrain\RenderableObject.h"\ - "..\Terrain\Terrain.h"\ - "..\Terrain\TerrGlobals.h"\ - "..\Terrain\Vector3D.h"\ - "..\Terrain\Vector4D.h"\ + "..\..\lib\res.h"\ + "..\..\Terrain\Bound.h"\ + "..\..\Terrain\Camera.h"\ + "..\..\Terrain\Frustum.h"\ + "..\..\Terrain\MathUtil.h"\ + "..\..\Terrain\Matrix3D.h"\ + "..\..\Terrain\MiniPatch.h"\ + "..\..\Terrain\Patch.h"\ + "..\..\Terrain\Plane.h"\ + "..\..\Terrain\RenderableObject.h"\ + "..\..\Terrain\Terrain.h"\ + "..\..\Terrain\TerrGlobals.h"\ + "..\..\Terrain\Vector3D.h"\ + "..\..\Terrain\Vector4D.h"\ ".\AlterElevationCommand.h"\ ".\Array2D.h"\ ".\Command.h"\ @@ -506,20 +506,20 @@ .\SmoothElevationCommand.cpp : \ - "..\lib\res.h"\ - "..\Terrain\Bound.h"\ - "..\Terrain\Camera.h"\ - "..\Terrain\Frustum.h"\ - "..\Terrain\MathUtil.h"\ - "..\Terrain\Matrix3D.h"\ - "..\Terrain\MiniPatch.h"\ - "..\Terrain\Patch.h"\ - "..\Terrain\Plane.h"\ - "..\Terrain\RenderableObject.h"\ - "..\Terrain\Terrain.h"\ - "..\Terrain\TerrGlobals.h"\ - "..\Terrain\Vector3D.h"\ - "..\Terrain\Vector4D.h"\ + "..\..\lib\res.h"\ + "..\..\Terrain\Bound.h"\ + "..\..\Terrain\Camera.h"\ + "..\..\Terrain\Frustum.h"\ + "..\..\Terrain\MathUtil.h"\ + "..\..\Terrain\Matrix3D.h"\ + "..\..\Terrain\MiniPatch.h"\ + "..\..\Terrain\Patch.h"\ + "..\..\Terrain\Plane.h"\ + "..\..\Terrain\RenderableObject.h"\ + "..\..\Terrain\Terrain.h"\ + "..\..\Terrain\TerrGlobals.h"\ + "..\..\Terrain\Vector3D.h"\ + "..\..\Terrain\Vector4D.h"\ ".\AlterElevationCommand.h"\ ".\Array2D.h"\ ".\Command.h"\ @@ -527,27 +527,27 @@ .\BrushTool.cpp : \ - "..\lib\glext_funcs.h"\ - "..\lib\misc.h"\ - "..\lib\ogl.h"\ - "..\lib\posix.h"\ - "..\lib\posix\aio.h"\ - "..\lib\res.h"\ - "..\ps\CStr.h"\ - "..\ps\Prometheus.h"\ - "..\Terrain\Bound.h"\ - "..\Terrain\Camera.h"\ - "..\Terrain\Frustum.h"\ - "..\Terrain\MathUtil.h"\ - "..\Terrain\Matrix3D.h"\ - "..\Terrain\MiniPatch.h"\ - "..\Terrain\Patch.h"\ - "..\Terrain\Plane.h"\ - "..\Terrain\RenderableObject.h"\ - "..\Terrain\Terrain.h"\ - "..\Terrain\TerrGlobals.h"\ - "..\Terrain\Vector3D.h"\ - "..\Terrain\Vector4D.h"\ + "..\..\lib\glext_funcs.h"\ + "..\..\lib\misc.h"\ + "..\..\lib\ogl.h"\ + "..\..\lib\posix.h"\ + "..\..\lib\posix\aio.h"\ + "..\..\lib\res.h"\ + "..\..\ps\CStr.h"\ + "..\..\ps\Pyrogenesis.h"\ + "..\..\Terrain\Bound.h"\ + "..\..\Terrain\Camera.h"\ + "..\..\Terrain\Frustum.h"\ + "..\..\Terrain\MathUtil.h"\ + "..\..\Terrain\Matrix3D.h"\ + "..\..\Terrain\MiniPatch.h"\ + "..\..\Terrain\Patch.h"\ + "..\..\Terrain\Plane.h"\ + "..\..\Terrain\RenderableObject.h"\ + "..\..\Terrain\Terrain.h"\ + "..\..\Terrain\TerrGlobals.h"\ + "..\..\Terrain\Vector3D.h"\ + "..\..\Terrain\Vector4D.h"\ ".\BrushTool.h"\ ".\HFTracer.h"\ ".\TextureEntry.h"\ @@ -559,31 +559,31 @@ .\PaintObjectTool.cpp : \ - "..\lib\glext_funcs.h"\ - "..\lib\misc.h"\ - "..\lib\ogl.h"\ - "..\lib\posix.h"\ - "..\lib\posix\aio.h"\ - "..\lib\res.h"\ - "..\ps\CStr.h"\ - "..\ps\Prometheus.h"\ - "..\Terrain\Bound.h"\ - "..\Terrain\Camera.h"\ - "..\Terrain\Color.h"\ - "..\Terrain\Frustum.h"\ - "..\Terrain\MathUtil.h"\ - "..\Terrain\Matrix3D.h"\ - "..\Terrain\MiniPatch.h"\ - "..\Terrain\Patch.h"\ - "..\Terrain\PatchRData.h"\ - "..\Terrain\Plane.h"\ - "..\Terrain\RenderableObject.h"\ - "..\Terrain\Renderer.h"\ - "..\Terrain\SHCoeffs.h"\ - "..\Terrain\Terrain.h"\ - "..\Terrain\TerrGlobals.h"\ - "..\Terrain\Vector3D.h"\ - "..\Terrain\Vector4D.h"\ + "..\..\lib\glext_funcs.h"\ + "..\..\lib\misc.h"\ + "..\..\lib\ogl.h"\ + "..\..\lib\posix.h"\ + "..\..\lib\posix\aio.h"\ + "..\..\lib\res.h"\ + "..\..\ps\CStr.h"\ + "..\..\ps\Pyrogenesis.h"\ + "..\..\Terrain\Bound.h"\ + "..\..\Terrain\Camera.h"\ + "..\..\Terrain\Color.h"\ + "..\..\Terrain\Frustum.h"\ + "..\..\Terrain\MathUtil.h"\ + "..\..\Terrain\Matrix3D.h"\ + "..\..\Terrain\MiniPatch.h"\ + "..\..\Terrain\Patch.h"\ + "..\..\Terrain\PatchRData.h"\ + "..\..\Terrain\Plane.h"\ + "..\..\Terrain\RenderableObject.h"\ + "..\..\Terrain\Renderer.h"\ + "..\..\Terrain\SHCoeffs.h"\ + "..\..\Terrain\Terrain.h"\ + "..\..\Terrain\TerrGlobals.h"\ + "..\..\Terrain\Vector3D.h"\ + "..\..\Terrain\Vector4D.h"\ ".\BrushTool.h"\ ".\Command.h"\ ".\CommandManager.h"\ @@ -597,12 +597,12 @@ .\PaintTextureTool.cpp : \ - "..\lib\misc.h"\ - "..\lib\posix.h"\ - "..\lib\posix\aio.h"\ - "..\lib\res.h"\ - "..\ps\CStr.h"\ - "..\ps\Prometheus.h"\ + "..\..\lib\misc.h"\ + "..\..\lib\posix.h"\ + "..\..\lib\posix\aio.h"\ + "..\..\lib\res.h"\ + "..\..\ps\CStr.h"\ + "..\..\ps\Pyrogenesis.h"\ ".\Array2D.h"\ ".\BrushTool.h"\ ".\Command.h"\ @@ -615,7 +615,7 @@ .\RaiseElevationTool.cpp : \ - "..\lib\res.h"\ + "..\..\lib\res.h"\ ".\AlterElevationCommand.h"\ ".\Array2D.h"\ ".\BrushTool.h"\ @@ -627,7 +627,7 @@ .\SmoothElevationTool.cpp : \ - "..\lib\res.h"\ + "..\..\lib\res.h"\ ".\AlterElevationCommand.h"\ ".\Array2D.h"\ ".\BrushTool.h"\ @@ -644,33 +644,33 @@ .\EditorData.cpp : \ - "..\lib\glext_funcs.h"\ - "..\lib\misc.h"\ - "..\lib\ogl.h"\ - "..\lib\posix.h"\ - "..\lib\posix\aio.h"\ - "..\lib\res.h"\ - "..\lib\tex.h"\ - "..\ps\CStr.h"\ - "..\ps\Prometheus.h"\ - "..\Terrain\Bound.h"\ - "..\Terrain\Camera.h"\ - "..\Terrain\Color.h"\ - "..\Terrain\Frustum.h"\ - "..\Terrain\LightEnv.h"\ - "..\Terrain\MathUtil.h"\ - "..\Terrain\Matrix3D.h"\ - "..\Terrain\MiniPatch.h"\ - "..\Terrain\Patch.h"\ - "..\Terrain\PatchRData.h"\ - "..\Terrain\Plane.h"\ - "..\Terrain\RenderableObject.h"\ - "..\Terrain\Renderer.h"\ - "..\Terrain\SHCoeffs.h"\ - "..\Terrain\Terrain.h"\ - "..\Terrain\TerrGlobals.h"\ - "..\Terrain\Vector3D.h"\ - "..\Terrain\Vector4D.h"\ + "..\..\lib\glext_funcs.h"\ + "..\..\lib\misc.h"\ + "..\..\lib\ogl.h"\ + "..\..\lib\posix.h"\ + "..\..\lib\posix\aio.h"\ + "..\..\lib\res.h"\ + "..\..\lib\tex.h"\ + "..\..\ps\CStr.h"\ + "..\..\ps\Pyrogenesis.h"\ + "..\..\Terrain\Bound.h"\ + "..\..\Terrain\Camera.h"\ + "..\..\Terrain\Color.h"\ + "..\..\Terrain\Frustum.h"\ + "..\..\Terrain\LightEnv.h"\ + "..\..\Terrain\MathUtil.h"\ + "..\..\Terrain\Matrix3D.h"\ + "..\..\Terrain\MiniPatch.h"\ + "..\..\Terrain\Patch.h"\ + "..\..\Terrain\PatchRData.h"\ + "..\..\Terrain\Plane.h"\ + "..\..\Terrain\RenderableObject.h"\ + "..\..\Terrain\Renderer.h"\ + "..\..\Terrain\SHCoeffs.h"\ + "..\..\Terrain\Terrain.h"\ + "..\..\Terrain\TerrGlobals.h"\ + "..\..\Terrain\Vector3D.h"\ + "..\..\Terrain\Vector4D.h"\ ".\BrushTool.h"\ ".\EditorData.h"\ ".\InfoBox.h"\ @@ -690,36 +690,36 @@ .\InfoBox.cpp : \ - "..\lib\glext_funcs.h"\ - "..\lib\misc.h"\ - "..\lib\ogl.h"\ - "..\lib\posix.h"\ - "..\lib\posix\aio.h"\ - "..\lib\res.h"\ - "..\ps\CStr.h"\ - "..\ps\NPFont.h"\ - "..\ps\NPFontManager.h"\ - "..\ps\Overlay.h"\ - "..\ps\OverlayText.h"\ - "..\ps\Prometheus.h"\ - "..\Terrain\Bound.h"\ - "..\Terrain\Camera.h"\ - "..\Terrain\Color.h"\ - "..\Terrain\Frustum.h"\ - "..\Terrain\MathUtil.h"\ - "..\Terrain\Matrix3D.h"\ - "..\Terrain\MiniPatch.h"\ - "..\Terrain\Patch.h"\ - "..\Terrain\PatchRData.h"\ - "..\Terrain\Plane.h"\ - "..\Terrain\RenderableObject.h"\ - "..\Terrain\Renderer.h"\ - "..\Terrain\SHCoeffs.h"\ - "..\Terrain\Terrain.h"\ - "..\Terrain\TerrGlobals.h"\ - "..\Terrain\Texture.h"\ - "..\Terrain\Vector3D.h"\ - "..\Terrain\Vector4D.h"\ + "..\..\lib\glext_funcs.h"\ + "..\..\lib\misc.h"\ + "..\..\lib\ogl.h"\ + "..\..\lib\posix.h"\ + "..\..\lib\posix\aio.h"\ + "..\..\lib\res.h"\ + "..\..\ps\CStr.h"\ + "..\..\ps\NPFont.h"\ + "..\..\ps\NPFontManager.h"\ + "..\..\ps\Overlay.h"\ + "..\..\ps\OverlayText.h"\ + "..\..\ps\Pyrogenesis.h"\ + "..\..\Terrain\Bound.h"\ + "..\..\Terrain\Camera.h"\ + "..\..\Terrain\Color.h"\ + "..\..\Terrain\Frustum.h"\ + "..\..\Terrain\MathUtil.h"\ + "..\..\Terrain\Matrix3D.h"\ + "..\..\Terrain\MiniPatch.h"\ + "..\..\Terrain\Patch.h"\ + "..\..\Terrain\PatchRData.h"\ + "..\..\Terrain\Plane.h"\ + "..\..\Terrain\RenderableObject.h"\ + "..\..\Terrain\Renderer.h"\ + "..\..\Terrain\SHCoeffs.h"\ + "..\..\Terrain\Terrain.h"\ + "..\..\Terrain\TerrGlobals.h"\ + "..\..\Terrain\Texture.h"\ + "..\..\Terrain\Vector3D.h"\ + "..\..\Terrain\Vector4D.h"\ ".\InfoBox.h"\ ".\UIGlobals.h"\ {$(INCLUDE)}"GL\glext.h"\ @@ -727,27 +727,27 @@ .\MiniMap.cpp : \ - "..\lib\glext_funcs.h"\ - "..\lib\misc.h"\ - "..\lib\ogl.h"\ - "..\lib\posix.h"\ - "..\lib\posix\aio.h"\ - "..\lib\res.h"\ - "..\ps\CStr.h"\ - "..\ps\Prometheus.h"\ - "..\Terrain\Bound.h"\ - "..\Terrain\Camera.h"\ - "..\Terrain\Frustum.h"\ - "..\Terrain\MathUtil.h"\ - "..\Terrain\Matrix3D.h"\ - "..\Terrain\MiniPatch.h"\ - "..\Terrain\Patch.h"\ - "..\Terrain\Plane.h"\ - "..\Terrain\RenderableObject.h"\ - "..\Terrain\Terrain.h"\ - "..\Terrain\TerrGlobals.h"\ - "..\Terrain\Vector3D.h"\ - "..\Terrain\Vector4D.h"\ + "..\..\lib\glext_funcs.h"\ + "..\..\lib\misc.h"\ + "..\..\lib\ogl.h"\ + "..\..\lib\posix.h"\ + "..\..\lib\posix\aio.h"\ + "..\..\lib\res.h"\ + "..\..\ps\CStr.h"\ + "..\..\ps\Pyrogenesis.h"\ + "..\..\Terrain\Bound.h"\ + "..\..\Terrain\Camera.h"\ + "..\..\Terrain\Frustum.h"\ + "..\..\Terrain\MathUtil.h"\ + "..\..\Terrain\Matrix3D.h"\ + "..\..\Terrain\MiniPatch.h"\ + "..\..\Terrain\Patch.h"\ + "..\..\Terrain\Plane.h"\ + "..\..\Terrain\RenderableObject.h"\ + "..\..\Terrain\Terrain.h"\ + "..\..\Terrain\TerrGlobals.h"\ + "..\..\Terrain\Vector3D.h"\ + "..\..\Terrain\Vector4D.h"\ ".\MiniMap.h"\ ".\TextureEntry.h"\ ".\TextureManager.h"\ @@ -757,22 +757,22 @@ .\ObjectEntry.cpp : \ - "..\lib\misc.h"\ - "..\lib\posix.h"\ - "..\lib\posix\aio.h"\ - "..\lib\res.h"\ - "..\ps\CStr.h"\ - "..\ps\Prometheus.h"\ - "..\ps\XercesErrorHandler.h"\ - "..\Terrain\Bound.h"\ - "..\Terrain\MathUtil.h"\ - "..\Terrain\Matrix3D.h"\ - "..\Terrain\Model.h"\ - "..\Terrain\ModelDef.h"\ - "..\Terrain\ModelFile.h"\ - "..\Terrain\Texture.h"\ - "..\Terrain\Vector3D.h"\ - "..\Terrain\Vector4D.h"\ + "..\..\lib\misc.h"\ + "..\..\lib\posix.h"\ + "..\..\lib\posix\aio.h"\ + "..\..\lib\res.h"\ + "..\..\ps\CStr.h"\ + "..\..\ps\Pyrogenesis.h"\ + "..\..\ps\XercesErrorHandler.h"\ + "..\..\Terrain\Bound.h"\ + "..\..\Terrain\MathUtil.h"\ + "..\..\Terrain\Matrix3D.h"\ + "..\..\Terrain\Model.h"\ + "..\..\Terrain\ModelDef.h"\ + "..\..\Terrain\ModelFile.h"\ + "..\..\Terrain\Texture.h"\ + "..\..\Terrain\Vector3D.h"\ + "..\..\Terrain\Vector4D.h"\ ".\ObjectEntry.h"\ ".\ObjectManager.h"\ ".\UIGlobals.h"\ @@ -906,14 +906,14 @@ .\ObjectManager.cpp : \ - "..\lib\misc.h"\ - "..\lib\posix.h"\ - "..\lib\posix\aio.h"\ - "..\ps\CStr.h"\ - "..\ps\Prometheus.h"\ - "..\Terrain\Bound.h"\ - "..\Terrain\MathUtil.h"\ - "..\Terrain\Vector3D.h"\ + "..\..\lib\misc.h"\ + "..\..\lib\posix.h"\ + "..\..\lib\posix\aio.h"\ + "..\..\ps\CStr.h"\ + "..\..\ps\Pyrogenesis.h"\ + "..\..\Terrain\Bound.h"\ + "..\..\Terrain\MathUtil.h"\ + "..\..\Terrain\Vector3D.h"\ ".\ObjectEntry.h"\ ".\ObjectManager.h"\ ".\StdAfx.h"\ @@ -921,24 +921,24 @@ .\SMDConverter.cpp : \ - "..\Terrain\MathUtil.h"\ - "..\Terrain\Matrix3D.h"\ - "..\Terrain\ModelDef.h"\ - "..\Terrain\Vector3D.h"\ - "..\Terrain\Vector4D.h"\ + "..\..\Terrain\MathUtil.h"\ + "..\..\Terrain\Matrix3D.h"\ + "..\..\Terrain\ModelDef.h"\ + "..\..\Terrain\Vector3D.h"\ + "..\..\Terrain\Vector4D.h"\ ".\SMDConverter.h"\ .\TextureManager.cpp : \ - "..\lib\glext_funcs.h"\ - "..\lib\misc.h"\ - "..\lib\ogl.h"\ - "..\lib\posix.h"\ - "..\lib\posix\aio.h"\ - "..\lib\res.h"\ - "..\lib\tex.h"\ - "..\ps\CStr.h"\ - "..\ps\Prometheus.h"\ + "..\..\lib\glext_funcs.h"\ + "..\..\lib\misc.h"\ + "..\..\lib\ogl.h"\ + "..\..\lib\posix.h"\ + "..\..\lib\posix\aio.h"\ + "..\..\lib\res.h"\ + "..\..\lib\tex.h"\ + "..\..\ps\CStr.h"\ + "..\..\ps\Pyrogenesis.h"\ ".\TextureEntry.h"\ ".\TextureManager.h"\ {$(INCLUDE)}"GL\glext.h"\ @@ -951,39 +951,39 @@ .\UnitManager.cpp : \ - "..\Terrain\MathUtil.h"\ - "..\Terrain\Matrix3D.h"\ - "..\Terrain\Vector3D.h"\ - "..\Terrain\Vector4D.h"\ + "..\..\Terrain\MathUtil.h"\ + "..\..\Terrain\Matrix3D.h"\ + "..\..\Terrain\Vector3D.h"\ + "..\..\Terrain\Vector4D.h"\ ".\Unit.h"\ ".\UnitManager.h"\ .\HFTracer.cpp : \ - "..\lib\res.h"\ - "..\Terrain\Bound.h"\ - "..\Terrain\Camera.h"\ - "..\Terrain\Frustum.h"\ - "..\Terrain\MathUtil.h"\ - "..\Terrain\Matrix3D.h"\ - "..\Terrain\MiniPatch.h"\ - "..\Terrain\Patch.h"\ - "..\Terrain\Plane.h"\ - "..\Terrain\RenderableObject.h"\ - "..\Terrain\Terrain.h"\ - "..\Terrain\TerrGlobals.h"\ - "..\Terrain\Triangle.h"\ - "..\Terrain\Vector3D.h"\ - "..\Terrain\Vector4D.h"\ + "..\..\lib\res.h"\ + "..\..\Terrain\Bound.h"\ + "..\..\Terrain\Camera.h"\ + "..\..\Terrain\Frustum.h"\ + "..\..\Terrain\MathUtil.h"\ + "..\..\Terrain\Matrix3D.h"\ + "..\..\Terrain\MiniPatch.h"\ + "..\..\Terrain\Patch.h"\ + "..\..\Terrain\Plane.h"\ + "..\..\Terrain\RenderableObject.h"\ + "..\..\Terrain\Terrain.h"\ + "..\..\Terrain\TerrGlobals.h"\ + "..\..\Terrain\Triangle.h"\ + "..\..\Terrain\Vector3D.h"\ + "..\..\Terrain\Vector4D.h"\ ".\HFTracer.h"\ .\StdAfx.cpp : \ - "..\lib\misc.h"\ - "..\lib\posix.h"\ - "..\lib\posix\aio.h"\ - "..\ps\CStr.h"\ - "..\ps\Prometheus.h"\ + "..\..\lib\misc.h"\ + "..\..\lib\posix.h"\ + "..\..\lib\posix\aio.h"\ + "..\..\ps\CStr.h"\ + "..\..\ps\Pyrogenesis.h"\ ".\StdAfx.h"\ {$(INCLUDE)}"unistd.h"\ diff --git a/source/tools/sced/ScEd.dsp b/source/tools/sced/ScEd.dsp index 07128a9620..0d8b820718 100755 --- a/source/tools/sced/ScEd.dsp +++ b/source/tools/sced/ScEd.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /G6 /MT /W3 /GR- /GX /Zi /O2 /Ob2 /I "..\\" /I "..\lib" /I "..\ps" /I "..\simulation" /I "..\maths" /I "..\graphics" /I "..\renderer" /I ".\\" /I ".\ui" /D "NDEBUG" /D "_MBCS" /D "_WINDOWS" /D "WIN32" /D "_NO_WINMAIN_" /D "_WGL_H_INCLUDED" /FD /c +# ADD CPP /nologo /G6 /MT /W3 /GR- /GX /Zi /O2 /Ob2 /I "..\..\\" /I "..\..\lib" /I "..\..\ps" /I "..\..\simulation" /I "..\..\maths" /I "..\..\graphics" /I "..\..\renderer" /I ".\\" /I ".\ui" /D "NDEBUG" /D "_MBCS" /D "_WINDOWS" /D "WIN32" /D "_NO_WINMAIN_" /D "_WGL_H_INCLUDED" /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 -# ADD LINK32 nafxcw.lib opengl32.lib glu32.lib ws2_32.lib version.lib xerces-c_2.lib /nologo /entry:"entry" /subsystem:windows /map /debug /machine:I386 /out:"D:\0ad\binaries\system\ScEd.exe" /libpath:"..\libs" /fixed:no +# ADD LINK32 nafxcw.lib opengl32.lib glu32.lib ws2_32.lib version.lib xerces-c_2.lib /nologo /entry:"entry" /subsystem:windows /map /debug /machine:I386 /out:"D:\0ad\binaries\system\ScEd.exe" /libpath:"..\..\libs" /fixed:no # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "ScEd - Win32 Debug" @@ -71,7 +71,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /G5 /MTd /W3 /Gm /Gi /GX /Zi /Od /I "..\\" /I "..\lib" /I "..\ps" /I "..\simulation" /I "..\maths" /I "..\graphics" /I "..\renderer" /I ".\\" /I ".\ui" /D "_DEBUG" /D "_MBCS" /D "_WINDOWS" /D "WIN32" /D "_NO_WINMAIN_" /D "_WGL_H_INCLUDED" /FD /GZ /c +# ADD CPP /nologo /G5 /MTd /W3 /Gm /Gi /GX /Zi /Od /I "..\..\\" /I "..\..\lib" /I "..\..\ps" /I "..\..\simulation" /I "..\..\maths" /I "..\..\graphics" /I "..\..\renderer" /I ".\\" /I ".\ui" /D "_DEBUG" /D "_MBCS" /D "_WINDOWS" /D "WIN32" /D "_NO_WINMAIN_" /D "_WGL_H_INCLUDED" /FD /GZ /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 @@ -82,7 +82,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 nafxcwd.lib opengl32.lib glu32.lib ws2_32.lib version.lib xerces-c_2D.lib /nologo /entry:"entry" /subsystem:windows /incremental:no /map /debug /machine:I386 /out:"D:\0ad\binaries\system\ScEd_d.exe" /libpath:"..\libs" /fixed:no +# ADD LINK32 nafxcwd.lib opengl32.lib glu32.lib ws2_32.lib version.lib xerces-c_2D.lib /nologo /entry:"entry" /subsystem:windows /incremental:no /map /debug /machine:I386 /out:"D:\0ad\binaries\system\ScEd_d.exe" /libpath:"..\..\libs" /fixed:no # SUBTRACT LINK32 /pdb:none !ENDIF @@ -99,67 +99,67 @@ LINK32=link.exe # PROP Default_Filter "" # Begin Source File -SOURCE=..\lib\res\file.cpp +SOURCE=..\..\lib\res\file.cpp # End Source File # Begin Source File -SOURCE=..\lib\res\file.h +SOURCE=..\..\lib\res\file.h # End Source File # Begin Source File -SOURCE=..\lib\res\font.cpp +SOURCE=..\..\lib\res\font.cpp # End Source File # Begin Source File -SOURCE=..\lib\res\font.h +SOURCE=..\..\lib\res\font.h # End Source File # Begin Source File -SOURCE=..\lib\res\h_mgr.cpp +SOURCE=..\..\lib\res\h_mgr.cpp # End Source File # Begin Source File -SOURCE=..\lib\res\h_mgr.h +SOURCE=..\..\lib\res\h_mgr.h # End Source File # Begin Source File -SOURCE=..\lib\res\mem.cpp +SOURCE=..\..\lib\res\mem.cpp # End Source File # Begin Source File -SOURCE=..\lib\res\mem.h +SOURCE=..\..\lib\res\mem.h # End Source File # Begin Source File -SOURCE=..\lib\res\res.cpp +SOURCE=..\..\lib\res\res.cpp # End Source File # Begin Source File -SOURCE=..\lib\res\res.h +SOURCE=..\..\lib\res\res.h # End Source File # Begin Source File -SOURCE=..\lib\res\tex.cpp +SOURCE=..\..\lib\res\tex.cpp # End Source File # Begin Source File -SOURCE=..\lib\res\tex.h +SOURCE=..\..\lib\res\tex.h # End Source File # Begin Source File -SOURCE=..\lib\res\vfs.cpp +SOURCE=..\..\lib\res\vfs.cpp # End Source File # Begin Source File -SOURCE=..\lib\res\vfs.h +SOURCE=..\..\lib\res\vfs.h # End Source File # Begin Source File -SOURCE=..\lib\res\zip.cpp +SOURCE=..\..\lib\res\zip.cpp # End Source File # Begin Source File -SOURCE=..\lib\res\zip.h +SOURCE=..\..\lib\res\zip.h # End Source File # End Group # Begin Group "sysdep" @@ -170,173 +170,173 @@ SOURCE=..\lib\res\zip.h # PROP Default_Filter "" # Begin Source File -SOURCE=..\lib\sysdep\win\waio.cpp +SOURCE=..\..\lib\sysdep\win\waio.cpp # End Source File # Begin Source File -SOURCE=..\lib\sysdep\win\waio.h +SOURCE=..\..\lib\sysdep\win\waio.h # End Source File # Begin Source File -SOURCE=..\lib\sysdep\win\wdetect.cpp +SOURCE=..\..\lib\sysdep\win\wdetect.cpp # End Source File # Begin Source File -SOURCE=..\lib\sysdep\win\wfam.cpp +SOURCE=..\..\lib\sysdep\win\wfam.cpp # End Source File # Begin Source File -SOURCE=..\lib\sysdep\win\wfam.h +SOURCE=..\..\lib\sysdep\win\wfam.h # End Source File # Begin Source File -SOURCE=..\lib\sysdep\win\wgl.h +SOURCE=..\..\lib\sysdep\win\wgl.h # End Source File # Begin Source File -SOURCE=..\lib\sysdep\win\win.cpp +SOURCE=..\..\lib\sysdep\win\win.cpp # End Source File # Begin Source File -SOURCE=..\lib\sysdep\win\win.h +SOURCE=..\..\lib\sysdep\win\win.h # End Source File # Begin Source File -SOURCE=..\lib\sysdep\win\win_internal.h +SOURCE=..\..\lib\sysdep\win\win_internal.h # End Source File # Begin Source File -SOURCE=..\lib\sysdep\win\wposix.cpp +SOURCE=..\..\lib\sysdep\win\wposix.cpp # End Source File # Begin Source File -SOURCE=..\lib\sysdep\win\wposix.h +SOURCE=..\..\lib\sysdep\win\wposix.h # End Source File # Begin Source File -SOURCE=..\lib\sysdep\win\wsdl.cpp +SOURCE=..\..\lib\sysdep\win\wsdl.cpp # End Source File # Begin Source File -SOURCE=..\lib\sysdep\win\wsdl.h +SOURCE=..\..\lib\sysdep\win\wsdl.h # End Source File # Begin Source File -SOURCE=..\lib\sysdep\win\wsock.cpp +SOURCE=..\..\lib\sysdep\win\wsock.cpp # End Source File # Begin Source File -SOURCE=..\lib\sysdep\win\wsock.h +SOURCE=..\..\lib\sysdep\win\wsock.h # End Source File # Begin Source File -SOURCE=..\lib\sysdep\win\wtime.cpp +SOURCE=..\..\lib\sysdep\win\wtime.cpp # End Source File # Begin Source File -SOURCE=..\lib\sysdep\win\wtime.h +SOURCE=..\..\lib\sysdep\win\wtime.h # End Source File # End Group # Begin Source File -SOURCE=..\lib\sysdep\ia32.cpp +SOURCE=..\..\lib\sysdep\ia32.cpp # End Source File # Begin Source File -SOURCE=..\lib\sysdep\ia32.h +SOURCE=..\..\lib\sysdep\ia32.h # End Source File # Begin Source File -SOURCE=..\lib\sysdep\sysdep.cpp +SOURCE=..\..\lib\sysdep\sysdep.cpp # End Source File # Begin Source File -SOURCE=..\lib\sysdep\sysdep.h +SOURCE=..\..\lib\sysdep\sysdep.h # End Source File # Begin Source File -SOURCE=..\lib\sysdep\x.cpp +SOURCE=..\..\lib\sysdep\x.cpp # End Source File # End Group # Begin Source File -SOURCE=..\lib\adts.cpp +SOURCE=..\..\lib\adts.cpp # End Source File # Begin Source File -SOURCE=..\lib\adts.h +SOURCE=..\..\lib\adts.h # End Source File # Begin Source File -SOURCE=..\lib\config.h +SOURCE=..\..\lib\config.h # End Source File # Begin Source File -SOURCE=..\lib\detect.cpp +SOURCE=..\..\lib\detect.cpp # End Source File # Begin Source File -SOURCE=..\lib\detect.h +SOURCE=..\..\lib\detect.h # End Source File # Begin Source File -SOURCE=..\lib\glext_funcs.h +SOURCE=..\..\lib\glext_funcs.h # End Source File # Begin Source File -SOURCE=..\lib\lib.cpp +SOURCE=..\..\lib\lib.cpp # End Source File # Begin Source File -SOURCE=..\lib\lib.h +SOURCE=..\..\lib\lib.h # End Source File # Begin Source File -SOURCE=..\lib\memcpy.cpp +SOURCE=..\..\lib\memcpy.cpp # End Source File # Begin Source File -SOURCE=..\lib\ogl.cpp +SOURCE=..\..\lib\ogl.cpp # End Source File # Begin Source File -SOURCE=..\lib\ogl.h +SOURCE=..\..\lib\ogl.h # End Source File # Begin Source File -SOURCE=..\lib\posix.h +SOURCE=..\..\lib\posix.h # End Source File # Begin Source File -SOURCE=..\lib\precompiled.cpp +SOURCE=..\..\lib\precompiled.cpp # End Source File # Begin Source File -SOURCE=..\lib\precompiled.h +SOURCE=..\..\lib\precompiled.h # End Source File # Begin Source File -SOURCE=..\lib\sdl.h +SOURCE=..\..\lib\sdl.h # End Source File # Begin Source File -SOURCE=..\lib\SDL_keysym.h +SOURCE=..\..\lib\SDL_keysym.h # End Source File # Begin Source File -SOURCE=..\lib\SDL_vkeys.h +SOURCE=..\..\lib\SDL_vkeys.h # End Source File # Begin Source File -SOURCE=..\lib\timer.cpp +SOURCE=..\..\lib\timer.cpp # End Source File # Begin Source File -SOURCE=..\lib\timer.h +SOURCE=..\..\lib\timer.h # End Source File # Begin Source File -SOURCE=..\lib\types.h +SOURCE=..\..\lib\types.h # End Source File # End Group # Begin Group "simulation" @@ -344,95 +344,95 @@ SOURCE=..\lib\types.h # PROP Default_Filter "" # Begin Source File -SOURCE=..\simulation\BaseEntity.cpp +SOURCE=..\..\simulation\BaseEntity.cpp # End Source File # Begin Source File -SOURCE=..\simulation\BaseEntity.h +SOURCE=..\..\simulation\BaseEntity.h # End Source File # Begin Source File -SOURCE=..\simulation\BaseEntityCollection.cpp +SOURCE=..\..\simulation\BaseEntityCollection.cpp # End Source File # Begin Source File -SOURCE=..\simulation\BaseEntityCollection.h +SOURCE=..\..\simulation\BaseEntityCollection.h # End Source File # Begin Source File -SOURCE=..\simulation\BoundingObjects.cpp +SOURCE=..\..\simulation\BoundingObjects.cpp # End Source File # Begin Source File -SOURCE=..\simulation\BoundingObjects.h +SOURCE=..\..\simulation\BoundingObjects.h # End Source File # Begin Source File -SOURCE=..\simulation\Collision.cpp +SOURCE=..\..\simulation\Collision.cpp # End Source File # Begin Source File -SOURCE=..\simulation\Collision.h +SOURCE=..\..\simulation\Collision.h # End Source File # Begin Source File -SOURCE=..\simulation\Entity.cpp +SOURCE=..\..\simulation\Entity.cpp # End Source File # Begin Source File -SOURCE=..\simulation\Entity.h +SOURCE=..\..\simulation\Entity.h # End Source File # Begin Source File -SOURCE=..\simulation\EntityHandles.cpp +SOURCE=..\..\simulation\EntityHandles.cpp # End Source File # Begin Source File -SOURCE=..\simulation\EntityHandles.h +SOURCE=..\..\simulation\EntityHandles.h # End Source File # Begin Source File -SOURCE=..\simulation\EntityManager.cpp +SOURCE=..\..\simulation\EntityManager.cpp # End Source File # Begin Source File -SOURCE=..\simulation\EntityManager.h +SOURCE=..\..\simulation\EntityManager.h # End Source File # Begin Source File -SOURCE=..\simulation\EntityMessage.h +SOURCE=..\..\simulation\EntityMessage.h # End Source File # Begin Source File -SOURCE=..\simulation\EntityOrders.h +SOURCE=..\..\simulation\EntityOrders.h # End Source File # Begin Source File -SOURCE=..\simulation\EntityProperties.cpp +SOURCE=..\..\simulation\EntityProperties.cpp # End Source File # Begin Source File -SOURCE=..\simulation\EntityProperties.h +SOURCE=..\..\simulation\EntityProperties.h # End Source File # Begin Source File -SOURCE=..\simulation\EntityStateProcessing.cpp +SOURCE=..\..\simulation\EntityStateProcessing.cpp # End Source File # Begin Source File -SOURCE=..\simulation\PathfindEngine.cpp +SOURCE=..\..\simulation\PathfindEngine.cpp # End Source File # Begin Source File -SOURCE=..\simulation\PathfindEngine.h +SOURCE=..\..\simulation\PathfindEngine.h # End Source File # Begin Source File -SOURCE=..\simulation\PathfindSparse.cpp +SOURCE=..\..\simulation\PathfindSparse.cpp # End Source File # Begin Source File -SOURCE=..\simulation\PathfindSparse.h +SOURCE=..\..\simulation\PathfindSparse.h # End Source File # End Group # Begin Group "graphics" @@ -440,191 +440,191 @@ SOURCE=..\simulation\PathfindSparse.h # PROP Default_Filter "" # Begin Source File -SOURCE=..\graphics\Camera.cpp +SOURCE=..\..\graphics\Camera.cpp # End Source File # Begin Source File -SOURCE=..\graphics\Camera.h +SOURCE=..\..\graphics\Camera.h # End Source File # Begin Source File -SOURCE=..\graphics\Color.h +SOURCE=..\..\graphics\Color.h # End Source File # Begin Source File -SOURCE=..\graphics\Frustum.cpp +SOURCE=..\..\graphics\Frustum.cpp # End Source File # Begin Source File -SOURCE=..\graphics\Frustum.h +SOURCE=..\..\graphics\Frustum.h # End Source File # Begin Source File -SOURCE=..\graphics\HFTracer.cpp +SOURCE=..\..\graphics\HFTracer.cpp # End Source File # Begin Source File -SOURCE=..\graphics\HFTracer.h +SOURCE=..\..\graphics\HFTracer.h # End Source File # Begin Source File -SOURCE=..\graphics\LightEnv.h +SOURCE=..\..\graphics\LightEnv.h # End Source File # Begin Source File -SOURCE=..\graphics\MapIO.h +SOURCE=..\..\graphics\MapIO.h # End Source File # Begin Source File -SOURCE=..\graphics\MapReader.cpp +SOURCE=..\..\graphics\MapReader.cpp # End Source File # Begin Source File -SOURCE=..\graphics\MapReader.h +SOURCE=..\..\graphics\MapReader.h # End Source File # Begin Source File -SOURCE=..\graphics\MapWriter.cpp +SOURCE=..\..\graphics\MapWriter.cpp # End Source File # Begin Source File -SOURCE=..\graphics\MapWriter.h +SOURCE=..\..\graphics\MapWriter.h # End Source File # Begin Source File -SOURCE=..\graphics\MiniPatch.cpp +SOURCE=..\..\graphics\MiniPatch.cpp # End Source File # Begin Source File -SOURCE=..\graphics\MiniPatch.h +SOURCE=..\..\graphics\MiniPatch.h # End Source File # Begin Source File -SOURCE=..\graphics\Model.cpp +SOURCE=..\..\graphics\Model.cpp # End Source File # Begin Source File -SOURCE=..\graphics\Model.h +SOURCE=..\..\graphics\Model.h # End Source File # Begin Source File -SOURCE=..\graphics\ModelDef.cpp +SOURCE=..\..\graphics\ModelDef.cpp # End Source File # Begin Source File -SOURCE=..\graphics\ModelDef.h +SOURCE=..\..\graphics\ModelDef.h # End Source File # Begin Source File -SOURCE=..\graphics\ObjectEntry.cpp +SOURCE=..\..\graphics\ObjectEntry.cpp # End Source File # Begin Source File -SOURCE=..\graphics\ObjectEntry.h +SOURCE=..\..\graphics\ObjectEntry.h # End Source File # Begin Source File -SOURCE=..\graphics\ObjectManager.cpp +SOURCE=..\..\graphics\ObjectManager.cpp # End Source File # Begin Source File -SOURCE=..\graphics\ObjectManager.h +SOURCE=..\..\graphics\ObjectManager.h # End Source File # Begin Source File -SOURCE=..\graphics\Particle.cpp +SOURCE=..\..\graphics\Particle.cpp # End Source File # Begin Source File -SOURCE=..\graphics\Particle.h +SOURCE=..\..\graphics\Particle.h # End Source File # Begin Source File -SOURCE=..\graphics\ParticleEmitter.cpp +SOURCE=..\..\graphics\ParticleEmitter.cpp # End Source File # Begin Source File -SOURCE=..\graphics\ParticleEmitter.h +SOURCE=..\..\graphics\ParticleEmitter.h # End Source File # Begin Source File -SOURCE=..\graphics\Patch.cpp +SOURCE=..\..\graphics\Patch.cpp # End Source File # Begin Source File -SOURCE=..\graphics\Patch.h +SOURCE=..\..\graphics\Patch.h # End Source File # Begin Source File -SOURCE=..\graphics\RenderableObject.h +SOURCE=..\..\graphics\RenderableObject.h # End Source File # Begin Source File -SOURCE=..\graphics\SkeletonAnim.h +SOURCE=..\..\graphics\SkeletonAnim.h # End Source File # Begin Source File -SOURCE=..\graphics\SkeletonAnimDef.cpp +SOURCE=..\..\graphics\SkeletonAnimDef.cpp # End Source File # Begin Source File -SOURCE=..\graphics\SkeletonAnimDef.h +SOURCE=..\..\graphics\SkeletonAnimDef.h # End Source File # Begin Source File -SOURCE=..\graphics\SkeletonAnimManager.cpp +SOURCE=..\..\graphics\SkeletonAnimManager.cpp # End Source File # Begin Source File -SOURCE=..\graphics\SkeletonAnimManager.h +SOURCE=..\..\graphics\SkeletonAnimManager.h # End Source File # Begin Source File -SOURCE=..\graphics\Sprite.cpp +SOURCE=..\..\graphics\Sprite.cpp # End Source File # Begin Source File -SOURCE=..\graphics\Sprite.h +SOURCE=..\..\graphics\Sprite.h # End Source File # Begin Source File -SOURCE=..\graphics\Terrain.cpp +SOURCE=..\..\graphics\Terrain.cpp # End Source File # Begin Source File -SOURCE=..\graphics\Terrain.h +SOURCE=..\..\graphics\Terrain.h # End Source File # Begin Source File -SOURCE=..\graphics\Texture.h +SOURCE=..\..\graphics\Texture.h # End Source File # Begin Source File -SOURCE=..\graphics\TextureEntry.cpp +SOURCE=..\..\graphics\TextureEntry.cpp # End Source File # Begin Source File -SOURCE=..\graphics\TextureEntry.h +SOURCE=..\..\graphics\TextureEntry.h # End Source File # Begin Source File -SOURCE=..\graphics\TextureManager.cpp +SOURCE=..\..\graphics\TextureManager.cpp # End Source File # Begin Source File -SOURCE=..\graphics\TextureManager.h +SOURCE=..\..\graphics\TextureManager.h # End Source File # Begin Source File -SOURCE=..\graphics\Unit.h +SOURCE=..\..\graphics\Unit.h # End Source File # Begin Source File -SOURCE=..\graphics\UnitManager.cpp +SOURCE=..\..\graphics\UnitManager.cpp # End Source File # Begin Source File -SOURCE=..\graphics\UnitManager.h +SOURCE=..\..\graphics\UnitManager.h # End Source File # End Group # Begin Group "maths" @@ -632,55 +632,55 @@ SOURCE=..\graphics\UnitManager.h # PROP Default_Filter "" # Begin Source File -SOURCE=..\maths\Bound.cpp +SOURCE=..\..\maths\Bound.cpp # End Source File # Begin Source File -SOURCE=..\maths\Bound.h +SOURCE=..\..\maths\Bound.h # End Source File # Begin Source File -SOURCE=..\maths\MathUtil.cpp +SOURCE=..\..\maths\MathUtil.cpp # End Source File # Begin Source File -SOURCE=..\maths\MathUtil.h +SOURCE=..\..\maths\MathUtil.h # End Source File # Begin Source File -SOURCE=..\maths\Matrix3D.cpp +SOURCE=..\..\maths\Matrix3D.cpp # End Source File # Begin Source File -SOURCE=..\maths\Matrix3D.h +SOURCE=..\..\maths\Matrix3D.h # End Source File # Begin Source File -SOURCE=..\maths\Plane.cpp +SOURCE=..\..\maths\Plane.cpp # End Source File # Begin Source File -SOURCE=..\maths\Plane.h +SOURCE=..\..\maths\Plane.h # End Source File # Begin Source File -SOURCE=..\maths\Quaternion.cpp +SOURCE=..\..\maths\Quaternion.cpp # End Source File # Begin Source File -SOURCE=..\maths\Quaternion.h +SOURCE=..\..\maths\Quaternion.h # End Source File # Begin Source File -SOURCE=..\maths\Vector3D.cpp +SOURCE=..\..\maths\Vector3D.cpp # End Source File # Begin Source File -SOURCE=..\maths\Vector3D.h +SOURCE=..\..\maths\Vector3D.h # End Source File # Begin Source File -SOURCE=..\maths\Vector4D.h +SOURCE=..\..\maths\Vector4D.h # End Source File # End Group # Begin Group "renderer" @@ -688,71 +688,71 @@ SOURCE=..\maths\Vector4D.h # PROP Default_Filter "" # Begin Source File -SOURCE=..\renderer\AlphaMapCalculator.cpp +SOURCE=..\..\renderer\AlphaMapCalculator.cpp # End Source File # Begin Source File -SOURCE=..\renderer\AlphaMapCalculator.h +SOURCE=..\..\renderer\AlphaMapCalculator.h # End Source File # Begin Source File -SOURCE=..\renderer\BlendShapes.h +SOURCE=..\..\renderer\BlendShapes.h # End Source File # Begin Source File -SOURCE=..\renderer\ModelRData.cpp +SOURCE=..\..\renderer\ModelRData.cpp # End Source File # Begin Source File -SOURCE=..\renderer\ModelRData.h +SOURCE=..\..\renderer\ModelRData.h # End Source File # Begin Source File -SOURCE=..\renderer\PatchRData.cpp +SOURCE=..\..\renderer\PatchRData.cpp # End Source File # Begin Source File -SOURCE=..\renderer\PatchRData.h +SOURCE=..\..\renderer\PatchRData.h # End Source File # Begin Source File -SOURCE=..\renderer\Renderer.cpp +SOURCE=..\..\renderer\Renderer.cpp # End Source File # Begin Source File -SOURCE=..\renderer\Renderer.h +SOURCE=..\..\renderer\Renderer.h # End Source File # Begin Source File -SOURCE=..\renderer\SHCoeffs.cpp +SOURCE=..\..\renderer\SHCoeffs.cpp # End Source File # Begin Source File -SOURCE=..\renderer\SHCoeffs.h +SOURCE=..\..\renderer\SHCoeffs.h # End Source File # Begin Source File -SOURCE=..\renderer\TransparencyRenderer.cpp +SOURCE=..\..\renderer\TransparencyRenderer.cpp # End Source File # Begin Source File -SOURCE=..\renderer\TransparencyRenderer.h +SOURCE=..\..\renderer\TransparencyRenderer.h # End Source File # Begin Source File -SOURCE=..\renderer\VertexBuffer.cpp +SOURCE=..\..\renderer\VertexBuffer.cpp # End Source File # Begin Source File -SOURCE=..\renderer\VertexBuffer.h +SOURCE=..\..\renderer\VertexBuffer.h # End Source File # Begin Source File -SOURCE=..\renderer\VertexBufferManager.cpp +SOURCE=..\..\renderer\VertexBufferManager.cpp # End Source File # Begin Source File -SOURCE=..\renderer\VertexBufferManager.h +SOURCE=..\..\renderer\VertexBufferManager.h # End Source File # End Group # Begin Group "sced" @@ -1263,11 +1263,11 @@ SOURCE=.\UserConfig.h # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\binaries\changes.txt +SOURCE=..\..\..\binaries\changes.txt # End Source File # Begin Source File -SOURCE=..\..\binaries\readme.txt +SOURCE=..\..\..\binaries\readme.txt # End Source File # End Group # End Group @@ -1276,151 +1276,151 @@ SOURCE=..\..\binaries\readme.txt # PROP Default_Filter "" # Begin Source File -SOURCE=..\ps\CLogger.cpp +SOURCE=..\..\ps\CLogger.cpp # End Source File # Begin Source File -SOURCE=..\ps\CLogger.h +SOURCE=..\..\ps\CLogger.h # End Source File # Begin Source File -SOURCE=..\ps\Config.cpp +SOURCE=..\..\ps\Config.cpp # End Source File # Begin Source File -SOURCE=..\ps\Config.h +SOURCE=..\..\ps\Config.h # End Source File # Begin Source File -SOURCE=..\ps\CStr.cpp +SOURCE=..\..\ps\CStr.cpp # End Source File # Begin Source File -SOURCE=..\ps\CStr.h +SOURCE=..\..\ps\CStr.h # End Source File # Begin Source File -SOURCE=..\ps\Encryption.cpp +SOURCE=..\..\ps\Encryption.cpp # End Source File # Begin Source File -SOURCE=..\ps\Encryption.h +SOURCE=..\..\ps\Encryption.h # End Source File # Begin Source File -SOURCE=..\ps\Error.h +SOURCE=..\..\ps\Error.h # End Source File # Begin Source File -SOURCE=..\ps\FilePacker.cpp +SOURCE=..\..\ps\FilePacker.cpp # End Source File # Begin Source File -SOURCE=..\ps\FilePacker.h +SOURCE=..\..\ps\FilePacker.h # End Source File # Begin Source File -SOURCE=..\ps\FileUnpacker.cpp +SOURCE=..\..\ps\FileUnpacker.cpp # End Source File # Begin Source File -SOURCE=..\ps\FileUnpacker.h +SOURCE=..\..\ps\FileUnpacker.h # End Source File # Begin Source File -SOURCE=..\ps\LogFile.cpp +SOURCE=..\..\ps\LogFile.cpp # End Source File # Begin Source File -SOURCE=..\ps\LogFile.h +SOURCE=..\..\ps\LogFile.h # End Source File # Begin Source File -SOURCE=..\ps\NPFont.cpp +SOURCE=..\..\ps\NPFont.cpp # End Source File # Begin Source File -SOURCE=..\ps\NPFont.h +SOURCE=..\..\ps\NPFont.h # End Source File # Begin Source File -SOURCE=..\ps\NPFontManager.cpp +SOURCE=..\..\ps\NPFontManager.cpp # End Source File # Begin Source File -SOURCE=..\ps\NPFontManager.h +SOURCE=..\..\ps\NPFontManager.h # End Source File # Begin Source File -SOURCE=..\ps\Overlay.cpp +SOURCE=..\..\ps\Overlay.cpp # End Source File # Begin Source File -SOURCE=..\ps\Overlay.h +SOURCE=..\..\ps\Overlay.h # End Source File # Begin Source File -SOURCE=..\ps\OverlayText.cpp +SOURCE=..\..\ps\OverlayText.cpp # End Source File # Begin Source File -SOURCE=..\ps\OverlayText.h +SOURCE=..\..\ps\OverlayText.h # End Source File # Begin Source File -SOURCE=..\ps\Parser.cpp +SOURCE=..\..\ps\Parser.cpp # End Source File # Begin Source File -SOURCE=..\ps\Parser.h +SOURCE=..\..\ps\Parser.h # End Source File # Begin Source File -SOURCE=..\ps\Prometheus.cpp +SOURCE=..\..\ps\Pyrogenesis.cpp # End Source File # Begin Source File -SOURCE=..\ps\Prometheus.h +SOURCE=..\..\ps\Pyrogenesis.h # End Source File # Begin Source File -SOURCE=..\ps\rc_array.h +SOURCE=..\..\ps\rc_array.h # End Source File # Begin Source File -SOURCE=..\ps\rc_vector.h +SOURCE=..\..\ps\rc_vector.h # End Source File # Begin Source File -SOURCE=..\ps\Singleton.h +SOURCE=..\..\ps\Singleton.h # End Source File # Begin Source File -SOURCE=..\ps\Sound.h +SOURCE=..\..\ps\Sound.h # End Source File # Begin Source File -SOURCE=..\ps\ThreadUtil.h +SOURCE=..\..\ps\ThreadUtil.h # End Source File # Begin Source File -SOURCE=..\ps\Vector2D.h +SOURCE=..\..\ps\Vector2D.h # End Source File # Begin Source File -SOURCE=..\ps\XercesErrorHandler.cpp +SOURCE=..\..\ps\XercesErrorHandler.cpp # End Source File # Begin Source File -SOURCE=..\ps\XercesErrorHandler.h +SOURCE=..\..\ps\XercesErrorHandler.h # End Source File # Begin Source File -SOURCE=..\ps\XML.h +SOURCE=..\..\ps\XML.h # End Source File # Begin Source File -SOURCE=..\ps\XMLUtils.cpp +SOURCE=..\..\ps\XMLUtils.cpp # End Source File # End Group # End Target diff --git a/source/tools/sced/ScEd.mak b/source/tools/sced/ScEd.mak index 6b040ea241..e844e9da92 100755 --- a/source/tools/sced/ScEd.mak +++ b/source/tools/sced/ScEd.mak @@ -35,11 +35,11 @@ OutDir=.\Release !IF "$(RECURSE)" == "0" -ALL : "..\..\binaries\ScEd.exe" "$(OUTDIR)\ScEd.pch" +ALL : "..\..\..\binaries\ScEd.exe" "$(OUTDIR)\ScEd.pch" !ELSE -ALL : "pslib - Win32 Release" "..\..\binaries\ScEd.exe" "$(OUTDIR)\ScEd.pch" +ALL : "pslib - Win32 Release" "..\..\..\binaries\ScEd.exe" "$(OUTDIR)\ScEd.pch" !ENDIF @@ -93,13 +93,13 @@ CLEAN : -@erase "$(INTDIR)\vc60.pdb" -@erase "$(INTDIR)\WebLinkButton.obj" -@erase "$(OUTDIR)\ScEd.pdb" - -@erase "..\..\binaries\ScEd.exe" + -@erase "..\..\..\binaries\ScEd.exe" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /G5 /MT /W3 /GX /Zi /O2 /Ob0 /I "..\\" /I "..\lib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP_PROJ=/nologo /G5 /MT /W3 /GX /Zi /O2 /Ob0 /I "..\..\\" /I "..\..\lib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c .c{$(INTDIR)}.obj:: $(CPP) @<< @@ -140,7 +140,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\ScEd.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=nafxcw.lib pslib.lib opengl32.lib glu32.lib ws2_32.lib version.lib xerces-c_2.lib /nologo /entry:"entry" /subsystem:windows /incremental:no /pdb:"$(OUTDIR)\ScEd.pdb" /debug /machine:I386 /out:"D:\0ad\binaries\ScEd.exe" /libpath:"..\libs" /fixed:no +LINK32_FLAGS=nafxcw.lib pslib.lib opengl32.lib glu32.lib ws2_32.lib version.lib xerces-c_2.lib /nologo /entry:"entry" /subsystem:windows /incremental:no /pdb:"$(OUTDIR)\ScEd.pdb" /debug /machine:I386 /out:"D:\0ad\binaries\ScEd.exe" /libpath:"..\..\libs" /fixed:no LINK32_OBJS= \ "$(INTDIR)\ColorButton.obj" \ "$(INTDIR)\DirectionButton.obj" \ @@ -184,7 +184,7 @@ LINK32_OBJS= \ "$(INTDIR)\StdAfx.obj" \ "$(INTDIR)\ScEd.res" -"..\..\binaries\ScEd.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) +"..\..\..\binaries\ScEd.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< $(LINK32_FLAGS) $(LINK32_OBJS) << @@ -199,11 +199,11 @@ OutDir=.\Debug !IF "$(RECURSE)" == "0" -ALL : "..\..\binaries\ScEd_d.exe" "$(OUTDIR)\ScEd.pch" +ALL : "..\..\..\binaries\ScEd_d.exe" "$(OUTDIR)\ScEd.pch" !ELSE -ALL : "pslib - Win32 Debug" "..\..\binaries\ScEd_d.exe" "$(OUTDIR)\ScEd.pch" +ALL : "pslib - Win32 Debug" "..\..\..\binaries\ScEd_d.exe" "$(OUTDIR)\ScEd.pch" !ENDIF @@ -257,14 +257,14 @@ CLEAN : -@erase "$(INTDIR)\vc60.pdb" -@erase "$(INTDIR)\WebLinkButton.obj" -@erase "$(OUTDIR)\ScEd_d.pdb" - -@erase "..\..\binaries\ScEd_d.exe" - -@erase "..\..\binaries\ScEd_d.ilk" + -@erase "..\..\..\binaries\ScEd_d.exe" + -@erase "..\..\..\binaries\ScEd_d.ilk" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /G6 /MTd /W3 /Gm /Gi /GX /ZI /Od /I "..\\" /I "..\lib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c +CPP_PROJ=/nologo /G6 /MTd /W3 /Gm /Gi /GX /ZI /Od /I "..\..\\" /I "..\..\lib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c .c{$(INTDIR)}.obj:: $(CPP) @<< @@ -305,7 +305,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\ScEd.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=nafxcwd.lib pslib_d.lib opengl32.lib glu32.lib ws2_32.lib version.lib xerces-c_2D.lib /nologo /entry:"entry" /subsystem:windows /incremental:yes /pdb:"$(OUTDIR)\ScEd_d.pdb" /debug /machine:I386 /out:"D:\0ad\binaries\ScEd_d.exe" /pdbtype:sept /libpath:"..\libs" +LINK32_FLAGS=nafxcwd.lib pslib_d.lib opengl32.lib glu32.lib ws2_32.lib version.lib xerces-c_2D.lib /nologo /entry:"entry" /subsystem:windows /incremental:yes /pdb:"$(OUTDIR)\ScEd_d.pdb" /debug /machine:I386 /out:"D:\0ad\binaries\ScEd_d.exe" /pdbtype:sept /libpath:"..\..\libs" LINK32_OBJS= \ "$(INTDIR)\ColorButton.obj" \ "$(INTDIR)\DirectionButton.obj" \ @@ -349,7 +349,7 @@ LINK32_OBJS= \ "$(INTDIR)\StdAfx.obj" \ "$(INTDIR)\ScEd.res" -"..\..\binaries\ScEd_d.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) +"..\..\..\binaries\ScEd_d.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< $(LINK32_FLAGS) $(LINK32_OBJS) << @@ -573,22 +573,22 @@ SOURCE=.\HFTracer.cpp "pslib - Win32 Release" : cd "\0ad\fw\pslib" NMAKE /f pslib.mak - cd "..\ScEd" + cd "..\..\ScEd" "pslib - Win32 ReleaseCLEAN" : cd "\0ad\fw\pslib" - cd "..\ScEd" + cd "..\..\ScEd" !ELSEIF "$(CFG)" == "ScEd - Win32 Debug" "pslib - Win32 Debug" : cd "\0ad\fw\pslib" NMAKE /f pslib.mak - cd "..\ScEd" + cd "..\..\ScEd" "pslib - Win32 DebugCLEAN" : cd "\0ad\fw\pslib" - cd "..\ScEd" + cd "..\..\ScEd" !ENDIF @@ -596,7 +596,7 @@ SOURCE=.\StdAfx.cpp !IF "$(CFG)" == "ScEd - Win32 Release" -CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /Zi /O2 /Ob0 /I "..\\" /I "..\lib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"$(INTDIR)\ScEd.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /Zi /O2 /Ob0 /I "..\..\\" /I "..\..\lib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"$(INTDIR)\ScEd.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c "$(INTDIR)\StdAfx.obj" "$(INTDIR)\ScEd.pch" : $(SOURCE) "$(INTDIR)" $(CPP) @<< @@ -606,7 +606,7 @@ CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /Zi /O2 /Ob0 /I "..\\" /I "..\lib" /D "WIN3 !ELSEIF "$(CFG)" == "ScEd - Win32 Debug" -CPP_SWITCHES=/nologo /G6 /MTd /W3 /Gm /Gi /GX /ZI /Od /I "..\\" /I "..\lib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"$(INTDIR)\ScEd.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c +CPP_SWITCHES=/nologo /G6 /MTd /W3 /Gm /Gi /GX /ZI /Od /I "..\..\\" /I "..\..\lib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"$(INTDIR)\ScEd.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c "$(INTDIR)\StdAfx.obj" "$(INTDIR)\ScEd.pch" : $(SOURCE) "$(INTDIR)" $(CPP) @<< diff --git a/source/tools/sced/SelectObjectTool.cpp b/source/tools/sced/SelectObjectTool.cpp index 19dbb2ec9d..6c6ed18976 100755 --- a/source/tools/sced/SelectObjectTool.cpp +++ b/source/tools/sced/SelectObjectTool.cpp @@ -1,3 +1,5 @@ +#include "precompiled.h" + #include "CommandManager.h" #include "Unit.h" #include "Model.h" diff --git a/source/tools/sced/SmoothElevationCommand.cpp b/source/tools/sced/SmoothElevationCommand.cpp index 9f657454b6..32213e44cd 100755 --- a/source/tools/sced/SmoothElevationCommand.cpp +++ b/source/tools/sced/SmoothElevationCommand.cpp @@ -1,3 +1,5 @@ +#include "precompiled.h" + #include "SmoothElevationCommand.h" #include "Terrain.h" diff --git a/source/tools/sced/SmoothElevationTool.cpp b/source/tools/sced/SmoothElevationTool.cpp index 19d9d623ea..480c9cb4ee 100755 --- a/source/tools/sced/SmoothElevationTool.cpp +++ b/source/tools/sced/SmoothElevationTool.cpp @@ -1,3 +1,5 @@ +#include "precompiled.h" + #include "timer.h" #include "CommandManager.h" #include "SmoothElevationTool.h" diff --git a/source/tools/sced/ToolManager.cpp b/source/tools/sced/ToolManager.cpp index 9535e4bc7f..036ab01262 100755 --- a/source/tools/sced/ToolManager.cpp +++ b/source/tools/sced/ToolManager.cpp @@ -1,3 +1,5 @@ +#include "precompiled.h" + #include "ToolManager.h" CToolManager g_ToolMan; diff --git a/source/tools/sced/UserConfig.cpp b/source/tools/sced/UserConfig.cpp index ad98fea4ec..bef9e68c99 100755 --- a/source/tools/sced/UserConfig.cpp +++ b/source/tools/sced/UserConfig.cpp @@ -1,3 +1,5 @@ +#include "precompiled.h" + #include "UserConfig.h" #include diff --git a/source/tools/sced/main.cpp b/source/tools/sced/main.cpp new file mode 100644 index 0000000000..34f63fe18f --- /dev/null +++ b/source/tools/sced/main.cpp @@ -0,0 +1,1311 @@ +#include "precompiled.h" +#include "ui/StdAfx.h" +#undef ERROR + +#include +#include +#include +#include +#include + + +#include "sdl.h" +#include "ogl.h" +#include "detect.h" +#include "timer.h" +#include "input.h" +#include "lib.h" +#include "lib/res/res.h" +#include "lib/res/tex.h" +#include "lib/res/hotload.h" +#ifdef _M_IX86 +#include "sysdep/ia32.h" // _control87 +#endif +#include "lib/res/cursor.h" + +#include "ps/Font.h" + +#include "ps/CConsole.h" + +#include "ps/Game.h" + +#include "MapReader.h" +#include "Terrain.h" +#include "TextureManager.h" +#include "ObjectManager.h" +#include "SkeletonAnimManager.h" +#include "Renderer.h" +#include "LightEnv.h" +#include "Model.h" +#include "UnitManager.h" +#include "MaterialManager.h" +#include "MeshManager.h" + +#include "Interact.h" +#include "Hotkey.h" +#include "BaseEntityCollection.h" +#include "Entity.h" +#include "EntityHandles.h" +#include "EntityManager.h" +#include "PathfindEngine.h" +#include "Scheduler.h" + +#include "scripting/ScriptingHost.h" +#include "scripting/JSInterface_Entity.h" +#include "scripting/JSInterface_BaseEntity.h" +#include "scripting/JSInterface_Vector3D.h" +#include "scripting/JSInterface_Camera.h" +#include "scripting/JSInterface_Selection.h" +#include "scripting/JSInterface_Console.h" +#include "scripting/JSCollection.h" +#include "scripting/DOMEvent.h" +#include "gui/scripting/JSInterface_IGUIObject.h" +#include "gui/scripting/JSInterface_GUITypes.h" + +#include "ConfigDB.h" +#include "CLogger.h" + +#include "ps/i18n.h" + +#define LOG_CATEGORY "main" + +#ifndef NO_GUI +#include "gui/GUI.h" +#endif + +#include "sound/CMusicPlayer.h" +#include "sound/JSI_Sound.h" +#include "lib/res/snd.h" + +#include "Network/SessionManager.h" +#include "Network/Server.h" + + +CConsole* g_Console = 0; + +u32 game_ticks; + +bool keys[SDLK_LAST]; +bool mouseButtons[5]; +int mouse_x=50, mouse_y=50; + +int g_xres, g_yres; +int g_bpp; +int g_freq; +bool g_active = true; + +extern int conInputHandler(const SDL_Event* ev); + +// Globals + +// flag to disable extended GL extensions until fix found - specifically, crashes +// using VBOs on laptop Radeon cards +static bool g_NoGLVBO=false; +// flag to switch on shadows +static bool g_Shadows=false; +// flag to switch off pbuffers +static bool g_NoPBuffer=true; +// flag to switch on fixed frame timing (RC: I'm using this for profiling purposes) +static bool g_FixedFrameTiming=false; +static bool g_VSync = false; +static float g_LodBias = 0.0f; + +static bool g_Quickstart=false; + +extern CLightEnv g_LightEnv; + +static bool g_EntGraph = false; + +static float g_Gamma = 1.0f; + +CGameAttributes g_GameAttributes; + +extern int game_view_handler(const SDL_Event* ev); + +static CMusicPlayer MusicPlayer; + + +CStr g_CursorName = "test"; + +CStr g_ActiveProfile = "default"; + +extern int allow_reload(); +extern int dir_add_watch(const char* dir, bool watch_subdirs); + +extern void sle(int); + +extern size_t frameCount; +static bool quit = false; // break out of main loop + +const wchar_t* HardcodedErrorString(int err) +{ +#define E(sym) case sym: return L ## #sym; + + switch(err) + { + E(ERR_NO_MEM) + E(ERR_FILE_NOT_FOUND) + E(ERR_INVALID_HANDLE) + E(ERR_INVALID_PARAM) + E(ERR_EOF) + E(ERR_PATH_NOT_FOUND) + E(ERR_PATH_LENGTH) + default: + return 0; + } +} + +const wchar_t* ErrorString(int err) +{ + // language file not available (yet) + if(1) + return HardcodedErrorString(err); + + // TODO: load from language file +} + + +ERROR_GROUP(System); +ERROR_TYPE(System, SDLInitFailed); +ERROR_TYPE(System, VmodeFailed); +ERROR_TYPE(System, RequiredExtensionsMissing); + +void Testing (void) +{ + g_Console->InsertMessage(L"Testing Function Registration"); +} + +static std::string SplitExts(const char *exts) +{ + std::string str = exts; + std::string ret = ""; + size_t idx = str.find_first_of(" "); + while(idx != std::string::npos) + { + if(idx >= str.length() - 1) + { + ret += str; + break; + } + + ret += str.substr(0, idx); + ret += "\n"; + str = str.substr(idx + 1); + idx = str.find_first_of(" "); + } + + return ret; +} + +static void WriteSysInfo() +{ + double t1 = get_time(); + get_gfx_info(); + get_cpu_info(); + get_snd_info(); + get_mem_status(); + double t2 = get_time(); + debug_out("SYS DETECT TIME %g\n\n", t2-t1); + + + struct utsname un; + uname(&un); + + FILE* f = fopen("../logs/system_info.txt", "w"); + if(!f) + return; + + // .. OS + fprintf(f, "%s %s (%s)\n", un.sysname, un.release, un.version); + + // .. CPU + fprintf(f, "%s, %s", un.machine, cpu_type); + if(cpus > 1) + fprintf(f, " (x%d)", cpus); + if(cpu_freq != 0.0f) + { + if(cpu_freq < 1e9) + fprintf(f, ", %.2f MHz\n", cpu_freq*1e-6); + else + fprintf(f, ", %.2f GHz\n", cpu_freq*1e-9); + } + else + fprintf(f, "\n"); + + // .. memory + fprintf(f, "%lu MB RAM; %lu MB free\n", tot_mem/MB, avl_mem/MB); + + // .. graphics card + fprintf(f, "%s\n", gfx_card); + fprintf(f, "%s\n", gfx_drv_ver); + fprintf(f, "%dx%d:%d@%d\n", g_xres, g_yres, g_bpp, g_freq); + fprintf(f, "OpenGL: %s\n", glGetString(GL_VERSION)); + + // .. sound card + fprintf(f, "%s\n", snd_card); + fprintf(f, "%s\n", snd_drv_ver); + + // .. network name / ips + // note: can't use un.nodename because it is for an + // "implementation-defined communications network". + char hostname[128]; + if (gethostname(hostname, sizeof(hostname)) == 0) // make sure it succeeded + { + fprintf(f, "%s\n", hostname); + hostent* host = gethostbyname(hostname); + if(host) + { + struct in_addr** ips = (struct in_addr**)host->h_addr_list; + for(int i = 0; ips && ips[i]; i++) + fprintf(f, "%s ", inet_ntoa(*ips[i])); + fprintf(f, "\n"); + } + } + + // Write extensions last, because there are lots of them + const char* exts = oglExtList(); + if (!exts) exts = "{unknown}"; + fprintf(f, "\nSupported extensions: \n%s\n", SplitExts(exts).c_str()); + + fclose(f); + f = 0; +} + + + +static int set_vmode(int w, int h, int bpp, bool fullscreen) +{ + SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24); + SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); + + if(!SDL_SetVideoMode(w, h, bpp, SDL_OPENGL|(fullscreen?SDL_FULLSCREEN:0))) + return -1; + + glViewport(0, 0, w, h); + +#ifndef NO_GUI + g_GUI.UpdateResolution(); +#endif + + oglInit(); // required after each mode change + + if(SDL_SetGamma(g_Gamma, g_Gamma, g_Gamma) < 0) + debug_warn("SDL_SetGamma failed"); + + return 0; +} + + +// use_bmp is for when you want high-speed output at the expense of huge files +static void WriteScreenshot(bool use_bmp = false) +{ + // determine next screenshot number. + // + // current approach: increment number until that file doesn't yet exist. + // this is fairly slow, but it's typically only done once, since the last + // number is cached. binary search shouldn't be necessary. + // + // known bug: after program restart, holes in the number series are + // filled first. example: add 1st and 2nd; [exit] delete 1st; [restart] + // add 3rd -> it gets number 1, not 3. + // could fix via enumerating all files, but it's not worth it ATM. + char fn[VFS_MAX_PATH]; + + const char* file_format = + use_bmp ? "screenshots/screenshot%04d.bmp" + : "screenshots/screenshot%04d.png"; + + static int next_num = 1; + do + sprintf(fn, file_format, next_num++); + while(vfs_exists(fn)); + + const int w = g_xres, h = g_yres; + const int bpp = 24; + const size_t size = w * h * bpp; + void* img = mem_alloc(size); + + glReadPixels(0, 0, w, h, use_bmp?GL_BGR:GL_RGB, GL_UNSIGNED_BYTE, img); + + if(tex_write(fn, w, h, bpp, use_bmp?TEX_BGR:0, img) < 0) + debug_warn("WriteScreenshot: tex_write failed"); + + mem_free(img); +} + + + +// HACK: Let code from other files (i.e. the scripting system) quit +void kill_mainloop() +{ + quit = true; +} + +static int handler(const SDL_Event* ev) +{ + int c; + + switch(ev->type) + { + case SDL_ACTIVEEVENT: + g_active = ev->active.gain != 0; + break; + + case SDL_MOUSEMOTION: + mouse_x = ev->motion.x; + mouse_y = ev->motion.y; + break; + + case SDL_KEYDOWN: + c = ev->key.keysym.sym; + keys[c] = true; + break; + + case SDL_HOTKEYDOWN: + + switch( ev->user.code ) + { + case HOTKEY_EXIT: + quit = true; + break; + + case HOTKEY_SCREENSHOT: + WriteScreenshot(); + break; + + case HOTKEY_PLAYMUSIC: + { + // MusicPlayer.open("audio/music/germanic peace 3.ogg"); + // MusicPlayer.play(); + Handle hs = snd_open( + //"audio/music/germanic peace 3.ogg" + "audio/voice/hellenes/soldier/Attack-ZeusSaviourandVictory.ogg" + ); + + + snd_set_pos(hs, 0,0,0, true); + snd_play(hs); + } + break; + + default: + return( EV_PASS ); + } + return( EV_HANDLED ); + + case SDL_KEYUP: + c = ev->key.keysym.sym; + keys[c] = false; + break; + case SDL_MOUSEBUTTONDOWN: + c = ev->button.button; + if( c < 5 ) + mouseButtons[c] = true; + else + debug_warn("SDL mouse button defs changed; fix mouseButton array def"); + break; + case SDL_MOUSEBUTTONUP: + c = ev->button.button; + if( c < 5 ) + mouseButtons[c] = false; + else + debug_warn("SDL mouse button defs changed; fix mouseButton array def"); + break; + } + + return EV_PASS; +} + +void EndGame() +{ + delete g_Game; + g_Game=NULL; +} + +void RenderNoCull() +{ +} +/* +///////////////////////////////////////////////////////////////////////////////////////////// +// RenderNoCull: render absolutely everything to a blank frame to force renderer +// to load required assets +void RenderNoCull() +{ + g_Renderer.BeginFrame(); + + if (g_Game) + g_Game->GetView()->RenderNoCull(); + + g_Renderer.FlushFrame(); + glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); + g_Renderer.EndFrame(); +} + + +static void Render() +{ + MICROLOG(L"begin frame"); + + oglCheck(); + + // start new frame + g_Renderer.BeginFrame(); + + // switch on wireframe for terrain if we want it + //g_Renderer.SetTerrainRenderMode( SOLID ); // (PT: If this is done here, the W key doesn't work) + + oglCheck(); + + if (g_Game) + { + g_Game->GetView()->Render(); + + oglCheck(); + + MICROLOG(L"flush frame"); + g_Renderer.FlushFrame(); + + glPushAttrib( GL_ENABLE_BIT ); + glDisable( GL_LIGHTING ); + glDisable( GL_TEXTURE_2D ); + glDisable( GL_DEPTH_TEST ); + + if( g_EntGraph ) + { + glColor3f( 1.0f, 0.0f, 1.0f ); + + MICROLOG(L"render entities"); + g_EntityManager.renderAll(); // <-- collision outlines, pathing routes + } + + g_Mouseover.renderSelectionOutlines(); + g_Selection.renderSelectionOutlines(); + + glPopAttrib(); + } + else + g_Renderer.FlushFrame(); + + oglCheck(); + + MICROLOG(L"render fonts"); + // overlay mode + glPushAttrib(GL_ENABLE_BIT); + glEnable(GL_TEXTURE_2D); + glDisable(GL_CULL_FACE); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glEnable(GL_BLEND); + glMatrixMode(GL_PROJECTION); + glPushMatrix(); + glLoadIdentity(); + glOrtho(0.f, (float)g_xres, 0.f, (float)g_yres, -1.f, 1000.f); + + glMatrixMode(GL_MODELVIEW); + glPushMatrix(); + + oglCheck(); + +#ifndef NO_GUI + // Temp GUI message GeeTODO + glLoadIdentity(); + MICROLOG(L"render GUI"); + g_GUI.Draw(); +#endif + + oglCheck(); + + // Text: + + // Use the GL_ALPHA texture as the alpha channel with a flat colouring + glDisable(GL_ALPHA_TEST); + glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); + // Added -- + glEnable(GL_TEXTURE_2D); + // -- GL + + oglCheck(); + + { + glLoadIdentity(); + + MICROLOG(L"render console"); + CFont font("console"); + font.Bind(); + g_Console->Render(); + } + + oglCheck(); + + if (g_Game) + { + g_Mouseover.renderOverlays(); + g_Selection.renderOverlays(); + } + + oglCheck(); + + // Draw the cursor (or set the Windows cursor, on Windows) + cursor_draw(g_CursorName); + + // restore + glMatrixMode(GL_PROJECTION); + glPopMatrix(); + glMatrixMode(GL_MODELVIEW); + glPopMatrix(); + glPopAttrib(); + + MICROLOG(L"end frame"); + g_Renderer.EndFrame(); + + oglCheck(); +} +*/ + +static void InitDefaultGameAttributes() +{ + g_GameAttributes.SetValue( "mapFile", L"combattest.pmp" ); +} + + +static void LoadProfile( CStr profile ) +{ + CStr filename = CStr( "profiles/" ) + profile + CStr( ".cfg" ); + g_ConfigDB.SetConfigFile( CFG_USER, true, filename ); + g_ConfigDB.Reload( CFG_USER ); +} + +// Fill in the globals from the config files. +static void LoadGlobals() +{ + CConfigValue *val; + + if ((val=g_ConfigDB.GetValue(CFG_SYSTEM, "profile"))) + val->GetString( g_ActiveProfile ); + + // Now load the profile before trying to retrieve the values of the rest of these. + + LoadProfile( g_ActiveProfile ); + + if ((val=g_ConfigDB.GetValue(CFG_USER, "xres"))) + val->GetInt(g_xres); + if ((val=g_ConfigDB.GetValue(CFG_USER, "yres"))) + val->GetInt(g_yres); + + if ((val=g_ConfigDB.GetValue(CFG_USER, "vsync"))) + val->GetBool(g_VSync); + if ((val=g_ConfigDB.GetValue(CFG_USER, "novbo"))) + val->GetBool(g_NoGLVBO); + if ((val=g_ConfigDB.GetValue(CFG_USER, "shadows"))) + val->GetBool(g_Shadows); + + LOG(NORMAL, LOG_CATEGORY, "g_x/yres is %dx%d", g_xres, g_yres); + LOG(NORMAL, LOG_CATEGORY, "Active profile is %s", g_ActiveProfile.c_str()); +} + +static void ParseArgs(int argc, char* argv[]) +{ + for(int i = 1; i < argc; i++) + { + // this arg isn't an option; skip + if(argv[i][0] != '-') + continue; + + char* name = argv[i]+1; // no leading '-' + + // switch first letter of option name + switch(argv[i][1]) + { + case 'c': + if(strcmp(name, "conf") == 0) + { + if(argc-i >= 1) // at least one arg left + { + i++; + char* arg = argv[i]; + char* equ = strchr(arg, '='); + if(equ) + { + *equ = 0; + g_ConfigDB.CreateValue(CFG_COMMAND, arg) + ->m_String = (equ+1); + } + } + } + break; + case 'e': + g_EntGraph = true; + break; + case 'f': + if(strncmp(name, "fixedframe", 10) == 0) + g_FixedFrameTiming=true; + break; + case 'g': + if(strncmp(name, "g=", 2) == 0) + { + g_Gamma = (float)atof(argv[i] + 3); + if(g_Gamma == 0.0f) + g_Gamma = 1.0f; + } + break; + case 'l': + if(strncmp(name, "listfiles", 9) == 0) + vfs_enable_file_listing(true); + break; + case 'm': + if(strncmp(name, "m=", 2) == 0) + g_GameAttributes.SetValue( "mapFile", CStr( argv[i] + 3 ) ); + break; + case 'n': + if(strncmp(name, "novbo", 5) == 0) + g_ConfigDB.CreateValue(CFG_COMMAND, "novbo")->m_String="true"; + else if(strncmp(name, "nopbuffer", 9) == 0) + g_NoPBuffer = true; + break; + case 'q': + if(strncmp(name, "quickstart", 10) == 0) + g_Quickstart = true; + break; + case 's': + if(strncmp(name, "shadows", 7) == 0) + g_ConfigDB.CreateValue(CFG_COMMAND, "shadows")->m_String="true"; + break; + case 'v': + g_ConfigDB.CreateValue(CFG_COMMAND, "vsync")->m_String="true"; + break; + case 'x': + if(strncmp(name, "xres=", 6) == 0) + g_ConfigDB.CreateValue(CFG_COMMAND, "xres")->m_String=argv[i]+6; + break; + case 'y': + if(strncmp(name, "yres=", 6) == 0) + g_ConfigDB.CreateValue(CFG_COMMAND, "yres")->m_String=argv[i]+6; + break; + case 'p': + if(strncmp(name, "profile=", 8) == 0 ) + g_ConfigDB.CreateValue(CFG_COMMAND, "profile")->m_String = argv[i]+9; + break; + } // switch + } + + +} + + +static void InitScripting() +{ + TIMER(InitScripting) + // Create the scripting host. This needs to be done before the GUI is created. + new ScriptingHost; + + // It would be nice for onLoad code to be able to access the setTimeout() calls. + new CScheduler; + + // Register the JavaScript interfaces with the runtime + CEntity::ScriptingInit(); + CBaseEntity::ScriptingInit(); + JSI_Sound::ScriptingInit(); + +#ifndef NO_GUI + JSI_IGUIObject::init(); + JSI_GUITypes::init(); +#endif + JSI_Vector3D::init(); + EntityCollection::Init( "EntityCollection" ); + // PlayerCollection::Init( "PlayerCollection" ); + CDamageType::ScriptingInit(); + CJSPropertyAccessor::ScriptingInit(); // <-- Doesn't really matter which we use, but we know CJSPropertyAccessor is already being compiled for T = CEntity. + CScriptEvent::ScriptingInit(); + + g_ScriptingHost.DefineConstant( "ORDER_NONE", -1 ); + g_ScriptingHost.DefineConstant( "ORDER_GOTO", CEntityOrder::ORDER_GOTO ); + g_ScriptingHost.DefineConstant( "ORDER_PATROL", CEntityOrder::ORDER_PATROL ); + g_ScriptingHost.DefineConstant( "ORDER_ATTACK", CEntityOrder::ORDER_ATTACK_MELEE ); + + JSI_Camera::init(); + JSI_Console::init(); +} + + +static void InitVfs(char* argv0) +{ + TIMER(InitVfs) + // set current directory to "$game_dir/data". + // this is necessary because it is otherwise unknown, + // especially if run from a shortcut / symlink. + // + // "../data" is relative to the executable (in "$game_dir/system"). + // + // rationale for data/ being root: untrusted scripts must not be + // allowed to overwrite critical game (or worse, OS) files. + // the VFS prevents any accesses to files above this directory. + int err = file_rel_chdir(argv0, "../data"); + if(err < 0) + throw err; + + // display_startup_error(L"error setting current directory.\n"\ + // L"argv[0] is probably incorrect. please start the game via command-line."); + + vfs_mount("", "mods/official", 0); + vfs_mount("screenshots/", "screenshots", 0); + vfs_mount("profiles/", "profiles", 0); + + // don't try vfs_display yet: SDL_Init hasn't yet redirected stdout +} + +static void InitPs() +{ + // console + { + TIMER(ps_console) + + float ConsoleHeight = g_yres * 0.6f; + g_Console->SetSize(0, g_yres-ConsoleHeight, (float)g_xres, ConsoleHeight); + + // Calculate and store the line spacing + CFont font("console"); + g_Console->m_iFontHeight = font.GetLineSpacing(); + // Offset by an arbitrary amount, to make it fit more nicely + g_Console->m_iFontOffset = 9; + } + + // language and hotkeys + { + TIMER(ps_lang_hotkeys) + + CConfigValue* val = g_ConfigDB.GetValue(CFG_SYSTEM, "language"); + std::string lang = "english"; + if (val) + val->GetString(lang); + I18n::LoadLanguage(lang.c_str()); + + loadHotkeys(); + } + +#ifndef NO_GUI + { + // GUI uses VFS, so this must come after VFS init. + {TIMER(ps_gui_init) + g_GUI.Initialize();} + + {TIMER(ps_gui_setup_xml) + g_GUI.LoadXMLFile("gui/test/setup.xml");} + {TIMER(ps_gui_styles_xml) + g_GUI.LoadXMLFile("gui/test/styles.xml");} + {TIMER(ps_gui_sprite1_xml) + g_GUI.LoadXMLFile("gui/test/sprite1.xml");} + } + + // Temporary hack until revised GUI structure is completed. + { + // TIMER(ps_gui_hack) + + {TIMER(ps_gui_1) + g_GUI.LoadXMLFile("gui/test/1_init.xml");} + {TIMER(ps_gui_2) + g_GUI.LoadXMLFile("gui/test/2_mainmenu.xml");} + {TIMER(ps_gui_3) + g_GUI.LoadXMLFile("gui/test/3_loading.xml");} + {TIMER(ps_gui_4) + g_GUI.LoadXMLFile("gui/test/4_session.xml");} + {TIMER(ps_gui_5) + g_GUI.LoadXMLFile("gui/test/5_manual.xml");} + {TIMER(ps_gui_6) + g_GUI.LoadXMLFile("gui/test/6_subwindows.xml");} + {TIMER(ps_gui_7) + g_GUI.LoadXMLFile("gui/test/7_atlas.xml");} + {TIMER(ps_gui_9) + g_GUI.LoadXMLFile("gui/test/9_global.xml");} + } + + // { + // TIMER(ps_gui_hello_xml) + // g_GUI.LoadXMLFile("gui/test/hello.xml"); + // } +#endif +} + +static void psShutdown() +{ +#ifndef NO_GUI + g_GUI.Destroy(); + delete &g_GUI; +#endif + + delete g_Console; + + // disable the special Windows cursor, or free textures for OGL cursors + cursor_draw(NULL); + + // close down Xerces if it was loaded + CXeromyces::Terminate(); + + MusicPlayer.release(); + + // Unload the real language (since it depends on the scripting engine, + // which is going to be killed later) and use the English fallback messages + I18n::LoadLanguage(NULL); +} + + +static void InitConfig(int argc, char* argv[]) +{ + TIMER(InitConfig) + MICROLOG(L"init config"); + + new CConfigDB; + + g_ConfigDB.SetConfigFile(CFG_SYSTEM, false, "config/system.cfg"); + g_ConfigDB.Reload(CFG_SYSTEM); + + g_ConfigDB.SetConfigFile(CFG_MOD, true, "config/mod.cfg"); + // No point in reloading mod.cfg here - we haven't mounted mods yet + + // We init the defaults here; command line options might want to override + InitDefaultGameAttributes(); + ParseArgs(argc, argv); + + LoadGlobals(); // Collects information from system.cfg, the profile file, and any command-line overrides + // to fill in the globals. +} + + +static void InitRenderer() +{ + TIMER(InitRenderer) + // create renderer + new CRenderer; + + // set renderer options from command line options - NOVBO must be set before opening the renderer + g_Renderer.SetOptionBool(CRenderer::OPT_NOVBO,g_NoGLVBO); + g_Renderer.SetOptionBool(CRenderer::OPT_SHADOWS,g_Shadows); + g_Renderer.SetOptionBool(CRenderer::OPT_NOPBUFFER,g_NoPBuffer); + g_Renderer.SetOptionFloat(CRenderer::OPT_LODBIAS, g_LodBias); + + // create terrain related stuff + new CTextureManager; + + // create the material manager + new CMaterialManager; + new CMeshManager; + + // create actor related stuff + new CSkeletonAnimManager; + new CObjectManager; + new CUnitManager; + + MICROLOG(L"init renderer"); + g_Renderer.Open(g_xres,g_yres,g_bpp); + + // Setup default lighting environment. Since the Renderer accesses the + // lighting environment through a pointer, this has to be done before + // the first Frame. + g_LightEnv.m_SunColor=RGBColor(1,1,1); + g_LightEnv.SetRotation(DEGTORAD(270)); + g_LightEnv.SetElevation(DEGTORAD(45)); + g_LightEnv.m_TerrainAmbientColor=RGBColor(0,0,0); + g_LightEnv.m_UnitsAmbientColor=RGBColor(0.4f,0.4f,0.4f); + g_Renderer.SetLightEnv(&g_LightEnv); + + // I haven't seen the camera affecting GUI rendering and such, but the + // viewport has to be updated according to the video mode + SViewPort vp; + vp.m_X=0; + vp.m_Y=0; + vp.m_Width=g_xres; + vp.m_Height=g_yres; + g_Renderer.SetViewport(vp); +} + +extern u64 PREVTSC; + +static void Shutdown() +{ + psShutdown(); // Must delete g_GUI before g_ScriptingHost + + // Release script references to the globals before ScriptingHost shuts down + // g_GameAttributes.ReleaseScriptObject(); + + if (g_Game) + delete g_Game; + + delete &g_Scheduler; + + delete &g_SessionManager; + + delete &g_Mouseover; + delete &g_Selection; + + delete &g_Pathfinder; + // Managed by CWorld + // delete &g_EntityManager; + + delete &g_EntityTemplateCollection; + + delete &g_ScriptingHost; + + // destroy actor related stuff + delete &g_UnitMan; + delete &g_ObjMan; + delete &g_SkelAnimMan; + + delete &g_MaterialManager; + delete &g_MeshManager; + + // destroy terrain related stuff + delete &g_TexMan; + + // destroy renderer + delete &g_Renderer; + + delete &g_ConfigDB; + + // Really shut down the i18n system. Any future calls + // to translate() will crash. + I18n::Shutdown(); + + snd_shutdown(); + + vfs_shutdown(); + + h_mgr_shutdown(); +} + +static void Init(int argc, char* argv[], bool setup_gfx = true) +{ +#ifdef _WIN32 + sle(11340106); +#endif + + MICROLOG(L"In init"); + + // If you ever want to catch a particular allocation: + //_CrtSetBreakAlloc(14246); + +#ifdef _MSC_VER + u64 TSC=rdtsc(); + debug_out( + "----------------------------------------\n"\ + "MAIN (elapsed = %f ms)\n"\ + "----------------------------------------\n", (TSC-PREVTSC)/2e9*1e3); + PREVTSC=TSC; +#endif + + MICROLOG(L"init lib"); + lib_init(); + + // Call LoadLanguage(NULL) to initialise the I18n system, but + // without loading an actual language file - translate() will + // just show the English key text, which is better than crashing + // from a null pointer when attempting to translate e.g. error messages. + // Real languages can only be loaded when the scripting system has + // been initialised. + MICROLOG(L"init i18n"); + I18n::LoadLanguage(NULL); + + // set 24 bit (float) FPU precision for faster divides / sqrts +#ifdef _M_IX86 + _control87(_PC_24, _MCW_PC); +#endif + + // Do this as soon as possible, because it chdirs + // and will mess up the error reporting if anything + // crashes before the working directory is set. + MICROLOG(L"init vfs"); + InitVfs(argv[0]); + + // Set up the console early, so that debugging + // messages can be logged to it. (The console's size + // and fonts are set later in InitPs()) + g_Console = new CConsole(); + + if (setup_gfx) + { + MICROLOG(L"init sdl"); + // init SDL + if(SDL_Init(SDL_INIT_VIDEO|SDL_INIT_TIMER|SDL_INIT_NOPARACHUTE) < 0) + { + LOG(ERROR, LOG_CATEGORY, "SDL library initialization failed: %s", SDL_GetError()); + throw PSERROR_System_SDLInitFailed(); + } + atexit(SDL_Quit); + SDL_EnableUNICODE(1); + } + + // preferred video mode = current desktop settings + // (command line params may override these) + get_cur_vmode(&g_xres, &g_yres, &g_bpp, &g_freq); + + MICROLOG(L"init scripting"); + InitScripting(); // before GUI + + // g_ConfigDB, command line args, globals + InitConfig(argc, argv); + + // GUI is notified in set_vmode, so this must come before that. +#ifndef NO_GUI + new CGUI; +#endif + + CConfigValue *val=g_ConfigDB.GetValue(CFG_SYSTEM, "windowed"); + bool windowed=false; + if (val) val->GetBool(windowed); + +#ifdef _WIN32 + sle(11340106); +#endif + + if (setup_gfx) + { + MICROLOG(L"set vmode"); + + if(set_vmode(g_xres, g_yres, 32, !windowed) < 0) + { + LOG(ERROR, LOG_CATEGORY, "Could not set %dx%d graphics mode: %s", g_xres, g_yres, SDL_GetError()); + throw PSERROR_System_VmodeFailed(); + } + SDL_WM_SetCaption("0 A.D.", "0 A.D."); + } + + if(!g_Quickstart) + { + WriteSysInfo(); + vfs_display(); + } + else + // speed up startup by disabling all sound + // (OpenAL init will be skipped). + // must be called before first snd_open. + snd_disable(true); + + if(!oglExtAvail("GL_ARB_multitexture") || !oglExtAvail("GL_ARB_texture_env_combine") || + !glActiveTexture) // prevent crashing later if multitexture support is falsely + // advertised (janwas 2004-08-25, for bug #18) + { + LOG(ERROR, LOG_CATEGORY, "Required ARB_multitexture or ARB_texture_env_combine extension not available"); + throw PSERROR_System_RequiredExtensionsMissing(); + } + + // enable/disable VSync + // note: "GL_EXT_SWAP_CONTROL" is "historical" according to dox. + /* if(oglExtAvail("WGL_EXT_swap_control")) + wglSwapIntervalEXT(g_VSync? 1 : 0); */ + +#ifdef _MSC_VER + u64 CURTSC=rdtsc(); + debug_out( + "----------------------------------------\n"\ + "low-level ready (elapsed = %f ms)\n"\ + "----------------------------------------\n", (CURTSC-PREVTSC)/2e9*1e3); + PREVTSC=CURTSC; +#endif + + MICROLOG(L"init ps"); + InitPs(); + + InitRenderer(); + + TIMER(init_after_InitRenderer); + + // This needs to be done after the renderer has loaded all its actors... + new CBaseEntityCollection; + // CEntityManager is managed by CWorld + //new CEntityManager; + new CPathfindEngine; + new CSelectedEntities; + new CMouseoverEntities; + + new CSessionManager; + + // Register a few Game/Network JS globals + g_ScriptingHost.SetGlobal("g_NetServerAttributes", OBJECT_TO_JSVAL(g_NetServerAttributes.GetJSObject())); + g_ScriptingHost.SetGlobal("g_GameAttributes", OBJECT_TO_JSVAL(g_GameAttributes.GetJSObject())); + + // Check for heap corruption after every allocation. Very, very slowly. + // (And it highlights the allocation just after the one you care about, + // so you need to run it again and tell it to break on the one before.) + /* + extern void memory_debug_extreme_turbo_plus(); + memory_debug_extreme_turbo_plus(); + _CrtSetBreakAlloc(36367); + // */ + + // register input handlers + { + in_add_handler(handler); + in_add_handler(game_view_handler); + + in_add_handler(interactInputHandler); + +#ifndef NO_GUI + in_add_handler(gui_handler); +#endif + + in_add_handler(conInputHandler); + + in_add_handler(hotkeyInputHandler); // <- Leave this one until after all the others. + } + + if (setup_gfx) + { + MICROLOG(L"render blank"); + // render everything to a blank frame to force renderer to load everything + RenderNoCull(); + } + + if (g_FixedFrameTiming) { + CCamera &g_Camera=*g_Game->GetView()->GetCamera(); +#if 0 // TOPDOWN + g_Camera.SetProjection(1.0f,10000.0f,DEGTORAD(90)); + g_Camera.m_Orientation.SetIdentity(); + g_Camera.m_Orientation.RotateX(DEGTORAD(90)); + g_Camera.m_Orientation.Translate(CELL_SIZE*250*0.5, 250, CELL_SIZE*250*0.5); +#else // std view + g_Camera.SetProjection(1.0f,10000.0f,DEGTORAD(20)); + g_Camera.m_Orientation.SetXRotation(DEGTORAD(30)); + g_Camera.m_Orientation.RotateY(DEGTORAD(-45)); + g_Camera.m_Orientation.Translate(350, 350, -275); +#endif + g_Camera.UpdateFrustum(); + } + + g_Console->RegisterFunc(Testing, L"Testing"); + +#ifdef _MSC_VER + { + u64 CURTSC=rdtsc(); + debug_out( + "----------------------------------------\n"\ + "READY (elapsed = %f ms)\n"\ + "----------------------------------------\n", (CURTSC-PREVTSC)/2e9*1e3); + PREVTSC=CURTSC; + } +#endif + +} + +/* +static void Frame() +{ + MICROLOG(L"In frame"); + + MusicPlayer.update(); + + static double last_time; + const double time = get_time(); + const float TimeSinceLastFrame = (float)(time-last_time); + last_time = time; + ONCE(return); + // first call: set last_time and return + assert(TimeSinceLastFrame >= 0.0f); + + MICROLOG(L"reload files"); + + res_reload_changed_files(); + + MICROLOG(L"input"); + + in_get_events(); + g_SessionManager.Poll(); + + g_GUI.TickObjects(); + + if (g_Game && g_Game->IsGameStarted()) + { + g_Game->Update(TimeSinceLastFrame); + + if (!g_FixedFrameTiming) + g_Game->GetView()->Update(float(TimeSinceLastFrame)); + + // TODO Where does GameView end and other things begin? + g_Mouseover.update( TimeSinceLastFrame ); + g_Selection.update(); + + + CCamera* camera = g_Game->GetView()->GetCamera(); + CMatrix3D& orientation = camera->m_Orientation; + + float* pos = &orientation._data[12]; + float* dir = &orientation._data[8]; + float* up = &orientation._data[4]; + if(snd_update(pos, dir, up) < 0) + debug_out("snd_update failed\n"); + } + else + { + // CSimulation would do this with the proper turn length if we were in + // a game. This is basically just to keep script timers running. + g_Scheduler.update((uint)(TimeSinceLastFrame*1000)); + if(snd_update(0, 0, 0) < 0) + debug_out("snd_update (pos=0 version) failed\n"); + } + + g_Console->Update(TimeSinceLastFrame); + + // ugly, but necessary. these are one-shot events, have to be reset. + + // Spoof mousebuttonup events for the hotkey system + SDL_Event spoof; + spoof.type = SDL_MOUSEBUTTONUP; + spoof.button.button = SDL_BUTTON_WHEELUP; + if( mouseButtons[SDL_BUTTON_WHEELUP] ) + hotkeyInputHandler( &spoof ); + spoof.button.button = SDL_BUTTON_WHEELDOWN; + if( mouseButtons[SDL_BUTTON_WHEELDOWN] ) + hotkeyInputHandler( &spoof ); + + mouseButtons[SDL_BUTTON_WHEELUP] = false; + mouseButtons[SDL_BUTTON_WHEELDOWN] = false; + + if(g_active) + { + MICROLOG(L"render"); + Render(); + MICROLOG(L"finished render"); + SDL_GL_SwapBuffers(); + } + // inactive; relinquish CPU for a little while + // don't use SDL_WaitEvent: don't want the main loop to freeze until app focus is restored + else + SDL_Delay(10); + + calc_fps(); + if (g_FixedFrameTiming && frameCount==100) quit=true; +} + +*/ +// Choose when to override the standard exception handling behaviour +// (opening the debugger when available, or crashing when not) with +// code that generates a crash log/dump. +#if defined(_WIN32) && ( defined(NDEBUG) || defined(TESTING) ) +# define CUSTOM_EXCEPTION_HANDLER +#endif + +#ifdef CUSTOM_EXCEPTION_HANDLER +#include +#endif + + +#include "jsapi.h" + +namespace JSI_IGUIObject +{ + JSBool getByName(JSContext* cx, JSObject* obj, unsigned int argc, jsval* argv, jsval* rval) + { + return JS_FALSE; + } +} + +void ScEd_Init() +{ + char path[256]; + ::GetModuleFileName(0,path,256); + + char* argv[1]; + argv[0] = path; + Init(1, argv, false); +} + +void ScEd_Shutdown() +{ + Shutdown(); +} \ No newline at end of file diff --git a/source/tools/sced/ui/BrushShapeEditorDlgBar.cpp b/source/tools/sced/ui/BrushShapeEditorDlgBar.cpp index 0d86e93dc7..80731dcf36 100755 --- a/source/tools/sced/ui/BrushShapeEditorDlgBar.cpp +++ b/source/tools/sced/ui/BrushShapeEditorDlgBar.cpp @@ -1,3 +1,4 @@ +#include "precompiled.h" #include "stdafx.h" #define _IGNORE_WGL_H_ #include "MainFrm.h" diff --git a/source/tools/sced/ui/ColorButton.cpp b/source/tools/sced/ui/ColorButton.cpp index 257c6eca1c..04ee35f7cd 100755 --- a/source/tools/sced/ui/ColorButton.cpp +++ b/source/tools/sced/ui/ColorButton.cpp @@ -1,6 +1,7 @@ // ColorButton.cpp : implementation file // +#include "precompiled.h" #include "stdafx.h" #include "ScEd.h" #include "ColorButton.h" diff --git a/source/tools/sced/ui/DirectionButton.cpp b/source/tools/sced/ui/DirectionButton.cpp index 0d0432e4a0..cea37ec5bf 100755 --- a/source/tools/sced/ui/DirectionButton.cpp +++ b/source/tools/sced/ui/DirectionButton.cpp @@ -1,6 +1,7 @@ // DirectionButton.cpp : implementation file // +#include "precompiled.h" #include #include "stdafx.h" #include "ScEd.h" diff --git a/source/tools/sced/ui/ElevToolsDlgBar.cpp b/source/tools/sced/ui/ElevToolsDlgBar.cpp index 9ee9c88944..b66a4acd46 100755 --- a/source/tools/sced/ui/ElevToolsDlgBar.cpp +++ b/source/tools/sced/ui/ElevToolsDlgBar.cpp @@ -1,3 +1,4 @@ +#include "precompiled.h" #include #include "stdafx.h" #include "ToolManager.h" diff --git a/source/tools/sced/ui/ElevationButton.cpp b/source/tools/sced/ui/ElevationButton.cpp index fb09666d97..a0dd758922 100755 --- a/source/tools/sced/ui/ElevationButton.cpp +++ b/source/tools/sced/ui/ElevationButton.cpp @@ -1,6 +1,7 @@ // ElevationButton.cpp : implementation file // +#include "precompiled.h" #include #include "stdafx.h" #include "ScEd.h" diff --git a/source/tools/sced/ui/ImageListCtrl.cpp b/source/tools/sced/ui/ImageListCtrl.cpp index f34fee3da5..70e34b4eaa 100755 --- a/source/tools/sced/ui/ImageListCtrl.cpp +++ b/source/tools/sced/ui/ImageListCtrl.cpp @@ -1,6 +1,7 @@ // ImageListCtrl.cpp : implementation file // +#include "precompiled.h" #include "stdafx.h" #include "ScEd.h" #include "ImageListCtrl.h" diff --git a/source/tools/sced/ui/LightSettingsDlg.cpp b/source/tools/sced/ui/LightSettingsDlg.cpp index 2cb6d779e8..5d23bfdab0 100755 --- a/source/tools/sced/ui/LightSettingsDlg.cpp +++ b/source/tools/sced/ui/LightSettingsDlg.cpp @@ -1,6 +1,7 @@ // LightSettingsDlg.cpp : implementation file // +#include "precompiled.h" #include "stdafx.h" #include "ScEd.h" #include "LightSettingsDlg.h" diff --git a/source/tools/sced/ui/MainFrameDlgBar.cpp b/source/tools/sced/ui/MainFrameDlgBar.cpp index 59e361affc..8c42a035c6 100755 --- a/source/tools/sced/ui/MainFrameDlgBar.cpp +++ b/source/tools/sced/ui/MainFrameDlgBar.cpp @@ -1,6 +1,7 @@ // MainFrameDlgBar.cpp : implementation file // +#include "precompiled.h" #include "stdafx.h" #include "ScEd.h" #include "MainFrm.h" diff --git a/source/tools/sced/ui/MainFrm.cpp b/source/tools/sced/ui/MainFrm.cpp index 3e919761e8..642680c09b 100755 --- a/source/tools/sced/ui/MainFrm.cpp +++ b/source/tools/sced/ui/MainFrm.cpp @@ -1,6 +1,7 @@ // MainFrm.cpp : implementation of the CMainFrame class // +#include "precompiled.h" #include "stdafx.h" #define _IGNORE_WGL_H_ @@ -22,6 +23,7 @@ #include "UnitManager.h" #include "ObjectManager.h" #include "TextureManager.h" +#include "ModelDef.h" #include "UIGlobals.h" #include "MainFrm.h" #include "OptionsPropSheet.h" @@ -563,7 +565,7 @@ void CMainFrame::OnFileSaveMap() CMapWriter writer; try { - writer.SaveMap(savename); + writer.SaveMap(savename, &g_Terrain, &g_LightEnv, &g_UnitMan); CStr filetitle=savedlg.m_ofn.lpstrFileTitle; int index=filetitle.ReverseFind(CStr(".")); @@ -603,7 +605,7 @@ void CMainFrame::OnFileLoadMap() CMapReader reader; try { - reader.LoadMap(loadname); + reader.LoadMap(loadname, &g_Terrain, &g_UnitMan, &g_LightEnv); CStr filetitle=loaddlg.m_ofn.lpstrFileTitle; int index=filetitle.ReverseFind(CStr(".")); diff --git a/source/tools/sced/ui/MapSizeDlg.cpp b/source/tools/sced/ui/MapSizeDlg.cpp index 15e1e3015d..d8f432612f 100755 --- a/source/tools/sced/ui/MapSizeDlg.cpp +++ b/source/tools/sced/ui/MapSizeDlg.cpp @@ -1,6 +1,7 @@ // MapSizeDlg.cpp : implementation file // +#include "precompiled.h" #include "stdafx.h" #include "ScEd.h" #include "MapSizeDlg.h" diff --git a/source/tools/sced/ui/NavigatePropPage.cpp b/source/tools/sced/ui/NavigatePropPage.cpp index d8fd8703ef..ce3183e75c 100755 --- a/source/tools/sced/ui/NavigatePropPage.cpp +++ b/source/tools/sced/ui/NavigatePropPage.cpp @@ -1,6 +1,7 @@ // NavigatePropPage.cpp : implementation file // +#include "precompiled.h" #include "stdafx.h" #include "ScEd.h" #include "NavigatePropPage.h" diff --git a/source/tools/sced/ui/OptionsDlg.cpp b/source/tools/sced/ui/OptionsDlg.cpp index 9c08bbf466..823251b8df 100755 --- a/source/tools/sced/ui/OptionsDlg.cpp +++ b/source/tools/sced/ui/OptionsDlg.cpp @@ -1,6 +1,7 @@ // OptionsDlg.cpp : implementation file // +#include "precompiled.h" #include "stdafx.h" #include "ScEd.h" #include "OptionsDlg.h" diff --git a/source/tools/sced/ui/OptionsPropSheet.cpp b/source/tools/sced/ui/OptionsPropSheet.cpp index f26e54333b..bb4d56f01b 100755 --- a/source/tools/sced/ui/OptionsPropSheet.cpp +++ b/source/tools/sced/ui/OptionsPropSheet.cpp @@ -1,6 +1,7 @@ // OptionsPropSheet.cpp : implementation file // +#include "precompiled.h" #include "stdafx.h" #include "ScEd.h" #include "OptionsPropSheet.h" diff --git a/source/tools/sced/ui/ScEd.cpp b/source/tools/sced/ui/ScEd.cpp index 7b5df6ee9e..001f00b60c 100755 --- a/source/tools/sced/ui/ScEd.cpp +++ b/source/tools/sced/ui/ScEd.cpp @@ -1,6 +1,7 @@ // ScEd.cpp : Defines the class behaviors for the application. // +#include "precompiled.h" #include "stdafx.h" #include "ScEd.h" @@ -47,8 +48,8 @@ CScEdApp theApp; BOOL CScEdApp::InitInstance() { - extern void pre_main_init(); - pre_main_init(); + extern void sced_init(); + sced_init(); AfxEnableControlContainer(); @@ -174,10 +175,11 @@ BOOL CAboutDlg::OnInitDialog() int CScEdApp::Run() { + MSG msg; // acquire and dispatch messages until a WM_QUIT message is received while (1) { // process windows messages - while (::PeekMessage(&m_msgCur, NULL, NULL, NULL, PM_NOREMOVE)) { + while (::PeekMessage(&msg, NULL, NULL, NULL, PM_NOREMOVE)) { // pump message, but quit on WM_QUIT if (!PumpMessage()) return ExitInstance(); diff --git a/source/tools/sced/ui/ScEdDoc.cpp b/source/tools/sced/ui/ScEdDoc.cpp index dac1d98231..d8e939be00 100755 --- a/source/tools/sced/ui/ScEdDoc.cpp +++ b/source/tools/sced/ui/ScEdDoc.cpp @@ -1,6 +1,7 @@ // ScEdDoc.cpp : implementation of the CScEdDoc class // +#include "precompiled.h" #include "stdafx.h" #include "ScEd.h" diff --git a/source/tools/sced/ui/ScEdView.cpp b/source/tools/sced/ui/ScEdView.cpp index f42c1a355a..3989b9e7a4 100755 --- a/source/tools/sced/ui/ScEdView.cpp +++ b/source/tools/sced/ui/ScEdView.cpp @@ -1,6 +1,7 @@ // ScEdView.cpp : implementation of the CScEdView class // +#include "precompiled.h" #include "stdafx.h" #define _IGNORE_WGL_H_ #include "ScEd.h" @@ -118,6 +119,10 @@ BOOL CScEdView::OnEraseBkgnd(CDC* pDC) int CScEdView::OnCreate(LPCREATESTRUCT lpCreateStruct) { + // make sure the delay-loaded OpenGL has been loaded before calling + // any graphical functions + glGetError(); + // base initialisation first if (CView::OnCreate(lpCreateStruct) == -1) return -1; @@ -145,17 +150,8 @@ int CScEdView::OnCreate(LPCREATESTRUCT lpCreateStruct) } - // initialise VFS paths - char path[256]; - ::GetModuleFileName(0,path,256); - file_rel_chdir(path, "../data"); - vfs_mount("", "mods/official", 0); - - // create renderer related stuff - new CRenderer; - - // start up the renderer - g_Renderer.Open(0,0,::GetDeviceCaps(dc,BITSPIXEL)); + extern void ScEd_Init(); + ScEd_Init(); // initialise document data if (!g_EditorData.Init()) return -1; @@ -170,16 +166,16 @@ void CScEdView::OnDestroy() { // close down editor resources g_EditorData.Terminate(); - - // destroy renderer related stuff - delete CRenderer::GetSingletonPtr(); + extern void ScEd_Shutdown(); + ScEd_Shutdown(); + // release rendering context if (m_hGLRC) { wglMakeCurrent(0,0); wglDeleteContext(m_hGLRC); m_hGLRC=0; - } + } // base destruction CView::OnDestroy(); diff --git a/source/tools/sced/ui/ShadowsPropPage.cpp b/source/tools/sced/ui/ShadowsPropPage.cpp index 0b960963de..fb42398d0d 100755 --- a/source/tools/sced/ui/ShadowsPropPage.cpp +++ b/source/tools/sced/ui/ShadowsPropPage.cpp @@ -1,6 +1,7 @@ // ShadowsPropPage.cpp : implementation file // +#include "precompiled.h" #include "stdafx.h" #include "ScEd.h" #include "ShadowsPropPage.h" diff --git a/source/tools/sced/ui/SimpleEdit.cpp b/source/tools/sced/ui/SimpleEdit.cpp index 2ef4d7e2dd..a147617e4b 100755 --- a/source/tools/sced/ui/SimpleEdit.cpp +++ b/source/tools/sced/ui/SimpleEdit.cpp @@ -1,6 +1,7 @@ // SimpleEdit.cpp : implementation file // +#include "precompiled.h" #include "stdafx.h" #include "ScEd.h" #include "SimpleEdit.h" diff --git a/source/tools/sced/ui/StdAfx.h b/source/tools/sced/ui/StdAfx.h index 193c180b99..be2abaa434 100755 --- a/source/tools/sced/ui/StdAfx.h +++ b/source/tools/sced/ui/StdAfx.h @@ -6,6 +6,8 @@ #if !defined(AFX_STDAFX_H__806A78B8_0008_491A_9FB6_5FF892838693__INCLUDED_) #define AFX_STDAFX_H__806A78B8_0008_491A_9FB6_5FF892838693__INCLUDED_ +#undef new // as defined by precompiled.h + #if _MSC_VER > 1000 #pragma once #endif // _MSC_VER > 1000 @@ -14,7 +16,7 @@ #define _SIZE_T_DEFINED #include "posix.h" -#include "CStr.h" +//#include "CStr.h" #undef _WINDOWS_ #undef UNUSED diff --git a/source/tools/sced/ui/TexToolsDlgBar.cpp b/source/tools/sced/ui/TexToolsDlgBar.cpp index 411a4e4711..b047960e47 100755 --- a/source/tools/sced/ui/TexToolsDlgBar.cpp +++ b/source/tools/sced/ui/TexToolsDlgBar.cpp @@ -1,3 +1,4 @@ +#include "precompiled.h" #include "stdafx.h" #define _IGNORE_WGL_H_ #include "TexToolsDlgBar.h" diff --git a/source/tools/sced/ui/UIGlobals.cpp b/source/tools/sced/ui/UIGlobals.cpp index f6acf3ad20..baba21b25b 100755 --- a/source/tools/sced/ui/UIGlobals.cpp +++ b/source/tools/sced/ui/UIGlobals.cpp @@ -1,3 +1,4 @@ +#include "precompiled.h" #include "stdafx.h" #include "UIGlobals.h" diff --git a/source/tools/sced/ui/UnitPropertiesAnimationsTab.cpp b/source/tools/sced/ui/UnitPropertiesAnimationsTab.cpp index cb4eb3e771..897e8a6cf5 100755 --- a/source/tools/sced/ui/UnitPropertiesAnimationsTab.cpp +++ b/source/tools/sced/ui/UnitPropertiesAnimationsTab.cpp @@ -1,6 +1,7 @@ // UnitPropertiesAnimationsTab.cpp : implementation file // +#include "precompiled.h" #include "stdafx.h" #include "ScEd.h" #include "UnitPropertiesAnimationsTab.h" diff --git a/source/tools/sced/ui/UnitPropertiesDlgBar.cpp b/source/tools/sced/ui/UnitPropertiesDlgBar.cpp index 1dbf9d8012..c600638370 100755 --- a/source/tools/sced/ui/UnitPropertiesDlgBar.cpp +++ b/source/tools/sced/ui/UnitPropertiesDlgBar.cpp @@ -1,3 +1,4 @@ +#include "precompiled.h" #include "stdafx.h" #define _IGNORE_WGL_H_ #include "UserConfig.h" @@ -193,15 +194,15 @@ void CUnitPropertiesDlgBar::UpdateEditorData() CWnd* name=GetDlgItem(IDC_EDIT_NAME); name->GetWindowText(str); - m_Object->m_Name=str; + m_Object->m_Name=(const char*)str; CWnd* model=GetDlgItem(IDC_EDIT_MODEL); model->GetWindowText(str); - m_Object->m_ModelName=str; + m_Object->m_ModelName=(const char*)str; CWnd* texture=GetDlgItem(IDC_EDIT_TEXTURE); texture->GetWindowText(str); - m_Object->m_TextureName=str; + m_Object->m_TextureName=(const char*)str; CWnd* animation=GetDlgItem(IDC_EDIT_ANIMATION); animation->GetWindowText(str); @@ -209,7 +210,7 @@ void CUnitPropertiesDlgBar::UpdateEditorData() m_Object->m_Animations.resize(1); m_Object->m_Animations[0].m_AnimName="Idle"; } - m_Object->m_Animations[0].m_FileName=str; + m_Object->m_Animations[0].m_FileName=(const char*)str; std::vector animupdatelist; const std::vector& units=g_UnitMan.GetUnits(); diff --git a/source/tools/sced/ui/UnitPropertiesTabCtrl.cpp b/source/tools/sced/ui/UnitPropertiesTabCtrl.cpp index 0e7e785c2f..abcb788ebf 100755 --- a/source/tools/sced/ui/UnitPropertiesTabCtrl.cpp +++ b/source/tools/sced/ui/UnitPropertiesTabCtrl.cpp @@ -1,6 +1,7 @@ // UnitPropertiesTabCtrl.cpp : implementation file // +#include "precompiled.h" #include "stdafx.h" #include "ScEd.h" #include "UnitPropertiesTabCtrl.h" diff --git a/source/tools/sced/ui/UnitPropertiesTexturesTab.cpp b/source/tools/sced/ui/UnitPropertiesTexturesTab.cpp index b79beb1483..a1b726b244 100755 --- a/source/tools/sced/ui/UnitPropertiesTexturesTab.cpp +++ b/source/tools/sced/ui/UnitPropertiesTexturesTab.cpp @@ -1,6 +1,7 @@ // UnitPropertiesTexturesTab.cpp : implementation file // +#include "precompiled.h" #include "stdafx.h" #include "ScEd.h" #include "UnitPropertiesTexturesTab.h" diff --git a/source/tools/sced/ui/UnitToolsDlgBar.cpp b/source/tools/sced/ui/UnitToolsDlgBar.cpp index 63818ca086..f6f0f1a21a 100755 --- a/source/tools/sced/ui/UnitToolsDlgBar.cpp +++ b/source/tools/sced/ui/UnitToolsDlgBar.cpp @@ -1,3 +1,4 @@ +#include "precompiled.h" #include "stdafx.h" #include "MainFrm.h" #include "SimpleEdit.h" @@ -132,7 +133,7 @@ void CUnitToolsDlgBar::OnButtonAdd() // now enter edit mode CObjectEntry* obj=new CObjectEntry(GetCurrentObjectType()); - obj->m_Name=name; + obj->m_Name=(const char*)name; g_ObjMan.AddObject(obj,GetCurrentObjectType()); CMainFrame* mainfrm=(CMainFrame*) AfxGetMainWnd(); diff --git a/source/tools/sced/ui/WebLinkButton.cpp b/source/tools/sced/ui/WebLinkButton.cpp index a286b57c08..72c61ea990 100755 --- a/source/tools/sced/ui/WebLinkButton.cpp +++ b/source/tools/sced/ui/WebLinkButton.cpp @@ -1,6 +1,7 @@ // WebLinkButton.cpp : implementation file // +#include "precompiled.h" #include "stdafx.h" #include "ScEd.h" #include "WebLinkButton.h" diff --git a/source/tools/sced/ui/res/0ad_logo.bmp b/source/tools/sced/ui/res/0ad_logo.bmp new file mode 100644 index 0000000000000000000000000000000000000000..a5a5feb14158ae68ff9055db7393503186760242 GIT binary patch literal 31878 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 literal 0 HcmV?d00001 diff --git a/source/tools/sced/ui/res/0ad_logo.bmp.ico b/source/tools/sced/ui/res/0ad_logo.bmp.ico new file mode 100644 index 0000000000000000000000000000000000000000..71b3b3dcc3f5b9e8211f8b4154ccc27dc94020a5 GIT binary patch literal 35886 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 WX9CXzo(Vh?cqZ^n;F-W1Mc~IiA-GZi literal 0 HcmV?d00001 diff --git a/source/tools/sced/ui/res/0ad_logo.ico b/source/tools/sced/ui/res/0ad_logo.ico new file mode 100644 index 0000000000000000000000000000000000000000..71b3b3dcc3f5b9e8211f8b4154ccc27dc94020a5 GIT binary patch literal 35886 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 WX9CXzo(Vh?cqZ^n;F-W1Mc~IiA-GZi literal 0 HcmV?d00001 diff --git a/source/tools/sced/ui/res/ScEd.ico b/source/tools/sced/ui/res/ScEd.ico new file mode 100644 index 0000000000000000000000000000000000000000..0e44744ca409febc8362125bda7d5edc6b367db5 GIT binary patch literal 3262 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 literal 0 HcmV?d00001 diff --git a/source/tools/sced/ui/res/ScEd.rc2 b/source/tools/sced/ui/res/ScEd.rc2 new file mode 100644 index 0000000000..d414e2f0bc --- /dev/null +++ b/source/tools/sced/ui/res/ScEd.rc2 @@ -0,0 +1,13 @@ +// +// SCED.RC2 - resources Microsoft Visual C++ does not edit directly +// + +#ifdef APSTUDIO_INVOKED + #error this file is not editable by Microsoft Visual C++ +#endif //APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// Add manually edited resources here... + +///////////////////////////////////////////////////////////////////////////// diff --git a/source/tools/sced/ui/res/ScEdDoc.ico b/source/tools/sced/ui/res/ScEdDoc.ico new file mode 100644 index 0000000000000000000000000000000000000000..2a1f1ae6ef15e51df8c39bc028bbfb2171822ba5 GIT binary patch literal 1078 zcmcJNF;c@Y5JlGsgIpoERJdY%i*S@2!JS&si6f-)RXoFGDAfg5;z_dQBoi_)1DpI^ z{oS?KlD%25H@>BZ{KJV|_dD9_G1MV<{5a&-}7^W%4AM)k- zx&P*V(j}a@*Y~UhksXTAK!NRyiYN-8NMyKz<)2v9@tUao7A!g+SzkAcsHvdq6!0vQ z#-rA6>0BAr)4*u6Y57EdkamnXf Uh-a7VEuQ2KJb_2>o71HC3-%7w@Bjb+ literal 0 HcmV?d00001 diff --git a/source/tools/sced/ui/res/Toolbar.bmp b/source/tools/sced/ui/res/Toolbar.bmp new file mode 100644 index 0000000000000000000000000000000000000000..754c6aabb4e606e35716d032162be2c8b6c0a1f3 GIT binary patch literal 1078 zcma))!D_=W42CrtsBe3X9Rr0i*d>g@a@o7=FeXC|Hf#{z`Y=0W(8KapF7)92lAAUm zEv*tOimlI*Exo)w7NqhC{ea;y?lJBtFZ2uioE4v)y;nvwOzQg{Ul^41rIf_Nz#~&o z%)1t3{x!iR`b9~b2n&)vXhm(dq2r9Np8w)DHE!RfrmUlQ`UMcR znBA10$5)=WUGvL7R12PYwV=Ky@#nlo3ah8DRVb-;GyYn9+U&bn;i5$HK{fv&{slhT z5aj+i1Vr}hs#w#yZZR9C`Cs675>9yQi3;Te4U)ty@s$tYBY1=2!NRat_+$Mn1u}YE zO&O?@+B0^W#@8KXCCgBMYm#3MlcO)(Z{l|ahoMI@ZsjyKd>{CjXOkp)rvG+_?6a3> zi=K7XprPgdj{W;?LUrOP=C+lYv8OjE6U39GI~KV|2&4We eLajeg)g*si!!l|%N-A$7H!U4;@=-^q!Sx^Bh?Ee;tFK-V%nLJ0CDS zc<_MX)vH$wKY#vY5Eq}tP+WWnNY4c7KaFAasK96ljE2C#h5+MW0@5IW$3dg=Si=V# gELaFwNMex!3(-p+W)CBZt#DBUW2DO?LV|8A0P$W;pa1{> literal 0 HcmV?d00001 diff --git a/source/tools/sced/ui/res/elevationtools.bmp b/source/tools/sced/ui/res/elevationtools.bmp new file mode 100644 index 0000000000000000000000000000000000000000..ee3430e642afbdaea9764b295a89b4824b352a0c GIT binary patch literal 2102 zcmc&zZ&Xut7=E2sQ@X8$F^tAknj|n0*;oa0#hTW^31;I~Yf>3u5n&-QGBR6>iqorBhwcz%qoRHC?8xyP&OYt*X&>*$eY~gBv%5c__PyWPyWgMpd7t-r-*>a_ zGp!?enHZvNIBm|`D#|@D*HAYIApm`=tIyLG>oLJ40^tX+qVbt7fCegy8W)@mP z=yQl9Cwkvu1b07)YL-OQmN*-rH0od!Uh*}eN2k#9mh3%B39X7!$e(Ef_gZLHx+pR3 zBBLol`brz6I0yO+O$s}?x&`ufuw<_8K_8=(=3Qh)9%A?{TN0&cb}r*A=D?z6FNNS|6ar%L8wh55Gy#KN%rQPA zAa59VAEn38OUzGzWvXH5t=NIRE{nsw)i`4wy6Py|YI-PvoYI0GH2{Y>OX#Nre9D6R z9t~x%rx2U*BfcGbLv~i!wXi{8J=mQv=+2bFDq$sv9mlTxuRq;w|HA+6f#)0fr!VsP z)mS(z?;f6Sbtm_~RKNg|M-{=zP#dJkQRb}$}d3AY&wZwGV_4|@Hf?QYR!H;DX{6S91xvQ=v#-4kpdt~!B_O11? zWY<2!ju&!`@EqhWKj|u4^{X(|yJ184iA%zPE`z~fX?;Bx&bPRo&J!b3Uq1WA+Q&C- z^7(%V3lW2%=G8*8S}JUJj`TVbT&$|90&DidQU9Cf*AC{x8>8IacTBzS{E<^u&b<8L zPZzi=e}s>gt;xC@vt4ZAE`Pq^o^_gQgMXG=&-^vK%kuM-V`p(pd}H(A8{s-;-NT$B z^7Zz%MYg^D$ftR7d0R8O^Zuh9_x>C7cIHm9{v4TyUwvsKLW(JIxOqML N-p%*hZr|Se@-Izb1_%HE literal 0 HcmV?d00001 diff --git a/source/tools/sced/ui/res/ico00001.ico b/source/tools/sced/ui/res/ico00001.ico new file mode 100644 index 0000000000000000000000000000000000000000..db756833a209feaffda4c67e470fa054c9bba2ae GIT binary patch literal 766 zcmb_aF>b;@5FDdO=o&6nT3qHA$%o(z_y?x-8zTPT&P6_fM3Iy(DUgQQ^~Qz(9ebX= zy`8<;yOV)Jqby%x_B#XKG`|a_@F^5{kq0Vq_pK5srmBWXULo4H)ocX)18I?=r9ha*Xc?25C$Gz+`7cgcLo! zc}mz0Ya(0sCTM#cLkfCWr$*-Wep0#Sibs;5TkKcACeYnf2YK2&1`7Q-f!n&Z_U@$f&3*piegU@gPVtwpa(&wqb_OVvz3l)1 literal 0 HcmV?d00001 diff --git a/source/tools/sced/ui/res/ico00002.ico b/source/tools/sced/ui/res/ico00002.ico new file mode 100644 index 0000000000000000000000000000000000000000..b31f0d9fc7a0fd97659a78258764d5b323257e2f GIT binary patch literal 766 zcmdUsK?=e!5Jjg}=rXR{+NHP9n;Gz85ie43q2DBx`h(%yM;f~>k;ez3efzl#Z^$?&+Fm30OYX>bf@Qeo)c+J%S literal 0 HcmV?d00001 diff --git a/source/tools/sced/ui/res/icon1.ico b/source/tools/sced/ui/res/icon1.ico new file mode 100644 index 0000000000000000000000000000000000000000..2aa0131e1292b8c173880c064d4fda7f50fcce97 GIT binary patch literal 766 zcmb_aF%H5o47?yD#xSwABfo&3kstI++4>EnE{qu&kj&W)X&TY3PR}{}94Ac+IF7zQ zL+y0{E}XAKPuvNIBRvqP{kK4oN(l2rPl^~LXBEUAh$tgCG^LJ~5}o(P)fu&9PLWr# z71T022((8rkENR>*X4Q3QoeJ{_ezRi|4d5U>a5%Qe9Pu`2!SuVGohDLUr-xcZMC4) z+nC>T)t{fXT5TuTa?(vA!zeNiB2&j(Bi=WW&tn^K{Btt4>a@?(&xogmYhKr6`vQMl Bx#0i+ literal 0 HcmV?d00001 diff --git a/source/tools/sced/ui/res/modeltools.bmp b/source/tools/sced/ui/res/modeltools.bmp new file mode 100644 index 0000000000000000000000000000000000000000..6e0529610e7db393af1324b56774f45858ee2fee GIT binary patch literal 2102 zcmeHFF-`DkyjWAE4$Flr(ho2=NU#B%VUS9}wg0BJFK_M*$UD zOBZE5o*CP@(~F@}i=hx5<90Ot5={W|U3?N<4o2^HhxGJtOOICv^znQ`uP+_za$a2Y9bvy%Dwc!~Nq7!bdDy%34OyD7iBq#A>SAVL> znPxFx)G`BVCS3^&1NXF_)_I7C@;A<@xY9fvgFcTcrOdH*H^$}?My#mpVa4*Tq?{$^ zs?BIyf}N96+s^n<+ql9U@VLWecV24MoDK)=x_2CG$3=3j5g#w_?Tb{rLKp^jHwZyb zvOz&Z@sZ;LbgQ4qd4sdh<<;f)6!?Ti+Mi&_9KU@*@{|9r>6=8dJ=4Xezsr6BgBv8W literal 0 HcmV?d00001 diff --git a/source/tools/sced/ui/res/select.bmp b/source/tools/sced/ui/res/select.bmp new file mode 100644 index 0000000000000000000000000000000000000000..92de5445951118169de4852485de010fcf55fa56 GIT binary patch literal 2102 zcmeH_u};G<5Qfi=?VMV*v658o$jH>O4}jE>H|SgRF)9Hoj1?=)bS!Hax`a9EQYi~d zmM(-#nj$2-89_ohDT#gG{b%2=TwPBQ>X-_EOIlqt4}%6!-il9v&1M5hl0Z=uP?jZZ zw>hj*t;cx(B z9$>L}rSCoI6YJ1?)lfrlO;B_({BVsgia9>o}zCkpB zQ!gWr$32pdJ%^n65+fmu)<(MIj7ii(rL`V9<;00qA!DDy8qyDrI8;hWF|s&6>9r1( zXJNYEQBOFCZCu~4t_UOha2lBA!-|Jz#`6QRM(csoyhe{W?7Pi5_Qyfrb+g*;>iph$ i%(z75ooilokjnXA)Xl4xaG3TD8RPAk3Vsy--tr5RoG-z0d(Zuy@0_!<*{X9CQfI)LUaRT|RDk|FdIOH*z;#_DNrEiP;CV4D%ZKm#l)j_) z6Q=n<7``apL(?wM^&6rnq4+@Y6^e3(Z3hT~0C5~6O;gD735Ic}`$&Gb(|Y=tHZX1A zyBiQcDM=a}dr2Bd$nijeRC2CGNm>60u8MQxjksA{*5iv8D)E7{~w4CH8U3V4={Qu~9CFGl#Y%5HhDtac4a1{OSleBCmyhpZa(V`si~E z`kdoIpI)bfW9CP_2ncolbhw!nxSOG)?%e7PkM| zMT>J$IIJ4S5NUcjj)SP^w3#L2n!MKrD%4btN_C7!uNgnP90Xdi_?zD`52C9Vbpif zYx~SQg_-VSbn2m4Jj17(f3oiroV4RJ_7Go#BepRbx)?nVcm@;UHqZ@y_M>CiHgVQ1 zVl<%U#Dk|in0gmo=7qk(Fi7L?(85`yFzVGg96YCf7_e)zjk@sAc1`p=o{ZX)j>SGL z`toelxO`(>KgKcrBHm4hwSzj)Qb0SN9k%&@yf!ybC=^N;!DXS@Z2z8^4ASy>P&F1j zo5TsygM-7vTDe@<5h51+HpPjb1V=~vhqYfSzY01uf1c*G{i7d#eE77nzgcmAVu=~9 z4xT)H{AgE*MoZdX#Qgi|{BMMK{Oz7C8bv8974q+5CiH4Ly*iu&IJ;Rz3sQV&jTQZKSlxxQ4GhA&_@L7!4 ztM-~SrVZ46rD8_&b*3AP{K|xbqJT86U0we~<_%-j*tl^eC@WQC2i0ozp0xAEhH-bp z$bEdp`94Zjm@DlygZ3-8?&h+~xl6(O9~6qWZ;Lx0u1Uet`CCTrqiil|Tnf$?f`wUp zm3TRuo1fQb1=h`c-pH>Sx%b{BUbtqENZh0aah$!7`4673n4KMGYnfzzrh)kHJLk1E zP0OSv@90wcb~cxp*R&<_rOVBU#f@b%nOR6CH7#Y#P3&JSm)=Thi;F2Om6|=^3r(E2 jm|94_R1gbay<7_)OZr^RMNm literal 0 HcmV?d00001 diff --git a/source/tools/sced/ui/res/texturetools.bmp b/source/tools/sced/ui/res/texturetools.bmp new file mode 100644 index 0000000000000000000000000000000000000000..75560efdb185e4a967a4bcccbc453bc0f770422b GIT binary patch literal 2102 zcmeHEJ9yhv6#f-CwQ54FIDyF2BtjUt76rQ{$g(Qx+fa%NlsW{6NDU~2hbb@dDk_0i z6b6qPGrChX`ukWsdi0nvBV)&mp7=O&(ub44!U*TnxkuLjIOkk1UN9sK!$<&(-qgJm zum=p$eaD|buh&B_iqI~ZxRJ>rP#Hqf1Vn8Ot3;;+pE7cr=yr)8XRnJcWv@#$PV(ur zTG%9g)QNylqDO+0ore=TfD1^f1lOl`dKxPYgkcC-mUoA00*a!*Yc^5;eHl%vCB~_1 z9DT^-#W_dRauN9^+Aa_^6-1swxKBx@C;>J4PFRQhx|DR12cvou+}wfVI8doi*Nd?p zVH}Jx$aNV#`X-TwM7WBwoinHwk;i^g6Qi1SpXudRK5pSvKGtDk@IhqoIj>ZV;@SrzxKZJ6 zExojh2I^7BIau7^nkuG<7# z)~T2Dyr!MgUasB4%cfbS2`tMxquY6Hv2c1(%e|PHo}SvZFv`TJkXE-B3c6N!;rQv? z+-xp$r^PeR7E32iu#?X%=!{zDk88Q-kL9G)^xX-DFD#!bQ1hn=o}J4j5=ZwF)Ti=! zE&rI7d-8FD$EDP$o_;++vlASv$Fqmvf=cSSp<2vJ`2%`Ecyzb7D2mzS{2_Sekz=`R zLKJ5RpV_y-kpA$jB4x)VNfeW*v4aMa)56R{N5qMVq?k+|TtJYgrqY=)IXyLz9G4Cu mJUA&##;)n~-w^J#{MUprk!E<{kRk8%7!r>DBOx(