Update and improve isometric demo for 3.2

Also tweak hex map demo

2d/hexagonal_map/troll.gd

@@ -1,12 +1,12 @@
 extends KinematicBody2D
 
-const MOTION_SPEED = 160 # Pixels/second
+const MOTION_SPEED = 160 # Pixels/second.
 
 func _physics_process(_delta):
 	var motion = Vector2()
 	motion.x = Input.get_action_strength("move_right") - Input.get_action_strength("move_left")
 	motion.y = Input.get_action_strength("move_down") - Input.get_action_strength("move_up")
-	motion.y *= 0.5
+	motion.y *= 0.57735056839 # tan(30 degrees).
 	motion = motion.normalized() * MOTION_SPEED
 	#warning-ignore:return_value_discarded
 	move_and_slide(motion)

2d/isometric/dungeon.tscn

@@ -10,8 +10,9 @@ mode = 1
 tile_set = ExtResource( 1 )
 cell_size = Vector2( 128, 64 )
 cell_tile_origin = 1
+centered_textures = true
 format = 1
-tile_data = PoolIntArray( -851956, 0, -1200553578, -851955, 0, -1200553578, -851954, 0, -1200553578, -786420, 1, -1200553578, -786419, 0, -1200553578, -786418, 0, -1200553578, -720884, 0, -1200553578, -720883, 0, -1200553578, -720882, 0, -1200553578, -655348, 1, -1200553578, -655347, 0, -1200553578, -655346, 0, -1200553578, -589812, 1, -1200553578, -589811, 0, -1200553578, -589810, 0, -1200553578, -524276, 0, -1200553578, -524275, 1, -1200553578, -524274, 0, -1200553578, -458740, 0, -1200553578, -458739, 0, -1200553578, -458738, 0, -1200553578, -393210, 0, -1200553578, -393209, 0, -1200553578, -393208, 0, -1200553578, -393207, 0, -1200553578, -393206, 0, -1200553578, -393205, 0, -1200553578, -393204, 0, -1200553578, -393203, 0, -1200553578, -393202, 0, -1200553578, -327674, 0, -1200553578, -327673, 0, -1200553578, -327672, 1, -1200553578, -327671, 1, -1200553578, -327670, 1, -1200553578, -327669, 1, -1200553578, -327668, 1, -1200553578, -327667, 0, -1200553578, -327666, 0, -1200553578, -262138, 0, -1200553578, -262137, 0, -1200553578, -262136, 0, -1200553578, -262135, 0, -1200553578, -262134, 0, -1200553578, -262133, 0, -1200553578, -262132, 0, -1200553578, -262131, 0, -1200553578, -262130, 0, -1200553578, -196602, 0, -1200553578, -196601, 0, -1200553578, -196600, 0, -1200553578, -196599, 0, -1200553578, -196598, 0, -1200553578, -196597, 0, -1200553578, -196596, 0, -1200553578, -196595, 0, -1200553578, -196594, 0, -1200553578, -131066, 0, -1200553578, -131065, 0, -1200553578, -131064, 0, -1200553578, -131063, 0, -1200553578, -65530, 0, -1200553578, -65529, 0, -1200553578, -65528, 0, -1200553578, -65527, 0, -1200553578, 6, 0, -1200553578, 7, 1, -1200553578, 8, 0, -1200553578, 9, 0, -1200553578, 65542, 0, -1200553578, 65543, 0, -1200553578, 65544, 0, -1200553578, 65545, 0, -1200553578, 131078, 0, -1200553578, 131079, 0, -1200553578, 131080, 0, -1200553578, 131081, 0, -1200553578, 196614, 0, -1200553578, 196615, 0, -1200553578, 196616, 0, -1200553578 )
+tile_data = PoolIntArray( -917493, 0, 0, -917492, 0, 0, -917491, 0, 0, -917490, 0, 0, -851957, 0, 0, -851956, 0, 0, -851955, 0, 0, -851954, 0, 0, -786421, 0, 0, -786420, 1, 0, -786419, 0, -1200553578, -786418, 0, 0, -720885, 0, 0, -720884, 0, 0, -720883, 0, -1200553578, -720882, 0, 0, -655349, 0, 0, -655348, 1, 0, -655347, 0, -1200553578, -655346, 0, 0, -589813, 0, 0, -589812, 1, 0, -589811, 0, -1200553578, -589810, 0, 0, -524277, 0, 0, -524276, 0, 0, -524275, 1, -1200553578, -524274, 0, 0, -458747, 0, 0, -458746, 0, 0, -458745, 0, 0, -458744, 0, 0, -458743, 0, 0, -458742, 0, 0, -458741, 0, 0, -458740, 0, 0, -458739, 0, -1200553578, -458738, 0, 0, -393211, 0, 0, -393210, 0, 0, -393209, 0, 0, -393208, 0, 0, -393207, 0, 0, -393206, 0, 0, -393205, 0, 0, -393204, 0, 0, -393203, 0, -1200553578, -393202, 0, 0, -327675, 0, 0, -327674, 0, 0, -327673, 0, -1200553578, -327672, 1, -1200553578, -327671, 1, -1200553578, -327670, 1, 0, -327669, 1, 0, -327668, 1, 0, -327667, 0, -1200553578, -327666, 0, 0, -262139, 0, 0, -262138, 0, 0, -262137, 0, -1200553578, -262136, 0, -1200553578, -262135, 0, -1200553578, -262134, 0, -1200553578, -262133, 0, -1200553578, -262132, 0, -1200553578, -262131, 0, -1200553578, -262130, 0, 0, -196603, 0, 0, -196602, 0, 0, -196601, 0, -1200553578, -196600, 0, -1200553578, -196599, 0, 0, -196598, 0, 0, -196597, 0, 0, -196596, 0, 0, -196595, 0, 0, -196594, 0, 0, -131067, 0, 0, -131066, 0, 0, -131065, 0, -1200553578, -131064, 0, -1200553578, -131063, 0, 0, -65531, 0, 0, -65530, 0, 0, -65529, 0, -1200553578, -65528, 0, -1200553578, -65527, 0, 0, 5, 0, 0, 6, 0, 0, 7, 1, -1200553578, 8, 0, -1200553578, 9, 0, 0, 65541, 0, 0, 65542, 0, 0, 65543, 0, -1200553578, 65544, 0, -1200553578, 65545, 0, 0, 131077, 0, 0, 131078, 0, 0, 131079, 0, -1200553578, 131080, 0, -1200553578, 131081, 0, 0, 196613, 0, 0, 196614, 0, 0, 196615, 0, 0, 196616, 0, 0 )
 
 [node name="Walls" type="TileMap" parent="."]
 mode = 1
