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

Changed getModel() to getMisoSceneModel() to jive with similar methods in

Browse Source 
other model classes; was passing tile coordinates backwards to tile layer
objects.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@668 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2001-11-29 00:18:15 +00:00
parent 538bd697a5
commit d666b38394
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/miso/tools/EditableMisoScene.java
+2 -2
View File
@@ -1,5 +1,5 @@
// //
// $Id: EditableMisoScene.java,v 1.7 2001/11/28 01:13:13 mdb Exp $ // $Id: EditableMisoScene.java,v 1.8 2001/11/29 00:18:15 mdb Exp $
package com.threerings.miso.tools.scene; package com.threerings.miso.tools.scene;
@@ -96,5 +96,5 @@ public interface EditableMisoScene
* Returns a reference to the miso scene model that reflects the * Returns a reference to the miso scene model that reflects the
* changes that have been made to this editable miso scene. * changes that have been made to this editable miso scene.
*/ */
public MisoSceneModel getModel (); public MisoSceneModel getMisoSceneModel ();
} }
src/java/com/threerings/miso/tools/EditableMisoSceneImpl.java
+7 -7
View File
@@ -1,5 +1,5 @@
// //
// $Id: EditableMisoSceneImpl.java,v 1.3 2001/11/28 01:13:13 mdb Exp $ // $Id: EditableMisoSceneImpl.java,v 1.4 2001/11/29 00:18:15 mdb Exp $
package com.threerings.miso.tools.scene; package com.threerings.miso.tools.scene;
@@ -59,7 +59,7 @@ public class EditableMisoSceneImpl
// documentation inherited // documentation inherited
public void setBaseTile (int x, int y, BaseTile tile, int fqTileId) public void setBaseTile (int x, int y, BaseTile tile, int fqTileId)
{ {
_base.setTile(x, y, tile); _base.setTile(y, x, tile);
// update the model as well // update the model as well
_model.baseTileIds[_model.width*y + x] = fqTileId; _model.baseTileIds[_model.width*y + x] = fqTileId;
} }
@@ -67,7 +67,7 @@ public class EditableMisoSceneImpl
// documentation inherited // documentation inherited
public void setFringeTile (int x, int y, Tile tile, int fqTileId) public void setFringeTile (int x, int y, Tile tile, int fqTileId)
{ {
_fringe.setTile(x, y, tile); _fringe.setTile(y, x, tile);
// update the model as well // update the model as well
_model.fringeTileIds[_model.width*y + x] = fqTileId; _model.fringeTileIds[_model.width*y + x] = fqTileId;
} }
@@ -81,7 +81,7 @@ public class EditableMisoSceneImpl
if (prev != null) { if (prev != null) {
clearObjectTile(x, y); clearObjectTile(x, y);
} }
_object.setTile(x, y, tile); _object.setTile(y, x, tile);
// stick this value into our non-sparse object layer // stick this value into our non-sparse object layer
_objectTileIds[_model.width*y + x] = fqTileId; _objectTileIds[_model.width*y + x] = fqTileId;
} }
@@ -89,7 +89,7 @@ public class EditableMisoSceneImpl
// documentation inherited // documentation inherited
public void clearBaseTile (int x, int y) public void clearBaseTile (int x, int y)
{ {
_base.setTile(x, y, _defaultBaseTile); _base.setTile(y, x, _defaultBaseTile);
// clear it out in the model // clear it out in the model
_model.baseTileIds[_model.width*y + x] = _defaultBaseTileId; _model.baseTileIds[_model.width*y + x] = _defaultBaseTileId;
} }
@@ -97,7 +97,7 @@ public class EditableMisoSceneImpl
// documentation inherited // documentation inherited
public void clearFringeTile (int x, int y) public void clearFringeTile (int x, int y)
{ {
_fringe.setTile(x, y, null); _fringe.setTile(y, x, null);
// clear it out in the model // clear it out in the model
_model.fringeTileIds[_model.width*y + x] = 0; _model.fringeTileIds[_model.width*y + x] = 0;
} }
@@ -115,7 +115,7 @@ public class EditableMisoSceneImpl
} }
// documentation inherited // documentation inherited
public MisoSceneModel getModel () public MisoSceneModel getMisoSceneModel ()
{ {
// we need to flush the object layer to the model prior to // we need to flush the object layer to the model prior to
// returning it // returning it