From: <mg...@us...> - 2008-08-14 05:36:42
|
Revision: 2043 http://planeshift.svn.sourceforge.net/planeshift/?rev=2043&view=rev Author: mgist Date: 2008-08-14 05:36:51 +0000 (Thu, 14 Aug 2008) Log Message: ----------- - Fixed version print. Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2008-08-12 03:38:14 UTC (rev 2042) +++ trunk/src/client/psengine.cpp 2008-08-14 05:36:51 UTC (rev 2043) @@ -40,7 +40,7 @@ ////////////////////////////////////////////////////////////////////////////// -#define APPNAME "PlaneShift Steel Blue (0.4.00)" +#define APPNAME "PlaneShift Steel Blue (0.4.01)" #define CONFIGFILENAME "/planeshift/userdata/planeshift.cfg" #define PSAPP "planeshift.application.client" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-08-15 11:39:40
|
Revision: 2059 http://planeshift.svn.sourceforge.net/planeshift/?rev=2059&view=rev Author: mgist Date: 2008-08-15 11:39:49 +0000 (Fri, 15 Aug 2008) Log Message: ----------- - Fix for name change. Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2008-08-15 11:25:58 UTC (rev 2058) +++ trunk/src/client/psengine.cpp 2008-08-15 11:39:49 UTC (rev 2059) @@ -1567,7 +1567,7 @@ for (size_t i=0; i < files2->GetSize(); i++) { csString localName= files2->Get(i); - if (localName.Slice(localName.Length()-4,4) != ".spr") + if (localName.Slice(localName.Length()-4,4) != ".meshfact") continue; modelnames.Push(localName); @@ -1576,7 +1576,7 @@ continue; } - if (filename.Slice(filename.Length()-4,4) != ".spr") + if (filename.Slice(filename.Length()-4,4) != ".meshfact") continue; modelnames.Push(filename); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-08-15 11:45:08
|
Revision: 2060 http://planeshift.svn.sourceforge.net/planeshift/?rev=2060&view=rev Author: mgist Date: 2008-08-15 11:45:17 +0000 (Fri, 15 Aug 2008) Log Message: ----------- - Fix for name change. Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2008-08-15 11:39:49 UTC (rev 2059) +++ trunk/src/client/psengine.cpp 2008-08-15 11:45:17 UTC (rev 2060) @@ -1567,7 +1567,7 @@ for (size_t i=0; i < files2->GetSize(); i++) { csString localName= files2->Get(i); - if (localName.Slice(localName.Length()-4,4) != ".meshfact") + if (localName.Slice(localName.Length()-9,9) != ".meshfact") continue; modelnames.Push(localName); @@ -1576,7 +1576,7 @@ continue; } - if (filename.Slice(filename.Length()-4,4) != ".meshfact") + if (filename.Slice(filename.Length()-9,9) != ".meshfact") continue; modelnames.Push(filename); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-02-24 11:22:00
|
Revision: 3107 http://planeshift.svn.sourceforge.net/planeshift/?rev=3107&view=rev Author: weltall2 Date: 2009-02-24 11:21:57 +0000 (Tue, 24 Feb 2009) Log Message: ----------- added a sleep in the main thread in order to not run it as fast as possible eating all the cpu if no drawing is being done Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2009-02-24 07:44:09 UTC (rev 3106) +++ trunk/src/client/psengine.cpp 2009-02-24 11:21:57 UTC (rev 3107) @@ -903,6 +903,11 @@ } } } + else + { + csSleep(150); //TODO: Find out a better way to handle this, like + // a condition. + } return false; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Ven...@us...> - 2009-03-12 03:53:47
|
Revision: 3189 http://planeshift.svn.sourceforge.net/planeshift/?rev=3189&view=rev Author: Vengeance2001 Date: 2009-03-12 03:53:45 +0000 (Thu, 12 Mar 2009) Log Message: ----------- Changed sleep call to use FrameLimit for consistency. Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2009-03-12 00:42:37 UTC (rev 3188) +++ trunk/src/client/psengine.cpp 2009-03-12 03:53:45 UTC (rev 3189) @@ -905,8 +905,9 @@ } else { - csSleep(150); //TODO: Find out a better way to handle this, like - // a condition. + // Sleep for a bit but don't draw anything if minimized + FrameLimit(); + return true; } return false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-03-21 15:33:48
|
Revision: 3266 http://planeshift.svn.sourceforge.net/planeshift/?rev=3266&view=rev Author: mgist Date: 2009-03-21 15:33:39 +0000 (Sat, 21 Mar 2009) Log Message: ----------- - Perform precache immediately on single-core systems. Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2009-03-21 13:16:50 UTC (rev 3265) +++ trunk/src/client/psengine.cpp 2009-03-21 15:33:39 UTC (rev 3266) @@ -532,6 +532,7 @@ { threadedWorldLoading = csString("Threaded").Compare(psengine->GetConfig()->GetStr("PlaneShift.Loading.WorldLoad", "NThreaded")); loader = new Loader(); + csRef<iThreadManager> tm = csQueryRegistry<iThreadManager>(object_reg); Loader::GetSingleton().Init(object_reg, gfxFeatures, 200); // Fill the loader cache. @@ -544,7 +545,14 @@ csString file = files->Get(j); if(file.Find(".cal3d", file.Length()-7) != size_t(-1)) { - modelPrecaches.Push(Loader::GetSingleton().PrecacheData(files->Get(j), false)); + if(tm->GetThreadCount() == 1) + { + Loader::GetSingleton().PrecacheDataWait(files->Get(j), false); + } + else + { + modelPrecaches.Push(Loader::GetSingleton().PrecacheData(files->Get(j), false)); + } } } } @@ -558,12 +566,18 @@ csString file = files->Get(j); if(file.Find(".meshfact", file.Length()-10) != size_t(-1)) { - modelPrecaches.Push(Loader::GetSingleton().PrecacheData(files->Get(j), false)); + if(tm->GetThreadCount() == 1) + { + Loader::GetSingleton().PrecacheDataWait(files->Get(j), false); + } + else + { + modelPrecaches.Push(Loader::GetSingleton().PrecacheData(files->Get(j), false)); + } } } } - csRef<iThreadManager> tm = csQueryRegistry<iThreadManager>(object_reg); if(threadedWorldLoading) { csString path; @@ -578,7 +592,14 @@ path.AppendFmt("%s, ", tmp->GetData()); csString vpath(maps->Get(i)); vpath.Append("/world"); - mapPrecaches.Push(Loader::GetSingleton().PrecacheData(vpath.GetData(), false)); + if(tm->GetThreadCount() == 1) + { + Loader::GetSingleton().PrecacheDataWait(vpath.GetData(), false); + } + else + { + mapPrecaches.Push(Loader::GetSingleton().PrecacheData(vpath.GetData(), false)); + } } } tm->Wait(mapPrecaches); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-03-21 15:54:35
|
Revision: 3268 http://planeshift.svn.sourceforge.net/planeshift/?rev=3268&view=rev Author: mgist Date: 2009-03-21 15:54:30 +0000 (Sat, 21 Mar 2009) Log Message: ----------- - Remove incorrect check. Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2009-03-21 15:44:16 UTC (rev 3267) +++ trunk/src/client/psengine.cpp 2009-03-21 15:54:30 UTC (rev 3268) @@ -424,17 +424,14 @@ // This could be a file or a dir csString slash(CS_PATH_SEPARATOR); - if(!vfs->Exists(skinPath)) + if(vfs->Exists(skinPath + slash)) { - if(vfs->Exists(skinPath + slash)) - { - skinPath += slash; - } - else if(vfs->Exists(skinPath + ".zip")) - { - skinPath += ".zip"; - } + skinPath += slash; } + else if(vfs->Exists(skinPath + ".zip")) + { + skinPath += ".zip"; + } // Create the PAWS window manager This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-04-12 14:26:31
|
Revision: 3439 http://planeshift.svn.sourceforge.net/planeshift/?rev=3439&view=rev Author: mgist Date: 2009-04-12 14:26:28 +0000 (Sun, 12 Apr 2009) Log Message: ----------- - Added VC handler for pure virtual function calls. Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2009-04-11 18:18:36 UTC (rev 3438) +++ trunk/src/client/psengine.cpp 2009-04-12 14:26:28 UTC (rev 3439) @@ -1847,19 +1847,30 @@ // ---------------------------------------------------------------------------- /** - * + * pureCallHandler() + * Handles all Pure Virtual Function calls for MSVC. + */ +#ifdef CS_COMPILER_MSVC +void pureCallHandler() +{ + CS::Debug::AssertMessage("false", __FILE__, __LINE__, "Pure Virtual Function Call!\n"); +} +#endif + +/** * main() * Main function. Like any other applications, this is the entry point of the * program. The SysSystemDriver is created and initialized here. It also * creates psEngine and initialize it. Then it calls the main loop. - * **/ psEngine * psengine; - int main (int argc, char *argv[]) { +#ifdef CS_COMPILER_MSVC + _set_purecall_handler(pureCallHandler); +#endif psCSSetup* CSSetup = new psCSSetup( argc, argv, "/this/psclient.cfg", CONFIGFILENAME ); iObjectRegistry* object_reg = CSSetup->InitCS(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-05-12 01:08:00
|
Revision: 3668 http://planeshift.svn.sourceforge.net/planeshift/?rev=3668&view=rev Author: mgist Date: 2009-05-12 01:07:47 +0000 (Tue, 12 May 2009) Log Message: ----------- - Set correct BeginDraw flag. Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2009-05-11 15:39:47 UTC (rev 3667) +++ trunk/src/client/psengine.cpp 2009-05-12 01:07:47 UTC (rev 3668) @@ -963,6 +963,7 @@ { if(camera) { + g3d->BeginDraw(CSDRAW_3DGRAPHICS); camera->Draw(); return true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-05-22 07:22:10
|
Revision: 3755 http://planeshift.svn.sourceforge.net/planeshift/?rev=3755&view=rev Author: mgist Date: 2009-05-22 07:22:01 +0000 (Fri, 22 May 2009) Log Message: ----------- - Fixed crash on exit. Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2009-05-21 19:07:08 UTC (rev 3754) +++ trunk/src/client/psengine.cpp 2009-05-22 07:22:01 UTC (rev 3755) @@ -296,7 +296,6 @@ delete mouseBinds; delete guiHandler; delete inventoryCache; - delete loader; // celclient needs to be destroyed before the effectmanager. celclient.Invalidate(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-06-18 15:06:19
|
Revision: 3848 http://planeshift.svn.sourceforge.net/planeshift/?rev=3848&view=rev Author: mgist Date: 2009-06-18 15:06:15 +0000 (Thu, 18 Jun 2009) Log Message: ----------- - Fixed loader only parsing world meshes when background world loading is enabled. It needs to always parse them, to make them available for use as items. Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2009-06-18 07:53:12 UTC (rev 3847) +++ trunk/src/client/psengine.cpp 2009-06-18 15:06:15 UTC (rev 3848) @@ -606,40 +606,37 @@ } } - if(threadedWorldLoading) - { - csRef<iStringArray> maps = vfs->FindFiles("/planeshift/world/"); + csRef<iStringArray> maps = vfs->FindFiles("/planeshift/world/"); - // Do the _common maps first. - for(size_t i=0; i<maps->GetSize(); ++i) + // Do the _common maps first. + for(size_t i=0; i<maps->GetSize(); ++i) + { + csRef<iDataBuffer> tmp = vfs->GetRealPath(maps->Get(i)); + if(csString(tmp->GetData()).Find("common") != (size_t)-1) { - csRef<iDataBuffer> tmp = vfs->GetRealPath(maps->Get(i)); - if(csString(tmp->GetData()).Find("common") != (size_t)-1) + csString vpath(maps->Get(i)); + vpath.Append("world"); + if(tm->GetThreadCount() == 1) { - csString vpath(maps->Get(i)); - vpath.Append("world"); - if(tm->GetThreadCount() == 1) - { loader->PrecacheDataWait(vpath.GetData(), false); - } - else - { + } + else + { mapPrecaches.Push(loader->PrecacheData(vpath.GetData(), false)); - } } } - tm->Wait(mapPrecaches); + } + tm->Wait(mapPrecaches); - // Now everything else. - for(size_t i=0; i<maps->GetSize(); ++i) + // Now everything else. + for(size_t i=0; i<maps->GetSize(); ++i) + { + csRef<iDataBuffer> tmp = vfs->GetRealPath(maps->Get(i)); + if(csString(tmp->GetData()).Find("common") == (size_t)-1) { - csRef<iDataBuffer> tmp = vfs->GetRealPath(maps->Get(i)); - if(csString(tmp->GetData()).Find("common") == (size_t)-1) - { - csString vpath(maps->Get(i)); - vpath.Append("world"); - mapPrecaches.Push(loader->PrecacheData(vpath.GetData(), false)); - } + csString vpath(maps->Get(i)); + vpath.Append("world"); + mapPrecaches.Push(loader->PrecacheData(vpath.GetData(), false)); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-07-07 20:34:23
|
Revision: 3944 http://planeshift.svn.sourceforge.net/planeshift/?rev=3944&view=rev Author: mgist Date: 2009-07-07 20:34:16 +0000 (Tue, 07 Jul 2009) Log Message: ----------- - Give paws priority over slot manager. Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2009-07-07 20:11:17 UTC (rev 3943) +++ trunk/src/client/psengine.cpp 2009-07-07 20:34:16 UTC (rev 3944) @@ -896,12 +896,12 @@ else { bool handled = false; - if(slotManager && slotManager->HandleEvent(ev)) + if(paws->HandleEvent(ev)) { handled = true; } - if(!handled && paws->HandleEvent(ev)) + if(slotManager && !handled && slotManager->HandleEvent(ev)) { handled = true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-08-01 07:08:13
|
Revision: 4164 http://planeshift.svn.sourceforge.net/planeshift/?rev=4164&view=rev Author: mgist Date: 2009-08-01 07:08:05 +0000 (Sat, 01 Aug 2009) Log Message: ----------- - One more fix. Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2009-08-01 06:55:35 UTC (rev 4163) +++ trunk/src/client/psengine.cpp 2009-08-01 07:08:05 UTC (rev 4164) @@ -932,9 +932,9 @@ { lastEvent = &ev; - while(!delayedLoaders.IsEmpty()) + for(size_t i=0; i<delayedLoaders.GetSize(); ++i) { - csWeakRef<DelayedLoader> dl = delayedLoaders.Get(0); + csWeakRef<DelayedLoader> dl = delayedLoaders.Get(i); if(dl.IsValid()) { if(dl->CheckLoadStatus()) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-09-20 01:00:17
|
Revision: 4454 http://planeshift.svn.sourceforge.net/planeshift/?rev=4454&view=rev Author: mgist Date: 2009-09-20 01:00:10 +0000 (Sun, 20 Sep 2009) Log Message: ----------- - Send DR update at the end of game load to trigger entity update. Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2009-09-20 00:42:07 UTC (rev 4453) +++ trunk/src/client/psengine.cpp 2009-09-20 01:00:10 UTC (rev 4454) @@ -1364,6 +1364,8 @@ GetMsgHandler()->SendMessage(statmsg.msg); AddLoadingWindowMsg( "Getting entities" ); + celclient->GetMainPlayer()->SendDRUpdate(0, celclient->GetClientDR()->GetMsgStrings()); + AddLoadingWindowMsg( "Loading GUI" ); ForceRefresh(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-09-20 02:44:04
|
Revision: 4458 http://planeshift.svn.sourceforge.net/planeshift/?rev=4458&view=rev Author: mgist Date: 2009-09-20 02:43:55 +0000 (Sun, 20 Sep 2009) Log Message: ----------- - Whoops Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2009-09-20 02:40:05 UTC (rev 4457) +++ trunk/src/client/psengine.cpp 2009-09-20 02:43:55 UTC (rev 4458) @@ -249,7 +249,7 @@ muteSoundsOnFocusLoss = false; - actorRequested = false + actorRequested = false; xmlparser = csQueryRegistry<iDocumentSystem> (object_reg); stringset = csQueryRegistryTagInterface<iStringSet> (object_reg, "crystalspace.shared.stringset"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Kha...@us...> - 2009-09-24 21:38:11
|
Revision: 4534 http://planeshift.svn.sourceforge.net/planeshift/?rev=4534&view=rev Author: Khakilord Date: 2009-09-24 21:38:01 +0000 (Thu, 24 Sep 2009) Log Message: ----------- Added debugging checks for vfs mounts. Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2009-09-24 20:54:28 UTC (rev 4533) +++ trunk/src/client/psengine.cpp 2009-09-24 21:38:01 UTC (rev 4534) @@ -561,7 +561,36 @@ loader = csQueryRegistry<iBgLoader>(object_reg); scenemanipulator = scfQueryInterface<iSceneManipulate>(loader); csRef<iThreadManager> tm = csQueryRegistry<iThreadManager>(object_reg); + + // Check VFS mounts + csString test_path; + csRef<iDataBuffer> realPath; + + test_path = "/planeshift/materials/"; + realPath = vfs->GetRealPath(test_path); + if (!realPath.IsValid()) + { + Error2("Bad virtual path %s.", test_path.GetData()); + PS_PAUSEEXIT(1); + } + test_path = "/planeshift/meshes/"; + realPath = vfs->GetRealPath(test_path); + + if (!realPath.IsValid()) + { + Error2("Bad virtual path %s.", test_path.GetData()); + PS_PAUSEEXIT(1); + } + test_path = "/planeshift/world/"; + realPath = vfs->GetRealPath(test_path); + + if (!realPath.IsValid()) + { + Error2("Bad virtual path %s.", test_path.GetData()); + PS_PAUSEEXIT(1); + } + // Start to fill the loader cache. precaches.Push(loader->Setup(gfxFeatures, 200)); precaches.Push(loader->PrecacheData("/planeshift/materials/materials.cslib", false)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Kha...@us...> - 2010-01-09 13:46:20
|
Revision: 5188 http://planeshift.svn.sourceforge.net/planeshift/?rev=5188&view=rev Author: Khakilord Date: 2010-01-09 13:46:13 +0000 (Sat, 09 Jan 2010) Log Message: ----------- Added initial wrapper around Google Breakpad. Only supports win32 for now. Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2010-01-09 13:32:57 UTC (rev 5187) +++ trunk/src/client/psengine.cpp 2010-01-09 13:46:13 UTC (rev 5188) @@ -17,6 +17,14 @@ * */ #include <psconfig.h> +#ifdef WIN32 +#include "client/windows/handler/exception_handler.h" +#include "client/windows/sender/crash_report_sender.h" +#elif defined(CS_PLATFORM_MACOSX) +// TODO +#else +// TODO +#endif ////////////////////////////////////////////////////////////////////////////// // OS Specific Defines @@ -28,16 +36,6 @@ #undef LoadImage #endif -#if defined(_MSC_VER) && (_MSC_VER >= 1300) -#define USE_WIN32_MINIDUMP -#endif - -#ifdef USE_WIN32_MINIDUMP -#include "win32/mdump.h" -// Initialise the crash dumper. -MiniDumper minidumper; -#endif - ////////////////////////////////////////////////////////////////////////////// #define CONFIGFILENAME "/planeshift/userdata/planeshift.cfg" @@ -62,6 +60,8 @@ ////////////////////////////////////////////////////////////////////////////// #include "psengine.h" +#include <map> +#include <string> // CS files #include <imap/services.h> @@ -202,7 +202,129 @@ #include "gui/pawsconfigshadows.h" #include "gui/pawsnpcdialog.h" +csString hwRenderer; +csString hwVersion; + +const wchar_t* crash_post_url = L"http://planeshift.ezpcusa.com/crash_reporting/upload.py"; + +// Only support breakpad for win32 for now. +#ifdef WIN32 +#define USE_BREAKPAD +#endif + +#ifdef USE_BREAKPAD +bool UploadDump(const wchar_t* dump_path, + const wchar_t* minidump_id, + void* context, + EXCEPTION_POINTERS* exinfo, + MDRawAssertionInfo* assertion, + bool succeeded); + +// Initialise the crash dumper. +class BreakPadWrapper +{ +public: + BreakPadWrapper() { + wchar_t* tempPath; +#ifdef WIN32 + int pathLen = GetTempPathW(0, NULL); + tempPath = new wchar_t[pathLen]; + GetTempPathW(pathLen, tempPath); +#else + tempPath = "/tmp/"; +#endif + + crash_handler = new google_breakpad::ExceptionHandler(tempPath, + NULL, + UploadDump, + NULL, +#ifdef WIN32 + google_breakpad::ExceptionHandler::HANDLER_ALL +#else + true +#endif + ); + crash_sender = new google_breakpad::CrashReportSender(L""); + } + +#ifdef WIN32 + static google_breakpad::CrashReportSender* crash_sender; +#endif +private: + static google_breakpad::ExceptionHandler* crash_handler; + +}; + +bool UploadDump(const wchar_t* dump_path, + const wchar_t* minidump_id, + void* context, + EXCEPTION_POINTERS* exinfo, + MDRawAssertionInfo* assertion, + bool succeeded) +{ +#ifdef WIN32 + char crashMsg[512]; + sprintf(crashMsg, "Something unexpected happened in PlaneShift!\nA crash report containing only information strictly necessary to resolve this crash in the future will automatically be sent to the developers."); + ::MessageBox( NULL, crashMsg, "PlaneShift", MB_OK + MB_ICONERROR ); +#endif + std::map<std::wstring, std::wstring> parameters; + // Add the date of compiled file to check version + struct __stat64 buf; + int result; + wchar_t paramBuffer[512]; + +#ifdef WIN32 + /* Get data associated with "psclient.exe": */ + result = _stat64( "psclient.exe", &buf ); + if(result == 0) + { + wchar_t* time = _wctime64(&buf.st_mtime); + parameters[L"exe_time"] = time; + } +#endif + + if( + psengine && + psengine->GetCelClient() && + psengine->GetCelClient()->GetMainPlayer() && + psengine->GetCelClient()->GetMainPlayer()->GetName() + ) + { + mbstowcs(paramBuffer, psengine->GetCelClient()->GetMainPlayer()->GetName(), 511); + parameters[L"player_name"] = paramBuffer; + } + mbstowcs(paramBuffer, CS_PLATFORM_NAME, 511); + parameters[L"platform"] = paramBuffer; + mbstowcs(paramBuffer, CS_PROCESSOR_NAME, 511); + parameters[L"processor"] = paramBuffer; + mbstowcs(paramBuffer, CS_COMPILER_NAME, 511); + parameters[L"compiler"] = paramBuffer; + mbstowcs(paramBuffer, hwRenderer, 511); + parameters[L"renderer"] = paramBuffer; + mbstowcs(paramBuffer, hwVersion, 511); + parameters[L"hw_version"] = paramBuffer; + + std::wstring report_code; + printf("Attempting to upload crash report."); +#ifdef WIN32 + BreakPadWrapper::crash_sender->SendCrashReport(crash_post_url, + parameters, + dump_path, + &report_code); +#endif + if(report_code.empty()) + { + printf("Upload successful."); + return succeeded; + } + else + return false; +} + +BreakPadWrapper wrapper; +#endif // USE_BREAKPAD + // ---------------------------------------------------------------------------- CS_IMPLEMENT_APPLICATION @@ -376,7 +498,11 @@ csReport (object_reg, CS_REPORTER_SEVERITY_NOTIFY, PSAPP, minidumper.GetDumpTypeString() ); #endif // #ifdef USE_WIN32_MINIDUMP + // Grab graphics info now in case we crash + hwRenderer = g2d->GetHWRenderer(); + hwVersion = g2d->GetHWGLVersion(); + // Initialize and tweak the Texture Manager txtmgr = g3d->GetTextureManager (); if (!txtmgr) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2010-01-11 21:00:39
|
Revision: 5240 http://planeshift.svn.sourceforge.net/planeshift/?rev=5240&view=rev Author: mgist Date: 2010-01-11 21:00:27 +0000 (Mon, 11 Jan 2010) Log Message: ----------- - Compile fix. Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2010-01-11 20:40:54 UTC (rev 5239) +++ trunk/src/client/psengine.cpp 2010-01-11 21:00:27 UTC (rev 5240) @@ -258,8 +258,11 @@ chatBubbles = 0; options = 0; + +#if !defined(CS_DEBUG) && defined(CS_PLATFORM_MACOSX) delete macReporter; macReporter = NULL; +#endif } // ---------------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Kha...@us...> - 2010-01-12 22:44:41
|
Revision: 5260 http://planeshift.svn.sourceforge.net/planeshift/?rev=5260&view=rev Author: Khakilord Date: 2010-01-12 22:44:35 +0000 (Tue, 12 Jan 2010) Log Message: ----------- Fixed potential null error. Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2010-01-12 22:38:10 UTC (rev 5259) +++ trunk/src/client/psengine.cpp 2010-01-12 22:44:35 UTC (rev 5260) @@ -193,9 +193,9 @@ #include "gui/pawsnpcdialog.h" // Needed for debugging -csString psEngine::hwRenderer; -csString psEngine::hwVersion; -csString psEngine::playerName; +csString psEngine::hwRenderer = ""; +csString psEngine::hwVersion = ""; +csString psEngine::playerName = ""; #if !defined(CS_DEBUG) && defined(CS_PLATFORM_MACOSX) // Set up the mac crash reporter in release builds. This needs to be done here This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Kha...@us...> - 2010-01-17 21:32:20
|
Revision: 5334 http://planeshift.svn.sourceforge.net/planeshift/?rev=5334&view=rev Author: Khakilord Date: 2010-01-17 21:32:14 +0000 (Sun, 17 Jan 2010) Log Message: ----------- Added fatal error when the Windows software OpenGL renderer is being used. Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2010-01-17 21:10:33 UTC (rev 5333) +++ trunk/src/client/psengine.cpp 2010-01-17 21:32:14 UTC (rev 5334) @@ -358,9 +358,16 @@ hwRenderer = g2d->GetHWRenderer(); hwVersion = g2d->GetHWGLVersion(); #ifdef WIN32 - csRef<iWin32Canvas> canvas = scfQueryInterface<iWin32Canvas> (g2d); - // This does not seem to give the correct window handle. - //hwnd = canvas->GetWindowHandle(); + // Check for Windows software OpenGL renderer. + if(hwRenderer == "GDI Generic") + { + printf("PlaneShift requires hardware acceleration (OpenGL). Make sure your video card drivers are up-to-date."); + ::MessageBoxA( NULL, "PlaneShift requires hardware acceleration (OpenGL). Make sure your video card drivers are up-to-date.", "Graphics drivers or card too old!", MB_OK + MB_ICONERROR ); + exit(1); + } + csRef<iWin32Canvas> canvas = scfQueryInterface<iWin32Canvas> (g2d); + // This does not seem to give the correct window handle. + //hwnd = canvas->GetWindowHandle(); #endif #if !defined(CS_DEBUG) && defined(CS_PLATFORM_MACOSX) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Kha...@us...> - 2010-01-17 22:15:14
|
Revision: 5336 http://planeshift.svn.sourceforge.net/planeshift/?rev=5336&view=rev Author: Khakilord Date: 2010-01-17 22:15:05 +0000 (Sun, 17 Jan 2010) Log Message: ----------- Changed error to be non-fatal. Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2010-01-17 21:48:37 UTC (rev 5335) +++ trunk/src/client/psengine.cpp 2010-01-17 22:15:05 UTC (rev 5336) @@ -362,8 +362,7 @@ if(hwRenderer == "GDI Generic") { printf("PlaneShift requires hardware acceleration (OpenGL). Make sure your video card drivers are up-to-date."); - ::MessageBoxA( NULL, "PlaneShift requires hardware acceleration (OpenGL). Make sure your video card drivers are up-to-date.", "Graphics drivers or card too old!", MB_OK + MB_ICONERROR ); - exit(1); + ::MessageBoxA( NULL, "PlaneShift requires hardware acceleration (OpenGL). Make sure your video card drivers are up-to-date.", "Warning!", MB_OK + MB_ICONERROR ); } csRef<iWin32Canvas> canvas = scfQueryInterface<iWin32Canvas> (g2d); // This does not seem to give the correct window handle. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2010-01-18 19:31:33
|
Revision: 5341 http://planeshift.svn.sourceforge.net/planeshift/?rev=5341&view=rev Author: mgist Date: 2010-01-18 19:31:26 +0000 (Mon, 18 Jan 2010) Log Message: ----------- - Compile fix. Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2010-01-18 17:11:19 UTC (rev 5340) +++ trunk/src/client/psengine.cpp 2010-01-18 19:31:26 UTC (rev 5341) @@ -198,6 +198,10 @@ csString psEngine::playerName = ""; #ifdef WIN32 +#include <WinUser.h> +#ifdef SendMessage +#undef SendMessage +#endif #include "csutil/win32/win32.h" HWND psEngine::hwnd = 0; #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Kha...@us...> - 2010-02-08 21:59:51
|
Revision: 5483 http://planeshift.svn.sourceforge.net/planeshift/?rev=5483&view=rev Author: Khakilord Date: 2010-02-08 21:59:45 +0000 (Mon, 08 Feb 2010) Log Message: ----------- Hardcoded disabling of background world loading due to #4060. Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2010-02-08 21:35:15 UTC (rev 5482) +++ trunk/src/client/psengine.cpp 2010-02-08 21:59:45 UTC (rev 5483) @@ -518,7 +518,7 @@ } else if (level == 1) { - backgroundWorldLoading = psengine->GetConfig()->GetBool("PlaneShift.Loading.BackgroundWorldLoading"); + backgroundWorldLoading = false; // Hardcoded disable due to major issues. psengine->GetConfig()->GetBool("PlaneShift.Loading.BackgroundWorldLoading"); loader = csQueryRegistry<iBgLoader>(object_reg); scenemanipulator = scfQueryInterface<iSceneManipulate>(loader); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Kha...@us...> - 2010-03-01 11:16:00
|
Revision: 5643 http://planeshift.svn.sourceforge.net/planeshift/?rev=5643&view=rev Author: Khakilord Date: 2010-03-01 11:15:51 +0000 (Mon, 01 Mar 2010) Log Message: ----------- Fixed bug when deleting registered delayed loaders that could cause some meshes to never finish loading when switching zones. Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2010-02-28 21:50:39 UTC (rev 5642) +++ trunk/src/client/psengine.cpp 2010-03-01 11:15:51 UTC (rev 5643) @@ -939,7 +939,8 @@ } else { - delayedLoaders.DeleteIndexFast(0); + delayedLoaders.DeleteIndexFast(i); + i = 0; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2010-03-01 23:06:38
|
Revision: 5645 http://planeshift.svn.sourceforge.net/planeshift/?rev=5645&view=rev Author: mgist Date: 2010-03-01 23:06:32 +0000 (Mon, 01 Mar 2010) Log Message: ----------- - Small improvement. Modified Paths: -------------- trunk/src/client/psengine.cpp Modified: trunk/src/client/psengine.cpp =================================================================== --- trunk/src/client/psengine.cpp 2010-03-01 20:02:08 UTC (rev 5644) +++ trunk/src/client/psengine.cpp 2010-03-01 23:06:32 UTC (rev 5645) @@ -932,16 +932,14 @@ for(size_t i=0; i<delayedLoaders.GetSize(); ++i) { csWeakRef<DelayedLoader> dl = delayedLoaders.Get(i); - if(dl.IsValid()) + if(!dl.IsValid()) { - if(dl->CheckLoadStatus()) - break; + delayedLoaders.DeleteIndex(i--); + continue; } - else - { - delayedLoaders.DeleteIndexFast(i); - i = 0; - } + + if(dl->CheckLoadStatus()) + break; } // Loading the game This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |