projectswg-bitbucket/cucore
1
0
Fork 0
mirror of https://bitbucket.org/projectswg/cucore.git synced 2026-07-13 20:00:58 -04:00
Code Issues Projects Releases Wiki Activity

Optimized SWGObject's getWorldLocation function to not make extra location copies

Browse Source
This commit is contained in:
Obique PSWG
2015-07-12 17:27:33 -05:00
parent bde7ea802b
commit 9df1189ca7
2 changed files with 17 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/SWGObject.java
+2 -4
View File
@@ -433,7 +433,7 @@ public abstract class SWGObject implements Serializable, Comparable<SWGObject> {
}
public Location getLocation() {
return location;
return new Location(location);
}
public Location getWorldLocation() {
@@ -441,7 +441,7 @@ public abstract class SWGObject implements Serializable, Comparable<SWGObject> {
SWGObject parent = getParent();
while (parent != null) {
Location l = parent.location;
loc.translatePosition(l.getX(), l.getY(), l.getZ()); // Have to access privately to avoid copies
loc.translateLocation(l); // Have to access privately to avoid copies
parent = parent.getParent();
}
return loc;
@@ -818,8 +818,6 @@ public abstract class SWGObject implements Serializable, Comparable<SWGObject> {
// Now create the contained objects
for (SWGObject containedObject : containedObjects.values()) {
if (containedObject != null && !sentObjects.contains(containedObject)) {
//Log.i("ChildrenObjects", "Sending containedObj " + containedObject + " to " + target);
//Log.d("SWGObject", "Sending to location " + containedObject.getLocation());
containedObject.createObject(target);
}
}