never output the fringe layer.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1364 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Ray Greenwell
2002-05-16 02:25:19 +00:00
parent 9a55ae3989
commit b63c2aeeba
3 changed files with 9 additions and 13 deletions
@@ -1,5 +1,5 @@
// //
// $Id: MisoSceneModel.java,v 1.5 2002/01/30 18:28:32 mdb Exp $ // $Id: MisoSceneModel.java,v 1.6 2002/05/16 02:25:19 ray Exp $
package com.threerings.miso.scene; package com.threerings.miso.scene;
@@ -62,9 +62,8 @@ public class MisoSceneModel
ibuf.put(height); ibuf.put(height);
ibuf.put(otc); ibuf.put(otc);
// insert the layer data // insert the layer data (except fringe)
ibuf.put(baseTileIds); ibuf.put(baseTileIds);
ibuf.put(fringeTileIds);
ibuf.put(objectTileIds); ibuf.put(objectTileIds);
// now write the binary data out to the output stream // now write the binary data out to the output stream
@@ -96,11 +95,8 @@ public class MisoSceneModel
baseTileIds[i] = in.readInt(); baseTileIds[i] = in.readInt();
} }
// read in the fringe layer // allocate, but don't read, the fringe layer
fringeTileIds = new int[tcount]; fringeTileIds = new int[tcount];
for (int i = 0; i < tcount; i++) {
fringeTileIds[i] = in.readInt();
}
// read in the object layer // read in the object layer
objectTileIds = new int[otc]; objectTileIds = new int[otc];
@@ -1,5 +1,5 @@
// //
// $Id: MisoSceneRuleSet.java,v 1.7 2002/02/02 01:32:18 mdb Exp $ // $Id: MisoSceneRuleSet.java,v 1.8 2002/05/16 02:25:19 ray Exp $
package com.threerings.miso.scene.tools.xml; package com.threerings.miso.scene.tools.xml;
@@ -53,8 +53,6 @@ public class MisoSceneRuleSet extends RuleSetBase
new SetFieldRule(digester, "height")); new SetFieldRule(digester, "height"));
digester.addRule(_prefix + "/base", digester.addRule(_prefix + "/base",
new SetFieldRule(digester, "baseTileIds")); new SetFieldRule(digester, "baseTileIds"));
digester.addRule(_prefix + "/fringe",
new SetFieldRule(digester, "fringeTileIds"));
digester.addRule(_prefix + "/object", digester.addRule(_prefix + "/object",
new SetFieldRule(digester, "objectTileIds")); new SetFieldRule(digester, "objectTileIds"));
digester.addRule(_prefix + "/actions", digester.addRule(_prefix + "/actions",
@@ -73,6 +71,9 @@ public class MisoSceneRuleSet extends RuleSetBase
model.objectActions.length == 0) { model.objectActions.length == 0) {
model.objectActions = new String[1]; model.objectActions = new String[1];
} }
// and allocate the fringe tile layer
model.fringeTileIds = new int[model.baseTileIds.length];
} }
}); });
} }
@@ -1,5 +1,5 @@
// //
// $Id: MisoSceneWriter.java,v 1.5 2002/02/02 01:09:53 mdb Exp $ // $Id: MisoSceneWriter.java,v 1.6 2002/05/16 02:25:19 ray Exp $
package com.threerings.miso.scene.tools.xml; package com.threerings.miso.scene.tools.xml;
@@ -40,8 +40,7 @@ public class MisoSceneWriter
writer.dataElement("height", Integer.toString(model.height)); writer.dataElement("height", Integer.toString(model.height));
writer.dataElement("base", writer.dataElement("base",
StringUtil.toString(model.baseTileIds, "", "")); StringUtil.toString(model.baseTileIds, "", ""));
writer.dataElement("fringe", // note that we don't write the fringe layer.
StringUtil.toString(model.fringeTileIds, "", ""));
writer.dataElement("object", writer.dataElement("object",
StringUtil.toString(model.objectTileIds, "", "")); StringUtil.toString(model.objectTileIds, "", ""));
writer.dataElement("actions", writer.dataElement("actions",