diff --git a/source/lib/res/h_mgr.h b/source/lib/res/h_mgr.h index 2d685cbb57..836726a0bc 100755 --- a/source/lib/res/h_mgr.h +++ b/source/lib/res/h_mgr.h @@ -310,11 +310,16 @@ guide to defining and using resources negative error code otherwise. if this fails, the resource is freed (=> dtor is called!). + note that any subsequent changes to the resource state must be + stored in the control block and 'replayed' when reloading. + example: when uploading a texture, store the upload parameters + (filter, internal format); when reloading, upload again accordingly. + -- dtor: frees all data allocated by init and reload. called after h_free, - or at exit. control block is zeroed afterwards. + or at exit. control block will be zeroed afterwards. static void Type_dtor (Res1* r); { diff --git a/source/lib/res/res.cpp b/source/lib/res/res.cpp index 5f656a45da..1f57f229c1 100755 --- a/source/lib/res/res.cpp +++ b/source/lib/res/res.cpp @@ -1 +1,8 @@ #include "precompiled.h" + +#include "res.h" + +int res_reload(const char* const fn) +{ + return h_reload(fn); +} \ No newline at end of file diff --git a/source/lib/res/res.h b/source/lib/res/res.h index e5209c7a33..28fb6a7050 100755 --- a/source/lib/res/res.h +++ b/source/lib/res/res.h @@ -4,4 +4,6 @@ #include "res/mem.h" #include "res/font.h" #include "res/file.h" -#include "res/zip.h" \ No newline at end of file +#include "res/zip.h" + +extern int res_reload(const char* fn); \ No newline at end of file diff --git a/source/lib/res/tex.cpp b/source/lib/res/tex.cpp index 61834e3d61..b3e2fa6049 100755 --- a/source/lib/res/tex.cpp +++ b/source/lib/res/tex.cpp @@ -59,7 +59,8 @@ struct Tex Handle hm; // H_MEM handle to loaded file uint id; -bool uploaded; + int filter; + int int_fmt; }; H_TYPE_DEFINE(Tex) @@ -689,120 +690,9 @@ static void Tex_dtor(Tex* t) } -// HACK HACK -static int tex_upload_t(Tex* t, int filter, int int_fmt); -// TEX output param is invalid if function fails -static int Tex_reload(Tex* t, const char* fn) +static int tex_upload(Tex* t, const char* const fn) { - printf("Tex_reload for %s.\n", fn); - // load file - void* _p = 0; - size_t size; - Handle hm = vfs_load(fn, _p, size); - if(hm <= 0) - return (int)hm; - // guarantee *_valid routines 4 header bytes - if(size < 4) - { - mem_free_h(hm); - return -1; - } - t->hm = hm; - - int err = -1; - - // more convenient to pass loaders u8 - less casting - const u8* p = (const u8*)_p; - -#ifndef NO_DDS - if(dds_valid(p, size)) - err = dds_load(fn, p, size, t); else -#endif -#ifndef NO_PNG - if(png_valid(p, size)) - err = png_load(fn, p, size, t); else -#endif -#ifndef NO_JP2 - if(jp2_valid(p, size)) - err = jp2_load(fn, p, size, t); else -#endif -#ifndef NO_BMP - if(bmp_valid(p, size)) - err = bmp_load(fn, p, size, t); else -#endif -#ifndef NO_TGA - if(tga_valid(p, size)) - err = tga_load(fn, p, size, t); else -#endif -#ifndef NO_RAW - if(raw_valid(p, size)) - err = raw_load(fn, p, size, t); else -#endif - ; // make sure else chain is ended - - if(err < 0) - { - mem_free_h(hm); - return err; - } - - // loaders weren't able to determine type - if(t->fmt == FMT_UNKNOWN) - { - assert(t->bpp == 8); - t->fmt = GL_ALPHA; - // TODO: check file name, go to 32 bit if wrong - } - - - uint id; - glGenTextures(1, &id); - t->id = id; - // this can't realistically fail, just note that the already_loaded - // check above assumes (id > 0) <==> texture is loaded and valid - -if(t->uploaded) -tex_upload_t(t, 0,0); - - return 0; -} - - -Handle tex_load(const char* const fn, int scope) -{ - return h_alloc(H_Tex, fn, scope); -} - - -int tex_bind(const Handle h) -{ - Tex* t = H_USER_DATA(h, Tex); - if(!t) - { - glBindTexture(GL_TEXTURE_2D, 0); - return ERR_INVALID_HANDLE; - } - -#ifndef NDEBUG - if(!t->id) - { - debug_warn("tex_bind: Tex.id is not a valid texture"); - return -1; - } -#endif - - glBindTexture(GL_TEXTURE_2D, t->id); - return 0; -} - - -int tex_filter = GL_LINEAR; -uint tex_bpp = 32; // 16 or 32 - -static int tex_upload_t(Tex* t, int filter, int int_fmt) -{ -t->uploaded = true; // data we will take from Tex GLsizei w; @@ -810,6 +700,8 @@ t->uploaded = true; GLenum fmt; void* tex_data; u32 bpp; // not used directly in gl calls + int filter; + int int_fmt; const char* err = 0; @@ -855,16 +747,13 @@ t->uploaded = true; if(bpp % 4 || bpp > 32) err = "invalid bpp? should be one of {4,8,16,24,32}"; + // upload parameters, set by tex_upload(Handle), or 0 + filter = t->filter; + int_fmt = t->int_fmt; + if(err) { -/* const char* fn = h_filename(ht); - if(!fn) - { - fn = "(could not determine filename)"; - assert(0); - } debug_out("tex_upload: %s: %s\n", fn, err); -*/ debug_warn("tex_upload failed"); return -1; } @@ -987,13 +876,135 @@ glBindTexture(GL_TEXTURE_2D, t->id); mem_free_h(t->hm); + t->filter = filter; + t->int_fmt = int_fmt; + return 0; } +// TEX output param is invalid if function fails +static int Tex_reload(Tex* t, const char* fn) +{ + printf("Tex_reload for %s.\n", fn); + // load file + void* _p = 0; + size_t size; + Handle hm = vfs_load(fn, _p, size); + if(hm <= 0) + return (int)hm; + // guarantee *_valid routines 4 header bytes + if(size < 4) + { + mem_free_h(hm); + return -1; + } + t->hm = hm; + + int err = -1; + + // more convenient to pass loaders u8 - less casting + const u8* p = (const u8*)_p; + +#ifndef NO_DDS + if(dds_valid(p, size)) + err = dds_load(fn, p, size, t); else +#endif +#ifndef NO_PNG + if(png_valid(p, size)) + err = png_load(fn, p, size, t); else +#endif +#ifndef NO_JP2 + if(jp2_valid(p, size)) + err = jp2_load(fn, p, size, t); else +#endif +#ifndef NO_BMP + if(bmp_valid(p, size)) + err = bmp_load(fn, p, size, t); else +#endif +#ifndef NO_TGA + if(tga_valid(p, size)) + err = tga_load(fn, p, size, t); else +#endif +#ifndef NO_RAW + if(raw_valid(p, size)) + err = raw_load(fn, p, size, t); else +#endif + ; // make sure else chain is ended + + if(err < 0) + { + mem_free_h(hm); + return err; + } + + // loaders weren't able to determine type + if(t->fmt == FMT_UNKNOWN) + { + assert(t->bpp == 8); + t->fmt = GL_ALPHA; + // TODO: check file name, go to 32 bit if wrong + } + + + uint id; + glGenTextures(1, &id); + t->id = id; + // this can't realistically fail, just note that the already_loaded + // check above assumes (id > 0) <==> texture is loaded and valid + + // was already uploaded once + if(t->int_fmt) + tex_upload(t, fn); + + return 0; +} + + +Handle tex_load(const char* const fn, int scope) +{ + return h_alloc(H_Tex, fn, scope); +} + + +int tex_bind(const Handle h) +{ + Tex* t = H_USER_DATA(h, Tex); + if(!t) + { + glBindTexture(GL_TEXTURE_2D, 0); + return ERR_INVALID_HANDLE; + } + +#ifndef NDEBUG + if(!t->id) + { + debug_warn("tex_bind: Tex.id is not a valid texture"); + return -1; + } +#endif + + glBindTexture(GL_TEXTURE_2D, t->id); + return 0; +} + + +int tex_filter = GL_LINEAR; +uint tex_bpp = 32; // 16 or 32 + int tex_upload(const Handle ht, int filter, int int_fmt) { H_DEREF(ht, Tex, t); - return tex_upload_t(t, filter, int_fmt); + t->filter = filter; + t->int_fmt = int_fmt; + + const char* fn = h_filename(ht); + if(!fn) + { + fn = "(could not determine filename)"; + debug_warn("tex_upload(Handle): h_filename failed"); + } + + return tex_upload(t, fn); } @@ -1003,7 +1014,7 @@ int tex_free(Handle& ht) } -int tex_info(Handle ht, int* w, int* h, int *fmt, int *bpp, void** p) +int tex_info(Handle ht, int* w, int* h, int* fmt, int* bpp, void** p) { H_DEREF(ht, Tex, t); @@ -1011,9 +1022,9 @@ int tex_info(Handle ht, int* w, int* h, int *fmt, int *bpp, void** p) *w = t->w; if(h) *h = t->h; - if (fmt) + if(fmt) *fmt = t->fmt; - if (bpp) + if(bpp) *bpp = t->bpp; if(p) *p = mem_get_ptr(t->hm); diff --git a/source/lib/res/vfs.cpp b/source/lib/res/vfs.cpp index 45b97ac42d..8f18e8d00b 100755 --- a/source/lib/res/vfs.cpp +++ b/source/lib/res/vfs.cpp @@ -71,8 +71,9 @@ // path types: // fn : filename only, no path at all. // f_* : path intended directly for underlying file layer. -// component separator is '/'; no ':' or '\\' allowed. +// component separator is '/'; no absolute paths, or ':', '\\' allowed. // * : as above, but path within the VFS. +// "" is root dir; no absolute path allowed. // path1 and path2 may be empty, filenames, or full paths. @@ -321,15 +322,17 @@ enum LookupFlags }; -static int tree_lookup(const char* vfs_path, const Loc** const loc = 0, VDir** const dir = 0, LookupFlags flags = LF_DEFAULT) +// starts in VFS root directory (path = ""). +// path doesn't need to, and shouldn't, start with '/'. +static int tree_lookup(const char* path, const Loc** const loc = 0, VDir** const dir = 0, LookupFlags flags = LF_DEFAULT) { - CHECK_PATH(vfs_path); + CHECK_PATH(path); // copy into (writeable) buffer so we can 'tokenize' path components // by replacing '/' with '\0'. // note: CHECK_PATH does length checking char buf[VFS_MAX_PATH]; - strcpy(buf, vfs_path); + strcpy(buf, path); const char* cur_component = buf; const bool create_missing_components = flags & LF_CREATE_MISSING_COMPONENTS; @@ -715,12 +718,6 @@ int vfs_unmount(const char* name) // and unmounts those when needed. -int vfs_reload(const char* fn) -{ - return h_reload(fn); -} - - int vfs_realpath(const char* fn, char* full_path) { const Loc* loc; diff --git a/source/lib/res/vfs.h b/source/lib/res/vfs.h index eed9432f0a..e3ef6de79a 100755 --- a/source/lib/res/vfs.h +++ b/source/lib/res/vfs.h @@ -44,7 +44,6 @@ extern int vfs_close(Handle& h); extern Handle vfs_map(Handle hf, uint flags, void*& p, size_t& size); -extern int vfs_reload(const char* fn); extern int vfs_rebuild(); diff --git a/source/main.cpp b/source/main.cpp index 566b1ca42a..383fb9bfc2 100755 --- a/source/main.cpp +++ b/source/main.cpp @@ -128,7 +128,7 @@ static bool handler(const SDL_Event& ev) case '1': case SDLK_F1: - vfs_reload("art/textures/terrain/types/grass/Base1.tga"); + res_reload("art/textures/terrain/types/grass/Base1.tga"); break; } break; diff --git a/source/vc6/ps.dsp b/source/vc6/ps.dsp deleted file mode 100755 index 48c172509f..0000000000 --- a/source/vc6/ps.dsp +++ /dev/null @@ -1,794 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ps" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=ps - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "ps.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ps.mak" CFG="ps - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ps - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "ps - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "ps - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\lib" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "NO_GUI" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x407 /d "NDEBUG" -# ADD RSC /l 0x407 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /entry:"entry" /subsystem:windows /pdb:"..\..\binaries/ps.vc6.pdb" /machine:I386 /out:"..\..\binaries\ps.vc6.exe" -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "ps - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\lib" /I "..\ps" /I ".." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x407 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib /nologo /entry:"entry" /subsystem:windows /pdb:"..\..\binaries/ps_dbg.vc6.pdb" /debug /machine:I386 /out:"..\..\binaries\ps_dbg.vc6.exe" /pdbtype:sept -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "ps - Win32 Release" -# Name "ps - Win32 Debug" -# Begin Group "terrain" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\terrain\AlphaMapCalculator.cpp -# End Source File -# Begin Source File - -SOURCE=..\terrain\AlphaMapCalculator.h -# End Source File -# Begin Source File - -SOURCE=..\terrain\Bound.cpp -# End Source File -# Begin Source File - -SOURCE=..\terrain\Bound.h -# End Source File -# Begin Source File - -SOURCE=..\terrain\Camera.cpp -# End Source File -# Begin Source File - -SOURCE=..\terrain\Camera.h -# End Source File -# Begin Source File - -SOURCE=..\terrain\Frustum.cpp -# End Source File -# Begin Source File - -SOURCE=..\terrain\Frustum.h -# End Source File -# Begin Source File - -SOURCE=..\terrain\LightEnv.h -# End Source File -# Begin Source File - -SOURCE=..\terrain\MathUtil.h -# End Source File -# Begin Source File - -SOURCE=..\terrain\Matrix3D.cpp -# End Source File -# Begin Source File - -SOURCE=..\terrain\Matrix3D.h -# End Source File -# Begin Source File - -SOURCE=..\terrain\MiniPatch.cpp -# End Source File -# Begin Source File - -SOURCE=..\terrain\MiniPatch.h -# End Source File -# Begin Source File - -SOURCE=..\terrain\Model.cpp -# End Source File -# Begin Source File - -SOURCE=..\terrain\Model.h -# End Source File -# Begin Source File - -SOURCE=..\terrain\ModelDef.cpp -# End Source File -# Begin Source File - -SOURCE=..\terrain\ModelDef.h -# End Source File -# Begin Source File - -SOURCE=..\terrain\ModelFile.cpp -# End Source File -# Begin Source File - -SOURCE=..\terrain\ModelFile.h -# End Source File -# Begin Source File - -SOURCE=..\terrain\ModelRData.cpp -# End Source File -# Begin Source File - -SOURCE=..\terrain\ModelRData.h -# End Source File -# Begin Source File - -SOURCE=..\terrain\Patch.cpp -# End Source File -# Begin Source File - -SOURCE=..\terrain\Patch.h -# End Source File -# Begin Source File - -SOURCE=..\terrain\PatchRData.cpp -# End Source File -# Begin Source File - -SOURCE=..\terrain\PatchRData.h -# End Source File -# Begin Source File - -SOURCE=..\terrain\Plane.cpp -# End Source File -# Begin Source File - -SOURCE=..\terrain\Plane.h -# End Source File -# Begin Source File - -SOURCE=..\terrain\Quaternion.cpp -# End Source File -# Begin Source File - -SOURCE=..\terrain\Quaternion.h -# End Source File -# Begin Source File - -SOURCE=..\terrain\Renderer.cpp -# End Source File -# Begin Source File - -SOURCE=..\terrain\Renderer.h -# End Source File -# Begin Source File - -SOURCE=..\terrain\SHCoeffs.cpp -# End Source File -# Begin Source File - -SOURCE=..\terrain\SHCoeffs.h -# End Source File -# Begin Source File - -SOURCE=..\terrain\Terrain.cpp -# End Source File -# Begin Source File - -SOURCE=..\terrain\Terrain.h -# End Source File -# Begin Source File - -SOURCE=..\terrain\terrainMain.cpp -# End Source File -# Begin Source File - -SOURCE=..\terrain\TerrGlobals.h -# End Source File -# Begin Source File - -SOURCE=..\terrain\Texture.h -# End Source File -# Begin Source File - -SOURCE=..\terrain\TextureManager.cpp -# End Source File -# Begin Source File - -SOURCE=..\terrain\TextureManager.h -# End Source File -# Begin Source File - -SOURCE=..\terrain\TransparencyRenderer.cpp -# End Source File -# Begin Source File - -SOURCE=..\terrain\TransparencyRenderer.h -# End Source File -# Begin Source File - -SOURCE=..\terrain\Types.h -# End Source File -# Begin Source File - -SOURCE=..\terrain\Vector3D.cpp -# End Source File -# Begin Source File - -SOURCE=..\terrain\Vector3D.h -# End Source File -# Begin Source File - -SOURCE=..\terrain\Vector4D.h -# End Source File -# End Group -# Begin Group "gui" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\gui\CButton.cpp -# End Source File -# Begin Source File - -SOURCE=..\gui\CButton.h -# End Source File -# Begin Source File - -SOURCE=..\gui\CGUI.cpp -# End Source File -# Begin Source File - -SOURCE=..\gui\CGUI.h -# End Source File -# Begin Source File - -SOURCE=..\gui\CGUIScrollBarStyle.cpp -# End Source File -# Begin Source File - -SOURCE=..\gui\CGUIScrollBarStyle.h -# End Source File -# Begin Source File - -SOURCE=..\gui\CGUIScrollBarVertical.cpp -# End Source File -# Begin Source File - -SOURCE=..\gui\CGUIScrollBarVertical.h -# End Source File -# Begin Source File - -SOURCE=..\gui\CGUISprite.cpp -# End Source File -# Begin Source File - -SOURCE=..\gui\CGUISprite.h -# End Source File -# Begin Source File - -SOURCE=..\gui\CText.cpp -# End Source File -# Begin Source File - -SOURCE=..\gui\CText.h -# End Source File -# Begin Source File - -SOURCE=..\gui\GUI.h -# End Source File -# Begin Source File - -SOURCE=..\gui\GUIbase.cpp -# End Source File -# Begin Source File - -SOURCE=..\gui\GUIbase.h -# End Source File -# Begin Source File - -SOURCE=..\gui\GUIutil.cpp -# End Source File -# Begin Source File - -SOURCE=..\gui\GUIutil.h -# End Source File -# Begin Source File - -SOURCE=..\gui\IGUIButtonBehavior.cpp -# End Source File -# Begin Source File - -SOURCE=..\gui\IGUIButtonBehavior.h -# End Source File -# Begin Source File - -SOURCE=..\gui\IGUIObject.cpp -# End Source File -# Begin Source File - -SOURCE=..\gui\IGUIObject.h -# End Source File -# Begin Source File - -SOURCE=..\gui\IGUIScrollBar.cpp -# End Source File -# Begin Source File - -SOURCE=..\gui\IGUIScrollBar.h -# End Source File -# Begin Source File - -SOURCE=..\gui\IGUIScrollBarOwner.cpp -# End Source File -# Begin Source File - -SOURCE=..\gui\IGUIScrollBarOwner.h -# End Source File -# Begin Source File - -SOURCE=..\gui\IGUISettingsObject.cpp -# End Source File -# Begin Source File - -SOURCE=..\gui\IGUISettingsObject.h -# End Source File -# End Group -# Begin Group "lib" - -# PROP Default_Filter "" -# Begin Group "sysdep" - -# PROP Default_Filter "" -# Begin Group "win" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\lib\sysdep\win\hrt.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\sysdep\win\hrt.h -# End Source File -# Begin Source File - -SOURCE=..\lib\sysdep\win\waio.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\sysdep\win\waio.h -# End Source File -# Begin Source File - -SOURCE=..\lib\sysdep\win\wdetect.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\sysdep\win\win.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\sysdep\win\win.h -# End Source File -# Begin Source File - -SOURCE=..\lib\sysdep\win\win_internal.h -# End Source File -# Begin Source File - -SOURCE=..\lib\sysdep\win\wposix.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\sysdep\win\wposix.h -# End Source File -# Begin Source File - -SOURCE=..\lib\sysdep\win\wsdl.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\sysdep\win\wsdl.h -# End Source File -# End Group -# Begin Source File - -SOURCE=..\lib\sysdep\ia32.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\sysdep\ia32.h -# End Source File -# Begin Source File - -SOURCE=..\lib\sysdep\sysdep.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\sysdep\sysdep.h -# End Source File -# Begin Source File - -SOURCE=..\lib\sysdep\x.cpp -# End Source File -# End Group -# Begin Group "res" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\lib\res\file.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\res\file.h -# End Source File -# Begin Source File - -SOURCE=..\lib\res\font.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\res\font.h -# End Source File -# Begin Source File - -SOURCE=..\lib\res\h_mgr.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\res\h_mgr.h -# End Source File -# Begin Source File - -SOURCE=..\lib\res\mem.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\res\mem.h -# End Source File -# Begin Source File - -SOURCE=..\lib\res\res.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\res\res.h -# End Source File -# Begin Source File - -SOURCE=..\lib\res\tex.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\res\tex.h -# End Source File -# Begin Source File - -SOURCE=..\lib\res\vfs.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\res\vfs.h -# End Source File -# Begin Source File - -SOURCE=..\lib\res\zip.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\res\zip.h -# End Source File -# End Group -# Begin Source File - -SOURCE=..\lib\adts.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\adts.h -# End Source File -# Begin Source File - -SOURCE=..\lib\config.h -# End Source File -# Begin Source File - -SOURCE=..\lib\detect.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\detect.h -# End Source File -# Begin Source File - -SOURCE=..\lib\glext_funcs.h -# End Source File -# Begin Source File - -SOURCE=..\lib\input.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\input.h -# End Source File -# Begin Source File - -SOURCE=..\lib\lib.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\lib.h -# End Source File -# Begin Source File - -SOURCE=..\lib\memcpy.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\misc.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\misc.h -# End Source File -# Begin Source File - -SOURCE=..\lib\ogl.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\ogl.h -# End Source File -# Begin Source File - -SOURCE=..\lib\posix.h -# End Source File -# Begin Source File - -SOURCE=..\lib\sdl.h -# End Source File -# Begin Source File - -SOURCE=..\lib\timer.cpp -# End Source File -# Begin Source File - -SOURCE=..\lib\timer.h -# End Source File -# Begin Source File - -SOURCE=..\lib\types.h -# End Source File -# End Group -# Begin Group "ps" - -# PROP Default_Filter "" -# Begin Group "Network" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\ps\Network\AllNetMessages.h -# End Source File -# Begin Source File - -SOURCE=..\ps\Network\NetMessage.cpp -# End Source File -# Begin Source File - -SOURCE=..\ps\Network\NetMessage.h -# End Source File -# Begin Source File - -SOURCE=..\ps\Network\Network.cpp -# End Source File -# Begin Source File - -SOURCE=..\ps\Network\Network.h -# End Source File -# Begin Source File - -SOURCE=..\ps\Network\NetworkInternal.h -# End Source File -# Begin Source File - -SOURCE=..\ps\Network\NMTCreator.h -# End Source File -# Begin Source File - -SOURCE=..\ps\Network\Serialization.h -# End Source File -# Begin Source File - -SOURCE=..\ps\Network\ServerSocket.cpp -# End Source File -# Begin Source File - -SOURCE=..\ps\Network\SocketBase.cpp -# End Source File -# Begin Source File - -SOURCE=..\ps\Network\SocketBase.h -# End Source File -# Begin Source File - -SOURCE=..\ps\Network\StreamSocket.cpp -# End Source File -# Begin Source File - -SOURCE=..\ps\Network\StreamSocket.h -# End Source File -# End Group -# Begin Source File - -SOURCE=..\ps\BaseEntity.h -# End Source File -# Begin Source File - -SOURCE=..\ps\CLogger.cpp -# End Source File -# Begin Source File - -SOURCE=..\ps\CLogger.h -# End Source File -# Begin Source File - -SOURCE=..\ps\Config.cpp -# End Source File -# Begin Source File - -SOURCE=..\ps\Config.h -# End Source File -# Begin Source File - -SOURCE=..\ps\CStr.cpp -# End Source File -# Begin Source File - -SOURCE=..\ps\CStr.h -# End Source File -# Begin Source File - -SOURCE=..\ps\Encryption.cpp -# End Source File -# Begin Source File - -SOURCE=..\ps\Encryption.h -# End Source File -# Begin Source File - -SOURCE=..\ps\Entity.cpp -# End Source File -# Begin Source File - -SOURCE=..\ps\Entity.h -# End Source File -# Begin Source File - -SOURCE=..\ps\Error.h -# End Source File -# Begin Source File - -SOURCE=..\ps\Event.cpp -# End Source File -# Begin Source File - -SOURCE=..\ps\Event.h -# End Source File -# Begin Source File - -SOURCE=..\ps\LogFile.cpp -# End Source File -# Begin Source File - -SOURCE=..\ps\LogFile.h -# End Source File -# Begin Source File - -SOURCE=..\ps\MathUtil.cpp -# End Source File -# Begin Source File - -SOURCE=..\ps\MathUtil.h -# End Source File -# Begin Source File - -SOURCE=..\ps\Parser.cpp -# End Source File -# Begin Source File - -SOURCE=..\ps\Parser.h -# End Source File -# Begin Source File - -SOURCE=..\ps\Prometheus.cpp -# End Source File -# Begin Source File - -SOURCE=..\ps\Prometheus.h -# End Source File -# Begin Source File - -SOURCE=..\ps\Singleton.h -# End Source File -# Begin Source File - -SOURCE=..\ps\Sound.h -# End Source File -# Begin Source File - -SOURCE=..\ps\XercesErrorHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\ps\XercesErrorHandler.h -# End Source File -# End Group -# Begin Source File - -SOURCE=..\main.cpp -# End Source File -# End Target -# End Project diff --git a/source/vc6/ps.dsw b/source/vc6/ps.dsw deleted file mode 100755 index 28df2c0fff..0000000000 --- a/source/vc6/ps.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "ps"=.\ps.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/source/vc6/readme.txt b/source/vc6/readme.txt deleted file mode 100755 index 7a43a2866d..0000000000 --- a/source/vc6/readme.txt +++ /dev/null @@ -1,25 +0,0 @@ -VC6 workspace: - -TODO: - -- get latest glext.h: - download from http://oss.sgi.com/projects/ogl-sample/ABI/glext.h ; - put it in GL subdir of compiler's include dir - -- install ZLib: - download from http://www.stud.uni-karlsruhe.de/~urkt/zlib.zip ; - put the DLL in binaries\, put header and lib into compiler dirs - Note: this is version 1.1.4.8751 - -- omit GUI (not necessary ATM) - remove its folder, and define NO_GUI -OR -- install Xerces: - download Xerces binary from http://xml.apache.org/xerces-c/download.cgi ; - put the DLL in binaries\, put include\ contents into compiler include dir - - -NOTE: important workspace settings (already set) - -- code generation = multithreaded [debug] -- entry point = entry -- add lib\ to include path \ No newline at end of file diff --git a/source/vc7/readme.txt b/source/vc7/readme.txt deleted file mode 100755 index 692de59849..0000000000 --- a/source/vc7/readme.txt +++ /dev/null @@ -1,25 +0,0 @@ -VC7.0 (2002) workspace (auto-converted from VC7.1) - -TODO: - -- get latest glext.h: - download from http://oss.sgi.com/projects/ogl-sample/ABI/glext.h ; - put it in GL subdir of compiler's include dir - -- install ZLib: - download from http://www.stud.uni-karlsruhe.de/~urkt/zlib.zip ; - put the DLL in binaries\, put header and lib into compiler dirs - Note: this is version 1.1.4.8751 - -- omit GUI (not necessary ATM) - remove its folder, and define NO_GUI -OR -- install Xerces: - download Xerces binary from http://xml.apache.org/xerces-c/download.cgi ; - put the DLL in binaries\, put include\ contents into compiler include dir - - -NOTE: important workspace settings (already set) - -- code generation = multithreaded [debug] -- entry point = entry -- add lib\ to include path \ No newline at end of file diff --git a/source/vc7/vc7.sln b/source/vc7/vc7.sln deleted file mode 100755 index 4c4c3a5513..0000000000 --- a/source/vc7/vc7.sln +++ /dev/null @@ -1,21 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 7.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vc7", "vc7.vcproj", "{BEBCC605-46F3-4927-BDC4-1E5F739A2A4F}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {BEBCC605-46F3-4927-BDC4-1E5F739A2A4F}.Debug.ActiveCfg = Debug|Win32 - {BEBCC605-46F3-4927-BDC4-1E5F739A2A4F}.Debug.Build.0 = Debug|Win32 - {BEBCC605-46F3-4927-BDC4-1E5F739A2A4F}.Release.ActiveCfg = Release|Win32 - {BEBCC605-46F3-4927-BDC4-1E5F739A2A4F}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/source/vc7/vc7.vcproj b/source/vc7/vc7.vcproj deleted file mode 100755 index 0a46c30113..0000000000 --- a/source/vc7/vc7.vcproj +++ /dev/null @@ -1,782 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -