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

Fix a bug where we were finishing resolution of the entire scene multiple times if some blocks were basically already resolved.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@957 ed5b42cb-e716-0410-a449-f6a68f950b19
This commit is contained in:
Mike Thomas
2010-07-15 21:30:20 +00:00
parent c26ce87830
commit a462e54e46
1 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/as/com/threerings/miso/client/MisoScenePanel.as
+28 -19
View File
@@ -206,12 +206,16 @@ public class MisoScenePanel extends Sprite
protected function refreshBaseBlockScenes () :void protected function refreshBaseBlockScenes () :void
{ {
_resStartTime = getTimer();
var blocks :Set = getBaseBlocks(); var blocks :Set = getBaseBlocks();
// Keep this to use in our function... // Keep this to use in our function...
var thisRef :MisoScenePanel = this; var thisRef :MisoScenePanel = this;
var resolving :Boolean = false;
// Postpone calling complete til they're all queued up.
_skipComplete = true;
blocks.forEach(function(blockKey :int) :void { blocks.forEach(function(blockKey :int) :void {
if (!_blocks.containsKey(blockKey)) { if (!_blocks.containsKey(blockKey)) {
@@ -219,11 +223,13 @@ public class MisoScenePanel extends Sprite
new SceneBlock(blockKey, _objScene, _isoView, _metrics); new SceneBlock(blockKey, _objScene, _isoView, _metrics);
_pendingBlocks.add(sceneBlock); _pendingBlocks.add(sceneBlock);
sceneBlock.resolve(_ctx, _model, thisRef, blockResolved); sceneBlock.resolve(_ctx, _model, thisRef, blockResolved);
resolving = true;
} }
}); });
if (!resolving) { _skipComplete = false;
if (_pendingBlocks.size() == 0) {
resolutionComplete(); resolutionComplete();
} }
} }
@@ -236,8 +242,7 @@ public class MisoScenePanel extends Sprite
// Move that guy from pending to ready... // Move that guy from pending to ready...
_readyBlocks.add(resolved); _readyBlocks.add(resolved);
_pendingBlocks.remove(resolved); _pendingBlocks.remove(resolved);
if (_pendingBlocks.size() == 0 && !_skipComplete) {
if (_pendingBlocks.size() == 0) {
resolutionComplete(); resolutionComplete();
} }
} }
@@ -257,22 +262,22 @@ public class MisoScenePanel extends Sprite
_objScene.render(); _objScene.render();
DelayUtil.delayFrame(function() :void { // Then we let the scene finally move if it's trying to...
// Then we let the scene finally move if it's trying to... if (_pendingMoveBy != null) {
if (_pendingMoveBy != null) { _isoView.centerOnPt(new Pt(_pendingMoveBy.x + _isoView.currentX,
_isoView.centerOnPt(new Pt(_pendingMoveBy.x + _isoView.currentX, _pendingMoveBy.y + _isoView.currentY), false);
_pendingMoveBy.y + _isoView.currentY), false); _pendingMoveBy = null;
_pendingMoveBy = null; }
}
// Now, take out any old blocks no longer in our valid blocks. // Now, take out any old blocks no longer in our valid blocks.
var blocks :Set = getBaseBlocks(); var blocks :Set = getBaseBlocks();
for each (var baseKey :int in _blocks.keys()) { for each (var baseKey :int in _blocks.keys()) {
if (!blocks.contains(baseKey)) { if (!blocks.contains(baseKey)) {
_blocks.remove(baseKey).release(); _blocks.remove(baseKey).release();
}
} }
}); }
trace("Scene Block Resolution took: " + (getTimer() - _resStartTime) + "ms");
} }
protected function refreshScene () :void protected function refreshScene () :void
@@ -321,6 +326,10 @@ public class MisoScenePanel extends Sprite
protected var _masks :Map = Maps.newMapOf(int); protected var _masks :Map = Maps.newMapOf(int);
protected var _fringes :Map = new WeakValueMap(Maps.newMapOf(FringeTile)); protected var _fringes :Map = new WeakValueMap(Maps.newMapOf(FringeTile));
protected var _resStartTime :int;
protected var _skipComplete :Boolean
protected const DEF_WIDTH :int = 985; protected const DEF_WIDTH :int = 985;
protected const DEF_HEIGHT :int = 560; protected const DEF_HEIGHT :int = 560;