AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-use one static rectangle for constraint ops. This should be safe if

Browse Source 
the method in which it's used is only called from the dobj thread.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3677 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Ray Greenwell
2005-08-10 01:35:07 +00:00
parent 5fbb02bc34
commit 429a655ae8
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/stage/util/PlacementConstraints.java
+7 -3
View File
@@ -271,10 +271,11 @@ public class PlacementConstraints
protected boolean hasSpaceConstrainedAdjacent (ObjectData data, protected boolean hasSpaceConstrainedAdjacent (ObjectData data,
ObjectData[] added, ObjectData[] removed) ObjectData[] added, ObjectData[] removed)
{ {
Rectangle rect = new Rectangle(data.bounds); Rectangle r = data.bounds;
rect.grow(1, 1); // grow the ObjectData bounds 1 square in each direction
_constrainRect.setBounds(r.x - 1, r.y - 1, r.width + 2, r.height + 2);
ArrayList objects = getObjectData(rect, added, removed); ArrayList objects = getObjectData(_constrainRect, added, removed);
for (int i = 0, size = objects.size(); i < size; i++) { for (int i = 0, size = objects.size(); i < size; i++) {
ObjectData odata = (ObjectData)objects.get(i); ObjectData odata = (ObjectData)objects.get(i);
int dir = getConstraintDirection(odata, ObjectTileSet.SPACE); int dir = getConstraintDirection(odata, ObjectTileSet.SPACE);
@@ -487,4 +488,7 @@ public class PlacementConstraints
/** For all objects in the scene, maps {@link ObjectInfo}s to /** For all objects in the scene, maps {@link ObjectInfo}s to
* {@link ObjectData}s. */ * {@link ObjectData}s. */
protected HashMap _objectData = new HashMap(); protected HashMap _objectData = new HashMap();
/** One rectangle we'll re-use for all constraints ops. */
protected static final Rectangle _constrainRect = new Rectangle();
} }