From f192023132ef38cd942de69404634dbb729866ab Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Thu, 29 Nov 2001 22:10:11 +0000
Subject: [PATCH] More object tile fixups.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@705 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 tests/rsrc/media/tile/bundle/tools/bundle.xml        | 12 ++++--------
 .../rsrc/media/tile/bundle/tools/bundler-config.xml  |  2 --
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/tests/rsrc/media/tile/bundle/tools/bundle.xml b/tests/rsrc/media/tile/bundle/tools/bundle.xml
index 6316fee0b..f84ffdbcd 100644
--- a/tests/rsrc/media/tile/bundle/tools/bundle.xml
+++ b/tests/rsrc/media/tile/bundle/tools/bundle.xml
@@ -5,7 +5,7 @@
   <uniform>
     <tileset name="Node Icons">
       <imagePath>node-icons.png</imagePath>
-      <width>16</width>
+      <!--<width>16</width>-->
       <height>16</height>
       <tileCount>8</tileCount>
     </tileset>
@@ -27,13 +27,9 @@
       <widths>224</widths>
       <tileCounts>4</tileCounts>
       <offsetPos>2, 2</offsetPos>
-      <gapDist>4, 0</gapDist>
-      <objects>
-        <object tid="0" width="4" height="3"/>
-        <object tid="1" width="3" height="4"/>
-        <object tid="2" width="4" height="3"/>
-        <object tid="3" width="3" height="4"/>
-      </objects>
+      <gapSize>4, 0</gapSize>
+      <objectWidths>4, 3, 4, 3</objectWidths>
+      <objectHeights>3, 4, 3, 4</objectHeights>
     </tileset>
   </object>
 </bundle>
diff --git a/tests/rsrc/media/tile/bundle/tools/bundler-config.xml b/tests/rsrc/media/tile/bundle/tools/bundler-config.xml
index ebf588c60..3edd05d90 100644
--- a/tests/rsrc/media/tile/bundle/tools/bundler-config.xml
+++ b/tests/rsrc/media/tile/bundle/tools/bundler-config.xml
@@ -12,10 +12,8 @@
       com.threerings.media.tools.tile.xml.SwissArmyTileSetRuleSet
     </ruleset>
   </mapping>
-  <!--
   <mapping>
     <path>bundle/object</path>
     <ruleset>com.threerings.media.tools.tile.xml.ObjectTileSetRuleSet</ruleset>
   </mapping>
-  -->
 </bundler-config>