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

Objects now have explicit render priorities rather than relying on the

Browse Source 
order in which they were added to the scene (that information is no longer
available as objects are reordered arbitrarily once loaded).

Also removed old-school scene conversion.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1743 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2002-09-23 23:07:11 +00:00
parent 92c8748c7c
commit 68af441fbf
7 changed files with 41 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/miso/client/DisplayMisoSceneImpl.java
+13 -15
View File
@@ -1,5 +1,5 @@
//
// $Id: DisplayMisoSceneImpl.java,v 1.61 2002/09/23 21:54:50 mdb Exp $
// $Id: DisplayMisoSceneImpl.java,v 1.62 2002/09/23 23:07:11 mdb Exp $
package com.threerings.miso.scene;
@@ -138,17 +138,14 @@ public class DisplayMisoSceneImpl
for (int ii = 0; ii < ocount; ii+= 3) {
int col = _model.objectTileIds[ii];
int row = _model.objectTileIds[ii+1];
String action = _model.objectActions[ii/3];
int fqTid = _model.objectTileIds[ii+2];
int tsid = (fqTid >> 16) & 0xFFFF;
int tid = (fqTid & 0xFFFF);
int tsid = (fqTid >> 16) & 0xFFFF, tid = (fqTid & 0xFFFF);
try {
expandObject(col, row, tsid, tid, fqTid, action);
expandObject(col, row, tsid, tid, fqTid, ii/3);
} catch (TileException te) {
Log.warning("Scene contains non-existent object tile " +
"[tsid=" + tsid + ", tid=" + tid +
", col=" + col + ", row=" + row +
", action=" + action + "].");
", col=" + col + ", row=" + row + "].");
}
}
}
@@ -162,14 +159,20 @@ public class DisplayMisoSceneImpl
* tables).
*/
protected SceneObject expandObject (
int col, int row, int tsid, int tid, int fqTid, String action)
int col, int row, int tsid, int tid, int fqTid, int objidx)
throws NoSuchTileException, NoSuchTileSetException
{
// create and initialize an object info record for this object
SceneObject scobj = createSceneObject(
col, row, (ObjectTile)_tmgr.getTile(tsid, tid));
if (!StringUtil.blank(action)) {
scobj.action = action;
// assign the object's remaining attributes
if (!StringUtil.blank(_model.objectActions[objidx])) {
scobj.action = _model.objectActions[objidx];
}
// if we have object priorities, use 'em
if (_model.objectPrios != null) {
scobj.priority = _model.objectPrios[objidx];
}
// generate a "shadow" for this object tile by toggling the
@@ -177,9 +180,6 @@ public class DisplayMisoSceneImpl
// sprites from walking on those tiles)
setObjectTileFootprint(scobj.tile, col, row, true);
// assign the object its index
scobj.index = _objects.size();
// add the info record to the list
_objects.add(scobj);
@@ -209,8 +209,6 @@ public class DisplayMisoSceneImpl
SceneObject scobj = (SceneObject)_objects.get(ii);
if (region.contains(scobj.x, scobj.y)) {
set.insert(scobj);
} else {
System.err.println("Skipping " + scobj + ", not in " + region + ".");
}
}
}