Menu
▾
▴
[PlaneShift-svn] SF.net SVN: planeshift:[4460] trunk/src/client/bgloader
|
From: <mg...@us...> - 2009-09-20 06:58:50
|
Revision: 4460
http://planeshift.svn.sourceforge.net/planeshift/?rev=4460&view=rev
Author: mgist
Date: 2009-09-20 06:58:44 +0000 (Sun, 20 Sep 2009)
Log Message:
-----------
- More cleanup.
Modified Paths:
--------------
trunk/src/client/bgloader/loader.cpp
trunk/src/client/bgloader/loader.h
Modified: trunk/src/client/bgloader/loader.cpp
===================================================================
--- trunk/src/client/bgloader/loader.cpp 2009-09-20 06:45:35 UTC (rev 4459)
+++ trunk/src/client/bgloader/loader.cpp 2009-09-20 06:58:44 UTC (rev 4460)
@@ -1173,7 +1173,7 @@
unloadBox.AddBoundingVertexSmart(pos.x-loadRange*1.5, pos.y-loadRange*1.5, pos.z-loadRange*1.5);
// Check.
- LoadSector(pos, loadBox, unloadBox, sector, 0, false, true);
+ LoadSector(loadBox, unloadBox, sector, 0, false, true);
if(force)
{
@@ -1417,7 +1417,7 @@
}
}
-void BgLoader::LoadSector(const csVector3& pos, const csBox3& loadBox, const csBox3& unloadBox,
+void BgLoader::LoadSector(const csBox3& loadBox, const csBox3& unloadBox,
Sector* sector, uint depth, bool force, bool loadMeshes, bool portalsOnly)
{
sector->isLoading = true;
@@ -1443,13 +1443,11 @@
{
if(!sector->activePortals[i]->targetSector->isLoading && !sector->activePortals[i]->targetSector->checked)
{
- csVector3 wwPos = pos;
csBox3 wwLoadBox = loadBox;
csBox3 wwUnloadBox = unloadBox;
if(sector->activePortals[i]->warp)
{
csVector3& transform = sector->activePortals[i]->transform;
- wwPos -= transform;
wwLoadBox.SetMin(0, wwLoadBox.MinX()-transform.x);
wwLoadBox.SetMin(1, wwLoadBox.MinY()-transform.y);
wwLoadBox.SetMin(2, wwLoadBox.MinZ()-transform.z);
@@ -1464,7 +1462,7 @@
wwUnloadBox.SetMax(2, wwUnloadBox.MaxZ()-transform.z);
}
- LoadSector(wwPos, wwLoadBox, wwUnloadBox, sector->activePortals[i]->targetSector, depth+1, false, loadMeshes);
+ LoadSector(wwLoadBox, wwUnloadBox, sector->activePortals[i]->targetSector, depth+1, false, loadMeshes);
}
}
}
@@ -1476,13 +1474,13 @@
{
if(!sector->meshes[i]->loading)
{
- if(force || sector->meshes[i]->InRange(pos, loadBox))
+ if(force || sector->meshes[i]->InRange(loadBox))
{
sector->meshes[i]->loading = true;
loadingMeshes.Push(sector->meshes[i]);
++sector->objectCount;
}
- else if(sector->meshes[i]->OutOfRange(pos, unloadBox))
+ else if(sector->meshes[i]->OutOfRange(unloadBox))
{
sector->meshes[i]->object->GetMovable()->ClearSectors();
sector->meshes[i]->object->GetMovable()->UpdateMove();
@@ -1560,13 +1558,11 @@
}
else if(!sector->portals[i]->targetSector->isLoading && !sector->portals[i]->targetSector->checked && recurse)
{
- csVector3 wwPos = pos;
csBox3 wwLoadBox = loadBox;
csBox3 wwUnloadBox = unloadBox;
if(sector->portals[i]->warp)
{
csVector3& transform = sector->portals[i]->transform;
- wwPos -= transform;
wwLoadBox.SetMin(0, wwLoadBox.MinX()-transform.x);
wwLoadBox.SetMin(1, wwLoadBox.MinY()-transform.y);
wwLoadBox.SetMin(2, wwLoadBox.MinZ()-transform.z);
@@ -1580,7 +1576,7 @@
wwUnloadBox.SetMax(1, wwUnloadBox.MaxY()-transform.y);
wwUnloadBox.SetMax(2, wwUnloadBox.MaxZ()-transform.z);
}
- LoadSector(wwPos, wwLoadBox, wwUnloadBox, sector->portals[i]->targetSector, depth+1, false, loadMeshes);
+ LoadSector(wwLoadBox, wwUnloadBox, sector->portals[i]->targetSector, depth+1, false, loadMeshes);
}
sector->portals[i]->mObject = engine->CreatePortal(sector->portals[i]->name, sector->object,
@@ -1614,13 +1610,11 @@
{
if(!sector->portals[i]->targetSector->isLoading)
{
- csVector3 wwPos = pos;
csBox3 wwLoadBox = loadBox;
csBox3 wwUnloadBox = unloadBox;
if(sector->portals[i]->warp)
{
csVector3& transform = sector->portals[i]->transform;
- wwPos -= transform;
wwLoadBox.SetMin(0, wwLoadBox.MinX()-transform.x);
wwLoadBox.SetMin(1, wwLoadBox.MinY()-transform.y);
wwLoadBox.SetMin(2, wwLoadBox.MinZ()-transform.z);
@@ -1634,7 +1628,7 @@
wwUnloadBox.SetMax(1, wwUnloadBox.MaxY()-transform.y);
wwUnloadBox.SetMax(2, wwUnloadBox.MaxZ()-transform.z);
}
- LoadSector(wwPos, wwLoadBox, wwUnloadBox, sector->portals[i]->targetSector, depth+1, false, loadMeshes);
+ LoadSector(wwLoadBox, wwUnloadBox, sector->portals[i]->targetSector, depth+1, false, loadMeshes);
}
engine->GetMeshes()->Remove(sector->portals[i]->mObject);
@@ -2087,14 +2081,14 @@
loadedZones.Push(newLoadedZones[i]);
for(size_t j=0; j<newLoadedZones[i]->sectors.GetSize(); ++j)
{
- LoadSector(csVector3(0.0f), csBox3(), csBox3(), newLoadedZones[i]->sectors[j], (uint)-1, true, loadMeshes);
+ LoadSector(csBox3(), csBox3(), newLoadedZones[i]->sectors[j], (uint)-1, true, loadMeshes);
}
}
else
{
for(size_t j=0; j<newLoadedZones[i]->sectors.GetSize(); ++j)
{
- LoadSector(csVector3(0.0f), csBox3(), csBox3(), newLoadedZones[i]->sectors[j], (uint)-1, true, loadMeshes, true);
+ LoadSector(csBox3(), csBox3(), newLoadedZones[i]->sectors[j], (uint)-1, true, loadMeshes, true);
}
}
}
Modified: trunk/src/client/bgloader/loader.h
===================================================================
--- trunk/src/client/bgloader/loader.h 2009-09-20 06:45:35 UTC (rev 4459)
+++ trunk/src/client/bgloader/loader.h 2009-09-20 06:58:44 UTC (rev 4460)
@@ -380,12 +380,12 @@
{
}
- inline bool InRange(const csVector3& curpos, const csBox3& curBBox)
+ inline bool InRange(const csBox3& curBBox)
{
return !object.IsValid() && (alwaysLoaded || curBBox.Overlap(bbox));
}
- inline bool OutOfRange(const csVector3& curpos, const csBox3& curBBox)
+ inline bool OutOfRange(const csBox3& curBBox)
{
return !alwaysLoaded && object.IsValid() && !curBBox.Overlap(bbox);
}
@@ -485,7 +485,7 @@
void CleanTexture(Texture* texture);
/* Internal loading methods. */
- void LoadSector(const csVector3& pos, const csBox3& loadBox, const csBox3& unloadBox,
+ void LoadSector(const csBox3& loadBox, const csBox3& unloadBox,
Sector* sector, uint depth, bool force, bool loadMeshes, bool portalsOnly = false);
void FinishMeshLoad(MeshObj* mesh);
bool LoadMeshGen(MeshGen* meshgen);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|