projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-07-14 00:03:01 -04:00
Code Issues Projects Releases Wiki Activity

Improved buildout/snapshot loading to allow getting entire object table

Browse Source
This commit is contained in:
Obique PSWG
2015-06-20 16:58:47 -05:00
parent a3bbc5676a
commit 9778176f7d
5 changed files with 74 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/objects/ObjectManager.java
+14 -10
View File
@@ -120,20 +120,24 @@ public class ObjectManager extends Manager {
long startLoad = System.nanoTime();
System.out.println("ObjectManager: Loading buildouts...");
Log.i("ObjectManager", "Loading buildouts...");
List <SWGObject> buildouts = null;
String terrain = c.getString("LOAD-BUILDOUTS-FOR", "");
BuildoutLoader loader = new BuildoutLoader();
if (Terrain.doesTerrainExistForName(terrain))
buildouts = BuildoutLoader.loadBuildoutsForTerrain(Terrain.getTerrainFromName(terrain));
loader.loadBuildoutsForTerrain(Terrain.getTerrainFromName(terrain));
else {
if (!terrain.isEmpty()) {
System.err.println("ObjectManager: Unknown terrain '" + terrain + "'");
Log.e("ObjectManager", "Unknown terrain: %s", terrain);
}
buildouts = BuildoutLoader.loadAllBuildouts();
loader.loadAllBuildouts();
}
List <SWGObject> buildouts = loader.getObjects();
for (SWGObject obj : buildouts) {
loadBuildout(obj);
}
for (SWGObject obj : loader.getObjectTable().values()) {
objectMap.put(obj.getObjectId(), obj);
}
double loadTime = (System.nanoTime() - startLoad) / 1E6;
System.out.printf("ObjectManager: Finished loading %d buildouts. Time: %fms%n", buildouts.size(), loadTime);
Log.i("ObjectManager", "Finished loading buildouts. Time: %fms", loadTime);
@@ -149,20 +153,24 @@ public class ObjectManager extends Manager {
long startLoad = System.nanoTime();
System.out.println("ObjectManager: Loading snapshots...");
Log.i("ObjectManager", "Loading snapshots...");
List <SWGObject> snapshots = null;
String terrain = c.getString("LOAD-SNAPSHOTS-FOR", "");
SnapshotLoader loader = new SnapshotLoader();
if (Terrain.doesTerrainExistForName(terrain))
snapshots = SnapshotLoader.loadSnapshotsForTerrain(Terrain.getTerrainFromName(terrain));
loader.loadSnapshotsForTerrain(Terrain.getTerrainFromName(terrain));
else {
if (!terrain.isEmpty()) {
System.err.println("ObjectManager: Unknown terrain '" + terrain + "'");
Log.e("ObjectManager", "Unknown terrain: %s", terrain);
}
snapshots = SnapshotLoader.loadAllSnapshots();
loader.loadAllSnapshots();
}
List <SWGObject> snapshots = loader.getObjects();
for (SWGObject obj : snapshots) {
loadSnapshot(obj);
}
for (SWGObject obj : loader.getObjectTable().values()) {
objectMap.put(obj.getObjectId(), obj);
}
double loadTime = (System.nanoTime() - startLoad) / 1E6;
System.out.printf("ObjectManager: Finished loading %d snapshots. Time: %fms%n", snapshots.size(), loadTime);
Log.i("ObjectManager", "Finished loading snapshots. Time: %fms", loadTime);
@@ -176,8 +184,6 @@ public class ObjectManager extends Manager {
if (obj instanceof TangibleObject || obj instanceof CellObject) {
objectAwareness.add(obj);
}
objectMap.put(obj.getObjectId(), obj);
addChildrenObjects(obj);
mapService.addMapLocation(obj, MapService.MapType.STATIC);
}
@@ -185,8 +191,6 @@ public class ObjectManager extends Manager {
if (obj instanceof TangibleObject || obj instanceof CellObject) {
objectAwareness.add(obj);
}
objectMap.put(obj.getObjectId(), obj);
addChildrenObjects(obj);
mapService.addMapLocation(obj, MapService.MapType.STATIC);
}