@@ -19,8 +20,9 @@ tile_set = ExtResource( 1 )
 cell_size = Vector2( 128, 64 )
 cell_tile_origin = 1
 cell_y_sort = true
+centered_textures = true
 format = 1
-tile_data = PoolIntArray( -917493, 2, -1200553578, -917492, 2, -1200553578, -917491, 2, -1200553578, -917490, 2, -1200553578, -917489, 2, -1200553578, -851957, 2, -1200553578, -851956, 3, -1200553578, -851954, 3, -1200553578, -851953, 2, -1200553578, -786421, 2, -1200553578, -786420, 3, -1200553578, -786418, 3, -1200553578, -786417, 2, -1200553578, -720885, 2, -1200553578, -720881, 2, -1200553578, -655349, 2, -1200553578, -655348, 2, -1200553578, -655346, 3, -1200553578, -655345, 2, -1200553578, -589813, 2, -1200553578, -589809, 2, -1200553578, -524277, 2, -1200553578, -524273, 2, -1200553578, -458747, 2, -1200553578, -458746, 2, -1200553578, -458745, 2, -1200553578, -458744, 536870916, -1200553578, -458743, 536870916, -1200553578, -458742, 2, -1200553578, -458741, 2, -1200553578, -458740, 2, -1200553578, -458738, 2, -1200553578, -458737, 2, -1200553578, -393211, 2, -1200553578, -393209, 3, -1200553578, -393205, 3, -1200553578, -393201, 2, -1200553578, -327675, 4, -1200553578, -327665, 2, -1200553578, -262139, 4, -1200553578, -262129, 2, -1200553578, -196603, 2, 0, -196601, 3, 0, -196593, 2, -1200553578, -131067, 2, 0, -131062, 2, -1200553578, -131061, 2, -1200553578, -131060, 2, -1200553578, -131059, 2, -1200553578, -131058, 2, -1200553578, -131057, 2, -1200553578, -65531, 2, 0, -65530, 2, 0, -65527, 2, -1200553578, -65526, 2, -1200553578, 5, 2, -1200553578, 10, 2, 0, 65541, 2, -1200553578, 65546, 2, 0, 131077, 2, -1200553578, 131081, 3, 0, 131082, 2, 0, 196613, 2, -1200553578, 196618, 2, 0, 262149, 2, -1200553578, 262150, 2, -1200553578, 262151, 2, -1200553578, 262152, 2, -1200553578, 262153, 2, -1200553578, 262154, 2, -1200553578 )
+tile_data = PoolIntArray( -917493, 2, -1200553578, -917492, 2, -1200553578, -917491, 2, -1200553578, -917490, 2, -1200553578, -917489, 2, -1200553578, -851957, 2, -1200553578, -851956, 3, -1200553578, -851954, 3, -1200553578, -851953, 2, -1200553578, -786421, 2, -1200553578, -786420, 3, -1200553578, -786418, 3, -1200553578, -786417, 2, -1200553578, -720885, 2, -1200553578, -720881, 2, -1200553578, -655349, 2, -1200553578, -655348, 2, -1200553578, -655346, 3, -1200553578, -655345, 2, -1200553578, -589813, 2, -1200553578, -589809, 2, -1200553578, -524277, 2, -1200553578, -524273, 2, -1200553578, -458747, 2, -1200553578, -458746, 2, -1200553578, -458745, 2, -1200553578, -458744, 536870916, -1200553578, -458743, 536870916, -1200553578, -458742, 2, 0, -458741, 2, 0, -458740, 2, 0, -458738, 2, 0, -458737, 2, -1200553578, -393211, 2, -1200553578, -393209, 3, -1200553578, -393201, 2, -1200553578, -327675, 4, -1200553578, -327665, 2, -1200553578, -262139, 4, -1200553578, -262129, 2, -1200553578, -196603, 2, 0, -196601, 3, 0, -196593, 2, -1200553578, -131067, 2, 0, -131062, 2, -1200553578, -131061, 2, -1200553578, -131060, 2, -1200553578, -131059, 2, -1200553578, -131058, 2, -1200553578, -131057, 2, -1200553578, -65531, 2, 0, -65530, 2, 0, -65527, 2, -1200553578, -65526, 2, -1200553578, 5, 2, -1200553578, 10, 2, 0, 65541, 2, -1200553578, 65546, 2, 0, 131077, 2, -1200553578, 131081, 3, 0, 131082, 2, 0, 196613, 2, -1200553578, 196618, 2, 0, 262149, 2, -1200553578, 262150, 2, -1200553578, 262151, 2, -1200553578, 262152, 2, 0, 262153, 2, 0, 262154, 2, 0 )
 
 [node name="Troll" parent="Walls" instance=ExtResource( 2 )]
 position = Vector2( 368.142, 347.007 )

2d/isometric/tileset.tres

@@ -3,80 +3,80 @@
 [ext_resource path="res://isotiles.png" type="Texture" id=1]
 
 [sub_resource type="ConvexPolygonShape2D" id=1]
-points = PoolVector2Array( -4, -30, 60, 2, -4, 34, -68, 2 )
+points = PoolVector2Array( 0, -32, 64, 0, 0, 32, -64, 0 )
 
 [sub_resource type="ConvexPolygonShape2D" id=2]
-points = PoolVector2Array( -4, -22, 12, -22, 28, -6, 4, 10, -4, 10, -20, -6 )
+points = PoolVector2Array( -24, -12, -10, -22, 10, -22, 24, -12, 24, 2, 10, 12, -10, 12, -24, 2 )
 
 [sub_resource type="ConvexPolygonShape2D" id=3]
-points = PoolVector2Array( -21.905, 23.3748, 50.095, -8.62516, 66.095, -0.62516, -5.90501, 31.3748 )
+points = PoolVector2Array( -40, 16, 24, -16, 40, -8, -24, 24 )
 
 [resource]
 0/name = "Base"
 0/texture = ExtResource( 1 )
-0/tex_offset = Vector2( -66, -42 )
+0/tex_offset = Vector2( 0, 0 )
 0/modulate = Color( 1, 1, 1, 1 )
