Merge pull request #45 from capnm/fix-tile-offsets

2d/hexagonal_map: Fix tile positions and offsets.

2d/hexagonal_map/tileset.tres

@@ -1,4 +1,4 @@
-[gd_resource type="TileSet" load_steps=1 format=2]
+[gd_resource type="TileSet" load_steps=27 format=2]
 
 [ext_resource path="res://WWT-01.png" type="Texture" id=1]
 [ext_resource path="res://WWT-02.png" type="Texture" id=2]
@@ -31,209 +31,210 @@
 
 0/name = "Tile 1"
 0/texture = ExtResource( 1 )
-0/tex_offset = Vector2( -64, -64 )
-0/region = Rect2( 0, 0, 0, 0 )
+0/tex_offset = Vector2( 0, 0 )
+0/modulate = Color( 1, 1, 1, 1 )
+0/region = Rect2( 0, 0, 128, 128 )
 0/occluder_offset = Vector2( 0, 0 )
 0/navigation_offset = Vector2( 0, 0 )
-0/shape_offset = Vector2( 0, 0 )
 0/shapes = [  ]
 1/name = "Tile 2"
 1/texture = ExtResource( 2 )
-1/tex_offset = Vector2( -64, -64 )
-1/region = Rect2( 0, 0, 0, 0 )
+1/tex_offset = Vector2( 0, 0 )
+1/modulate = Color( 1, 1, 1, 1 )
+1/region = Rect2( 0, 0, 128, 128 )
 1/occluder_offset = Vector2( 0, 0 )
 1/navigation_offset = Vector2( 0, 0 )
-1/shape_offset = Vector2( 0, 0 )
 1/shapes = [  ]
 2/name = "Tile 3"
 2/texture = ExtResource( 13 )
-2/tex_offset = Vector2( -64, -64 )
-2/region = Rect2( 0, 0, 0, 0 )
+2/tex_offset = Vector2( 0, 0 )
+2/modulate = Color( 1, 1, 1, 1 )
+2/region = Rect2( 0, 0, 128, 128 )
 2/occluder_offset = Vector2( 0, 0 )
 2/navigation_offset = Vector2( 0, 0 )
-2/shape_offset = Vector2( 0, 0 )
 2/shapes = [  ]
 3/name = "Tile 4"
 3/texture = ExtResource( 20 )
-3/tex_offset = Vector2( -64, -64 )
-3/region = Rect2( 0, 0, 0, 0 )
+3/tex_offset = Vector2( 0, 0 )
+3/modulate = Color( 1, 1, 1, 1 )
+3/region = Rect2( 0, 0, 128, 128 )
 3/occluder_offset = Vector2( 0, 0 )
 3/navigation_offset = Vector2( 0, 0 )
-3/shape_offset = Vector2( 0, 0 )
 3/shapes = [  ]
 4/name = "Tile 5"
 4/texture = ExtResource( 21 )
-4/tex_offset = Vector2( -64, -64 )
-4/region = Rect2( 0, 0, 0, 0 )
+4/tex_offset = Vector2( 0, 0 )
+4/modulate = Color( 1, 1, 1, 1 )
+4/region = Rect2( 0, 0, 128, 128 )
 4/occluder_offset = Vector2( 0, 0 )
 4/navigation_offset = Vector2( 0, 0 )
-4/shape_offset = Vector2( 0, 0 )
 4/shapes = [  ]
 5/name = "Tile 6"
 5/texture = ExtResource( 22 )
-5/tex_offset = Vector2( -64, -64 )
-5/region = Rect2( 0, 0, 0, 0 )
+5/tex_offset = Vector2( 0, 0 )
+5/modulate = Color( 1, 1, 1, 1 )
+5/region = Rect2( 0, 0, 128, 128 )
 5/occluder_offset = Vector2( 0, 0 )
 5/navigation_offset = Vector2( 0, 0 )
-5/shape_offset = Vector2( 0, 0 )
 5/shapes = [  ]
 6/name = "Tile 7"
 6/texture = ExtResource( 23 )
-6/tex_offset = Vector2( -64, -64 )
-6/region = Rect2( 0, 0, 0, 0 )
+6/tex_offset = Vector2( 0, 0 )
+6/modulate = Color( 1, 1, 1, 1 )
+6/region = Rect2( 0, 0, 128, 128 )
 6/occluder_offset = Vector2( 0, 0 )
 6/navigation_offset = Vector2( 0, 0 )
