Skip to content

Commit

Permalink
Update most demos for Godot 4.0.beta9
Browse files Browse the repository at this point in the history
The HDR for 2D demo was renamed to Glow for 2D as autoexposure can
no longer be used in 2D in 4.0.

The SDF font demo was renamed to MSDF font to denote that multi-channel
distance field fonts are now used.

The OpenSimplexNoise demo was renamed to Noise Viewer as it now
uses FastNoiseLite.
  • Loading branch information
Calinou committed Dec 19, 2022
1 parent 4eb852a commit ff2df2b
Show file tree
Hide file tree
Showing 728 changed files with 22,533 additions and 9,452 deletions.
1 change: 1 addition & 0 deletions 2d/bullet_shower/bullet.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,6 @@ 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
2 changes: 1 addition & 1 deletion 2d/bullet_shower/bullets.gd
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func _ready():

func _process(_delta):
# Order the CanvasItem to update every frame.
update()
queue_redraw()


func _physics_process(delta):
Expand Down
1 change: 1 addition & 0 deletions 2d/bullet_shower/face_happy.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,6 @@ 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
1 change: 1 addition & 0 deletions 2d/bullet_shower/face_sad.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,6 @@ 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
1 change: 1 addition & 0 deletions 2d/bullet_shower/icon.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,6 @@ 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
2 changes: 1 addition & 1 deletion 2d/bullet_shower/project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ _global_script_class_icons={}
config/name="Bullet Shower"
config/description="Demonstrates how to manage large amounts of objects efficiently using low-level Servers."
run/main_scene="res://shower.tscn"
config/icon="res://icon.png"
config/features=PackedStringArray("4.0")
config/icon="res://icon.png"

[display]

Expand Down
10 changes: 5 additions & 5 deletions 2d/bullet_shower/shower.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

