Browse Source

WIP porting demos

Juan Linietsky 8 years ago
parent
commit
c3899b9e7d
100 changed files with 1139 additions and 281 deletions
  1. 17 0
      2d/hdr/beach_cave.gd
  2. 119 0
      2d/hdr/beach_cave.tscn
  3. 0 0
      2d/hdr/icon.png
  4. 0 0
      2d/hdr/ocean_beach.png
  5. 0 0
      2d/hdr/ocean_cave.png
  6. 15 0
      2d/hdr/project.godot
  7. 0 0
      2d/hexagonal_map/WWT-01.png
  8. 0 0
      2d/hexagonal_map/WWT-02.png
  9. 0 0
      2d/hexagonal_map/WWT-03.png
  10. 0 0
      2d/hexagonal_map/WWT-04.png
  11. 0 0
      2d/hexagonal_map/WWT-05.png
  12. 0 0
      2d/hexagonal_map/WWT-06.png
  13. 0 0
      2d/hexagonal_map/WWT-07.png
  14. 0 0
      2d/hexagonal_map/WWT-08.png
  15. 0 0
      2d/hexagonal_map/WWT-09.png
  16. 0 0
      2d/hexagonal_map/WWT-10.png
  17. 0 0
      2d/hexagonal_map/WWT-11.png
  18. 0 0
      2d/hexagonal_map/WWT-12.png
  19. 0 0
      2d/hexagonal_map/WWT-13.png
  20. 0 0
      2d/hexagonal_map/WWT-14.png
  21. 0 0
      2d/hexagonal_map/WWT-15.png
  22. 0 0
      2d/hexagonal_map/WWT-16.png
  23. 0 0
      2d/hexagonal_map/WWT-17.png
  24. 0 0
      2d/hexagonal_map/WWT-18.png
  25. 0 0
      2d/hexagonal_map/WWT-19.png
  26. 0 0
      2d/hexagonal_map/WWT-20.png
  27. 0 0
      2d/hexagonal_map/WWT-21.png
  28. 0 0
      2d/hexagonal_map/WWT-22.png
  29. 0 0
      2d/hexagonal_map/WWT-23.png
  30. 0 0
      2d/hexagonal_map/WWT-24.png
  31. 0 0
      2d/hexagonal_map/WWT-25.png
  32. 0 0
      2d/hexagonal_map/WWT-26.png
  33. 0 0
      2d/hexagonal_map/icon.png
  34. 31 0
      2d/hexagonal_map/map.tscn
  35. 13 0
      2d/hexagonal_map/project.godot
  36. 1 2
      2d/hexagonal_map/tileset.tres
  37. 28 29
      2d/hexagonal_map/tileset_edit.tscn
  38. 3 5
      2d/hexagonal_map/troll.gd
  39. 0 0
      2d/hexagonal_map/troll.png
  40. 17 19
      2d/hexagonal_map/troll.tscn
  41. 48 0
      2d/isometric/dungeon.tscn
  42. 0 0
      2d/isometric/icon.png
  43. 0 0
      2d/isometric/isotiles.png
  44. 22 0
      2d/isometric/project.godot
  45. 10 5
      2d/isometric/tileset.tres
  46. 27 28
      2d/isometric/tileset_edit.tscn
  47. 3 12
      2d/isometric/troll.gd
  48. 0 0
      2d/isometric/troll.png
  49. 18 20
      2d/isometric/troll.tscn
  50. 0 0
      2d/kinematic_character/circle.png
  51. 0 0
      2d/kinematic_character/colworld.gd
  52. 145 0
      2d/kinematic_character/colworld.tscn
  53. 0 0
      2d/kinematic_character/icon.png
  54. 0 0
      2d/kinematic_character/long_obstacle.png
  55. 0 0
      2d/kinematic_character/obstacle.png
  56. 4 47
      2d/kinematic_character/player.gd
  57. 0 0
      2d/kinematic_character/player.png
  58. 7 9
      2d/kinematic_character/player.tscn
  59. 0 0
      2d/kinematic_character/princess.png
  60. 30 0
      2d/kinematic_character/project.godot
  61. 40 0
      2d/kinematic_collision/colworld.tscn
  62. 0 0
      2d/kinematic_collision/icon.png
  63. 0 0
      2d/kinematic_collision/obstacle.png
  64. 2 13
      2d/kinematic_collision/player.gd
  65. 0 0
      2d/kinematic_collision/player.png
  66. 6 8
      2d/kinematic_collision/player.tscn
  67. 13 0
      2d/kinematic_collision/project.godot
  68. BIN
      2d/light2d_as_mask/.import/burano.png-893cff79ccbe972d7b1ad3e1845f81bf.stex
  69. BIN
      2d/light2d_as_mask/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex
  70. BIN
      2d/light2d_as_mask/.import/splat.png-a41a35966004eec2e8a20d517d1ec4bb.stex
  71. 0 0
      2d/light2d_as_mask/burano.png
  72. 23 0
      2d/light2d_as_mask/burano.png.import
  73. 0 0
      2d/light2d_as_mask/icon.png
  74. 23 0
      2d/light2d_as_mask/icon.png.import
  75. 157 0
      2d/light2d_as_mask/lightmask.tscn
  76. 10 0
      2d/light2d_as_mask/project.godot
  77. 0 0
      2d/light2d_as_mask/splat.png
  78. 23 0
      2d/light2d_as_mask/splat.png.import
  79. BIN
      2d/lights_and_shadows/.import/bg.png-24bff804693ee063127ad100e04c5185.stex
  80. BIN
      2d/lights_and_shadows/.import/caster.png-67727cb056b9e0209664a84f1653a25a.stex
  81. BIN
      2d/lights_and_shadows/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex
  82. BIN
      2d/lights_and_shadows/.import/light.png-06e94102f0cce323cff7daad56cf3030.stex
  83. BIN
      2d/lights_and_shadows/.import/spot.png-36b4dfbff4efeea17ec3137d266ffc4a.stex
  84. 0 0
      2d/lights_and_shadows/bg.png
  85. 23 0
      2d/lights_and_shadows/bg.png.import
  86. 0 0
      2d/lights_and_shadows/caster.png
  87. 23 0
      2d/lights_and_shadows/caster.png.import
  88. 0 0
      2d/lights_and_shadows/icon.png
  89. 23 0
      2d/lights_and_shadows/icon.png.import
  90. 0 0
      2d/lights_and_shadows/light.png
  91. 23 0
      2d/lights_and_shadows/light.png.import
  92. 129 84
      2d/lights_and_shadows/light_shadows.tscn
  93. 17 0
      2d/lights_and_shadows/project.godot
  94. 0 0
      2d/lights_and_shadows/spot.png
  95. 23 0
      2d/lights_and_shadows/spot.png.import
  96. BIN
      2d/navigation/.import/agent.png-22bdd448030a3457042db97db7630b4c.stex
  97. BIN
      2d/navigation/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex
  98. BIN
      2d/navigation/.import/path.png-03249d8c3f5af613913d0eb997e480a3.stex
  99. 0 0
      2d/navigation/agent.png
  100. 23 0
      2d/navigation/agent.png.import

+ 17 - 0
2d/hdr/beach_cave.gd

@@ -0,0 +1,17 @@
+
+extends Node2D
+
+# Member variables
+const CAVE_LIMIT = 1000
+
+
+func _input(event):
+	if (event is InputEventMouseMotion and event.button_mask&1):
+		var rel_x = event.relative.x
+		var cavepos = get_node("cave").position
+		cavepos.x += rel_x
+		if (cavepos.x < -CAVE_LIMIT):
+			cavepos.x = -CAVE_LIMIT
+		elif (cavepos.x > 0):
+			cavepos.x = 0
+		get_node("cave").position=cavepos

+ 119 - 0
2d/hdr/beach_cave.tscn

@@ -0,0 +1,119 @@
+[gd_scene load_steps=5 format=2]
+
+[ext_resource path="res://beach_cave.gd" type="Script" id=1]
+[ext_resource path="res://ocean_beach.png" type="Texture" id=2]
+[ext_resource path="res://ocean_cave.png" type="Texture" id=3]
+
+[sub_resource type="Environment" id=1]
+
+background_mode = 3
+background_sky_scale = 1.0
+background_color = Color( 0, 0, 0, 1 )
+background_energy = 1.0
+background_canvas_max_layer = 0
+ambient_light_color = Color( 0, 0, 0, 1 )
+ambient_light_energy = 1.0
+ambient_light_sky_contribution = 0.0
+fog_enabled = false
+fog_color = Color( 0.5, 0.6, 0.7, 1 )
+fog_sun_color = Color( 1, 0.9, 0.7, 1 )
+fog_sun_amount = 0.0
+fog_depth_enabled = true
+fog_depth_begin = 10.0
+fog_depth_curve = 1.0
+fog_transmit_enabled = false
+fog_transmit_curve = 1.0
+fog_height_enabled = false
+fog_height_min = 0.0
+fog_height_max = 100.0
+fog_height_curve = 1.0
+tonemap_mode = 0
+tonemap_exposure = 1.0
+tonemap_white = 1.0
+auto_exposure_enabled = true
+auto_exposure_scale = 0.51
+auto_exposure_min_luma = 0.05
+auto_exposure_max_luma = 8.0
+auto_exposure_speed = 4.0
+ss_reflections_enabled = false
+ss_reflections_max_steps = 64
+ss_reflections_fade_in = 0.15
+ss_reflections_fade_out = 2.0
+ss_reflections_depth_tolerance = 0.2
+ss_reflections_roughness = true
+ssao_enabled = false
+ssao_radius = 1.0
+ssao_intensity = 1.0
+ssao_radius2 = 0.0
+ssao_intensity2 = 1.0
+ssao_bias = 0.01
+ssao_light_affect = 0.0
+ssao_color = Color( 0, 0, 0, 1 )
+ssao_blur = true
+dof_blur_far_enabled = false
+dof_blur_far_distance = 10.0
+dof_blur_far_transition = 5.0
+dof_blur_far_amount = 0.1
+dof_blur_far_quality = 1
+dof_blur_near_enabled = false
+dof_blur_near_distance = 2.0
+dof_blur_near_transition = 1.0
+dof_blur_near_amount = 0.1
+dof_blur_near_quality = 1
+glow_enabled = true
+glow_levels/1 = false
+glow_levels/2 = false
+glow_levels/3 = false
+glow_levels/4 = true
+glow_levels/5 = true
+glow_levels/6 = false
+glow_levels/7 = true
+glow_intensity = 0.8
+glow_strength = 0.88
+glow_bloom = 0.0
+glow_blend_mode = 0
+glow_hdr_treshold = 1.0
+glow_hdr_scale = 2.0
+glow_bicubic_upscale = true
+adjustment_enabled = false
+adjustment_brightness = 1.0
+adjustment_contrast = 1.0
+adjustment_saturation = 1.0
+
+[node name="hdr" type="Node2D"]
+
+script = ExtResource( 1 )
+
+[node name="beach" type="Sprite" parent="."]
+
+modulate = Color( 2, 2, 2, 1 )
+self_modulate = Color( 2, 2, 2, 1 )
+texture = ExtResource( 2 )
+centered = false
+
+[node name="cave" type="Sprite" parent="."]
+
+self_modulate = Color( 0.233166, 0.221219, 0.23582, 1 )
+scale = Vector2( 1.2, 1 )
+texture = ExtResource( 3 )
+centered = false
+
+[node name="environment" type="WorldEnvironment" parent="."]
+
+environment = SubResource( 1 )
+
+[node name="Label" type="Label" parent="."]
+
+margin_right = 40.0
+margin_bottom = 13.0
+rect_clip_content = false
+mouse_filter = 2
+size_flags_horizontal = 2
+size_flags_vertical = 0
+custom_colors/font_color = Color( 0.213955, 0.205626, 0.20313, 1 )
+text = "Drag  Left and Right"
+percent_visible = 1.0
+lines_skipped = 0
+max_lines_visible = -1
+
+

+ 0 - 0
old/2d/hdr/icon.png → 2d/hdr/icon.png


+ 0 - 0
old/2d/hdr/ocean_beach.png → 2d/hdr/ocean_beach.png


+ 0 - 0
old/2d/hdr/ocean_cave.png → 2d/hdr/ocean_cave.png


+ 15 - 0
2d/hdr/project.godot

@@ -0,0 +1,15 @@
+[application]
+
+icon = "res://icon.png"
+main_scene = "res://beach_cave.tscn"
+name = "HDR for 2D"
+
+[display]
+
+window/height = 720
+window/width = 1080
+
+[rasterizer]
+
+blur_buffer_size = 128
+

+ 0 - 0
old/2d/hexamap/WWT-01.png → 2d/hexagonal_map/WWT-01.png


+ 0 - 0
old/2d/hexamap/WWT-02.png → 2d/hexagonal_map/WWT-02.png


+ 0 - 0
old/2d/hexamap/WWT-03.png → 2d/hexagonal_map/WWT-03.png


+ 0 - 0
old/2d/hexamap/WWT-04.png → 2d/hexagonal_map/WWT-04.png


+ 0 - 0
old/2d/hexamap/WWT-05.png → 2d/hexagonal_map/WWT-05.png


+ 0 - 0
old/2d/hexamap/WWT-06.png → 2d/hexagonal_map/WWT-06.png


+ 0 - 0
old/2d/hexamap/WWT-07.png → 2d/hexagonal_map/WWT-07.png


+ 0 - 0
old/2d/hexamap/WWT-08.png → 2d/hexagonal_map/WWT-08.png


+ 0 - 0
old/2d/hexamap/WWT-09.png → 2d/hexagonal_map/WWT-09.png


+ 0 - 0
old/2d/hexamap/WWT-10.png → 2d/hexagonal_map/WWT-10.png


+ 0 - 0
old/2d/hexamap/WWT-11.png → 2d/hexagonal_map/WWT-11.png


+ 0 - 0
old/2d/hexamap/WWT-12.png → 2d/hexagonal_map/WWT-12.png


+ 0 - 0
old/2d/hexamap/WWT-13.png → 2d/hexagonal_map/WWT-13.png


+ 0 - 0
old/2d/hexamap/WWT-14.png → 2d/hexagonal_map/WWT-14.png


+ 0 - 0
old/2d/hexamap/WWT-15.png → 2d/hexagonal_map/WWT-15.png


+ 0 - 0
old/2d/hexamap/WWT-16.png → 2d/hexagonal_map/WWT-16.png


+ 0 - 0
old/2d/hexamap/WWT-17.png → 2d/hexagonal_map/WWT-17.png


+ 0 - 0
old/2d/hexamap/WWT-18.png → 2d/hexagonal_map/WWT-18.png


+ 0 - 0
old/2d/hexamap/WWT-19.png → 2d/hexagonal_map/WWT-19.png


+ 0 - 0
old/2d/hexamap/WWT-20.png → 2d/hexagonal_map/WWT-20.png


+ 0 - 0
old/2d/hexamap/WWT-21.png → 2d/hexagonal_map/WWT-21.png


+ 0 - 0
old/2d/hexamap/WWT-22.png → 2d/hexagonal_map/WWT-22.png


+ 0 - 0
old/2d/hexamap/WWT-23.png → 2d/hexagonal_map/WWT-23.png


+ 0 - 0
old/2d/hexamap/WWT-24.png → 2d/hexagonal_map/WWT-24.png


+ 0 - 0
old/2d/hexamap/WWT-25.png → 2d/hexagonal_map/WWT-25.png


+ 0 - 0
old/2d/hexamap/WWT-26.png → 2d/hexagonal_map/WWT-26.png


+ 0 - 0
old/2d/hexamap/icon.png → 2d/hexagonal_map/icon.png


+ 31 - 0
2d/hexagonal_map/map.tscn

@@ -0,0 +1,31 @@
+[gd_scene load_steps=3 format=2]
+
+[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 = Transform2D( 1, 0, 0, 1, 0, 0 )
+cell_half_offset = 1
+cell_tile_origin = 1
+cell_y_sort = false
+collision_use_kinematic = false
+collision_friction = 1.0
+collision_bounce = 0.0
+collision_layer = 1
+collision_mask = 1
+occluder_light_mask = 1
+tile_data = PoolIntArray( -393210, 1073741831, -327676, 1073741831, -327675, 1073741831, -327674, 6, -327673, 1073741831, -327672, 1073741830, -327671, 1073741830, -327670, 6, -327669, 8, -262142, 1073741831, -262141, 1073741831, -262140, 1073741831, -262139, 1073741830, -262138, 1073741831, -262137, 6, -262136, 6, -262135, 6, -262134, 6, -262133, 6, -262132, 0, -262131, 0, -196606, 1073741831, -196605, 1073741831, -196604, 6, -196603, 6, -196602, 0, -196601, 6, -196600, 1, -196599, 0, -196598, 1, -196597, 1, -196596, 0, -196595, 0, -196594, 0, -131071, 9, -131070, 1073741832, -131069, 1073741830, -131068, 2, -131067, 2, -131066, 1073741845, -131065, 21, -131064, 19, -131063, 1073741826, -131062, 0, -131061, 16, -131060, 0, -131059, 0, -131058, 0, -131057, 0, -131056, 0, -65534, 0, -65533, 1, -65532, 1073741827, -65531, 1073741846, -65530, 20, -65529, 19, -65528, 2, -65527, 0, -65526, 14, -65525, 0, -65524, 0, -65523, 0, -65522, 0, -65521, 0, -65520, 0, -65519, 0, 3, 1, 4, 2, 5, 1073741827, 6, 1, 7, 1, 8, 0, 9, 10, 10, 12, 11, 0, 12, 0, 13, 0, 14, 0, 15, 0, 16, 0, 17, 0, 65538, 0, 65539, 0, 65540, 2, 65541, 1073741826, 65542, 1, 65543, 15, 65544, 0, 65545, 0, 65546, 0, 65547, 0, 65548, 0, 65549, 0, 65550, 0, 65551, 0, 65552, 0, 65553, 0, 131074, 0, 131075, 1, 131076, 1610612749, 131077, 1, 131078, 0, 131079, 0, 131080, 0, 131081, 0, 131082, 1610612753, 131083, 0, 131084, 0, 131085, 0, 131086, 0, 131087, 1073741848, 131088, 1073741849, 131089, 0, 196610, 0, 196611, 0, 196612, 0, 196613, 0, 196614, 1610612751, 196615, 1610612752, 196616, 1610612752, 196617, 1610612751, 196618, 1610612751, 196619, 0, 196620, 0, 196621, 0, 196622, 0, 196623, 0, 262149, 0, 262150, 1610612751, 262151, 1610612752, 262152, 1610612751, 262153, 1610612751, 262154, 1073741839, 262155, 1073741839, 262156, 0, 262157, 0, 262158, 0, 327687, 0, 327689, 0, 327691, 0, 327693, 0 )
+
+[node name="troll" parent="." instance=ExtResource( 2 )]
+
+position = Vector2( 602.819, -39.2876 )
+collision/safe_margin = 0.08
+
+

+ 13 - 0
2d/hexagonal_map/project.godot

@@ -0,0 +1,13 @@
+[application]
+
+icon = "res://icon.png"
+main_scene = "res://map.tscn"
+name = "Hexagonal Game"
+
+[input]
+
+move_bottom = [ InputEvent(KEY,16777234) ]
+move_left = [ InputEvent(KEY,16777231) ]
+move_right = [ InputEvent(KEY,16777233) ]
+move_up = [ InputEvent(KEY,16777232) ]
+

+ 1 - 2
old/2d/hexamap/tileset.tres → 2d/hexagonal_map/tileset.tres

@@ -1,4 +1,4 @@
-[gd_resource type="TileSet" load_steps=27 format=1]
+[gd_resource type="TileSet" load_steps=1 format=2]
 
 [ext_resource path="res://WWT-01.png" type="Texture" id=1]
 [ext_resource path="res://WWT-02.png" type="Texture" id=2]
@@ -237,4 +237,3 @@
 25/navigation_offset = Vector2( 0, 0 )
 25/shape_offset = Vector2( 0, 0 )
 25/shapes = [  ]
-

+ 28 - 29
old/2d/hexamap/tileset_edit.tscn → 2d/hexagonal_map/tileset_edit.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=27 format=1]
+[gd_scene 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]
@@ -29,186 +29,185 @@
 
 [node name="Node2D" type="Node2D"]
 
+
 [node name="Tile 1" type="Sprite" parent="."]
 
-transform/pos = Vector2( 96.6174, 42.2665 )
+position = Vector2( 96.6174, 42.2665 )
 texture = ExtResource( 1 )
 centered = false
 offset = Vector2( -64, -64 )
 
 [node name="Tile 2" type="Sprite" parent="."]
 
-transform/pos = Vector2( 96.6174, 42.2665 )
+position = Vector2( 96.6174, 42.2665 )
 texture = ExtResource( 2 )
 centered = false
 offset = Vector2( -64, -64 )
 
 [node name="Tile 3" type="Sprite" parent="."]
 
-transform/pos = Vector2( 96.6174, 42.2665 )
+position = Vector2( 96.6174, 42.2665 )
 texture = ExtResource( 3 )
 centered = false
 offset = Vector2( -64, -64 )
 
 [node name="Tile 4" type="Sprite" parent="."]
 
-transform/pos = Vector2( 96.6174, 42.2665 )
+position = Vector2( 96.6174, 42.2665 )
 texture = ExtResource( 4 )
 centered = false
 offset = Vector2( -64, -64 )
 
 [node name="Tile 5" type="Sprite" parent="."]
 
-transform/pos = Vector2( 96.6174, 42.2665 )
+position = Vector2( 96.6174, 42.2665 )
 texture = ExtResource( 5 )
 centered = false
 offset = Vector2( -64, -64 )
 
 [node name="Tile 6" type="Sprite" parent="."]
 
-transform/pos = Vector2( 96.6174, 42.2665 )
+position = Vector2( 96.6174, 42.2665 )
 texture = ExtResource( 6 )
 centered = false
 offset = Vector2( -64, -64 )
 
 [node name="Tile 7" type="Sprite" parent="."]
 
-transform/pos = Vector2( 96.6174, 42.2665 )
+position = Vector2( 96.6174, 42.2665 )
 texture = ExtResource( 7 )
 centered = false
 offset = Vector2( -64, -64 )
 
 [node name="Tile 8" type="Sprite" parent="."]
 
-transform/pos = Vector2( 96.6174, 42.2665 )
+position = Vector2( 96.6174, 42.2665 )
 texture = ExtResource( 8 )
 centered = false
 offset = Vector2( -64, -64 )
 
 [node name="Tile 9" type="Sprite" parent="."]
 
-transform/pos = Vector2( 96.6174, 42.2665 )
+position = Vector2( 96.6174, 42.2665 )
 texture = ExtResource( 9 )
 centered = false
 offset = Vector2( -64, -64 )
 
 [node name="Tile 10" type="Sprite" parent="."]
 
-transform/pos = Vector2( 96.6174, 42.2665 )
+position = Vector2( 96.6174, 42.2665 )
 texture = ExtResource( 10 )
 centered = false
 offset = Vector2( -64, -64 )
 
 [node name="Tile 11" type="Sprite" parent="."]
 
-transform/pos = Vector2( 96.6174, 42.2665 )
+position = Vector2( 96.6174, 42.2665 )
 texture = ExtResource( 11 )
 centered = false
 offset = Vector2( -64, -64 )
 
 [node name="Tile 12" type="Sprite" parent="."]
 
-transform/pos = Vector2( 96.6174, 42.2665 )
+position = Vector2( 96.6174, 42.2665 )
 texture = ExtResource( 12 )
 centered = false
 offset = Vector2( -64, -64 )
 
 [node name="Tile 13" type="Sprite" parent="."]
 
-transform/pos = Vector2( 96.6174, 42.2665 )
+position = Vector2( 96.6174, 42.2665 )
 texture = ExtResource( 13 )
 centered = false
 offset = Vector2( -64, -64 )
 
 [node name="Tile 14" type="Sprite" parent="."]
 
-transform/pos = Vector2( 96.6174, 42.2665 )
+position = Vector2( 96.6174, 42.2665 )
 texture = ExtResource( 14 )
 centered = false
 offset = Vector2( -64, -64 )
 
 [node name="Tile 15" type="Sprite" parent="."]
 
-transform/pos = Vector2( 96.6174, 42.2665 )
+position = Vector2( 96.6174, 42.2665 )
 texture = ExtResource( 15 )
 centered = false
 offset = Vector2( -64, -64 )
 
 [node name="Tile 16" type="Sprite" parent="."]
 
-transform/pos = Vector2( 96.6174, 42.2665 )
+position = Vector2( 96.6174, 42.2665 )
 texture = ExtResource( 16 )
 centered = false
 offset = Vector2( -64, -64 )
 
 [node name="Tile 17" type="Sprite" parent="."]
 
-transform/pos = Vector2( 96.6174, 42.2665 )
+position = Vector2( 96.6174, 42.2665 )
 texture = ExtResource( 17 )
 centered = false
 offset = Vector2( -64, -64 )
 
 [node name="Tile 18" type="Sprite" parent="."]
 
-transform/pos = Vector2( 96.6174, 42.2665 )
+position = Vector2( 96.6174, 42.2665 )
 texture = ExtResource( 18 )
 centered = false
 offset = Vector2( -64, -64 )
 
 [node name="Tile 19" type="Sprite" parent="."]
 
-transform/pos = Vector2( 96.6174, 42.2665 )
+position = Vector2( 96.6174, 42.2665 )
 texture = ExtResource( 19 )
 centered = false
 offset = Vector2( -64, -64 )
 
 [node name="Tile 20" type="Sprite" parent="."]
 
-transform/pos = Vector2( 96.6174, 42.2665 )
+position = Vector2( 96.6174, 42.2665 )
 texture = ExtResource( 20 )
 centered = false
 offset = Vector2( -64, -64 )
 
 [node name="Tile 21" type="Sprite" parent="."]
 
-transform/pos = Vector2( 96.6174, 42.2665 )
+position = Vector2( 96.6174, 42.2665 )
 texture = ExtResource( 21 )
 centered = false
 offset = Vector2( -64, -64 )
 
 [node name="Tile 22" type="Sprite" parent="."]
 
-transform/pos = Vector2( 96.6174, 42.2665 )
+position = Vector2( 96.6174, 42.2665 )
 texture = ExtResource( 22 )
 centered = false
 offset = Vector2( -64, -64 )
 
 [node name="Tile 23" type="Sprite" parent="."]
 
-transform/pos = Vector2( 96.6174, 42.2665 )
+position = Vector2( 96.6174, 42.2665 )
 texture = ExtResource( 23 )
 centered = false
 offset = Vector2( -64, -64 )
 
 [node name="Tile 24" type="Sprite" parent="."]
 
-transform/pos = Vector2( 96.6174, 42.2665 )
+position = Vector2( 96.6174, 42.2665 )
 texture = ExtResource( 24 )
 centered = false
 offset = Vector2( -64, -64 )
 
 [node name="Tile 25" type="Sprite" parent="."]
 
-transform/pos = Vector2( 96.6174, 42.2665 )
+position = Vector2( 96.6174, 42.2665 )
 texture = ExtResource( 25 )
 centered = false
 offset = Vector2( -64, -64 )
 
 [node name="Tile 26" type="Sprite" parent="."]
 
-transform/pos = Vector2( 96.6174, 42.2665 )
+position = Vector2( 96.6174, 42.2665 )
 texture = ExtResource( 26 )
 centered = false
 offset = Vector2( -64, -64 )
-
-

+ 3 - 5
old/2d/kinematic_col/player.gd → 2d/hexagonal_map/troll.gd

@@ -23,9 +23,7 @@ func _fixed_process(delta):
 	if (Input.is_action_pressed("move_right")):
 		motion += Vector2(1, 0)
 	
-	motion = motion.normalized()*MOTION_SPEED*delta
-	move(motion)
+	motion = motion.normalized()*MOTION_SPEED
 
-
-func _ready():
-	set_fixed_process(true)
+	move_and_slide(motion)
+	

+ 0 - 0
old/2d/hexamap/troll.png → 2d/hexagonal_map/troll.png


+ 17 - 19
old/2d/hexamap/troll.tscn → 2d/hexagonal_map/troll.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=4 format=1]
+[gd_scene load_steps=5 format=2]
 
 [ext_resource path="res://troll.gd" type="Script" id=1]
 [ext_resource path="res://troll.png" type="Texture" id=2]
@@ -10,14 +10,14 @@ radius = 16.0
 
 [node name="troll" type="KinematicBody2D"]
 
-input/pickable = false
+input_pickable = false
 shapes/0/shape = SubResource( 1 )
-shapes/0/transform = Matrix32( 1, 0, 0, 1, 3.24216, 19.453 )
+shapes/0/transform = Transform2D( 1, 0, 0, 1, 3.24216, 19.453 )
 shapes/0/trigger = false
-collision/layers = 1
-collision/mask = 1
+collision_layer = 1
+collision_mask = 1
 collision/margin = 0.001
-script/script = ExtResource( 1 )
+script = ExtResource( 1 )
 
 [node name="Sprite" type="Sprite" parent="."]
 
@@ -25,7 +25,7 @@ texture = ExtResource( 2 )
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 
-transform/pos = Vector2( 3.24216, 19.453 )
+position = Vector2( 3.24216, 19.453 )
 shape = SubResource( 1 )
 trigger = false
 _update_shape_index = -1
@@ -36,17 +36,15 @@ anchor_mode = 1
 rotating = false
 current = true
 zoom = Vector2( 1, 1 )
-limit/left = -10000000
-limit/top = -10000000
-limit/right = 10000000
-limit/bottom = 10000000
+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
-
-
+smoothing_enabled = 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

+ 48 - 0
2d/isometric/dungeon.tscn

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

+ 0 - 0
old/2d/isometric/icon.png → 2d/isometric/icon.png


+ 0 - 0
old/2d/isometric/isotiles.png → 2d/isometric/isotiles.png


+ 22 - 0
2d/isometric/project.godot

@@ -0,0 +1,22 @@
+[application]
+
+icon = "res://icon.png"
+main_scene = "res://dungeon.tscn"
+name = "Isometric Game"
+
+[image_loader]
+
+filter = false
+gen_mipmaps = false
+
+[input]
+
+move_bottom = [ InputEvent(KEY,16777234) ]
+move_left = [ InputEvent(KEY,16777231) ]
+move_right = [ InputEvent(KEY,16777233) ]
+move_up = [ InputEvent(KEY,16777232) ]
+
+[rasterizer]
+
+use_pixel_snap = true
+

+ 10 - 5
old/2d/isometric/tileset.tres → 2d/isometric/tileset.tres

@@ -1,32 +1,33 @@
-[gd_resource type="TileSet" load_steps=6 format=1]
+[gd_resource type="TileSet" load_steps=6 format=2]
 
 [ext_resource path="res://isotiles.png" type="Texture" id=1]
 
 [sub_resource type="ConvexPolygonShape2D" id=1]
 
 custom_solver_bias = 0.0
-points = Vector2Array( -68, 2, -4, -30, 60, 2, -4, 34 )
+points = PoolVector2Array( -68, 2, -4, -30, 60, 2, -4, 34 )
 
 [sub_resource type="ConvexPolygonShape2D" id=2]
 
 custom_solver_bias = 0.0
-points = Vector2Array( -20, -6, -4, -22, 12, -22, 4, 10, -4, 10 )
+points = PoolVector2Array( -20, -6, -4, -22, 12, -22, 4, 10, -4, 10 )
 
 [sub_resource type="ConvexPolygonShape2D" id=3]
 
 custom_solver_bias = 0.0
-points = Vector2Array( 28, -6, 4, 10, 12, -22 )
+points = PoolVector2Array( 28, -6, 4, 10, 12, -22 )
 
 [sub_resource type="ConvexPolygonShape2D" id=4]
 
 custom_solver_bias = 0.0
-points = Vector2Array( 66.095, -0.62516, -5.90501, 31.3748, -21.905, 23.3748, 50.095, -8.62516 )
+points = PoolVector2Array( 66.095, -0.62516, -5.90501, 31.3748, -21.905, 23.3748, 50.095, -8.62516 )
 
 [resource]
 
 0/name = "base"
 0/texture = ExtResource( 1 )
 0/tex_offset = Vector2( -4, 6 )
+0/modulate = Color( 1, 1, 1, 1 )
 0/region = Rect2( 28, 92, 132, 84 )
 0/occluder_offset = Vector2( 66, 42 )
 0/navigation_offset = Vector2( 66, 42 )
@@ -35,6 +36,7 @@ points = Vector2Array( 66.095, -0.62516, -5.90501, 31.3748, -21.905, 23.3748, 50
 1/name = "base2"
 1/texture = ExtResource( 1 )
 1/tex_offset = Vector2( -4, 6 )
+1/modulate = Color( 1, 1, 1, 1 )
 1/region = Rect2( 220, 92, 132, 84 )
 1/occluder_offset = Vector2( 66, 42 )
 1/navigation_offset = Vector2( 66, 42 )
@@ -43,6 +45,7 @@ points = Vector2Array( 66.095, -0.62516, -5.90501, 31.3748, -21.905, 23.3748, 50
 2/name = "wall"
 2/texture = ExtResource( 1 )
 2/tex_offset = Vector2( -4, -32 )
+2/modulate = Color( 1, 1, 1, 1 )
 2/region = Rect2( 28, 220, 132, 136 )
 2/occluder_offset = Vector2( 66, 68 )
 2/navigation_offset = Vector2( 66, 68 )
@@ -51,6 +54,7 @@ points = Vector2Array( 66.095, -0.62516, -5.90501, 31.3748, -21.905, 23.3748, 50
 3/name = "column"
 3/texture = ExtResource( 1 )
 3/tex_offset = Vector2( -2, -32 )
+3/modulate = Color( 1, 1, 1, 1 )
 3/region = Rect2( 220, 220, 132, 136 )
 3/occluder_offset = Vector2( 66, 68 )
 3/navigation_offset = Vector2( 66, 68 )
@@ -59,6 +63,7 @@ points = Vector2Array( 66.095, -0.62516, -5.90501, 31.3748, -21.905, 23.3748, 50
 4/name = "door1"
 4/texture = ExtResource( 1 )
 4/tex_offset = Vector2( 16, -22 )
+4/modulate = Color( 1, 1, 1, 1 )
 4/region = Rect2( 24, 408, 132, 136 )
 4/occluder_offset = Vector2( 66, 68 )
 4/navigation_offset = Vector2( 66, 68 )

+ 27 - 28
old/2d/isometric/tileset_edit.tscn → 2d/isometric/tileset_edit.tscn

@@ -1,32 +1,33 @@
-[gd_scene load_steps=6 format=1]
+[gd_scene load_steps=16 format=2]
 
 [ext_resource path="res://isotiles.png" type="Texture" id=1]
 
 [sub_resource type="ConvexPolygonShape2D" id=1]
 
 custom_solver_bias = 0.0
-points = Vector2Array( -68, 2, -4, -30, 60, 2, -4, 34 )
+points = PoolVector2Array( -68, 2, -4, -30, 60, 2, -4, 34 )
 
 [sub_resource type="ConvexPolygonShape2D" id=2]
 
 custom_solver_bias = 0.0
-points = Vector2Array( -20, -6, -4, -22, 12, -22, 4, 10, -4, 10 )
+points = PoolVector2Array( -20, -6, -4, -22, 12, -22, 4, 10, -4, 10 )
 
 [sub_resource type="ConvexPolygonShape2D" id=3]
 
 custom_solver_bias = 0.0
-points = Vector2Array( 28, -6, 4, 10, 12, -22 )
+points = PoolVector2Array( 28, -6, 4, 10, 12, -22 )
 
 [sub_resource type="ConvexPolygonShape2D" id=4]
 
 custom_solver_bias = 0.0
-points = Vector2Array( 66.095, -0.62516, -5.90501, 31.3748, -21.905, 23.3748, 50.095, -8.62516 )
+points = PoolVector2Array( 66.095, -0.62516, -5.90501, 31.3748, -21.905, 23.3748, 50.095, -8.62516 )
 
 [node name="Node2D" type="Node2D"]
 
+
 [node name="base" type="Sprite" parent="."]
 
-transform/pos = Vector2( 87.5658, 0.113792 )
+position = Vector2( 87.5658, 0.113792 )
 texture = ExtResource( 1 )
 offset = Vector2( -4, 6 )
 region = true
@@ -34,7 +35,7 @@ region_rect = Rect2( 28, 92, 132, 84 )
 
 [node name="base2" type="Sprite" parent="."]
 
-transform/pos = Vector2( 196, 44 )
+position = Vector2( 196, 44 )
 texture = ExtResource( 1 )
 offset = Vector2( -4, 6 )
 region = true
@@ -42,7 +43,7 @@ region_rect = Rect2( 220, 92, 132, 84 )
 
 [node name="wall" type="Sprite" parent="."]
 
-transform/pos = Vector2( 356, 70 )
+position = Vector2( 356, 70 )
 texture = ExtResource( 1 )
 offset = Vector2( -4, -32 )
 region = true
@@ -50,12 +51,12 @@ region_rect = Rect2( 28, 220, 132, 136 )
 
 [node name="StaticBody2D" type="StaticBody2D" parent="wall"]
 
-input/pickable = false
+input_pickable = false
 shapes/0/shape = SubResource( 1 )
-shapes/0/transform = Matrix32( 1, 0, 0, 1, 0, 0 )
+shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 )
 shapes/0/trigger = false
-collision/layers = 1
-collision/mask = 1
+collision_layer = 1
+collision_mask = 1
 constant_linear_velocity = Vector2( 0, 0 )
 constant_angular_velocity = 0.0
 friction = 1.0
@@ -64,13 +65,13 @@ bounce = 0.0
 [node name="collision" type="CollisionPolygon2D" parent="wall/StaticBody2D"]
 
 build_mode = 0
-polygon = Vector2Array( -68, 2, -4, 34, 60, 2, -4, -30 )
+polygon = PoolVector2Array( -68, 2, -4, 34, 60, 2, -4, -30 )
 shape_range = Vector2( -1, -1 )
 trigger = false
 
 [node name="column" type="Sprite" parent="."]
 
-transform/pos = Vector2( 292, 198 )
+position = Vector2( 292, 198 )
 texture = ExtResource( 1 )
 offset = Vector2( -2, -32 )
 region = true
@@ -78,15 +79,15 @@ region_rect = Rect2( 220, 220, 132, 136 )
 
 [node name="StaticBody" type="StaticBody2D" parent="column"]
 
-input/pickable = false
+input_pickable = false
 shapes/0/shape = SubResource( 2 )
-shapes/0/transform = Matrix32( 1, 0, 0, 1, 0, 0 )
+shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 )
 shapes/0/trigger = false
 shapes/1/shape = SubResource( 3 )
-shapes/1/transform = Matrix32( 1, 0, 0, 1, 0, 0 )
+shapes/1/transform = Transform2D( 1, 0, 0, 1, 0, 0 )
 shapes/1/trigger = false
-collision/layers = 1
-collision/mask = 1
+collision_layer = 1
+collision_mask = 1
 constant_linear_velocity = Vector2( 0, 0 )
 constant_angular_velocity = 0.0
 friction = 1.0
@@ -95,13 +96,13 @@ bounce = 0.0
 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="column/StaticBody"]
 
 build_mode = 0
-polygon = Vector2Array( -20, -6, -4, 10, 4, 10, 28, -6, 12, -22, -4, -22 )
+polygon = PoolVector2Array( -20, -6, -4, 10, 4, 10, 28, -6, 12, -22, -4, -22 )
 shape_range = Vector2( -1, -1 )
 trigger = false
 
 [node name="door1" type="Sprite" parent="."]
 
-transform/pos = Vector2( 85.905, 0.62516 )
+position = Vector2( 85.905, 0.62516 )
 texture = ExtResource( 1 )
 offset = Vector2( 16, -22 )
 region = true
@@ -109,12 +110,12 @@ region_rect = Rect2( 24, 408, 132, 136 )
 
 [node name="StaticBody2D" type="StaticBody2D" parent="door1"]
 
-input/pickable = false
+input_pickable = false
 shapes/0/shape = SubResource( 4 )
-shapes/0/transform = Matrix32( 1, 0, 0, 1, 0, 0 )
+shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 )
 shapes/0/trigger = false
-collision/layers = 1
-collision/mask = 1
+collision_layer = 1
+collision_mask = 1
 constant_linear_velocity = Vector2( 0, 0 )
 constant_angular_velocity = 0.0
 friction = 1.0
@@ -123,8 +124,6 @@ bounce = 0.0
 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="door1/StaticBody2D"]
 
 build_mode = 0
-polygon = Vector2Array( -5.90501, 31.3748, 66.095, -0.62516, 50.095, -8.62516, -21.905, 23.3748 )
+polygon = PoolVector2Array( -5.90501, 31.3748, 66.095, -0.62516, 50.095, -8.62516, -21.905, 23.3748 )
 shape_range = Vector2( -1, -1 )
 trigger = false
-
-

+ 3 - 12
old/2d/isometric/troll.gd → 2d/isometric/troll.gd

@@ -23,16 +23,7 @@ func _fixed_process(delta):
 	if (Input.is_action_pressed("move_right")):
 		motion += Vector2(1, 0)
 	
-	motion = motion.normalized()*MOTION_SPEED*delta
-	motion = move(motion)
-	
-	# Make character slide nicely through the world
-	var slide_attempts = 4
-	while(is_colliding() and slide_attempts > 0):
-		motion = get_collision_normal().slide(motion)
-		motion = move(motion)
-		slide_attempts -= 1
-
+	motion = motion.normalized()*MOTION_SPEED
+		# Make character slide nicely through the world
+	move_and_slide( motion )
 
-func _ready():
-	set_fixed_process(true)

+ 0 - 0
old/2d/isometric/troll.png → 2d/isometric/troll.png


+ 18 - 20
old/2d/isometric/troll.tscn → 2d/isometric/troll.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=4 format=1]
+[gd_scene load_steps=5 format=2]
 
 [ext_resource path="res://troll.gd" type="Script" id=1]
 [ext_resource path="res://troll.png" type="Texture" id=2]
@@ -10,23 +10,23 @@ radius = 16.0
 
 [node name="troll" type="KinematicBody2D"]
 
-input/pickable = false
+input_pickable = false
 shapes/0/shape = SubResource( 1 )
-shapes/0/transform = Matrix32( 1, 0, 0, 1, -0.342697, -0.980721 )
+shapes/0/transform = Transform2D( 1, 0, 0, 1, -0.342697, -0.980721 )
 shapes/0/trigger = false
-collision/layers = 1
-collision/mask = 1
+collision_layer = 1
+collision_mask = 1
 collision/margin = 0.001
-script/script = ExtResource( 1 )
+script = ExtResource( 1 )
 
 [node name="Sprite" type="Sprite" parent="."]
 
-transform/pos = Vector2( -3.94334, -36.924 )
+position = Vector2( -3.94334, -36.924 )
 texture = ExtResource( 2 )
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 
-transform/pos = Vector2( -0.342697, -0.980721 )
+position = Vector2( -0.342697, -0.980721 )
 shape = SubResource( 1 )
 trigger = false
 _update_shape_index = -1
@@ -37,17 +37,15 @@ anchor_mode = 1
 rotating = false
 current = true
 zoom = Vector2( 1, 1 )
-limit/left = -10000000
-limit/top = -10000000
-limit/right = 10000000
-limit/bottom = 10000000
+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
-
-
+smoothing_enabled = 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

+ 0 - 0
old/2d/kinematic_char/circle.png → 2d/kinematic_character/circle.png


+ 0 - 0
old/2d/kinematic_char/colworld.gd → 2d/kinematic_character/colworld.gd


File diff suppressed because it is too large
+ 145 - 0
2d/kinematic_character/colworld.tscn


+ 0 - 0
old/2d/kinematic_char/icon.png → 2d/kinematic_character/icon.png


+ 0 - 0
old/2d/kinematic_char/long_obstacle.png → 2d/kinematic_character/long_obstacle.png


+ 0 - 0
old/2d/kinematic_char/obstacle.png → 2d/kinematic_character/obstacle.png


+ 4 - 47
old/2d/kinematic_char/player.gd → 2d/kinematic_character/player.gd

@@ -59,52 +59,13 @@ func _fixed_process(delta):
 		velocity.x = vlen*vsign
 	
 	# Integrate forces to velocity
-	velocity += force*delta
-	
+	velocity += force*delta	
 	# Integrate velocity into motion and move
-	var motion = velocity*delta
-	
-	# Move and consume motion
-	motion = move(motion)
-	
-	var floor_velocity = Vector2()
+	velocity = move_and_slide(velocity,Vector2(0,-1))
 	
-	if (is_colliding()):
-		# You can check which tile was collision against with this
-		# print(get_collider_metadata())
-		
-		# Ran against something, is it the floor? Get normal
-		var n = get_collision_normal()
-		
-		if (rad2deg(acos(n.dot(Vector2(0, -1)))) < FLOOR_ANGLE_TOLERANCE):
-			# If angle to the "up" vectors is < angle tolerance
-			# char is on floor
-			on_air_time = 0
-			floor_velocity = get_collider_velocity()
+	if (is_on_floor()):
+		on_air_time=0
 		
-		if (on_air_time == 0 and force.x == 0 and get_travel().length() < SLIDE_STOP_MIN_TRAVEL and abs(velocity.x) < SLIDE_STOP_VELOCITY and get_collider_velocity() == Vector2()):
-			# Since this formula will always slide the character around, 
-			# a special case must be considered to to stop it from moving 
-			# if standing on an inclined floor. Conditions are:
-			# 1) Standing on floor (on_air_time == 0)
-			# 2) Did not move more than one pixel (get_travel().length() < SLIDE_STOP_MIN_TRAVEL)
-			# 3) Not moving horizontally (abs(velocity.x) < SLIDE_STOP_VELOCITY)
-			# 4) Collider is not moving
-			
-			revert_motion()
-			velocity.y = 0.0
-		else:
-			# For every other case of motion, our motion was interrupted.
-			# Try to complete the motion by "sliding" by the normal
-			motion = n.slide(motion)
-			velocity = n.slide(velocity)
-			# Then move again
-			move(motion)
-	
-	if (floor_velocity != Vector2()):
-		# If floor moves, move with floor
-		move(floor_velocity*delta)
-	
 	if (jumping and velocity.y > 0):
 		# If falling, no longer jumping
 		jumping = false
@@ -117,7 +78,3 @@ func _fixed_process(delta):
 	
 	on_air_time += delta
 	prev_jump_pressed = jump
-
-
-func _ready():
-	set_fixed_process(true)

+ 0 - 0
old/2d/kinematic_char/player.png → 2d/kinematic_character/player.png


+ 7 - 9
old/2d/kinematic_char/player.tscn → 2d/kinematic_character/player.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=4 format=1]
+[gd_scene load_steps=4 format=2]
 
 [ext_resource path="res://player.gd" type="Script" id=1]
 [ext_resource path="res://player.png" type="Texture" id=2]
@@ -10,14 +10,14 @@ extents = Vector2( 7, 7 )
 
 [node name="player" type="KinematicBody2D"]
 
-input/pickable = false
+input_pickable = false
 shapes/0/shape = SubResource( 1 )
-shapes/0/transform = Matrix32( 1, 0, 0, 1, -0.315559, 0.157784 )
+shapes/0/transform = Transform2D( 1, 0, 0, 1, -0.315559, 0.157784 )
 shapes/0/trigger = false
-collision/layers = 1
-collision/mask = 1
+collision_layer = 1
+collision_mask = 1
 collision/margin = 0.01
-script/script = ExtResource( 1 )
+script = ExtResource( 1 )
 
 [node name="sprite" type="Sprite" parent="."]
 
@@ -25,9 +25,7 @@ texture = ExtResource( 2 )
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 
-transform/pos = Vector2( -0.315559, 0.157784 )
+position = Vector2( -0.315559, 0.157784 )
 shape = SubResource( 1 )
 trigger = false
 _update_shape_index = -1
-
-

+ 0 - 0
old/2d/kinematic_char/princess.png → 2d/kinematic_character/princess.png


+ 30 - 0
2d/kinematic_character/project.godot

@@ -0,0 +1,30 @@
+config_version=3
+[application]
+
+name="Kinematic Character"
+main_scene="res://colworld.tscn"
+icon="res://icon.png"
+
+[display]
+
+stretch/aspect="keep"
+stretch/mode="2d"
+window/height=495
+window/width=530
+
+[input]
+
+jump=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null)
+ ]
+move_bottom=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"unicode":0,"echo":false,"script":null)
+ ]
+move_left=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"unicode":0,"echo":false,"script":null)
+ ]
+move_right=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"unicode":0,"echo":false,"script":null)
+ ]
+move_up=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"unicode":0,"echo":false,"script":null)
+ ]
+
+[memory]
+
+multithread/thread_rid_pool_prealloc=60

File diff suppressed because it is too large
+ 40 - 0
2d/kinematic_collision/colworld.tscn


+ 0 - 0
old/2d/kinematic_col/icon.png → 2d/kinematic_collision/icon.png


+ 0 - 0
old/2d/kinematic_col/obstacle.png → 2d/kinematic_collision/obstacle.png


+ 2 - 13
old/2d/hexamap/troll.gd → 2d/kinematic_collision/player.gd

@@ -23,16 +23,5 @@ func _fixed_process(delta):
 	if (Input.is_action_pressed("move_right")):
 		motion += Vector2(1, 0)
 	
-	motion = motion.normalized()*MOTION_SPEED*delta
-	motion = move(motion)
-	
-	# Make character slide nicely through the world
-	var slide_attempts = 4
-	while(is_colliding() and slide_attempts > 0):
-		motion = get_collision_normal().slide(motion)
-		motion = move(motion)
-		slide_attempts -= 1
-
-
-func _ready():
-	set_fixed_process(true)
+	motion = motion.normalized()*MOTION_SPEED
+	move_and_slide(motion)

+ 0 - 0
old/2d/kinematic_col/player.png → 2d/kinematic_collision/player.png


+ 6 - 8
old/2d/kinematic_col/player.tscn → 2d/kinematic_collision/player.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=4 format=1]
+[gd_scene load_steps=4 format=2]
 
 [ext_resource path="res://player.gd" type="Script" id=1]
 [ext_resource path="res://player.png" type="Texture" id=2]
@@ -10,14 +10,14 @@ extents = Vector2( 8, 8 )
 
 [node name="player" type="KinematicBody2D"]
 
-input/pickable = false
+input_pickable = false
 shapes/0/shape = SubResource( 1 )
-shapes/0/transform = Matrix32( 1, 0, 0, 1, 0, 0 )
+shapes/0/transform = Transform2D( 1, 0, 0, 1, 0, 0 )
 shapes/0/trigger = false
-collision/layers = 1
-collision/mask = 1
+collision_layer = 1
+collision_mask = 1
 collision/margin = 0.01
-script/script = ExtResource( 1 )
+script = ExtResource( 1 )
 
 [node name="sprite" type="Sprite" parent="."]
 
@@ -28,5 +28,3 @@ texture = ExtResource( 2 )
 shape = SubResource( 1 )
 trigger = false
 _update_shape_index = -1
-
-

+ 13 - 0
2d/kinematic_collision/project.godot

@@ -0,0 +1,13 @@
+[application]
+
+icon = "res://icon.png"
+main_scene = "res://colworld.tscn"
+name = "Kinematic Collision"
+
+[input]
+
+move_bottom = [ InputEvent(KEY,16777234) ]
+move_left = [ InputEvent(KEY,16777231) ]
+move_right = [ InputEvent(KEY,16777233) ]
+move_up = [ InputEvent(KEY,16777232) ]
+

BIN
2d/light2d_as_mask/.import/burano.png-893cff79ccbe972d7b1ad3e1845f81bf.stex


BIN
2d/light2d_as_mask/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex


BIN
2d/light2d_as_mask/.import/splat.png-a41a35966004eec2e8a20d517d1ec4bb.stex


+ 0 - 0
old/2d/light_mask/burano.png → 2d/light2d_as_mask/burano.png


+ 23 - 0
2d/light2d_as_mask/burano.png.import

@@ -0,0 +1,23 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/burano.png-893cff79ccbe972d7b1ad3e1845f81bf.stex"
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+stream=false
+size_limit=0
+detect_3d=true

+ 0 - 0
old/2d/light_mask/icon.png → 2d/light2d_as_mask/icon.png


+ 23 - 0
2d/light2d_as_mask/icon.png.import

@@ -0,0 +1,23 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+stream=false
+size_limit=0
+detect_3d=true

+ 157 - 0
2d/light2d_as_mask/lightmask.tscn

@@ -0,0 +1,157 @@
+[gd_scene load_steps=5 format=2]
+
+[ext_resource path="res://burano.png" type="Texture" id=1]
+[ext_resource path="res://splat.png" type="Texture" id=2]
+
+[sub_resource type="CanvasItemMaterial" id=1]
+
+blend_mode = 0
+light_mode = 2
+
+[sub_resource type="Animation" id=2]
+
+length = 4.0
+loop = true
+step = 0.1
+tracks/0/type = "value"
+tracks/0/path = NodePath("light1:position")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/imported = false
+tracks/0/keys = {
+"times": PoolFloatArray( 0, 1, 2, 3 ),
+"transitions": PoolFloatArray( -2, -2, -2, -2 ),
+"update": 0,
+"values": [ Vector2( 601.028, 242.639 ), Vector2( 318.649, 327.353 ), Vector2( 381.263, 130.915 ), Vector2( 462.294, 389.968 ) ]
+}
+tracks/1/type = "value"
+tracks/1/path = NodePath("light2:position")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/imported = false
+tracks/1/keys = {
+"times": PoolFloatArray( 0, 1, 2, 3 ),
+"transitions": PoolFloatArray( -2, -2, -2, -2 ),
+"update": 0,
+"values": [ Vector2( 196.528, 185.139 ), Vector2( 135.142, 454.013 ), Vector2( 638.105, 334.923 ), Vector2( 331.375, 101.653 ) ]
+}
+tracks/2/type = "value"
+tracks/2/path = NodePath("light3:position")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/imported = false
+tracks/2/keys = {
+"times": PoolFloatArray( 0, 1, 2, 3 ),
+"transitions": PoolFloatArray( -2, -2, -2, -2 ),
+"update": 0,
+"values": [ Vector2( 442.528, 411.139 ), Vector2( 635.283, 236.8 ), Vector2( 216.215, 396.815 ), Vector2( 682.96, 294.708 ) ]
+}
+
+[node name="lightmask_demo" type="Control"]
+
+anchor_right = 1
+anchor_bottom = 1
+rect_clip_content = false
+mouse_filter = 0
+size_flags_horizontal = 2
+size_flags_vertical = 2
+
+[node name="burano" type="TextureRect" parent="."]
+
+material = SubResource( 1 )
+margin_right = 800.0
+margin_bottom = 600.0
+rect_clip_content = false
+mouse_filter = 1
+size_flags_horizontal = 2
+size_flags_vertical = 2
+texture = ExtResource( 1 )
+stretch_mode = 0
+
+[node name="light1" type="Light2D" parent="."]
+
+position = Vector2( 601.028, 242.639 )
+enabled = true
+editor_only = false
+texture = ExtResource( 2 )
+offset = Vector2( 0, 0 )
+scale = 1.0
+color = Color( 1, 1, 1, 1 )
+energy = 1.0
+mode = 2
+range_height = 0.0
+range_z_min = -1024
+range_z_max = 1024
+range_layer_min = 0
+range_layer_max = 0
+range_item_cull_mask = 1
+shadow_enabled = false
+shadow_color = Color( 0, 0, 0, 0 )
+shadow_buffer_size = 2048
+shadow_gradient_length = 0.0
+shadow_filter = 0
+shadow_filter_smooth = 0.0
+shadow_item_cull_mask = 1
+
+[node name="light2" type="Light2D" parent="."]
+
+position = Vector2( 196.528, 185.139 )
+enabled = true
+editor_only = false
+texture = ExtResource( 2 )
+offset = Vector2( 0, 0 )
+scale = 1.0
+color = Color( 1, 1, 1, 1 )
+energy = 1.0
+mode = 2
+range_height = 0.0
+range_z_min = -1024
+range_z_max = 1024
+range_layer_min = 0
+range_layer_max = 0
+range_item_cull_mask = 1
+shadow_enabled = false
+shadow_color = Color( 0, 0, 0, 0 )
+shadow_buffer_size = 2048
+shadow_gradient_length = 0.0
+shadow_filter = 0
+shadow_filter_smooth = 0.0
+shadow_item_cull_mask = 1
+
+[node name="light3" type="Light2D" parent="."]
+
+position = Vector2( 442.528, 411.139 )
+enabled = true
+editor_only = false
+texture = ExtResource( 2 )
+offset = Vector2( 0, 0 )
+scale = 1.0
+color = Color( 1, 1, 1, 1 )
+energy = 1.0
+mode = 2
+range_height = 0.0
+range_z_min = -1024
+range_z_max = 1024
+range_layer_min = 0
+range_layer_max = 0
+range_item_cull_mask = 1
+shadow_enabled = false
+shadow_color = Color( 0, 0, 0, 0 )
+shadow_buffer_size = 2048
+shadow_gradient_length = 0.0
+shadow_filter = 0
+shadow_filter_smooth = 0.0
+shadow_item_cull_mask = 1
+
+[node name="anim" type="AnimationPlayer" parent="."]
+
+playback_process_mode = 1
+playback_default_blend_time = 0.0
+root_node = NodePath("..")
+anims/maskmotion = SubResource( 2 )
+playback/active = true
+playback/speed = 1.0
+blend_times = [  ]
+autoplay = "maskmotion"
+
+

+ 10 - 0
2d/light2d_as_mask/project.godot

@@ -0,0 +1,10 @@
+[application]
+
+icon = "res://icon.png"
+main_scene = "res://lightmask.tscn"
+name = "Using Lights As Mask"
+
+[rasterizer]
+
+shadow_filter = 3
+

+ 0 - 0
old/2d/light_mask/splat.png → 2d/light2d_as_mask/splat.png


+ 23 - 0
2d/light2d_as_mask/splat.png.import

@@ -0,0 +1,23 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/splat.png-a41a35966004eec2e8a20d517d1ec4bb.stex"
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+stream=false
+size_limit=0
+detect_3d=true

BIN
2d/lights_and_shadows/.import/bg.png-24bff804693ee063127ad100e04c5185.stex


BIN
2d/lights_and_shadows/.import/caster.png-67727cb056b9e0209664a84f1653a25a.stex


BIN
2d/lights_and_shadows/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex


BIN
2d/lights_and_shadows/.import/light.png-06e94102f0cce323cff7daad56cf3030.stex


BIN
2d/lights_and_shadows/.import/spot.png-36b4dfbff4efeea17ec3137d266ffc4a.stex


+ 0 - 0
old/2d/lights_shadows/bg.png → 2d/lights_and_shadows/bg.png


+ 23 - 0
2d/lights_and_shadows/bg.png.import

@@ -0,0 +1,23 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/bg.png-24bff804693ee063127ad100e04c5185.stex"
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+stream=false
+size_limit=0
+detect_3d=true

+ 0 - 0
old/2d/lights_shadows/caster.png → 2d/lights_and_shadows/caster.png


+ 23 - 0
2d/lights_and_shadows/caster.png.import

@@ -0,0 +1,23 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/caster.png-67727cb056b9e0209664a84f1653a25a.stex"
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+stream=false
+size_limit=0
+detect_3d=true

+ 0 - 0
old/2d/lights_shadows/icon.png → 2d/lights_and_shadows/icon.png


+ 23 - 0
2d/lights_and_shadows/icon.png.import

@@ -0,0 +1,23 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+stream=false
+size_limit=0
+detect_3d=true

+ 0 - 0
old/2d/lights_shadows/light.png → 2d/lights_and_shadows/light.png


+ 23 - 0
2d/lights_and_shadows/light.png.import

@@ -0,0 +1,23 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/light.png-06e94102f0cce323cff7daad56cf3030.stex"
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+stream=false
+size_limit=0
+detect_3d=true

+ 129 - 84
old/2d/lights_shadows/light_shadows.tscn → 2d/lights_and_shadows/light_shadows.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=9 format=1]
+[gd_scene load_steps=12 format=2]
 
 [ext_resource path="res://bg.png" type="Texture" id=1]
 [ext_resource path="res://caster.png" type="Texture" id=2]
@@ -9,55 +9,91 @@
 
 closed = true
 cull_mode = 0
-polygon = Vector2Array( -15.913, -15.9738, 15.9079, -16.0785, 15.6986, 15.847, -16.1223, 15.9517 )
+polygon = PoolVector2Array( -15.913, -15.9738, 15.9079, -16.0785, 15.6986, 15.847, -16.1223, 15.9517 )
 
-[sub_resource type="Animation" id=2]
+[sub_resource type="CanvasItemMaterial" id=2]
+
+blend_mode = 1
+light_mode = 0
+
+[sub_resource type="Animation" id=3]
 
 length = 16.0
 loop = true
 step = 0.1
 tracks/0/type = "value"
-tracks/0/path = NodePath(".:transform/pos")
+tracks/0/path = NodePath(".:position")
 tracks/0/interp = 1
-tracks/0/keys = { "cont":true, "times":FloatArray( 0, 4, 8, 12 ), "transitions":FloatArray( -2, -2, -2, -2 ), "values":[ Vector2( 159.289, 452.441 ), Vector2( 132.279, 80.4366 ), Vector2( 700.722, 241.27 ), Vector2( 429.392, 571.532 ) ] }
+tracks/0/loop_wrap = true
+tracks/0/imported = false
+tracks/0/keys = {
+"times": PoolFloatArray( 0, 4, 8, 12 ),
+"transitions": PoolFloatArray( -2, -2, -2, -2 ),
+"update": 0,
+"values": [ Vector2( 159.289, 452.441 ), Vector2( 132.279, 80.4366 ), Vector2( 700.722, 241.27 ), Vector2( 429.392, 571.532 ) ]
+}
 
-[sub_resource type="Animation" id=3]
+[sub_resource type="Animation" id=4]
 
 length = 16.0
 loop = true
 step = 0.1
 tracks/0/type = "value"
-tracks/0/path = NodePath(".:transform/pos")
+tracks/0/path = NodePath(".:position")
 tracks/0/interp = 1
-tracks/0/keys = { "cont":true, "times":FloatArray( 0, 4.1, 8.1, 11.8 ), "transitions":FloatArray( -2, -2, -2, -2 ), "values":[ Vector2( 753.756, 314.336 ), Vector2( 69.7562, 234.336 ), Vector2( 256.756, 575.336 ), Vector2( 516.756, 530.336 ) ] }
+tracks/0/loop_wrap = true
+tracks/0/imported = false
+tracks/0/keys = {
+"times": PoolFloatArray( 0, 4.1, 8.1, 11.8 ),
+"transitions": PoolFloatArray( -2, -2, -2, -2 ),
+"update": 0,
+"values": [ Vector2( 753.756, 314.336 ), Vector2( 69.7562, 234.336 ), Vector2( 256.756, 575.336 ), Vector2( 516.756, 530.336 ) ]
+}
 
-[sub_resource type="Animation" id=4]
+[sub_resource type="CanvasItemMaterial" id=5]
+
+blend_mode = 1
+light_mode = 0
+
+[sub_resource type="CanvasItemMaterial" id=6]
+
+blend_mode = 1
+light_mode = 0
+
+[sub_resource type="Animation" id=7]
 
 length = 16.0
 loop = true
 step = 0.1
 tracks/0/type = "value"
-tracks/0/path = NodePath(".:transform/pos")
+tracks/0/path = NodePath(".:position")
 tracks/0/interp = 1
-tracks/0/keys = { "cont":true, "times":FloatArray( 0, 4.1, 7.9, 12.1 ), "transitions":FloatArray( -2, -2, -2, -2 ), "values":[ Vector2( 692.078, 29.8849 ), Vector2( 309.606, 31.5551 ), Vector2( 40.7064, 238.658 ), Vector2( 685.397, 282.082 ) ] }
+tracks/0/loop_wrap = true
+tracks/0/imported = false
+tracks/0/keys = {
+"times": PoolFloatArray( 0, 4.1, 7.9, 12.1 ),
+"transitions": PoolFloatArray( -2, -2, -2, -2 ),
+"update": 0,
+"values": [ Vector2( 692.078, 29.8849 ), Vector2( 309.606, 31.5551 ), Vector2( 40.7064, 238.658 ), Vector2( 685.397, 282.082 ) ]
+}
 
 [node name="base" type="Node2D"]
 
 [node name="ambient" type="CanvasModulate" parent="."]
 
-color = Color( 0.479177, 0.464761, 0.498946, 1 )
+color = Color( 0.27451, 0.27451, 0.27451, 1 )
 
 [node name="bg" type="Sprite" parent="."]
 
-transform/pos = Vector2( 401.251, 301.906 )
-transform/scale = Vector2( 6.39454, 4.82665 )
+position = Vector2( 401.251, 301.906 )
+scale = Vector2( 6.39454, 4.82665 )
 texture = ExtResource( 1 )
 
 [node name="casters" type="Node2D" parent="."]
 
 [node name="shadow_caster" type="Sprite" parent="casters"]
 
-transform/pos = Vector2( 95.2909, 85.3186 )
+position = Vector2( 95.2909, 85.3186 )
 texture = ExtResource( 2 )
 
 [node name="occluder" type="LightOccluder2D" parent="casters/shadow_caster"]
@@ -67,7 +103,7 @@ light_mask = 1
 
 [node name="shadow_caster1" type="Sprite" parent="casters"]
 
-transform/pos = Vector2( 200.291, 313.319 )
+position = Vector2( 200.291, 313.319 )
 texture = ExtResource( 2 )
 
 [node name="occluder" type="LightOccluder2D" parent="casters/shadow_caster1"]
@@ -77,7 +113,7 @@ light_mask = 1
 
 [node name="shadow_caster2" type="Sprite" parent="casters"]
 
-transform/pos = Vector2( 76.2909, 405.319 )
+position = Vector2( 76.2909, 405.319 )
 texture = ExtResource( 2 )
 
 [node name="occluder" type="LightOccluder2D" parent="casters/shadow_caster2"]
@@ -87,7 +123,7 @@ light_mask = 1
 
 [node name="shadow_caster3" type="Sprite" parent="casters"]
 
-transform/pos = Vector2( 348.291, 206.319 )
+position = Vector2( 348.291, 206.319 )
 texture = ExtResource( 2 )
 
 [node name="occluder" type="LightOccluder2D" parent="casters/shadow_caster3"]
@@ -97,7 +133,7 @@ light_mask = 1
 
 [node name="shadow_caster4" type="Sprite" parent="casters"]
 
-transform/pos = Vector2( 239.291, 48.3186 )
+position = Vector2( 239.291, 48.3186 )
 texture = ExtResource( 2 )
 
 [node name="occluder" type="LightOccluder2D" parent="casters/shadow_caster4"]
@@ -107,7 +143,7 @@ light_mask = 1
 
 [node name="shadow_caster5" type="Sprite" parent="casters"]
 
-transform/pos = Vector2( 140.291, 561.319 )
+position = Vector2( 140.291, 561.319 )
 texture = ExtResource( 2 )
 
 [node name="occluder" type="LightOccluder2D" parent="casters/shadow_caster5"]
@@ -117,7 +153,7 @@ light_mask = 1
 
 [node name="shadow_caster6" type="Sprite" parent="casters"]
 
-transform/pos = Vector2( 392.291, 499.319 )
+position = Vector2( 392.291, 499.319 )
 texture = ExtResource( 2 )
 
 [node name="occluder" type="LightOccluder2D" parent="casters/shadow_caster6"]
@@ -127,7 +163,7 @@ light_mask = 1
 
 [node name="shadow_caster7" type="Sprite" parent="casters"]
 
-transform/pos = Vector2( 735.291, 552.319 )
+position = Vector2( 735.291, 552.319 )
 texture = ExtResource( 2 )
 
 [node name="occluder" type="LightOccluder2D" parent="casters/shadow_caster7"]
@@ -137,7 +173,7 @@ light_mask = 1
 
 [node name="shadow_caster8" type="Sprite" parent="casters"]
 
-transform/pos = Vector2( 661.291, 371.319 )
+position = Vector2( 661.291, 371.319 )
 texture = ExtResource( 2 )
 
 [node name="occluder" type="LightOccluder2D" parent="casters/shadow_caster8"]
@@ -147,7 +183,7 @@ light_mask = 1
 
 [node name="shadow_caster9" type="Sprite" parent="casters"]
 
-transform/pos = Vector2( 567.291, 574.319 )
+position = Vector2( 567.291, 574.319 )
 texture = ExtResource( 2 )
 
 [node name="occluder" type="LightOccluder2D" parent="casters/shadow_caster9"]
@@ -157,7 +193,7 @@ light_mask = 1
 
 [node name="shadow_caster10" type="Sprite" parent="casters"]
 
-transform/pos = Vector2( 420.291, 350.319 )
+position = Vector2( 420.291, 350.319 )
 texture = ExtResource( 2 )
 
 [node name="occluder" type="LightOccluder2D" parent="casters/shadow_caster10"]
@@ -167,7 +203,7 @@ light_mask = 1
 
 [node name="shadow_caster11" type="Sprite" parent="casters"]
 
-transform/pos = Vector2( 463.291, 106.319 )
+position = Vector2( 463.291, 106.319 )
 texture = ExtResource( 2 )
 
 [node name="occluder" type="LightOccluder2D" parent="casters/shadow_caster11"]
@@ -177,7 +213,7 @@ light_mask = 1
 
 [node name="shadow_caster12" type="Sprite" parent="casters"]
 
-transform/pos = Vector2( 621.291, 78.3186 )
+position = Vector2( 621.291, 78.3186 )
 texture = ExtResource( 2 )
 
 [node name="occluder" type="LightOccluder2D" parent="casters/shadow_caster12"]
@@ -187,7 +223,7 @@ light_mask = 1
 
 [node name="shadow_caster13" type="Sprite" parent="casters"]
 
-transform/pos = Vector2( 761.291, 240.319 )
+position = Vector2( 761.291, 240.319 )
 texture = ExtResource( 2 )
 
 [node name="occluder" type="LightOccluder2D" parent="casters/shadow_caster13"]
@@ -197,7 +233,7 @@ light_mask = 1
 
 [node name="shadow_caster14" type="Sprite" parent="casters"]
 
-transform/pos = Vector2( 771.291, 29.3186 )
+position = Vector2( 771.291, 29.3186 )
 texture = ExtResource( 2 )
 
 [node name="occluder" type="LightOccluder2D" parent="casters/shadow_caster14"]
@@ -207,38 +243,41 @@ light_mask = 1
 
 [node name="red_light" type="Light2D" parent="."]
 
-transform/pos = Vector2( 159.289, 452.441 )
+position = Vector2( 159.289, 452.441 )
 enabled = true
+editor_only = false
 texture = ExtResource( 3 )
 offset = Vector2( 0, 0 )
 scale = 1.0
 color = Color( 1, 0.446392, 0.0576646, 1 )
 energy = 1.0
 mode = 0
-range/height = 0.0
-range/z_min = -1024
-range/z_max = 1024
-range/layer_min = 0
-range/layer_max = 0
-range/item_mask = 1
-shadow/enabled = true
-shadow/color = Color( 0, 0, 0, 0 )
-shadow/buffer_size = 2048
-shadow/esm_multiplier = 80.0
-shadow/item_mask = 1
+range_height = 0.0
+range_z_min = -1024
+range_z_max = 1024
+range_layer_min = 0
+range_layer_max = 0
+range_item_cull_mask = 1
+shadow_enabled = true
+shadow_color = Color( 0, 0, 0, 0 )
+shadow_buffer_size = 2048
+shadow_gradient_length = 1.3
+shadow_filter = 3
+shadow_filter_smooth = 11.1
+shadow_item_cull_mask = 1
 
 [node name="blob" type="Sprite" parent="red_light"]
 
-visibility/blend_mode = 1
+material = SubResource( 2 )
 texture = ExtResource( 4 )
 
 [node name="anim" type="AnimationPlayer" parent="red_light"]
 
-playback/process_mode = 1
-playback/default_blend_time = 0.0
-root/root = NodePath("..")
-anims/motion = SubResource( 2 )
-anims/motion2 = SubResource( 3 )
+playback_process_mode = 1
+playback_default_blend_time = 0.0
+root_node = NodePath("..")
+anims/motion = SubResource( 3 )
+anims/motion2 = SubResource( 4 )
 playback/active = true
 playback/speed = 1.0
 blend_times = [  ]
@@ -246,38 +285,41 @@ autoplay = "motion"
 
 [node name="green_light" type="Light2D" parent="."]
 
-transform/pos = Vector2( 753.756, 314.336 )
+position = Vector2( 753.756, 314.336 )
 enabled = true
+editor_only = false
 texture = ExtResource( 3 )
 offset = Vector2( 0, 0 )
 scale = 1.0
 color = Color( 0.49247, 0.878537, 0.409146, 1 )
 energy = 1.0
 mode = 0
-range/height = 0.0
-range/z_min = -1024
-range/z_max = 1024
-range/layer_min = 0
-range/layer_max = 0
-range/item_mask = 1
-shadow/enabled = true
-shadow/color = Color( 0, 0, 0, 0 )
-shadow/buffer_size = 2048
-shadow/esm_multiplier = 80.0
-shadow/item_mask = 1
+range_height = 0.0
+range_z_min = -1024
+range_z_max = 1024
+range_layer_min = 0
+range_layer_max = 0
+range_item_cull_mask = 1
+shadow_enabled = true
+shadow_color = Color( 0, 0, 0, 0 )
+shadow_buffer_size = 2048
+shadow_gradient_length = 1.2
+shadow_filter = 3
+shadow_filter_smooth = 7.1
+shadow_item_cull_mask = 1
 
 [node name="blob" type="Sprite" parent="green_light"]
 
-visibility/blend_mode = 1
+material = SubResource( 5 )
 texture = ExtResource( 4 )
 
 [node name="anim" type="AnimationPlayer" parent="green_light"]
 
-playback/process_mode = 1
-playback/default_blend_time = 0.0
-root/root = NodePath("..")
-anims/m2 = SubResource( 3 )
-anims/motion = SubResource( 2 )
+playback_process_mode = 1
+playback_default_blend_time = 0.0
+root_node = NodePath("..")
+anims/m2 = SubResource( 4 )
+anims/motion = SubResource( 3 )
 playback/active = true
 playback/speed = 1.0
 blend_times = [  ]
@@ -285,39 +327,42 @@ autoplay = "m2"
 
 [node name="blue_light" type="Light2D" parent="."]
 
-transform/pos = Vector2( 692.078, 29.8849 )
+position = Vector2( 692.078, 29.8849 )
 enabled = true
+editor_only = false
 texture = ExtResource( 3 )
 offset = Vector2( 0, 0 )
 scale = 1.0
 color = Color( 0.396752, 0.446392, 0.929792, 1 )
 energy = 1.0
 mode = 0
-range/height = 0.0
-range/z_min = -1024
-range/z_max = 1024
-range/layer_min = 0
-range/layer_max = 0
-range/item_mask = 1
-shadow/enabled = true
-shadow/color = Color( 0, 0, 0, 0 )
-shadow/buffer_size = 2048
-shadow/esm_multiplier = 80.0
-shadow/item_mask = 1
+range_height = 0.0
+range_z_min = -1024
+range_z_max = 1024
+range_layer_min = 0
+range_layer_max = 0
+range_item_cull_mask = 1
+shadow_enabled = true
+shadow_color = Color( 0, 0, 0, 0 )
+shadow_buffer_size = 2048
+shadow_gradient_length = 1.4
+shadow_filter = 3
+shadow_filter_smooth = 5.3
+shadow_item_cull_mask = 1
 
 [node name="blob" type="Sprite" parent="blue_light"]
 
-visibility/blend_mode = 1
+material = SubResource( 6 )
 texture = ExtResource( 4 )
 
 [node name="anim" type="AnimationPlayer" parent="blue_light"]
 
-playback/process_mode = 1
-playback/default_blend_time = 0.0
-root/root = NodePath("..")
-anims/motion = SubResource( 2 )
-anims/motion2 = SubResource( 3 )
-anims/motion3 = SubResource( 4 )
+playback_process_mode = 1
+playback_default_blend_time = 0.0
+root_node = NodePath("..")
+anims/motion = SubResource( 3 )
+anims/motion2 = SubResource( 4 )
+anims/motion3 = SubResource( 7 )
 playback/active = true
 playback/speed = 1.0
 blend_times = [  ]

+ 17 - 0
2d/lights_and_shadows/project.godot

@@ -0,0 +1,17 @@
+[application]
+
+icon = "res://icon.png"
+main_scene = "res://light_shadows.tscn"
+name = "2D Lighting"
+
+[display]
+
+stretch/aspect = "keep"
+stretch/mode = "2d"
+window/height = 600
+window/width = 800
+
+[rasterizer]
+
+shadow_filter = 2
+

+ 0 - 0
old/2d/lights_shadows/spot.png → 2d/lights_and_shadows/spot.png


+ 23 - 0
2d/lights_and_shadows/spot.png.import

@@ -0,0 +1,23 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/spot.png-36b4dfbff4efeea17ec3137d266ffc4a.stex"
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+stream=false
+size_limit=0
+detect_3d=true

BIN
2d/navigation/.import/agent.png-22bdd448030a3457042db97db7630b4c.stex


BIN
2d/navigation/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex


BIN
2d/navigation/.import/path.png-03249d8c3f5af613913d0eb997e480a3.stex


+ 0 - 0
old/2d/navpoly/agent.png → 2d/navigation/agent.png


+ 23 - 0
2d/navigation/agent.png.import

@@ -0,0 +1,23 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/agent.png-22bdd448030a3457042db97db7630b4c.stex"
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+stream=false
+size_limit=0
+detect_3d=true

Some files were not shown because too many files changed in this diff