-6/shape_offset = Vector2( 0, 0 )
 6/shapes = [  ]
 7/name = "Tile 8"
 7/texture = ExtResource( 24 )
-7/tex_offset = Vector2( -64, -64 )
-7/region = Rect2( 0, 0, 0, 0 )
+7/tex_offset = Vector2( 0, 0 )
+7/modulate = Color( 1, 1, 1, 1 )
+7/region = Rect2( 0, 0, 128, 128 )
 7/occluder_offset = Vector2( 0, 0 )
 7/navigation_offset = Vector2( 0, 0 )
-7/shape_offset = Vector2( 0, 0 )
 7/shapes = [  ]
 8/name = "Tile 9"
 8/texture = ExtResource( 25 )
-8/tex_offset = Vector2( -64, -64 )
-8/region = Rect2( 0, 0, 0, 0 )
+8/tex_offset = Vector2( 0, 0 )
+8/modulate = Color( 1, 1, 1, 1 )
+8/region = Rect2( 0, 0, 128, 128 )
 8/occluder_offset = Vector2( 0, 0 )
 8/navigation_offset = Vector2( 0, 0 )
-8/shape_offset = Vector2( 0, 0 )
 8/shapes = [  ]
 9/name = "Tile 10"
 9/texture = ExtResource( 26 )
-9/tex_offset = Vector2( -64, -64 )
-9/region = Rect2( 0, 0, 0, 0 )
+9/tex_offset = Vector2( 0, 0 )
+9/modulate = Color( 1, 1, 1, 1 )
+9/region = Rect2( 0, 0, 128, 128 )
 9/occluder_offset = Vector2( 0, 0 )
 9/navigation_offset = Vector2( 0, 0 )
-9/shape_offset = Vector2( 0, 0 )
 9/shapes = [  ]
 10/name = "Tile 11"
 10/texture = ExtResource( 3 )
-10/tex_offset = Vector2( -64, -64 )
-10/region = Rect2( 0, 0, 0, 0 )
+10/tex_offset = Vector2( 0, 0 )
+10/modulate = Color( 1, 1, 1, 1 )
+10/region = Rect2( 0, 0, 128, 128 )
 10/occluder_offset = Vector2( 0, 0 )
 10/navigation_offset = Vector2( 0, 0 )
-10/shape_offset = Vector2( 0, 0 )
 10/shapes = [  ]
 11/name = "Tile 12"
 11/texture = ExtResource( 4 )
-11/tex_offset = Vector2( -64, -64 )
-11/region = Rect2( 0, 0, 0, 0 )
+11/tex_offset = Vector2( 0, 0 )
+11/modulate = Color( 1, 1, 1, 1 )
+11/region = Rect2( 0, 0, 128, 128 )
 11/occluder_offset = Vector2( 0, 0 )
 11/navigation_offset = Vector2( 0, 0 )
-11/shape_offset = Vector2( 0, 0 )
 11/shapes = [  ]
 12/name = "Tile 13"
 12/texture = ExtResource( 5 )
-12/tex_offset = Vector2( -64, -64 )
-12/region = Rect2( 0, 0, 0, 0 )
+12/tex_offset = Vector2( 0, 0 )
+12/modulate = Color( 1, 1, 1, 1 )
+12/region = Rect2( 0, 0, 128, 128 )
 12/occluder_offset = Vector2( 0, 0 )
 12/navigation_offset = Vector2( 0, 0 )
-12/shape_offset = Vector2( 0, 0 )
 12/shapes = [  ]
 13/name = "Tile 14"
 13/texture = ExtResource( 6 )
-13/tex_offset = Vector2( -64, -64 )
-13/region = Rect2( 0, 0, 0, 0 )
+13/tex_offset = Vector2( 0, 0 )
+13/modulate = Color( 1, 1, 1, 1 )
+13/region = Rect2( 0, 0, 128, 128 )
 13/occluder_offset = Vector2( 0, 0 )
 13/navigation_offset = Vector2( 0, 0 )
-13/shape_offset = Vector2( 0, 0 )
 13/shapes = [  ]
 14/name = "Tile 15"
 14/texture = ExtResource( 7 )
-14/tex_offset = Vector2( -64, -64 )
-14/region = Rect2( 0, 0, 0, 0 )
+14/tex_offset = Vector2( 0, 0 )
+14/modulate = Color( 1, 1, 1, 1 )
+14/region = Rect2( 0, 0, 128, 128 )
 14/occluder_offset = Vector2( 0, 0 )
 14/navigation_offset = Vector2( 0, 0 )
-14/shape_offset = Vector2( 0, 0 )
 14/shapes = [  ]
 15/name = "Tile 16"
 15/texture = ExtResource( 8 )
-15/tex_offset = Vector2( -64, -64 )
-15/region = Rect2( 0, 0, 0, 0 )
+15/tex_offset = Vector2( 0, 0 )
+15/modulate = Color( 1, 1, 1, 1 )
+15/region = Rect2( 0, 0, 128, 128 )
 15/occluder_offset = Vector2( 0, 0 )
 15/navigation_offset = Vector2( 0, 0 )
-15/shape_offset = Vector2( 0, 0 )
 15/shapes = [  ]
 16/name = "Tile 17"
 16/texture = ExtResource( 9 )
-16/tex_offset = Vector2( -64, -64 )
-16/region = Rect2( 0, 0, 0, 0 )
+16/tex_offset = Vector2( 0, 0 )
+16/modulate = Color( 1, 1, 1, 1 )
+16/region = Rect2( 0, 0, 128, 128 )
 16/occluder_offset = Vector2( 0, 0 )
 16/navigation_offset = Vector2( 0, 0 )
-16/shape_offset = Vector2( 0, 0 )
 16/shapes = [  ]
 17/name = "Tile 18"
 17/texture = ExtResource( 10 )
-17/tex_offset = Vector2( -64, -64 )
-17/region = Rect2( 0, 0, 0, 0 )
+17/tex_offset = Vector2( 0, 0 )
+17/modulate = Color( 1, 1, 1, 1 )
+17/region = Rect2( 0, 0, 128, 128 )
 17/occluder_offset = Vector2( 0, 0 )
 17/navigation_offset = Vector2( 0, 0 )
-17/shape_offset = Vector2( 0, 0 )
 17/shapes = [  ]
 18/name = "Tile 19"
 18/texture = ExtResource( 11 )
-18/tex_offset = Vector2( -64, -64 )
-18/region = Rect2( 0, 0, 0, 0 )
+18/tex_offset = Vector2( 0, 0 )
+18/modulate = Color( 1, 1, 1, 1 )
+18/region = Rect2( 0, 0, 128, 128 )
 18/occluder_offset = Vector2( 0, 0 )
 18/navigation_offset = Vector2( 0, 0 )
-18/shape_offset = Vector2( 0, 0 )
 18/shapes = [  ]
 19/name = "Tile 20"
 19/texture = ExtResource( 12 )
-19/tex_offset = Vector2( -64, -64 )
-19/region = Rect2( 0, 0, 0, 0 )
+19/tex_offset = Vector2( 0, 0 )
+19/modulate = Color( 1, 1, 1, 1 )
+19/region = Rect2( 0, 0, 128, 128 )
 19/occluder_offset = Vector2( 0, 0 )
 19/navigation_offset = Vector2( 0, 0 )
-19/shape_offset = Vector2( 0, 0 )
 19/shapes = [  ]
 20/name = "Tile 21"
 20/texture = ExtResource( 14 )
-20/tex_offset = Vector2( -64, -64 )
-20/region = Rect2( 0, 0, 0, 0 )
+20/tex_offset = Vector2( 0, 0 )
+20/modulate = Color( 1, 1, 1, 1 )
+20/region = Rect2( 0, 0, 128, 128 )
 20/occluder_offset = Vector2( 0, 0 )
 20/navigation_offset = Vector2( 0, 0 )
-20/shape_offset = Vector2( 0, 0 )
 20/shapes = [  ]
 21/name = "Tile 22"
 21/texture = ExtResource( 15 )
-21/tex_offset = Vector2( -64, -64 )
-21/region = Rect2( 0, 0, 0, 0 )
+21/tex_offset = Vector2( 0, 0 )
+21/modulate = Color( 1, 1, 1, 1 )
+21/region = Rect2( 0, 0, 128, 128 )
 21/occluder_offset = Vector2( 0, 0 )
 21/navigation_offset = Vector2( 0, 0 )
-21/shape_offset = Vector2( 0, 0 )
 21/shapes = [  ]
 22/name = "Tile 23"
 22/texture = ExtResource( 16 )
-22/tex_offset = Vector2( -64, -64 )
-22/region = Rect2( 0, 0, 0, 0 )
+22/tex_offset = Vector2( 0, 0 )
+22/modulate = Color( 1, 1, 1, 1 )
+22/region = Rect2( 0, 0, 128, 128 )
 22/occluder_offset = Vector2( 0, 0 )
 22/navigation_offset = Vector2( 0, 0 )
-22/shape_offset = Vector2( 0, 0 )
 22/shapes = [  ]
 23/name = "Tile 24"
 23/texture = ExtResource( 17 )
-23/tex_offset = Vector2( -64, -64 )
-23/region = Rect2( 0, 0, 0, 0 )
+23/tex_offset = Vector2( 0, 0 )
+23/modulate = Color( 1, 1, 1, 1 )
+23/region = Rect2( 0, 0, 128, 128 )
 23/occluder_offset = Vector2( 0, 0 )
 23/navigation_offset = Vector2( 0, 0 )
-23/shape_offset = Vector2( 0, 0 )
 23/shapes = [  ]
 24/name = "Tile 25"
 24/texture = ExtResource( 18 )
-24/tex_offset = Vector2( -64, -64 )
-24/region = Rect2( 0, 0, 0, 0 )
+24/tex_offset = Vector2( 0, 0 )
+24/modulate = Color( 1, 1, 1, 1 )
+24/region = Rect2( 0, 0, 128, 128 )
 24/occluder_offset = Vector2( 0, 0 )
 24/navigation_offset = Vector2( 0, 0 )
-24/shape_offset = Vector2( 0, 0 )
 24/shapes = [  ]
 25/name = "Tile 26"
 25/texture = ExtResource( 19 )
-25/tex_offset = Vector2( -64, -64 )
-25/region = Rect2( 0, 0, 0, 0 )
+25/tex_offset = Vector2( 0, 0 )
+25/modulate = Color( 1, 1, 1, 1 )
+25/region = Rect2( 0, 0, 128, 128 )
 25/occluder_offset = Vector2( 0, 0 )
 25/navigation_offset = Vector2( 0, 0 )
-25/shape_offset = Vector2( 0, 0 )
 25/shapes = [  ]
+

2d/hexagonal_map/tileset_edit.tscn

@@ -29,185 +29,160 @@
 
 [node name="Node2D" type="Node2D"]
 
-
 [node name="Tile 1" type="Sprite" parent="."]
 
-position = Vector2( 96.6174, 42.2665 )
+position = Vector2( 0, 0 )
 texture = ExtResource( 1 )
 centered = false
-offset = Vector2( -64, -64 )
 
 [node name="Tile 2" type="Sprite" parent="."]
 
-position = Vector2( 96.6174, 42.2665 )
+position = Vector2( 128, 0 )
 texture = ExtResource( 2 )
 centered = false
-offset = Vector2( -64, -64 )
 
 [node name="Tile 3" type="Sprite" parent="."]
 
-position = Vector2( 96.6174, 42.2665 )
+position = Vector2( 256, 0 )
 texture = ExtResource( 3 )
 centered = false
-offset = Vector2( -64, -64 )
 
 [node name="Tile 4" type="Sprite" parent="."]
 
-position = Vector2( 96.6174, 42.2665 )
+position = Vector2( 384, 0 )
 texture = ExtResource( 4 )
 centered = false
-offset = Vector2( -64, -64 )
 
 [node name="Tile 5" type="Sprite" parent="."]
 
-position = Vector2( 96.6174, 42.2665 )
+position = Vector2( 512, 0 )
 texture = ExtResource( 5 )
 centered = false
-offset = Vector2( -64, -64 )
 
 [node name="Tile 6" type="Sprite" parent="."]
 
-position = Vector2( 96.6174, 42.2665 )
+position = Vector2( 640, 0 )
 texture = ExtResource( 6 )
 centered = false
-offset = Vector2( -64, -64 )
 
 [node name="Tile 7" type="Sprite" parent="."]
 
-position = Vector2( 96.6174, 42.2665 )
+position = Vector2( 768, 0 )
 texture = ExtResource( 7 )
 centered = false
-offset = Vector2( -64, -64 )
 
 [node name="Tile 8" type="Sprite" parent="."]
 
-position = Vector2( 96.6174, 42.2665 )
+position = Vector2( 896, 0 )
 texture = ExtResource( 8 )
 centered = false
-offset = Vector2( -64, -64 )
 
 [node name="Tile 9" type="Sprite" parent="."]
 
-position = Vector2( 96.6174, 42.2665 )
+position = Vector2( 1024, 0 )
 texture = ExtResource( 9 )
 centered = false