-0/region = Rect2( 28, 92, 132, 84 )
+0/region = Rect2( 28, 75, 135, 105 )
 0/tile_mode = 0
-0/occluder_offset = Vector2( 0, 0 )
-0/navigation_offset = Vector2( 0, 0 )
+0/occluder_offset = Vector2( 67.5, 52.5 )
+0/navigation_offset = Vector2( 67.5, 52.5 )
 0/shapes = [  ]
 0/z_index = 0
 1/name = "Base2"
 1/texture = ExtResource( 1 )
-1/tex_offset = Vector2( -66, -42 )
+1/tex_offset = Vector2( 0, 0 )
 1/modulate = Color( 1, 1, 1, 1 )
-1/region = Rect2( 220, 92, 132, 84 )
+1/region = Rect2( 221, 75, 135, 105 )
 1/tile_mode = 0
-1/occluder_offset = Vector2( 0, 0 )
-1/navigation_offset = Vector2( 0, 0 )
+1/occluder_offset = Vector2( 67.5, 52.5 )
+1/navigation_offset = Vector2( 67.5, 52.5 )
 1/shapes = [  ]
 1/z_index = 0
 2/name = "Wall"
 2/texture = ExtResource( 1 )
-2/tex_offset = Vector2( -69.3109, -99.8051 )
+2/tex_offset = Vector2( 0, -32 )
 2/modulate = Color( 1, 1, 1, 1 )
-2/region = Rect2( 28, 220, 132, 136 )
+2/region = Rect2( 28, 220, 140, 140 )
 2/tile_mode = 0
