9 files changed, 538 insertions, 1 deletions
diff --git a/demos/2d/hexamap/engine.cfg b/demos/2d/hexamap/engine.cfg
index 4567af7a16..28043b0860 100644
--- a/demos/2d/hexamap/engine.cfg
+++ b/demos/2d/hexamap/engine.cfg
@@ -1,7 +1,7 @@
 [application]
 
 name="Hexagonal Game"
-main_scene="res://map.scn"
+main_scene="res://map.tscn"
 icon="res://icon.png"
 
 [input]
diff --git a/demos/2d/hexamap/map.scn b/demos/2d/hexamap/map.scn
deleted file mode 100644
index de49527003..0000000000
--- a/demos/2d/hexamap/map.scn
+++ /dev/null
diff --git a/demos/2d/hexamap/map.tscn b/demos/2d/hexamap/map.tscn
new file mode 100644
index 0000000000..3abda31bb0
--- /dev/null
+++ b/demos/2d/hexamap/map.tscn
@@ -0,0 +1,31 @@
+[gd_scene load_steps=3 format=1]
+
+[ext_resource path="res://tileset.tres" type="TileSet" id=1]
+[ext_resource path="res://troll.tscn" type="PackedScene" id=2]
+
+[node name="Node2D" type="Node2D"]
+
+[node name="TileMap" type="TileMap" parent="."]
+
+mode = 0
+tile_set = ExtResource( 1 )
+cell/size = Vector2( 82, 94 )
+cell/quadrant_size = 16
+cell/custom_transform = Matrix32( 1, 0, 0, 1, 0, 0 )
+cell/half_offset = 1
+cell/tile_origin = 0
+cell/y_sort = false
+collision/use_kinematic = false
+collision/friction = 1.0
+collision/bounce = 0.0
+collision/layers = 1
+collision/mask = 1
+occluder/light_mask = 1
+tile_data = IntArray( -458747, 1073741831, -393213, 1073741831, -393212, 1073741831, -393211, 6, -393210, 1073741831, -393209, 1073741830, -393208, 1073741830, -393207, 6, -393206, 8, -327679, 1073741831, -327678, 1073741831, -327677, 1073741831, -327676, 1073741830, -327675, 1073741831, -327674, 6, -327673, 6, -327672, 6, -327671, 6, -327670, 6, -327669, 0, -327668, 0, -262143, 1073741831, -262142, 1073741831, -262141, 6, -262140, 6, -262139, 0, -262138, 6, -262137, 1, -262136, 0, -262135, 1, -262134, 1, -262133, 0, -262132, 0, -262131, 0, -196608, 9, -196607, 1073741832, -196606, 1073741830, -196605, 2, -196604, 2, -196603, 1073741845, -196602, 21, -196601, 19, -196600, 1073741826, -196599, 0, -196598, 16, -196597, 0, -196596, 0, -196595, 0, -196594, 0, -196593, 0, -131071, 0, -131070, 1, -131069, 1073741827, -131068, 1073741846, -131067, 20, -131066, 19, -131065, 2, -131064, 0, -131063, 14, -131062, 0, -131061, 0, -131060, 0, -131059, 0, -131058, 0, -131057, 0, -131056, 0, -65534, 1, -65533, 2, -65532, 1073741827, -65531, 1, -65530, 1, -65529, 0, -65528, 10, -65527, 12, -65526, 0, -65525, 0, -65524, 0, -65523, 0, -65522, 0, -65521, 0, -65520, 0, 1, 0, 2, 0, 3, 2, 4, 1073741826, 5, 1, 6, 15, 7, 0, 8, 0, 9, 0, 10, 0, 11, 0, 12, 0, 13, 0, 14, 0, 15, 0, 16, 0, 65537, 0, 65538, 1, 65539, 1610612749, 65540, 1, 65541, 0, 65542, 0, 65543, 0, 65544, 0, 65545, 1610612753, 65546, 0, 65547, 0, 65548, 0, 65549, 0, 65550, 1073741848, 65551, 1073741849, 65552, 0, 131073, 0, 131074, 0, 131075, 0, 131076, 0, 131077, 1610612751, 131078, 1610612752, 131079, 1610612752, 131080, 1610612751, 131081, 1610612751, 131082, 0, 131083, 0, 131084, 0, 131085, 0, 131086, 0, 196612, 0, 196613, 1610612751, 196614, 1610612752, 196615, 1610612751, 196616, 1610612751, 196617, 1073741839, 196618, 1073741839, 196619, 0, 196620, 0, 196621, 0, 262150, 0, 262152, 0, 262154, 0, 262156, 0 )
+
+[node name="troll" parent="." instance=ExtResource( 2 )]
+
+transform/pos = Vector2( 602.819, -39.2876 )
+collision/margin = 0.001
+
+
diff --git a/demos/2d/hexamap/tiles.scn b/demos/2d/hexamap/tiles.scn
deleted file mode 100644
index a019bbb92d..0000000000
--- a/demos/2d/hexamap/tiles.scn
+++ /dev/null
diff --git a/demos/2d/hexamap/tileset.res b/demos/2d/hexamap/tileset.res
deleted file mode 100644
index 05d89316a2..0000000000
--- a/demos/2d/hexamap/tileset.res
+++ /dev/null
diff --git a/demos/2d/hexamap/tileset.tres b/demos/2d/hexamap/tileset.tres
new file mode 100644
index 0000000000..4538202335
--- /dev/null
+++ b/demos/2d/hexamap/tileset.tres
@@ -0,0 +1,240 @@
+[gd_resource type="TileSet" load_steps=27 format=1]
+
+[ext_resource path="res://WWT-01.png" type="Texture" id=1]
+[ext_resource path="res://WWT-02.png" type="Texture" id=2]
+[ext_resource path="res://WWT-11.png" type="Texture" id=3]
+[ext_resource path="res://WWT-12.png" type="Texture" id=4]
+[ext_resource path="res://WWT-13.png" type="Texture" id=5]
+[ext_resource path="res://WWT-14.png" type="Texture" id=6]
+[ext_resource path="res://WWT-15.png" type="Texture" id=7]
+[ext_resource path="res://WWT-16.png" type="Texture" id=8]
+[ext_resource path="res://WWT-17.png" type="Texture" id=9]
+[ext_resource path="res://WWT-18.png" type="Texture" id=10]
+[ext_resource path="res://WWT-19.png" type="Texture" id=11]
+[ext_resource path="res://WWT-20.png" type="Texture" id=12]
+[ext_resource path="res://WWT-03.png" type="Texture" id=13]
+[ext_resource path="res://WWT-21.png" type="Texture" id=14]
+[ext_resource path="res://WWT-22.png" type="Texture" id=15]
+[ext_resource path="res://WWT-23.png" type="Texture" id=16]
+[ext_resource path="res://WWT-24.png" type="Texture" id=17]
+[ext_resource path="res://WWT-25.png" type="Texture" id=18]
+[ext_resource path="res://WWT-26.png" type="Texture" id=19]
+[ext_resource path="res://WWT-04.png" type="Texture" id=20]
+[ext_resource path="res://WWT-05.png" type="Texture" id=21]
+[ext_resource path="res://WWT-06.png" type="Texture" id=22]
+[ext_resource path="res://WWT-07.png" type="Texture" id=23]
+[ext_resource path="res://WWT-08.png" type="Texture" id=24]
+[ext_resource path="res://WWT-09.png" type="Texture" id=25]
+[ext_resource path="res://WWT-10.png" type="Texture" id=26]
+
+[resource]
+
+0/name = "Tile 1"
+0/texture = ExtResource( 1 )
+0/tex_offset = Vector2( -24, -17 )
+0/region = Rect2( 0, 0, 0, 0 )
+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( -24, -17 )
+1/region = Rect2( 0, 0, 0, 0 )
+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( -24, -17 )
+2/region = Rect2( 0, 0, 0, 0 )
+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( -24, -17 )
+3/region = Rect2( 0, 0, 0, 0 )
+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( -24, -17 )
+4/region = Rect2( 0, 0, 0, 0 )
+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( -24, -17 )
+5/region = Rect2( 0, 0, 0, 0 )
+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( -24, -17 )
+6/region = Rect2( 0, 0, 0, 0 )
+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( -24, -17 )
+7/region = Rect2( 0, 0, 0, 0 )
+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( -24, -17 )
+8/region = Rect2( 0, 0, 0, 0 )
+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( -24, -17 )
+9/region = Rect2( 0, 0, 0, 0 )
+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( -24, -17 )
+10/region = Rect2( 0, 0, 0, 0 )
+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( -24, -17 )
+11/region = Rect2( 0, 0, 0, 0 )
+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( -24, -17 )
+12/region = Rect2( 0, 0, 0, 0 )
+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( -24, -17 )
+13/region = Rect2( 0, 0, 0, 0 )
+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( -24, -17 )
+14/region = Rect2( 0, 0, 0, 0 )
+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( -24, -17 )
+15/region = Rect2( 0, 0, 0, 0 )
+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( -24, -17 )
+16/region = Rect2( 0, 0, 0, 0 )
+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( -24, -17 )
+17/region = Rect2( 0, 0, 0, 0 )
+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( -24, -17 )
+18/region = Rect2( 0, 0, 0, 0 )
+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( -24, -17 )
+19/region = Rect2( 0, 0, 0, 0 )
+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( -24, -17 )
+20/region = Rect2( 0, 0, 0, 0 )
+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( -24, -17 )
+21/region = Rect2( 0, 0, 0, 0 )
+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( -24, -17 )
+22/region = Rect2( 0, 0, 0, 0 )
+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( -24, -17 )
+23/region = Rect2( 0, 0, 0, 0 )
+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( -24, -17 )
+24/region = Rect2( 0, 0, 0, 0 )
+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( -24, -17 )
+25/region = Rect2( 0, 0, 0, 0 )
+25/occluder_offset = Vector2( -0, -0 )
+25/navigation_offset = Vector2( -0, -0 )
+25/shape_offset = Vector2( 0, 0 )
+25/shapes = [  ]
+
diff --git a/demos/2d/hexamap/tileset_edit.tscn b/demos/2d/hexamap/tileset_edit.tscn
new file mode 100644
index 0000000000..d400d55fd0
--- /dev/null
+++ b/demos/2d/hexamap/tileset_edit.tscn
@@ -0,0 +1,214 @@
+[gd_scene load_steps=27 format=1]
+
+[ext_resource path="res://WWT-01.png" type="Texture" id=1]
+[ext_resource path="res://WWT-02.png" type="Texture" id=2]
+[ext_resource path="res://WWT-03.png" type="Texture" id=3]
+[ext_resource path="res://WWT-04.png" type="Texture" id=4]
+[ext_resource path="res://WWT-05.png" type="Texture" id=5]
+[ext_resource path="res://WWT-06.png" type="Texture" id=6]
+[ext_resource path="res://WWT-07.png" type="Texture" id=7]
+[ext_resource path="res://WWT-08.png" type="Texture" id=8]
+[ext_resource path="res://WWT-09.png" type="Texture" id=9]
+[ext_resource path="res://WWT-10.png" type="Texture" id=10]
+[ext_resource path="res://WWT-11.png" type="Texture" id=11]
+[ext_resource path="res://WWT-12.png" type="Texture" id=12]
+[ext_resource path="res://WWT-13.png" type="Texture" id=13]
+[ext_resource path="res://WWT-14.png" type="Texture" id=14]
+[ext_resource path="res://WWT-15.png" type="Texture" id=15]
+[ext_resource path="res://WWT-16.png" type="Texture" id=16]
+[ext_resource path="res://WWT-17.png" type="Texture" id=17]
+[ext_resource path="res://WWT-18.png" type="Texture" id=18]
+[ext_resource path="res://WWT-19.png" type="Texture" id=19]
+[ext_resource path="res://WWT-20.png" type="Texture" id=20]
+[ext_resource path="res://WWT-21.png" type="Texture" id=21]
+[ext_resource path="res://WWT-22.png" type="Texture" id=22]
+[ext_resource path="res://WWT-23.png" type="Texture" id=23]
+[ext_resource path="res://WWT-24.png" type="Texture" id=24]
+[ext_resource path="res://WWT-25.png" type="Texture" id=25]
+[ext_resource path="res://WWT-26.png" type="Texture" id=26]
+
+[node name="Node2D" type="Node2D"]
+
+[node name="Tile 1" type="Sprite" parent="."]
+
+transform/pos = Vector2( 96.6174, 42.2665 )
+texture = ExtResource( 1 )
+centered = false
+offset = Vector2( -24, -17 )
+
+[node name="Tile 2" type="Sprite" parent="."]
+
+transform/pos = Vector2( 96.6174, 42.2665 )
+texture = ExtResource( 2 )
+centered = false
+offset = Vector2( -24, -17 )
+
+[node name="Tile 3" type="Sprite" parent="."]
+
+transform/pos = Vector2( 96.6174, 42.2665 )
+texture = ExtResource( 3 )
+centered = false
+offset = Vector2( -24, -17 )
+
+[node name="Tile 4" type="Sprite" parent="."]
+
+transform/pos = Vector2( 96.6174, 42.2665 )
+texture = ExtResource( 4 )
+centered = false
+offset = Vector2( -24, -17 )
+
+[node name="Tile 5" type="Sprite" parent="."]
+
+transform/pos = Vector2( 96.6174, 42.2665 )
+texture = ExtResource( 5 )
+centered = false
+offset = Vector2( -24, -17 )
+
+[node name="Tile 6" type="Sprite" parent="."]
+
+transform/pos = Vector2( 96.6174, 42.2665 )
+texture = ExtResource( 6 )
+centered = false
+offset = Vector2( -24, -17 )
+
+[node name="Tile 7" type="Sprite" parent="."]
+
+transform/pos = Vector2( 96.6174, 42.2665 )
+texture = ExtResource( 7 )
+centered = false
+offset = Vector2( -24, -17 )
+
+[node name="Tile 8" type="Sprite" parent="."]
+
+transform/pos = Vector2( 96.6174, 42.2665 )
+texture = ExtResource( 8 )
+centered = false
+offset = Vector2( -24, -17 )
+
+[node name="Tile 9" type="Sprite" parent="."]
+
+transform/pos = Vector2( 96.6174, 42.2665 )
+texture = ExtResource( 9 )
+centered = false
+offset = Vector2( -24, -17 )
+
+[node name="Tile 10" type="Sprite" parent="."]
+
+transform/pos = Vector2( 96.6174, 42.2665 )
+texture = ExtResource( 10 )
+centered = false
+offset = Vector2( -24, -17 )
+
+[node name="Tile 11" type="Sprite" parent="."]
+
+transform/pos = Vector2( 96.6174, 42.2665 )
+texture = ExtResource( 11 )
+centered = false
+offset = Vector2( -24, -17 )
+
+[node name="Tile 12" type="Sprite" parent="."]
+
+transform/pos = Vector2( 96.6174, 42.2665 )
+texture = ExtResource( 12 )
+centered = false
+offset = Vector2( -24, -17 )
+
+[node name="Tile 13" type="Sprite" parent="."]
+
+transform/pos = Vector2( 96.6174, 42.2665 )
+texture = ExtResource( 13 )
+centered = false
+offset = Vector2( -24, -17 )
+
+[node name="Tile 14" type="Sprite" parent="."]
+
+transform/pos = Vector2( 96.6174, 42.2665 )
+texture = ExtResource( 14 )
+centered = false
+offset = Vector2( -24, -17 )
+
+[node name="Tile 15" type="Sprite" parent="."]
+
+transform/pos = Vector2( 96.6174, 42.2665 )
+texture = ExtResource( 15 )
+centered = false
+offset = Vector2( -24, -17 )
+
+[node name="Tile 16" type="Sprite" parent="."]
+
+transform/pos = Vector2( 96.6174, 42.2665 )
+texture = ExtResource( 16 )
+centered = false
+offset = Vector2( -24, -17 )
+
+[node name="Tile 17" type="Sprite" parent="."]
+
+transform/pos = Vector2( 96.6174, 42.2665 )
+texture = ExtResource( 17 )
+centered = false
+offset = Vector2( -24, -17 )
+
+[node name="Tile 18" type="Sprite" parent="."]
+
+transform/pos = Vector2( 96.6174, 42.2665 )
+texture = ExtResource( 18 )
+centered = false
+offset = Vector2( -24, -17 )
+
+[node name="Tile 19" type="Sprite" parent="."]
+
+transform/pos = Vector2( 96.6174, 42.2665 )
+texture = ExtResource( 19 )
+centered = false
+offset = Vector2( -24, -17 )
+
+[node name="Tile 20" type="Sprite" parent="."]
+
+transform/pos = Vector2( 96.6174, 42.2665 )
+texture = ExtResource( 20 )
+centered = false
+offset = Vector2( -24, -17 )
+
+[node name="Tile 21" type="Sprite" parent="."]
+
+transform/pos = Vector2( 96.6174, 42.2665 )
+texture = ExtResource( 21 )
+centered = false
+offset = Vector2( -24, -17 )
+
+[node name="Tile 22" type="Sprite" parent="."]
+
+transform/pos = Vector2( 96.6174, 42.2665 )
+texture = ExtResource( 22 )
+centered = false
+offset = Vector2( -24, -17 )
+
+[node name="Tile 23" type="Sprite" parent="."]
+
+transform/pos = Vector2( 96.6174, 42.2665 )
+texture = ExtResource( 23 )
+centered = false
+offset = Vector2( -24, -17 )
+
+[node name="Tile 24" type="Sprite" parent="."]
+
+transform/pos = Vector2( 96.6174, 42.2665 )
+texture = ExtResource( 24 )
+centered = false
+offset = Vector2( -24, -17 )
+
+[node name="Tile 25" type="Sprite" parent="."]
+
+transform/pos = Vector2( 96.6174, 42.2665 )
+texture = ExtResource( 25 )
+centered = false
+offset = Vector2( -24, -17 )
+
+[node name="Tile 26" type="Sprite" parent="."]
+
+transform/pos = Vector2( 96.6174, 42.2665 )
+texture = ExtResource( 26 )
+centered = false
+offset = Vector2( -24, -17 )
+
+
diff --git a/demos/2d/hexamap/troll.scn b/demos/2d/hexamap/troll.scn
deleted file mode 100644
index 1f33dabf8e..0000000000
--- a/demos/2d/hexamap/troll.scn
+++ /dev/null
diff --git a/demos/2d/hexamap/troll.tscn b/demos/2d/hexamap/troll.tscn
new file mode 100644
index 0000000000..2dc8bdbf67
--- /dev/null
+++ b/demos/2d/hexamap/troll.tscn
@@ -0,0 +1,52 @@
+[gd_scene load_steps=4 format=1]
+
+[ext_resource path="res://troll.gd" type="Script" id=1]
+[ext_resource path="res://troll.png" type="Texture" id=2]
+
+[sub_resource type="CircleShape2D" id=1]
+
+custom_solver_bias = 0.0
+radius = 16.0
+
+[node name="troll" type="KinematicBody2D"]
+
+input/pickable = false
+shapes/0/shape = SubResource( 1 )
+shapes/0/transform = Matrix32( 1, 0, 0, 1, 3.24216, 19.453 )
+shapes/0/trigger = false
+collision/layers = 1
+collision/mask = 1
+collision/margin = 0.001
+script/script = ExtResource( 1 )
+
+[node name="Sprite" type="Sprite" parent="."]
+
+texture = ExtResource( 2 )
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+
+transform/pos = Vector2( 3.24216, 19.453 )
+shape = SubResource( 1 )
+trigger = false
+_update_shape_index = -1
+
+[node name="Camera2D" type="Camera2D" parent="."]
+
+anchor_mode = 1
+rotating = false
+current = true
+zoom = Vector2( 1, 1 )
+limit/left = -10000000
+limit/top = -10000000
+limit/right = 10000000
+limit/bottom = 10000000
+drag_margin/h_enabled = true
+drag_margin/v_enabled = true
+smoothing/enable = false
+smoothing/speed = 5.0
+drag_margin/left = 0.2
+drag_margin/top = 0.2
+drag_margin/right = 0.2
+drag_margin/bottom = 0.2
+
+