-offset = Vector2( -64, -64 )
 
 [node name="Tile 10" type="Sprite" parent="."]
 
-position = Vector2( 96.6174, 42.2665 )
+position = Vector2( 0, 128 )
 texture = ExtResource( 10 )
 centered = false
-offset = Vector2( -64, -64 )
 
 [node name="Tile 11" type="Sprite" parent="."]
 
-position = Vector2( 96.6174, 42.2665 )
+position = Vector2( 128, 128 )
 texture = ExtResource( 11 )
 centered = false
-offset = Vector2( -64, -64 )
 
 [node name="Tile 12" type="Sprite" parent="."]
 
-position = Vector2( 96.6174, 42.2665 )
+position = Vector2( 256, 128 )
 texture = ExtResource( 12 )
 centered = false
-offset = Vector2( -64, -64 )
 
 [node name="Tile 13" type="Sprite" parent="."]
 
-position = Vector2( 96.6174, 42.2665 )
+position = Vector2( 384, 128 )
 texture = ExtResource( 13 )
 centered = false
-offset = Vector2( -64, -64 )
 
 [node name="Tile 14" type="Sprite" parent="."]
 
-position = Vector2( 96.6174, 42.2665 )
+position = Vector2( 512, 128 )
 texture = ExtResource( 14 )
 centered = false
-offset = Vector2( -64, -64 )
 
 [node name="Tile 15" type="Sprite" parent="."]
 
-position = Vector2( 96.6174, 42.2665 )
+position = Vector2( 640, 128 )
 texture = ExtResource( 15 )
 centered = false
-offset = Vector2( -64, -64 )
 
 [node name="Tile 16" type="Sprite" parent="."]
 
-position = Vector2( 96.6174, 42.2665 )
+position = Vector2( 768, 128 )
 texture = ExtResource( 16 )
 centered = false
-offset = Vector2( -64, -64 )
 
 [node name="Tile 17" type="Sprite" parent="."]
 
-position = Vector2( 96.6174, 42.2665 )
+position = Vector2( 896, 128 )
 texture = ExtResource( 17 )
 centered = false
-offset = Vector2( -64, -64 )
 
 [node name="Tile 18" type="Sprite" parent="."]
 
-position = Vector2( 96.6174, 42.2665 )
+position = Vector2( 1024, 128 )
 texture = ExtResource( 18 )
 centered = false
-offset = Vector2( -64, -64 )
 
 [node name="Tile 19" type="Sprite" parent="."]
 
-position = Vector2( 96.6174, 42.2665 )
+position = Vector2( 0, 256 )
 texture = ExtResource( 19 )
 centered = false
-offset = Vector2( -64, -64 )
 
 [node name="Tile 20" type="Sprite" parent="."]
 
-position = Vector2( 96.6174, 42.2665 )
+position = Vector2( 128, 256 )
 texture = ExtResource( 20 )
 centered = false
-offset = Vector2( -64, -64 )
 
 [node name="Tile 21" type="Sprite" parent="."]
 
-position = Vector2( 96.6174, 42.2665 )
+position = Vector2( 256, 256 )
 texture = ExtResource( 21 )
 centered = false
-offset = Vector2( -64, -64 )
 
 [node name="Tile 22" type="Sprite" parent="."]
 
-position = Vector2( 96.6174, 42.2665 )
+position = Vector2( 384, 256 )
 texture = ExtResource( 22 )
 centered = false
-offset = Vector2( -64, -64 )
 
 [node name="Tile 23" type="Sprite" parent="."]
 
-position = Vector2( 96.6174, 42.2665 )
+position = Vector2( 512, 256 )
 texture = ExtResource( 23 )
 centered = false
-offset = Vector2( -64, -64 )
 
 [node name="Tile 24" type="Sprite" parent="."]
 
-position = Vector2( 96.6174, 42.2665 )
+position = Vector2( 640, 256 )
 texture = ExtResource( 24 )
 centered = false
-offset = Vector2( -64, -64 )
 
 [node name="Tile 25" type="Sprite" parent="."]
 
-position = Vector2( 96.6174, 42.2665 )
+position = Vector2( 768, 256 )
 texture = ExtResource( 25 )
 centered = false
-offset = Vector2( -64, -64 )
 
 [node name="Tile 26" type="Sprite" parent="."]
 
-position = Vector2( 96.6174, 42.2665 )
+position = Vector2( 896, 256 )
 texture = ExtResource( 26 )
 centered = false
-offset = Vector2( -64, -64 )
+
+