-2/occluder_offset = Vector2( 0, 0 )
-2/navigation_offset = Vector2( 0, 0 )
+2/occluder_offset = Vector2( 70, 70 )
+2/navigation_offset = Vector2( 70, 70 )
 2/shapes = [ {
 "autotile_coord": Vector2( 0, 0 ),
 "one_way": false,
 "one_way_margin": 1.0,
 "shape": SubResource( 1 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+"shape_transform": Transform2D( 1, 0, 0, 1, 70, 70 )
 } ]
 2/z_index = 0
 3/name = "Column"
 3/texture = ExtResource( 1 )
-3/tex_offset = Vector2( -69.5632, -100.446 )
+3/tex_offset = Vector2( 0, -32 )
 3/modulate = Color( 1, 1, 1, 1 )
-3/region = Rect2( 220, 220, 132, 136 )
+3/region = Rect2( 259, 241, 55, 95 )
 3/tile_mode = 0
-3/occluder_offset = Vector2( 0, 0 )
-3/navigation_offset = Vector2( 0, 0 )
+3/occluder_offset = Vector2( 27.5, 47.5 )
+3/navigation_offset = Vector2( 27.5, 47.5 )
 3/shapes = [ {
 "autotile_coord": Vector2( 0, 0 ),
 "one_way": false,
 "one_way_margin": 1.0,
 "shape": SubResource( 2 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+"shape_transform": Transform2D( 1, 0, 0, 1, 29.5, 47.5 )
 } ]
 3/z_index = 0
 4/name = "Door1"
 4/texture = ExtResource( 1 )
-4/tex_offset = Vector2( -50.3623, -90.8164 )
+4/tex_offset = Vector2( 0, -25 )
 4/modulate = Color( 1, 1, 1, 1 )
-4/region = Rect2( 24, 408, 132, 136 )
+4/region = Rect2( 54, 426, 85, 110 )
 4/tile_mode = 0
-4/occluder_offset = Vector2( 0, 0 )
-4/navigation_offset = Vector2( 0, 0 )
+4/occluder_offset = Vector2( 42.5, 55 )
+4/navigation_offset = Vector2( 42.5, 55 )
 4/shapes = [ {
 "autotile_coord": Vector2( 0, 0 ),
 "one_way": false,
 "one_way_margin": 1.0,
 "shape": SubResource( 3 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+"shape_transform": Transform2D( 1, 0, 0, 1, 42.5, 55 )
 } ]
 4/z_index = 0

2d/isometric/tileset_edit.tscn

@@ -5,56 +5,49 @@
 [node name="TilesetEdit" type="Node2D"]
 
 [node name="Base" type="Sprite" parent="."]
-position = Vector2( 150.049, 61.1264 )
 texture = ExtResource( 1 )
-centered = false
-offset = Vector2( -66, -42 )
 region_enabled = true
-region_rect = Rect2( 28, 92, 132, 84 )
+region_rect = Rect2( 28, 75, 135, 105 )
 
 [node name="Base2" type="Sprite" parent="."]
-position = Vector2( 257.013, 124.86 )
+position = Vector2( 200, 0 )
 texture = ExtResource( 1 )
-centered = false
-offset = Vector2( -66, -42 )
 region_enabled = true
-region_rect = Rect2( 220, 92, 132, 84 )
+region_rect = Rect2( 221, 75, 135, 105 )
 
 [node name="Wall" type="Sprite" parent="."]
-position = Vector2( 421.311, 137.805 )
+position = Vector2( 400, 0 )
 texture = ExtResource( 1 )
-centered = false
-offset = Vector2( -69.3109, -99.8051 )
+offset = Vector2( 0, -32 )
 region_enabled = true
-region_rect = Rect2( 28, 220, 132, 136 )
+region_rect = Rect2( 28, 220, 140, 140 )
 
 [node name="StaticBody2D" type="StaticBody2D" parent="Wall"]
 
-[node name="collision" type="CollisionPolygon2D" parent="Wall/StaticBody2D"]
-polygon = PoolVector2Array( -68, 2, -4, 34, 60, 2, -4, -30 )
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Wall/StaticBody2D"]
+polygon = PoolVector2Array( -64, 0, 0, 32, 64, 0, 0, -32 )
 
 [node name="Column" type="Sprite" parent="."]
-position = Vector2( 359.563, 266.446 )
+position = Vector2( 600, 0 )
 texture = ExtResource( 1 )
-centered = false
-offset = Vector2( -69.5632, -100.446 )
+offset = Vector2( 0, -32 )
 region_enabled = true
-region_rect = Rect2( 220, 220, 132, 136 )
+region_rect = Rect2( 259, 241, 55, 95 )
 
-[node name="StaticBody" type="StaticBody2D" parent="Column"]
+[node name="StaticBody2D" type="StaticBody2D" parent="Column"]
 
-[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Column/StaticBody"]
-polygon = PoolVector2Array( -20, -6, -4, 10, 4, 10, 28, -6, 12, -22, -4, -22 )
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Column/StaticBody2D"]
+position = Vector2( 2, 0 )
+polygon = PoolVector2Array( -24, 2, -10, 12, 10, 12, 24, 2, 24, -12, 10, -22, -10, -22, -24, -12 )
 
 [node name="Door1" type="Sprite" parent="."]
-position = Vector2( -24.1548, 142.216 )
+position = Vector2( 800, 0 )
 texture = ExtResource( 1 )
-centered = false
-offset = Vector2( -50.3623, -90.8164 )
+offset = Vector2( 0, -25 )
 region_enabled = true
-region_rect = Rect2( 24, 408, 132, 136 )
+region_rect = Rect2( 54, 426, 85, 110 )
 
 [node name="StaticBody2D" type="StaticBody2D" parent="Door1"]
 
 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Door1/StaticBody2D"]
-polygon = PoolVector2Array( -5.90501, 31.3748, 66.095, -0.62516, 50.095, -8.62516, -21.905, 23.3748 )
+polygon = PoolVector2Array( -24, 24, 40, -8, 24, -16, -40, 16 )

2d/isometric/troll.gd

@@ -1,6 +1,6 @@
 extends KinematicBody2D
 
-const MOTION_SPEED = 160 # Pixels/second
+const MOTION_SPEED = 160 # Pixels/second.
 
 func _physics_process(_delta):
 	var motion = Vector2()

2d/isometric/troll.tscn

@@ -10,11 +10,10 @@ radius = 16.0
 script = ExtResource( 1 )
 
 [node name="Sprite" type="Sprite" parent="."]
-position = Vector2( -3.94334, -36.924 )
+position = Vector2( -4, -28 )
 texture = ExtResource( 2 )
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
-position = Vector2( -0.342697, -0.980721 )
 shape = SubResource( 1 )
 
 [node name="Camera2D" type="Camera2D" parent="."]