[sub_resource type="SpriteFrames" id="1"]
animations = [{
"frames": [ExtResource( "3" ), ExtResource( "4" )],
"frames": [ExtResource("3"), ExtResource("4")],
"loop": true,
"name": &"default",
"speed": 5.0
Expand All @@ -19,16 +19,16 @@ radius = 27.0
[node name="Shower" type="Node2D"]

[node name="Bullets" type="Node2D" parent="."]
script = ExtResource( "2" )
script = ExtResource("2")

[node name="Player" type="Area2D" parent="."]
script = ExtResource( "5" )
script = ExtResource("5")

[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="Player"]
frames = SubResource( "1" )
frames = SubResource("1")

[node name="CollisionShape2D" type="CollisionShape2D" parent="Player"]
shape = SubResource( "2" )
shape = SubResource("2")

[connection signal="body_shape_entered" from="Player" to="Player" method="_on_body_shape_entered"]
[connection signal="body_shape_exited" from="Player" to="Player" method="_on_body_shape_exited"]
20 changes: 14 additions & 6 deletions 2d/dodge_the_creeps/HUD.tscn
Original file line number Diff line number Diff line change
@@ -1,34 +1,41 @@
[gd_scene load_steps=4 format=3 uid="uid://ccqoreueuxdb7"]

[ext_resource type="Script" path="res://HUD.gd" id="1"]
[ext_resource type="Font" uid="uid://dyjc58f6sdms0" path="res://fonts/Xolonium-Regular.tres" id="2_3dmm8"]

[sub_resource type="InputEventAction" id="InputEventAction_fopy7"]
action = &"start_game"

[sub_resource type="Shortcut" id="4"]
events = [SubResource("InputEventAction_fopy7")]

[node name="HUD" type="CanvasLayer"]
script = ExtResource( "1" )
script = ExtResource("1")

[node name="ScoreLabel" type="Label" parent="."]
anchors_preset = 10
anchor_right = 1.0
offset_bottom = 78.0
theme_override_fonts/font = ExtResource( "2_3dmm8" )
grow_horizontal = 2
theme_override_font_sizes/font_size = 60
text = "0"
horizontal_alignment = 1

[node name="MessageLabel" type="Label" parent="."]
anchors_preset = 14
anchor_top = 0.5
anchor_right = 1.0
anchor_bottom = 0.5
offset_top = -79.5
offset_bottom = 79.5
theme_override_fonts/font = ExtResource( "2_3dmm8" )
grow_horizontal = 2
grow_vertical = 2
theme_override_font_sizes/font_size = 60
text = "Dodge the
Creeps"
horizontal_alignment = 1

[node name="StartButton" type="Button" parent="."]
anchors_preset = 7
anchor_left = 0.5
anchor_top = 1.0
anchor_right = 0.5
Expand All @@ -37,9 +44,10 @@ offset_left = -90.0
offset_top = -200.0
offset_right = 90.0
offset_bottom = -100.0
theme_override_fonts/font = ExtResource( "2_3dmm8" )
grow_horizontal = 2
grow_vertical = 0
theme_override_font_sizes/font_size = 60
shortcut = SubResource( "4" )
shortcut = SubResource("4")
text = "Start"

[node name="MessageTimer" type="Timer" parent="."]
Expand Down
2 changes: 1 addition & 1 deletion 2d/dodge_the_creeps/Main.gd
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func _on_MobTimer_timeout():

# Choose a random location on Path2D.
var mob_spawn_location = get_node(^"MobPath/MobSpawnLocation")
mob_spawn_location.offset = randi()
mob_spawn_location.progress = randi()

# Set the mob's direction perpendicular to the path direction.
var direction = mob_spawn_location.rotation + PI / 2
Expand Down
20 changes: 12 additions & 8 deletions 2d/dodge_the_creeps/Main.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,21 @@
_data = {
"points": PackedVector2Array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 480, 0, 0, 0, 0, 0, 480, 720, 0, 0, 0, 0, 0, 720, 0, 0, 0, 0, 0, 0)
}
point_count = 5

[node name="Main" type="Node"]
script = ExtResource( "1" )
mob_scene = ExtResource( "2" )
script = ExtResource("1")
mob_scene = ExtResource("2")

[node name="ColorRect" type="ColorRect" parent="."]
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
color = Color(0.219608, 0.372549, 0.380392, 1)

[node name="Player" parent="." instance=ExtResource( "3" )]
[node name="Player" parent="." instance=ExtResource("3")]

[node name="MobTimer" type="Timer" parent="."]
wait_time = 0.5
Expand All @@ -32,21 +36,21 @@ wait_time = 0.5
wait_time = 2.0
one_shot = true

[node name="StartPosition" type="Position2D" parent="."]
[node name="StartPosition" type="Marker2D" parent="."]
position = Vector2(240, 450)

[node name="MobPath" type="Path2D" parent="."]
curve = SubResource( "1" )
curve = SubResource("1")

[node name="MobSpawnLocation" type="PathFollow2D" parent="MobPath"]

[node name="HUD" parent="." instance=ExtResource( "4" )]
[node name="HUD" parent="." instance=ExtResource("4")]

[node name="Music" type="AudioStreamPlayer" parent="."]
stream = ExtResource( "5" )
stream = ExtResource("5")

[node name="DeathSound" type="AudioStreamPlayer" parent="."]
stream = ExtResource( "6" )
stream = ExtResource("6")

[connection signal="hit" from="Player" to="." method="game_over"]
[connection signal="timeout" from="MobTimer" to="." method="_on_MobTimer_timeout"]
Expand Down
2 changes: 1 addition & 1 deletion 2d/dodge_the_creeps/Mob.gd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
extends RigidDynamicBody2D
extends RigidBody2D

func _ready():
$AnimatedSprite2D.playing = true
Expand Down
5 changes: 4 additions & 1 deletion 2d/dodge_the_creeps/art/House In a Forest Loop.ogg.import
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[remap]

importer="oggvorbisstr"
type="AudioStreamOGGVorbis"
type="AudioStreamOggVorbis"
uid="uid://q2pf4fr8d0ks"
path="res://.godot/imported/House In a Forest Loop.ogg-1a6a72ae843ad792b7039931227e8d50.oggvorbisstr"

Expand All @@ -14,3 +14,6 @@ dest_files=["res://.godot/imported/House In a Forest Loop.ogg-1a6a72ae843ad792b7

loop=true
loop_offset=0
bpm=0
beat_count=0
bar_beats=4
2 changes: 1 addition & 1 deletion 2d/dodge_the_creeps/art/gameover.wav.import
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[remap]

importer="wav"
type="AudioStreamSample"
type="AudioStreamWAV"
uid="uid://dw26fpygeag8o"
path="res://.godot/imported/gameover.wav-98c95c744b35280048c2bd093cf8a356.sample"

Expand Down
22 changes: 10 additions & 12 deletions 2d/dodge_the_creeps/fonts/Xolonium-Regular.ttf.import
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[remap]

importer="font_data_dynamic"
type="FontData"
type="FontFile"
uid="uid://cit6gwe5px1q8"
path="res://.godot/imported/Xolonium-Regular.ttf-bc2981e3069cff4c34dd7c8e2bb73fba.fontdata"

Expand All @@ -12,23 +12,21 @@ dest_files=["res://.godot/imported/Xolonium-Regular.ttf-bc2981e3069cff4c34dd7c8e

[params]

antialiased=true
Rendering=null
antialiasing=1
generate_mipmaps=false
multichannel_signed_distance_field=false
msdf_pixel_range=8
msdf_size=48
force_autohinter=false
hinting=1
subpixel_positioning=1
embolden=0.0
transform=Transform2D(1, 0, 0, 1, 0, 0)
oversampling=0.0
Fallbacks=null
fallbacks=[]
Compress=null
compress=true
opentype_feature_overrides={}
preload/char_ranges=PackedStringArray()
preload/glyph_ranges=PackedStringArray()
preload/configurations=PackedStringArray()
support_overrides/language_enabled=PackedStringArray()
support_overrides/language_disabled=PackedStringArray()
support_overrides/script_enabled=PackedStringArray()
support_overrides/script_disabled=PackedStringArray()
preload=[]
language_support={}
script_support={}
opentype_features={}
21 changes: 11 additions & 10 deletions 2d/dodge_the_creeps/project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ This is a finished version of the game featured in the 'Your first 2D game'
tutorial in the documentation. For more details, consider
following the tutorial in the documentation."
run/main_scene="res://Main.tscn"
config/icon="res://icon.png"
config/features=PackedStringArray("4.0")
config/icon="res://icon.png"

[debug]

Expand All @@ -37,39 +37,40 @@ window/stretch/mode="canvas_items"

move_left={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"store_command":true,"alt_pressed":false,"shift_pressed":false,"meta_pressed":false,"command_pressed":false,"pressed":false,"keycode":16777231,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"store_command":true,"alt_pressed":false,"shift_pressed":false,"meta_pressed":false,"command_pressed":false,"pressed":false,"keycode":65,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"unicode":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194319,"unicode":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":14,"pressure":0.0,"pressed":false,"script":null)
, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":-1.0,"script":null)
]
}
move_right={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"store_command":true,"alt_pressed":false,"shift_pressed":false,"meta_pressed":false,"command_pressed":false,"pressed":false,"keycode":16777233,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"store_command":true,"alt_pressed":false,"shift_pressed":false,"meta_pressed":false,"command_pressed":false,"pressed":false,"keycode":68,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"unicode":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"unicode":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":15,"pressure":0.0,"pressed":false,"script":null)
, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":1.0,"script":null)
]
}
move_up={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"store_command":true,"alt_pressed":false,"shift_pressed":false,"meta_pressed":false,"command_pressed":false,"pressed":false,"keycode":16777232,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"store_command":true,"alt_pressed":false,"shift_pressed":false,"meta_pressed":false,"command_pressed":false,"pressed":false,"keycode":87,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"unicode":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"unicode":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":12,"pressure":0.0,"pressed":false,"script":null)
, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":-1.0,"script":null)
]
}
move_down={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"store_command":true,"alt_pressed":false,"shift_pressed":false,"meta_pressed":false,"command_pressed":false,"pressed":false,"keycode":16777234,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"store_command":true,"alt_pressed":false,"shift_pressed":false,"meta_pressed":false,"command_pressed":false,"pressed":false,"keycode":83,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"unicode":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194322,"unicode":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":13,"pressure":0.0,"pressed":false,"script":null)
, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":1.0,"script":null)
]
}
start_game={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"store_command":true,"alt_pressed":false,"shift_pressed":false,"meta_pressed":false,"command_pressed":false,"pressed":false,"keycode":16777221,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194309,"unicode":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"unicode":0,"echo":false,"script":null)
]
}

Expand Down
Loading

0 comments on commit ff2df2b

Please sign in to comment.