From: <mg...@us...> - 2009-03-14 02:12:31
|
Revision: 3198 http://planeshift.svn.sourceforge.net/planeshift/?rev=3198&view=rev Author: mgist Date: 2009-03-14 02:12:22 +0000 (Sat, 14 Mar 2009) Log Message: ----------- - Simplification. Modified Paths: -------------- trunk/src/common/paws/pawsobjectview.cpp Modified: trunk/src/common/paws/pawsobjectview.cpp =================================================================== --- trunk/src/common/paws/pawsobjectview.cpp 2009-03-13 23:48:25 UTC (rev 3197) +++ trunk/src/common/paws/pawsobjectview.cpp 2009-03-14 02:12:22 UTC (rev 3198) @@ -149,14 +149,10 @@ VFS->ChDir (map); VFS->SetSyncDir(VFS->GetCwd()); engine->SetCacheManager(NULL); - csRef<iThreadReturn> itr = loader->LoadMap(worldNode, CS_LOADER_KEEP_WORLD, col); - itr->Wait(); + csRef<iThreadReturn> itr = loader->LoadMapWait(worldNode, CS_LOADER_KEEP_WORLD, col); if (!itr->WasSuccessful()) return false; - VFS->ChDir (map); - engine->SyncEngineListsNow(loader); - stage = engine->FindSector( sector ); stage->PrecacheDraw(); CS_ASSERT( stage ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-03-31 09:52:34
|
Revision: 3362 http://planeshift.svn.sourceforge.net/planeshift/?rev=3362&view=rev Author: mgist Date: 2009-03-31 09:52:29 +0000 (Tue, 31 Mar 2009) Log Message: ----------- - Removed a incorrect ChDir. Modified Paths: -------------- trunk/src/common/paws/pawsobjectview.cpp Modified: trunk/src/common/paws/pawsobjectview.cpp =================================================================== --- trunk/src/common/paws/pawsobjectview.cpp 2009-03-31 09:50:59 UTC (rev 3361) +++ trunk/src/common/paws/pawsobjectview.cpp 2009-03-31 09:52:29 UTC (rev 3362) @@ -148,8 +148,6 @@ } // Now load the map into the selected region - VFS->ChDir (map); - engine->SetCacheManager(NULL); csRef<iThreadReturn> itr = loader->LoadMapWait(map, worldNode, CS_LOADER_KEEP_WORLD, col); if (!itr->WasSuccessful()) return false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-04-24 17:54:50
|
Revision: 3544 http://planeshift.svn.sourceforge.net/planeshift/?rev=3544&view=rev Author: mgist Date: 2009-04-24 17:54:36 +0000 (Fri, 24 Apr 2009) Log Message: ----------- - Added error print. Modified Paths: -------------- trunk/src/common/paws/pawsobjectview.cpp Modified: trunk/src/common/paws/pawsobjectview.cpp =================================================================== --- trunk/src/common/paws/pawsobjectview.cpp 2009-04-24 17:15:16 UTC (rev 3543) +++ trunk/src/common/paws/pawsobjectview.cpp 2009-04-24 17:54:36 UTC (rev 3544) @@ -114,7 +114,12 @@ csString filename = map; filename.Append("/world"); csRef<iDataBuffer> buf (VFS->ReadFile (filename, false)); - doc->Parse(buf); + const char* error = doc->Parse(buf); + if(error) + { + printf("pawsObjectView world parse error: %s\n", error); + } + csRef<iDocumentNode> worldNode = doc->GetRoot()->GetNode("world"); // Now load the map into the selected region This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-09-19 01:05:25
|
Revision: 4446 http://planeshift.svn.sourceforge.net/planeshift/?rev=4446&view=rev Author: mgist Date: 2009-09-19 01:05:17 +0000 (Sat, 19 Sep 2009) Log Message: ----------- - Added error check. Modified Paths: -------------- trunk/src/common/paws/pawsobjectview.cpp Modified: trunk/src/common/paws/pawsobjectview.cpp =================================================================== --- trunk/src/common/paws/pawsobjectview.cpp 2009-09-19 00:10:56 UTC (rev 4445) +++ trunk/src/common/paws/pawsobjectview.cpp 2009-09-19 01:05:17 UTC (rev 4446) @@ -110,7 +110,10 @@ { csRef<iStringArray> zone = csPtr<iStringArray>(new scfStringArray()); zone->Push(map); - loader->LoadZones(zone); + if(!loader->LoadZones(zone)) + { + Error2("Failed to load zone '%s'\n", map); + } stage = engine->FindSector( sector ); if (!stage) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-09-22 16:42:01
|
Revision: 4486 http://planeshift.svn.sourceforge.net/planeshift/?rev=4486&view=rev Author: mgist Date: 2009-09-22 16:41:54 +0000 (Tue, 22 Sep 2009) Log Message: ----------- - Do a precachedraw on the pawsObjectView stage sector after load. Modified Paths: -------------- trunk/src/common/paws/pawsobjectview.cpp Modified: trunk/src/common/paws/pawsobjectview.cpp =================================================================== --- trunk/src/common/paws/pawsobjectview.cpp 2009-09-22 16:36:30 UTC (rev 4485) +++ trunk/src/common/paws/pawsobjectview.cpp 2009-09-22 16:41:54 UTC (rev 4486) @@ -151,7 +151,10 @@ bool pawsObjectView::ContinueLoad() { if(loader->GetLoadingCount() == 0) + { + stage->PrecacheDraw(); return true; + } loader->ContinueLoading(false); return false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-04-21 04:29:58
|
Revision: 5823 http://planeshift.svn.sourceforge.net/planeshift/?rev=5823&view=rev Author: weltall2 Date: 2010-04-21 04:29:49 +0000 (Wed, 21 Apr 2010) Log Message: ----------- missing file from rlydontknow Modified Paths: -------------- trunk/src/common/paws/pawsobjectview.cpp Modified: trunk/src/common/paws/pawsobjectview.cpp =================================================================== --- trunk/src/common/paws/pawsobjectview.cpp 2010-04-20 20:20:39 UTC (rev 5822) +++ trunk/src/common/paws/pawsobjectview.cpp 2010-04-21 04:29:49 UTC (rev 5823) @@ -105,22 +105,17 @@ { csRef<iEngine> engine = csQueryRegistry<iEngine > ( PawsManager::GetSingleton().GetObjectRegistry()); - stage = engine->FindSector( sector ); - - if (!stage) + csRef<iStringArray> zone = csPtr<iStringArray>(new scfStringArray()); + zone->Push(map); + if(!loader->LoadPriorityZones(zone)) { - csRef<iStringArray> zone = csPtr<iStringArray>(new scfStringArray()); - zone->Push(map); - if(!loader->LoadZones(zone)) - { - Error2("Failed to load zone '%s'\n", map); - } - - stage = engine->FindSector( sector ); - if (!stage) - return false; + Error2("Failed to load priority zone '%s'\n", map); } + stage = engine->FindSector( sector ); + if (!stage) + return false; + static uint sectorCount = 0; meshSector = engine->CreateSector( csString(sector).AppendFmt("%u", sectorCount++)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-10-10 07:22:48
|
Revision: 6259 http://planeshift.svn.sourceforge.net/planeshift/?rev=6259&view=rev Author: weltall2 Date: 2010-10-10 07:22:41 +0000 (Sun, 10 Oct 2010) Log Message: ----------- allow to start without render objects (will break the podium view) Modified Paths: -------------- trunk/src/common/paws/pawsobjectview.cpp Modified: trunk/src/common/paws/pawsobjectview.cpp =================================================================== --- trunk/src/common/paws/pawsobjectview.cpp 2010-10-09 23:18:17 UTC (rev 6258) +++ trunk/src/common/paws/pawsobjectview.cpp 2010-10-10 07:22:41 UTC (rev 6259) @@ -94,7 +94,7 @@ if ( !rmTargets.IsValid()) { Error1("pawsObjectView: RenderManager doesn't support targets! object views will be disabled"); - return false; + return true; } PawsManager::GetSingleton().AddObjectView(this); @@ -133,7 +133,7 @@ void pawsObjectView::OnResize() { - if(target.IsValid()) + if(target.IsValid() && rmTargets.IsValid()) { // unregister old tex from render targets csRef<iRenderManagerTargets> rmTargets = scfQueryInterface<iRenderManagerTargets>(engine->GetRenderManager()); @@ -161,18 +161,24 @@ int h = screenFrame.Height(); // update the stage view - view->SetWidth(w); - view->SetHeight(h); - view->SetRectangle(0, 0, w, h, false); - view->GetCamera()->SetViewportSize(w, h); - view->GetPerspectiveCamera()->SetFOV((float)(h)/w, 1); + if(view) + { + view->SetWidth(w); + view->SetHeight(h); + view->SetRectangle(0, 0, w, h, false); + view->GetCamera()->SetViewportSize(w, h); + view->GetPerspectiveCamera()->SetFOV((float)(h)/w, 1); + } // update the doll view - meshView->SetWidth(w); - meshView->SetHeight(h); - meshView->SetRectangle(0, 0, w, h, false); - meshView->GetCamera()->SetViewportSize(w, h); - meshView->GetPerspectiveCamera()->SetFOV((float)(h)/w, 1); + if(meshView) + { + meshView->SetWidth(w); + meshView->SetHeight(h); + meshView->SetRectangle(0, 0, w, h, false); + meshView->GetCamera()->SetViewportSize(w, h); + meshView->GetPerspectiveCamera()->SetFOV((float)(h)/w, 1); + } needsDraw = true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rly...@us...> - 2010-12-25 00:35:58
|
Revision: 6584 http://planeshift.svn.sourceforge.net/planeshift/?rev=6584&view=rev Author: rlydontknow Date: 2010-12-25 00:35:52 +0000 (Sat, 25 Dec 2010) Log Message: ----------- don't load the stage blockingly properly copy ambient light as well, not just static and pseudo-dynamic lights (fixes black character in char selection) Modified Paths: -------------- trunk/src/common/paws/pawsobjectview.cpp Modified: trunk/src/common/paws/pawsobjectview.cpp =================================================================== --- trunk/src/common/paws/pawsobjectview.cpp 2010-12-25 00:20:46 UTC (rev 6583) +++ trunk/src/common/paws/pawsobjectview.cpp 2010-12-25 00:35:52 UTC (rev 6584) @@ -223,6 +223,13 @@ { if(loader->GetLoadingCount() == 0) { + // precache stage + stage->PrecacheDraw(); + + // copy ambient light + meshSector->SetDynamicAmbientLight(stage->GetDynamicAmbientLight()); + + // copy static and pseudo-dynamic lights iLightList* lightList = meshSector->GetLights(); iLightList* stageLightList = stage->GetLights(); @@ -231,13 +238,13 @@ lightList->Add(stageLightList->Get(i)); } + // precache mesh sector meshSector->PrecacheDraw(); - stage->PrecacheDraw(); return true; } else { - loader->ContinueLoading(true); + loader->ContinueLoading(false); return false; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rly...@us...> - 2010-12-25 20:02:27
|
Revision: 6591 http://planeshift.svn.sourceforge.net/planeshift/?rev=6591&view=rev Author: rlydontknow Date: 2010-12-25 20:02:21 +0000 (Sat, 25 Dec 2010) Log Message: ----------- added error message if stage sector cannot be found only clean up objects in the destructor if they're actually there Modified Paths: -------------- trunk/src/common/paws/pawsobjectview.cpp Modified: trunk/src/common/paws/pawsobjectview.cpp =================================================================== --- trunk/src/common/paws/pawsobjectview.cpp 2010-12-25 19:00:36 UTC (rev 6590) +++ trunk/src/common/paws/pawsobjectview.cpp 2010-12-25 20:02:21 UTC (rev 6591) @@ -85,12 +85,20 @@ Clear(); // free map ressources - engine->RemoveObject(view); - view.Invalidate(); - engine->RemoveObject(meshView); - meshView.Invalidate(); - engine->RemoveObject(meshSector); - meshSector.Invalidate(); + if(view.IsValid()) + { + engine->RemoveObject(view); + } + + if(meshView.IsValid()) + { + engine->RemoveObject(meshView); + } + + if(meshSector.IsValid()) + { + engine->RemoveObject(meshSector); + } } bool pawsObjectView::Setup(iDocumentNode* node ) @@ -201,7 +209,10 @@ stage = engine->FindSector( sector ); if (!stage) - return false; + { + Error2("couldn't find stage sector '%s'", sector); + return false; + } static uint sectorCount = 0; meshSector = engine->CreateSector( csString(sector).AppendFmt("%u", sectorCount++)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2011-01-22 19:52:26
|
Revision: 6825 http://planeshift.svn.sourceforge.net/planeshift/?rev=6825&view=rev Author: weltall2 Date: 2011-01-22 19:52:20 +0000 (Sat, 22 Jan 2011) Log Message: ----------- fixed fow in the pawsobjectview Modified Paths: -------------- trunk/src/common/paws/pawsobjectview.cpp Modified: trunk/src/common/paws/pawsobjectview.cpp =================================================================== --- trunk/src/common/paws/pawsobjectview.cpp 2011-01-22 19:18:53 UTC (rev 6824) +++ trunk/src/common/paws/pawsobjectview.cpp 2011-01-22 19:52:20 UTC (rev 6825) @@ -171,6 +171,8 @@ // update the views int w, h; + int originW = screenFrame.Width(); + int originH = screenFrame.Height(); // update the stage view if(view) @@ -180,7 +182,10 @@ view->SetHeight(h); view->SetRectangle(0, 0, w, h, false); view->GetCamera()->SetViewportSize(w, h); - view->GetPerspectiveCamera()->SetFOV((float)(h)/w, 1); + //we need to use the original height and widht of the window because we just resize the texture + //to fill the whole space (and we don't do a relative rescaling so the fov would screw up if + //we used the render size) + view->GetPerspectiveCamera()->SetFOV((float)(originH)/originW, 1); } // update the doll view @@ -191,7 +196,7 @@ meshView->SetHeight(h); meshView->SetRectangle(0, 0, w, h, false); meshView->GetCamera()->SetViewportSize(w, h); - meshView->GetPerspectiveCamera()->SetFOV((float)(h)/w, 1); + meshView->GetPerspectiveCamera()->SetFOV((float)(originH)/originW, 1); } needsDraw = true; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rly...@us...> - 2011-02-26 18:38:21
|
Revision: 6998 http://planeshift.svn.sourceforge.net/planeshift/?rev=6998&view=rev Author: rlydontknow Date: 2011-02-26 18:38:15 +0000 (Sat, 26 Feb 2011) Log Message: ----------- finish loading object views blockingly (fixes never ending "loading gui" at login) Modified Paths: -------------- trunk/src/common/paws/pawsobjectview.cpp Modified: trunk/src/common/paws/pawsobjectview.cpp =================================================================== --- trunk/src/common/paws/pawsobjectview.cpp 2011-02-26 17:49:32 UTC (rev 6997) +++ trunk/src/common/paws/pawsobjectview.cpp 2011-02-26 18:38:15 UTC (rev 6998) @@ -259,7 +259,7 @@ } else { - loader->ContinueLoading(false); + loader->ContinueLoading(true); return false; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2011-06-01 11:55:03
|
Revision: 7343 http://planeshift.svn.sourceforge.net/planeshift/?rev=7343&view=rev Author: weltall2 Date: 2011-06-01 11:54:57 +0000 (Wed, 01 Jun 2011) Log Message: ----------- fixed crash when using rlcompat Modified Paths: -------------- trunk/src/common/paws/pawsobjectview.cpp Modified: trunk/src/common/paws/pawsobjectview.cpp =================================================================== --- trunk/src/common/paws/pawsobjectview.cpp 2011-06-01 05:00:24 UTC (rev 7342) +++ trunk/src/common/paws/pawsobjectview.cpp 2011-06-01 11:54:57 UTC (rev 7343) @@ -103,7 +103,7 @@ bool pawsObjectView::Setup(iDocumentNode* node ) { rmTargets = scfQueryInterface<iRenderManagerTargets>(engine->GetRenderManager()); - if ( !rmTargets.IsValid()) + if(!rmTargets.IsValid()) { Error1("pawsObjectView: RenderManager doesn't support targets! object views will be disabled"); return true; @@ -236,6 +236,9 @@ bool pawsObjectView::ContinueLoad() { + if(!rmTargets.IsValid()) + return true; + if(loader->GetLoadingCount() == 0) { // precache stage This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |