camera smoothing only on y

This commit is contained in:
Jonas Braus
2024-08-05 00:19:18 +02:00
parent 6ef02c5628
commit a2f9549d15
17 changed files with 159 additions and 52 deletions
BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 626 B

+34
View File
@@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://bkrv87t2ryjd0"
path="res://.godot/imported/Dead.png-29ce68f874dbc43f4f9778a714b32623.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Dead.png"
dest_files=["res://.godot/imported/Dead.png-29ce68f874dbc43f4f9778a714b32623.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
BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 649 B

+34
View File
@@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dgyuh7qglc7vd"
path="res://.godot/imported/Flag.png-47653dcbce6ad9726dae00766f6d8d5d.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Flag.png"
dest_files=["res://.godot/imported/Flag.png-47653dcbce6ad9726dae00766f6d8d5d.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
Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

+34
View File
@@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://bwrwij2s8csyn"
path="res://.godot/imported/1.png-ab0c3ae98db1c6648eb7fb8190d73dd9.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/screenshots/1.png"
dest_files=["res://.godot/imported/1.png-ab0c3ae98db1c6648eb7fb8190d73dd9.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
+1
View File
@@ -81,4 +81,5 @@ flower={
[rendering]
textures/canvas_textures/default_texture_filter=0
renderer/rendering_method.mobile="forward_plus"
textures/vram_compression/import_etc2_astc=true
+3 -3
View File
@@ -28,6 +28,9 @@ animations = [{
[sub_resource type="RectangleShape2D" id="RectangleShape2D_mdpkr"]
size = Vector2(16, 24)
[sub_resource type="Animation" id="Animation_axvvr"]
length = 0.001
[sub_resource type="Animation" id="Animation_g0wcr"]
resource_name = "default"
length = 8.0
@@ -50,9 +53,6 @@ tracks/0/keys = {
}]
}
[sub_resource type="Animation" id="Animation_axvvr"]
length = 0.001
[sub_resource type="AnimationLibrary" id="AnimationLibrary_x0mu6"]
_data = {
"RESET": SubResource("Animation_axvvr"),
+38 -26
View File
@@ -1,7 +1,9 @@
[gd_scene load_steps=3 format=3 uid="uid://drbqiko4xx71d"]
[gd_scene load_steps=5 format=3 uid="uid://drbqiko4xx71d"]
[ext_resource type="Script" path="res://scripts/LevelSelect.gd" id="1_ck5bd"]
[ext_resource type="FontFile" uid="uid://cpwx7datjer6s" path="res://assets/PixelOperator8.ttf" id="2_3ebbo"]
[ext_resource type="Texture2D" uid="uid://dgyuh7qglc7vd" path="res://assets/Flag.png" id="3_v04a0"]
[ext_resource type="Texture2D" uid="uid://bkrv87t2ryjd0" path="res://assets/Dead.png" id="4_3d18b"]
[node name="LevelSelect" type="CanvasLayer"]
script = ExtResource("1_ck5bd")
@@ -21,16 +23,18 @@ anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -240.0
offset_top = -148.0
offset_right = -32.0
offset_bottom = -84.0
offset_left = -336.0
offset_top = -100.0
offset_right = -192.0
offset_bottom = -36.0
grow_horizontal = 2
grow_vertical = 2
theme_override_fonts/font = ExtResource("2_3ebbo")
theme_override_font_sizes/font_size = 24
disabled = true
text = "Level 1"
text = "1-1"
icon = ExtResource("3_v04a0")
expand_icon = true
[node name="Button_2" type="Button" parent="Control"]
layout_mode = 1
@@ -39,16 +43,18 @@ anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = 32.0
offset_top = -148.0
offset_right = 240.0
offset_bottom = -84.0
offset_left = -160.0
offset_top = -100.0
offset_right = -16.0
offset_bottom = -36.0
grow_horizontal = 2
grow_vertical = 2
theme_override_fonts/font = ExtResource("2_3ebbo")
theme_override_font_sizes/font_size = 24
disabled = true
text = "Level 2"
text = "1-2"
icon = ExtResource("3_v04a0")
expand_icon = true
[node name="Button_3" type="Button" parent="Control"]
layout_mode = 1
@@ -57,16 +63,18 @@ anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -240.0
offset_top = -36.0
offset_right = -32.0
offset_bottom = 28.0
offset_left = 16.0
offset_top = -100.0
offset_right = 160.0
offset_bottom = -36.0
grow_horizontal = 2
grow_vertical = 2
theme_override_fonts/font = ExtResource("2_3ebbo")
theme_override_font_sizes/font_size = 24
disabled = true
text = "Level 3"
text = "1-3"
icon = ExtResource("3_v04a0")
expand_icon = true
[node name="Button_4" type="Button" parent="Control"]
layout_mode = 1
@@ -75,16 +83,18 @@ anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = 32.0
offset_top = -36.0
offset_right = 240.0
offset_bottom = 28.0
offset_left = 192.0
offset_top = -100.0
offset_right = 336.0
offset_bottom = -36.0
grow_horizontal = 2
grow_vertical = 2
theme_override_fonts/font = ExtResource("2_3ebbo")
theme_override_font_sizes/font_size = 24
disabled = true
text = "Level 4"
text = "1-4"
icon = ExtResource("4_3d18b")
expand_icon = true
[node name="Button_5" type="Button" parent="Control"]
layout_mode = 1
@@ -93,16 +103,18 @@ anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -240.0
offset_top = 76.0
offset_right = -32.0
offset_bottom = 140.0
offset_left = -336.0
offset_top = -4.0
offset_right = -192.0
offset_bottom = 60.0
grow_horizontal = 2
grow_vertical = 2
theme_override_fonts/font = ExtResource("2_3ebbo")
theme_override_font_sizes/font_size = 24
disabled = true
text = "Level 5"
text = "2-1"
icon = ExtResource("3_v04a0")
expand_icon = true
[connection signal="pressed" from="Control/Button_1" to="." method="_on_button_pressed" binds= ["1"]]
[connection signal="pressed" from="Control/Button_2" to="." method="_on_button_pressed" binds= ["2"]]
+1 -5
View File
@@ -19367,7 +19367,7 @@ position = Vector2(2048, 0)
[node name="pipe" parent="Pipes" instance=ExtResource("9_sfjeq")]
position = Vector2(832, -64)
target = Vector2(640, 112)
target = Vector2(640, 192)
[node name="pipe2" parent="Pipes" instance=ExtResource("9_sfjeq")]
position = Vector2(816, 240)
@@ -19387,7 +19387,6 @@ offset_right = 98.0
offset_bottom = -88.0
theme_override_colors/font_color = Color(0.25332, 0.473895, 1, 1)
theme_override_fonts/font = ExtResource("11_1j7cv")
text = "Swipe Left To Move"
horizontal_alignment = 1
vertical_alignment = 1
script = ExtResource("12_uc2k2")
@@ -19399,7 +19398,6 @@ offset_right = 105.0
offset_bottom = -64.0
theme_override_colors/font_color = Color(0.25332, 0.473895, 1, 1)
theme_override_fonts/font = ExtResource("11_1j7cv")
text = "Right Down Tap Jump"
horizontal_alignment = 1
vertical_alignment = 1
@@ -19410,7 +19408,6 @@ offset_right = 1304.0
offset_bottom = -75.0
theme_override_colors/font_color = Color(0.25332, 0.473895, 1, 1)
theme_override_fonts/font = ExtResource("11_1j7cv")
text = "Right Up Tap Fire"
horizontal_alignment = 1
vertical_alignment = 1
@@ -19471,7 +19468,6 @@ zoom = Vector2(3, 3)
limit_left = -160
limit_top = -184
limit_bottom = 32
position_smoothing_enabled = true
position_smoothing_speed = 10.0
[node name="ColorRect" type="ColorRect" parent="Camera2D"]
+1 -2
View File
@@ -45755,7 +45755,7 @@ position = Vector2(1296, 176)
[node name="pipe" parent="pipes" instance=ExtResource("10_aqfih")]
position = Vector2(1472, -48)
target = Vector2(1264, 64)
target = Vector2(1264, 192)
[node name="pipe2" parent="pipes" instance=ExtResource("10_aqfih")]
position = Vector2(1440, 240)
@@ -45858,7 +45858,6 @@ zoom = Vector2(3, 3)
limit_left = -160
limit_top = -184
limit_bottom = 32
position_smoothing_enabled = true
position_smoothing_speed = 10.0
[node name="ColorRect" type="ColorRect" parent="Camera2D"]
-1
View File
@@ -7888,7 +7888,6 @@ zoom = Vector2(3, 3)
limit_left = -160
limit_top = -184
limit_bottom = 32
position_smoothing_enabled = true
position_smoothing_speed = 10.0
[node name="ColorRect" type="ColorRect" parent="Camera2D"]
-1
View File
@@ -7466,7 +7466,6 @@ zoom = Vector2(3, 3)
limit_left = -160
limit_top = -184
limit_bottom = 32
position_smoothing_enabled = true
position_smoothing_speed = 10.0
[node name="ColorRect" type="ColorRect" parent="Camera2D"]
File diff suppressed because one or more lines are too long
+1 -6
View File
@@ -6,15 +6,10 @@ extends Label
func _ready():
var platform = ""
match OS.get_name():
"Windows", "macOS", "Linux", "FreeBSD", "NetBSD", "OpenBSD", "BSD":
"Windows", "macOS", "Linux", "FreeBSD", "NetBSD", "OpenBSD", "BSD", "Web":
label.text = "A, S, D To Move"
label_2.text = "Space To Jump"
label_3.text = "E To Fire"
"Web":
label.text = "Swipe Left/W, S, A, D"
label_2.text = "Right Down Tap/Space"
label_3.text = "Right Up Tap/E"
"Android", "iOS":
pass
+3 -3
View File
@@ -16,9 +16,9 @@ func _on_body_entered(body):
func _process(delta):
if mover < 25:
collision_shape_2d.position.y += -1 if up else 1
animated_sprite_2d.position.y += -1 if up else 1
mover += 1
collision_shape_2d.position.y += -25 * delta if up else 25 * delta
animated_sprite_2d.position.y += -25 * delta if up else 25 * delta
mover += 25 * delta
func _on_timer_timeout():
innocent = false
+7 -2
View File
@@ -72,11 +72,16 @@ func _ready():
pipedetector_ground.position.y = 0
collision_shape_2d.shape.height = 15
var camera_target_pos_y = 0
func _process(delta):
camera_2d.position.x = position.x + 50
if is_on_floor() or velocity.y > 0 and camera_2d.position.y < position.y:
camera_2d.position.y = position.y if not is_big else position.y + 8
if is_on_floor() or velocity.y > 0 and camera_target_pos_y < position.y:
camera_target_pos_y = position.y if not is_big else position.y + 8
if camera_target_pos_y != camera_2d.position.y:
camera_2d.position.y += (camera_target_pos_y - camera_2d.position.y) * 10 * delta
# set camera
if position.y <= 32: