Merge pull request #5 from Piralein/area_2d

Update area_2d starter to 4.x

src/area_2d_starter/Ball.gd

@@ -2,4 +2,4 @@ extends RigidBody2D
 
 
 func _on_VisibilityNotifier2D_screen_exited():
-	queue_free()
+	queue_free()

src/area_2d_starter/Ball.tscn

@@ -1,26 +1,27 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=5 format=3 uid="uid://cem8bb7lkb7sr"]
 
-[ext_resource path="res://Ball.gd" type="Script" id=1]
-[ext_resource path="res://assets/ballBlue_09.png" type="Texture" id=2]
+[ext_resource type="Script" path="res://Ball.gd" id="1"]
+[ext_resource type="Texture2D" uid="uid://b2bimjy3075py" path="res://assets/ballBlue_09.png" id="2"]
 
-[sub_resource type="PhysicsMaterial" id=2]
+[sub_resource type="PhysicsMaterial" id="2"]
 friction = 0.1
 bounce = 0.25
 
-[sub_resource type="CircleShape2D" id=1]
+[sub_resource type="CircleShape2D" id="1"]
 radius = 14.8321
 
 [node name="Ball" type="RigidBody2D"]
-physics_material_override = SubResource( 2 )
+physics_material_override = SubResource("2")
 gravity_scale = 5.0
-script = ExtResource( 1 )
+script = ExtResource("1")
 
-[node name="Sprite" type="Sprite" parent="."]
-scale = Vector2( 0.2, 0.2 )
-texture = ExtResource( 2 )
+[node name="Sprite2D" type="Sprite2D" parent="."]
+scale = Vector2(0.2, 0.2)
+texture = ExtResource("2")
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
-shape = SubResource( 1 )
+shape = SubResource("1")
 
-[node name="VisibilityNotifier2D" type="VisibilityNotifier2D" parent="."]
-[connection signal="screen_exited" from="VisibilityNotifier2D" to="." method="_on_VisibilityNotifier2D_screen_exited"]
+[node name="VisibleOnScreenNotifier2D" type="VisibleOnScreenNotifier2D" parent="."]
+
+[connection signal="screen_exited" from="VisibleOnScreenNotifier2D" to="." method="_on_VisibilityNotifier2D_screen_exited"]

src/area_2d_starter/World.gd

@@ -6,16 +6,16 @@ var Ball = load("res://Ball.tscn")
 func _draw():
 	# Draw shaded regions to show the areas.
 	draw_circle($Point.position, $Point/CollisionShape2D.shape.radius,
-				Color(1, 1, 1, 0.1))	
-	var s = $Antigrav/CollisionShape2D.shape.extents
-	draw_rect(Rect2($Antigrav.position-s, s * 2), Color(1, 1, 0, 0.1))
-	s = $Slow/CollisionShape2D.shape.extents
-	draw_rect(Rect2($Slow.position-s, s * 2), Color(0, 1, 1, 0.1))
+				Color(1, 1, 1, 0.1))
+	var s = $Antigrav/CollisionShape2D.shape.size
+	draw_rect(Rect2($Antigrav.position - (s / 2), s), Color(1, 1, 0, 0.1))
+	s = $Slow/CollisionShape2D.shape.size
+	draw_rect(Rect2($Slow.position - (s / 2), s), Color(0, 1, 1, 0.1))
 
 	
 func _unhandled_input(event):
 	if event is InputEventMouseButton and event.pressed:
-		if event.button_index == BUTTON_LEFT:
-			var b = Ball.instance()
+		if event.button_index == MOUSE_BUTTON_LEFT:
+			var b = Ball.instantiate()
 			b.position = event.position
-			add_child(b)
+			add_child(b)

src/area_2d_starter/World.tscn

@@ -1,104 +1,108 @@
-[gd_scene load_steps=8 format=2]
+[gd_scene load_steps=8 format=3 uid="uid://cwghg4um8ohpo"]
 
-[ext_resource path="res://World.gd" type="Script" id=1]
-[ext_resource path="res://assets/Roboto-Bold.ttf" type="DynamicFontData" id=2]
+[ext_resource type="Script" path="res://World.gd" id="1"]
+[ext_resource type="FontFile" uid="uid://sjnahvlt0cil" path="res://assets/Roboto-Bold.ttf" id="2"]
 
-[sub_resource type="RectangleShape2D" id=2]
-extents = Vector2( 151.758, 151.815 )
+[sub_resource type="RectangleShape2D" id="2"]
+size = Vector2(250, 300)
 
-[sub_resource type="RectangleShape2D" id=3]
-extents = Vector2( 151.758, 94.5276 )
+[sub_resource type="RectangleShape2D" id="3"]
+size = Vector2(250, 300)
 
-[sub_resource type="CircleShape2D" id=4]
+[sub_resource type="CircleShape2D" id="4"]
 radius = 225.0
 
-[sub_resource type="DynamicFont" id=5]
-size = 24
-font_data = ExtResource( 2 )
+[sub_resource type="FontFile" id="5"]
+fallbacks = Array[Font]([ExtResource("2")])
+cache/0/16/0/ascent = 0.0
+cache/0/16/0/descent = 0.0
+cache/0/16/0/underline_position = 0.0
+cache/0/16/0/underline_thickness = 0.0
+cache/0/16/0/scale = 1.0
+cache/0/16/0/kerning_overrides/16/0 = Vector2(0, 0)
 
-[sub_resource type="DynamicFont" id=6]
-size = 48
-font_data = ExtResource( 2 )
+[sub_resource type="FontFile" id="6"]
+fallbacks = Array[Font]([ExtResource("2")])
+cache/0/16/0/ascent = 0.0
+cache/0/16/0/descent = 0.0
+cache/0/16/0/underline_position = 0.0
+cache/0/16/0/underline_thickness = 0.0
+cache/0/16/0/scale = 1.0
+cache/0/16/0/kerning_overrides/16/0 = Vector2(0, 0)
 
 [node name="World" type="Node2D"]
-script = ExtResource( 1 )
+script = ExtResource("1")
 
 [node name="Antigrav" type="Area2D" parent="."]
-editor/display_folded = true
-position = Vector2( 899.202, 468.526 )
-space_override = 3
-gravity_vec = Vector2( 0, -1 )
-__meta__ = {
-"_edit_group_": true
-}
+position = Vector2(900, 400)
+gravity_space_override = 3
+gravity_point_center = Vector2(0, -1)
+gravity_direction = Vector2(0, -1)
+metadata/_edit_group_ = true
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Antigrav"]
-shape = SubResource( 2 )
+shape = SubResource("2")
 
 [node name="Slow" type="Area2D" parent="."]
-editor/display_folded = true
-position = Vector2( 590.261, 516.606 )
-space_override = 3
-linear_damp = 10.0
-__meta__ = {
-"_edit_group_": true
-}
+position = Vector2(620, 400)
+linear_damp_space_override = 3
+linear_damp = 20.0
+metadata/_edit_group_ = true
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Slow"]
-shape = SubResource( 3 )
+shape = SubResource("3")
 
 [node name="Point" type="Area2D" parent="."]
-editor/display_folded = true
-position = Vector2( 239.378, 288.481 )
-space_override = 3
+position = Vector2(239.378, 288.481)
+gravity_space_override = 1
 gravity_point = true
-gravity_vec = Vector2( 0, 0 )
-linear_damp = 0.0
-__meta__ = {
-"_edit_group_": true
-}
+gravity_point_center = Vector2(0, 0)
+gravity_direction = Vector2(0, 0)
+metadata/_edit_group_ = true
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Point"]
-shape = SubResource( 4 )
+shape = SubResource("4")
 
 [node name="Label" type="Label" parent="."]
-margin_left = 597.422
-margin_top = 67.5169
-margin_right = 790.422
-margin_bottom = 96.5169
-custom_fonts/font = SubResource( 5 )
+offset_left = 597.422
+offset_top = 67.5169
+offset_right = 790.422
+offset_bottom = 96.5169
+theme_override_fonts/font = SubResource("5")
 text = "Click to add a ball"
 
 [node name="Label5" type="Label" parent="."]
+anchors_preset = 5
 anchor_left = 0.5
 anchor_right = 0.5
-margin_left = 272.555
-margin_top = 11.2528
-margin_right = 793.555
-margin_bottom = 68.2528
-custom_fonts/font = SubResource( 6 )
-text = "Area Override Examples"
+offset_left = 272.555
+offset_top = 11.2528
+offset_right = 793.555
+offset_bottom = 68.2528
+theme_override_fonts/font = SubResource("6")
+text = "Area3D Override Examples"
 
 [node name="Label2" type="Label" parent="."]
-margin_left = 172.885
-margin_top = 516.621
-margin_right = 308.885
-margin_bottom = 545.621
-custom_fonts/font = SubResource( 5 )
+offset_left = 172.885
+offset_top = 516.621
+offset_right = 308.885
+offset_bottom = 545.621
+theme_override_fonts/font = SubResource("5")
 text = "Point gravity"
 
 [node name="Label3" type="Label" parent="."]
-margin_left = 793.836
-margin_top = 560.609
-margin_right = 960.836
-margin_bottom = 589.609
-custom_fonts/font = SubResource( 5 )
+offset_left = 780.0
+offset_top = 560.0
+offset_right = 947.0
+offset_bottom = 589.0
+theme_override_fonts/font = SubResource("5")
 text = "Reverse gravity"
 
 [node name="Label4" type="Label" parent="."]
-margin_left = 519.391
-margin_top = 562.527
-margin_right = 656.391
-margin_bottom = 591.527
-custom_fonts/font = SubResource( 5 )
+offset_left = 500.0
+offset_top = 560.0
+offset_right = 637.0
+offset_bottom = 589.0
+theme_override_fonts/font = SubResource("5")
 text = "Linear Damp"
+vertical_alignment = 1

src/area_2d_starter/assets/Roboto-Bold.ttf.import

@@ -0,0 +1,33 @@
+[remap]
+
+importer="font_data_dynamic"
+type="FontFile"
+uid="uid://sjnahvlt0cil"
+path="res://.godot/imported/Roboto-Bold.ttf-ae06ffe7949c1b65f3f7f2503c116443.fontdata"
+
+[deps]
+
+source_file="res://assets/Roboto-Bold.ttf"
+dest_files=["res://.godot/imported/Roboto-Bold.ttf-ae06ffe7949c1b65f3f7f2503c116443.fontdata"]
+
+[params]
+
+Rendering=null
+antialiasing=1
+generate_mipmaps=false
+multichannel_signed_distance_field=false
+msdf_pixel_range=8
+msdf_size=48
+allow_system_fallback=true
+force_autohinter=false
+hinting=1
+subpixel_positioning=1
+oversampling=0.0
+Fallbacks=null
+fallbacks=[]
+Compress=null
+compress=true
+preload=[]
+language_support={}
+script_support={}
+opentype_features={}

src/area_2d_starter/assets/ballBlue_09.png.import

@@ -1,8 +1,9 @@
 [remap]
 
 importer="texture"
-type="StreamTexture"
-path="res://.import/ballBlue_09.png-c0bf5b440aad02f790810494f82deb20.stex"
+type="CompressedTexture2D"
+uid="uid://b2bimjy3075py"
+path="res://.godot/imported/ballBlue_09.png-c0bf5b440aad02f790810494f82deb20.ctex"
 metadata={
 "vram_texture": false
 }
@@ -10,25 +11,24 @@ metadata={
 [deps]
 
 source_file="res://assets/ballBlue_09.png"
-dest_files=[ "res://.import/ballBlue_09.png-c0bf5b440aad02f790810494f82deb20.stex" ]
+dest_files=["res://.godot/imported/ballBlue_09.png-c0bf5b440aad02f790810494f82deb20.ctex"]
 
 [params]
 
 compress/mode=0
+compress/high_quality=false
 compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
+compress/hdr_compression=1
 compress/normal_map=0
-flags/repeat=0
-flags/filter=false
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
 process/fix_alpha_border=true
 process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=false
-svg/scale=1.0
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

src/area_2d_starter/assets/coin_06.png.import

@@ -1,8 +1,9 @@
 [remap]
 
 importer="texture"
-type="StreamTexture"
-path="res://.import/coin_06.png-68534832945e7874cb02aa1ed58314f9.stex"
+type="CompressedTexture2D"
+uid="uid://bfu46le40g6f8"
+path="res://.godot/imported/coin_06.png-68534832945e7874cb02aa1ed58314f9.ctex"
 metadata={
 "vram_texture": false
 }
@@ -10,25 +11,24 @@ metadata={
 [deps]
 
 source_file="res://assets/coin_06.png"
-dest_files=[ "res://.import/coin_06.png-68534832945e7874cb02aa1ed58314f9.stex" ]
+dest_files=["res://.godot/imported/coin_06.png-68534832945e7874cb02aa1ed58314f9.ctex"]
 
 [params]
 
 compress/mode=0
+compress/high_quality=false
 compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
+compress/hdr_compression=1
 compress/normal_map=0
-flags/repeat=0
-flags/filter=false
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
 process/fix_alpha_border=true
 process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

src/area_2d_starter/default_env.tres

@@ -1,7 +0,0 @@
-[gd_resource type="Environment" load_steps=2 format=2]
-
-[sub_resource type="ProceduralSky" id=1]
-
-[resource]
-background_mode = 2
-background_sky = SubResource( 1 )

src/area_2d_starter/icon.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://icon.png"
-dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=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
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

src/area_2d_starter/icon.svg

@@ -0,0 +1 @@
+<svg height="128" width="128" xmlns="http://www.w3.org/2000/svg"><g transform="translate(32 32)"><path d="m-16-32c-8.86 0-16 7.13-16 15.99v95.98c0 8.86 7.13 15.99 16 15.99h96c8.86 0 16-7.13 16-15.99v-95.98c0-8.85-7.14-15.99-16-15.99z" fill="#363d52"/><path d="m-16-32c-8.86 0-16 7.13-16 15.99v95.98c0 8.86 7.13 15.99 16 15.99h96c8.86 0 16-7.13 16-15.99v-95.98c0-8.85-7.14-15.99-16-15.99zm0 4h96c6.64 0 12 5.35 12 11.99v95.98c0 6.64-5.35 11.99-12 11.99h-96c-6.64 0-12-5.35-12-11.99v-95.98c0-6.64 5.36-11.99 12-11.99z" fill-opacity=".4"/></g><g stroke-width="9.92746" transform="matrix(.10073078 0 0 .10073078 12.425923 2.256365)"><path d="m0 0s-.325 1.994-.515 1.976l-36.182-3.491c-2.879-.278-5.115-2.574-5.317-5.459l-.994-14.247-27.992-1.997-1.904 12.912c-.424 2.872-2.932 5.037-5.835 5.037h-38.188c-2.902 0-5.41-2.165-5.834-5.037l-1.905-12.912-27.992 1.997-.994 14.247c-.202 2.886-2.438 5.182-5.317 5.46l-36.2 3.49c-.187.018-.324-1.978-.511-1.978l-.049-7.83 30.658-4.944 1.004-14.374c.203-2.91 2.551-5.263 5.463-5.472l38.551-2.75c.146-.01.29-.016.434-.016 2.897 0 5.401 2.166 5.825 5.038l1.959 13.286h28.005l1.959-13.286c.423-2.871 2.93-5.037 5.831-5.037.142 0 .284.005.423.015l38.556 2.75c2.911.209 5.26 2.562 5.463 5.472l1.003 14.374 30.645 4.966z" fill="#fff" transform="matrix(4.162611 0 0 -4.162611 919.24059 771.67186)"/><path d="m0 0v-47.514-6.035-5.492c.108-.001.216-.005.323-.015l36.196-3.49c1.896-.183 3.382-1.709 3.514-3.609l1.116-15.978 31.574-2.253 2.175 14.747c.282 1.912 1.922 3.329 3.856 3.329h38.188c1.933 0 3.573-1.417 3.855-3.329l2.175-14.747 31.575 2.253 1.115 15.978c.133 1.9 1.618 3.425 3.514 3.609l36.182 3.49c.107.01.214.014.322.015v4.711l.015.005v54.325c5.09692 6.4164715 9.92323 13.494208 13.621 19.449-5.651 9.62-12.575 18.217-19.976 26.182-6.864-3.455-13.531-7.369-19.828-11.534-3.151 3.132-6.7 5.694-10.186 8.372-3.425 2.751-7.285 4.768-10.946 7.118 1.09 8.117 1.629 16.108 1.846 24.448-9.446 4.754-19.519 7.906-29.708 10.17-4.068-6.837-7.788-14.241-11.028-21.479-3.842.642-7.702.88-11.567.926v.006c-.027 0-.052-.006-.075-.006-.024 0-.049.006-.073.006v-.006c-3.872-.046-7.729-.284-11.572-.926-3.238 7.238-6.956 14.642-11.03 21.479-10.184-2.264-20.258-5.416-29.703-10.17.216-8.34.755-16.331 1.848-24.448-3.668-2.35-7.523-4.367-10.949-7.118-3.481-2.678-7.036-5.24-10.188-8.372-6.297 4.165-12.962 8.079-19.828 11.534-7.401-7.965-14.321-16.562-19.974-26.182 4.4426579-6.973692 9.2079702-13.9828876 13.621-19.449z" fill="#478cbf" transform="matrix(4.162611 0 0 -4.162611 104.69892 525.90697)"/><path d="m0 0-1.121-16.063c-.135-1.936-1.675-3.477-3.611-3.616l-38.555-2.751c-.094-.007-.188-.01-.281-.01-1.916 0-3.569 1.406-3.852 3.33l-2.211 14.994h-31.459l-2.211-14.994c-.297-2.018-2.101-3.469-4.133-3.32l-38.555 2.751c-1.936.139-3.476 1.68-3.611 3.616l-1.121 16.063-32.547 3.138c.015-3.498.06-7.33.06-8.093 0-34.374 43.605-50.896 97.781-51.086h.066.067c54.176.19 97.766 16.712 97.766 51.086 0 .777.047 4.593.063 8.093z" fill="#478cbf" transform="matrix(4.162611 0 0 -4.162611 784.07144 817.24284)"/><path d="m0 0c0-12.052-9.765-21.815-21.813-21.815-12.042 0-21.81 9.763-21.81 21.815 0 12.044 9.768 21.802 21.81 21.802 12.048 0 21.813-9.758 21.813-21.802" fill="#fff" transform="matrix(4.162611 0 0 -4.162611 389.21484 625.67104)"/><path d="m0 0c0-7.994-6.479-14.473-14.479-14.473-7.996 0-14.479 6.479-14.479 14.473s6.483 14.479 14.479 14.479c8 0 14.479-6.485 14.479-14.479" fill="#414042" transform="matrix(4.162611 0 0 -4.162611 367.36686 631.05679)"/><path d="m0 0c-3.878 0-7.021 2.858-7.021 6.381v20.081c0 3.52 3.143 6.381 7.021 6.381s7.028-2.861 7.028-6.381v-20.081c0-3.523-3.15-6.381-7.028-6.381" fill="#fff" transform="matrix(4.162611 0 0 -4.162611 511.99336 724.73954)"/><path d="m0 0c0-12.052 9.765-21.815 21.815-21.815 12.041 0 21.808 9.763 21.808 21.815 0 12.044-9.767 21.802-21.808 21.802-12.05 0-21.815-9.758-21.815-21.802" fill="#fff" transform="matrix(4.162611 0 0 -4.162611 634.78706 625.67104)"/><path d="m0 0c0-7.994 6.477-14.473 14.471-14.473 8.002 0 14.479 6.479 14.479 14.473s-6.477 14.479-14.479 14.479c-7.994 0-14.471-6.485-14.471-14.479" fill="#414042" transform="matrix(4.162611 0 0 -4.162611 656.64056 631.05679)"/></g></svg>

src/area_2d_starter/icon.svg.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://mwm6yi7ak504"
+path="res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://icon.svg"
+dest_files=["res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=1.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false

src/area_2d_starter/project.godot

@@ -6,18 +6,14 @@
 ;   [section] ; section goes between []
 ;   param=value ; assign values to parameters
 
-config_version=4
-
-_global_script_classes=[  ]
-_global_script_class_icons={
-
-}
+config_version=5
 
 [application]
 
 config/name="using_area_2d"
 run/main_scene="res://World.tscn"
-config/icon="res://icon.png"
+config/features=PackedStringArray("4.0")
+config/icon="res://icon.svg"
 
 [importer_defaults]
 
@@ -42,6 +38,6 @@ texture={
 "svg/scale": 1.0
 }
 
-[rendering]
+[physics]
 
-environment/default_environment="res://default_env.tres"
+2d/default_gravity=490.0