minimata/GGJ26
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Camera control fixes
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 8s
Details
Create tag and build when new code gets to main / Export (push) Successful in 1m13s
Details

Browse Source
This commit is contained in:
Alexandre Serex
2026-01-31 13:20:16 +01:00
parent f2dcd332f4
commit da655ed9b7
3 changed files with 260 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
default_bus_layout.tres
View File

@@ -5,11 +5,11 @@ bus/1/name = &"Music"
bus/1/solo = false
bus/1/mute = false
bus/1/bypass_fx = false
bus/1/volume_db = 0.0
bus/1/volume_db = -9.632782
bus/1/send = &"Master"
bus/2/name = &"SFX"
bus/2/solo = false
bus/2/mute = false
bus/2/bypass_fx = false
bus/2/volume_db = 0.0
bus/2/volume_db = -1.4192572
bus/2/send = &"Master"

9
scenes/camera/camera_controller.gd
View File

@@ -14,9 +14,16 @@ func _ready() -> void:
# Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta: float) -> void:
var limit_left_at_center = limit_left + get_viewport_rect().size.x/2
var limit_right_at_center = limit_right - get_viewport_rect().size.x/2
if position.x < limit_left_at_center:
position.x = limit_left_at_center
if position.x > limit_right_at_center:
position.x = limit_right_at_center
if should_move_right:
position.x += pan_speed
if should_move_left:
if should_move_left and position.x > 0:
position.x -= pan_speed

250
scenes/main/main.tscn8449123712.tmp Normal file
View File

@@ -0,0 +1,250 @@
[gd_scene format=3 uid="uid://cukfdjcnb5tm6"]
[ext_resource type="Script" uid="uid://bqrfmft2g1agc" path="res://scenes/main/main.gd" id="1_7smn1"]
[ext_resource type="AudioStream" uid="uid://cv42wcg48s7pe" path="res://assets/audio/kenney_casino-audio/Audio/card-slide-1.ogg" id="2_m4h2d"]
[ext_resource type="PackedScene" uid="uid://bvpyqyftqhy45" path="res://scenes/character/character.tscn" id="2_raeie"]
[ext_resource type="Script" uid="uid://b1w0ocrgjkjen" path="res://scenes/managers/game_manager.gd" id="3_hxu8e"]
[ext_resource type="AudioStream" uid="uid://cfv8y85lm0rv1" path="res://assets/audio/kenney_casino-audio/Audio/card-slide-2.ogg" id="3_p8abn"]
[ext_resource type="Script" uid="uid://bwam50qxikpw4" path="res://scenes/character/chara_resource.gd" id="4_nvumn"]
[ext_resource type="AudioStream" uid="uid://b0eggikcow8xr" path="res://assets/audio/kenney_casino-audio/Audio/card-slide-3.ogg" id="4_s17dp"]
[ext_resource type="AudioStream" uid="uid://5n4xmrthp0em" path="res://assets/audio/kenney_casino-audio/Audio/card-slide-4.ogg" id="5_37hlw"]
[ext_resource type="Resource" uid="uid://c87odmn680x7" path="res://resources/characters/duchex.tres" id="5_ou6is"]
[ext_resource type="AudioStream" uid="uid://c0winrfat714w" path="res://assets/audio/kenney_casino-audio/Audio/card-slide-5.ogg" id="6_6llfj"]
[ext_resource type="Resource" uid="uid://gy4ygqrjj5ys" path="res://resources/characters/duke.tres" id="6_necax"]
[ext_resource type="AudioStream" uid="uid://cbew82s7f33tm" path="res://assets/audio/kenney_casino-audio/Audio/card-slide-6.ogg" id="7_0bhws"]
[ext_resource type="Resource" uid="uid://da2ptl3f7h0ot" path="res://resources/characters/king.tres" id="7_r4lks"]
[ext_resource type="AudioStream" uid="uid://dbwso01ip7fy3" path="res://assets/audio/kenney_casino-audio/Audio/card-slide-7.ogg" id="8_62atk"]
[ext_resource type="Resource" uid="uid://wq3g1j3l4gl6" path="res://resources/characters/queen.tres" id="8_pg34l"]
[ext_resource type="AudioStream" uid="uid://x6erlvj03nlm" path="res://assets/audio/kenney_casino-audio/Audio/card-slide-8.ogg" id="9_i7in8"]
[ext_resource type="Script" uid="uid://d26mv2xtvmpqt" path="res://scenes/mask/mask_resource.gd" id="9_m4h2d"]
[ext_resource type="AudioStream" uid="uid://vrw6idscfnei" path="res://assets/audio/kenney_casino-audio/Audio/card-shove-1.ogg" id="10_6llfj"]
[ext_resource type="Resource" uid="uid://cuf1ocb4px4m3" path="res://resources/masks/cat.tres" id="10_p8abn"]
[ext_resource type="AudioStream" uid="uid://b5ea6pr6bv85d" path="res://assets/audio/kenney_casino-audio/Audio/card-shove-2.ogg" id="11_0bhws"]
[ext_resource type="Resource" uid="uid://pdiaprcknftw" path="res://resources/masks/mute.tres" id="11_s17dp"]
[ext_resource type="Resource" uid="uid://cbcqtj8mxngfy" path="res://resources/masks/unracist.tres" id="12_37hlw"]
[ext_resource type="AudioStream" uid="uid://dpv07j0ia0ayl" path="res://assets/audio/kenney_casino-audio/Audio/card-shove-3.ogg" id="12_62atk"]
[ext_resource type="Texture2D" uid="uid://cftllq6l7xclt" path="res://icon.svg" id="13_6llfj"]
[ext_resource type="AudioStream" uid="uid://b7pe3ogc8rbvx" path="res://assets/audio/kenney_casino-audio/Audio/card-shove-4.ogg" id="13_i7in8"]
[ext_resource type="Script" uid="uid://cgctwciolfqe5" path="res://scenes/camera/camera_controller.gd" id="14_0bhws"]
[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_gkmcc"]
random_pitch = 1.122462
streams_count = 8
stream_0/stream = ExtResource("2_m4h2d")
stream_1/stream = ExtResource("3_p8abn")
stream_2/stream = ExtResource("4_s17dp")
stream_3/stream = ExtResource("5_37hlw")
stream_4/stream = ExtResource("6_6llfj")
stream_5/stream = ExtResource("7_0bhws")
stream_6/stream = ExtResource("8_62atk")
stream_7/stream = ExtResource("9_i7in8")
[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_7nlll"]
random_pitch = 1.122462
streams_count = 4
stream_0/stream = ExtResource("10_6llfj")
stream_1/stream = ExtResource("11_0bhws")
stream_2/stream = ExtResource("12_62atk")
stream_3/stream = ExtResource("13_i7in8")
[sub_resource type="AudioStreamInteractive" id="AudioStreamInteractive_7smn1"]
clip_count = 2
clip_0/name = &"list_up"
clip_0/stream = SubResource("AudioStreamRandomizer_gkmcc")
clip_0/auto_advance = 0
clip_1/name = &"list_down"
clip_1/stream = SubResource("AudioStreamRandomizer_7nlll")
clip_1/auto_advance = 0
initial_clip = 1
_transitions = {
Vector2i(-1, -1): {
"fade_beats": 1.0,
"fade_mode": 4,
"from_time": 0,
"to_time": 1
}
}
[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_trceg"]
radius = 198.0
height = 1044.0
[sub_resource type="RectangleShape2D" id="RectangleShape2D_ya4ey"]
size = Vector2(512, 1080)
[sub_resource type="Animation" id="Animation_7smn1"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("GuestList:position")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector2(-409, 523)]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("GuestList:rotation")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [-0.16732943]
}
[sub_resource type="Animation" id="Animation_hxu8e"]
resource_name = "guest_list_down"
length = 0.5
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("GuestList:position")
tracks/0/interp = 2
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 0.5),
"transitions": PackedFloat32Array(1, 1),
"update": 0,
"values": [Vector2(-388, 176), Vector2(-409, 523)]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("GuestList:rotation")
tracks/1/interp = 2
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0, 0.5),
"transitions": PackedFloat32Array(1, 1),
"update": 0,
"values": [0.0, -0.16732943]
}
tracks/2/type = "method"
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/path = NodePath(".")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"values": [{
"args": [],
"method": &"play_list_down_sfx"
}]
}
[sub_resource type="Animation" id="Animation_raeie"]
resource_name = "guest_list_up"
length = 0.5
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("GuestList:position")
tracks/0/interp = 2
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 0.5),
"transitions": PackedFloat32Array(1, 1),
"update": 0,
"values": [Vector2(-409, 523), Vector2(-388, 176)]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("GuestList:rotation")
tracks/1/interp = 2
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0, 0.5),
"transitions": PackedFloat32Array(1, 1),
"update": 0,
"values": [-0.16732943, 0.0]
}
tracks/2/type = "method"
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/path = NodePath(".")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"values": [{
"args": [],
"method": &"play_list_up_sfx"
}]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_hxu8e"]
_data = {
&"RESET": SubResource("Animation_7smn1"),
&"guest_list_down": SubResource("Animation_hxu8e"),
&"guest_list_up": SubResource("Animation_raeie")
}
[node name="Main" type="Node2D" unique_id=875553242]
script = ExtResource("1_7smn1")
[node name="SFXPlayer" type="AudioStreamPlayer" parent="." unique_id=831453323]
stream = SubResource("AudioStreamInteractive_7smn1")
autoplay = true
bus = &"SFX"
[node name="Character" parent="." unique_id=138741531 instance=ExtResource("2_raeie")]
scale = Vector2(0.5488516, 0.5501616)
[node name="GameManager" type="Node" parent="." unique_id=528989100]
script = ExtResource("3_hxu8e")
character_roster = Array[ExtResource("4_nvumn")]([ExtResource("5_ou6is"), ExtResource("6_necax"), ExtResource("7_r4lks"), ExtResource("8_pg34l")])
mask_roster = Array[ExtResource("9_m4h2d")]([ExtResource("10_p8abn"), ExtResource("11_s17dp"), ExtResource("12_37hlw")])
[node name="GuestList" type="Node2D" parent="." unique_id=1314693850]
position = Vector2(-409, 523)
rotation = -0.16732943
[node name="Sprite2D" type="Sprite2D" parent="GuestList" unique_id=508689157]
texture = ExtResource("13_6llfj")
[node name="Area2D" type="Area2D" parent="GuestList" unique_id=416235822]
[node name="CollisionShape2D" type="CollisionShape2D" parent="GuestList/Area2D" unique_id=845691842]
shape = SubResource("CapsuleShape2D_trceg")
[node name="Camera2D" type="Camera2D" parent="." unique_id=1166192115]
limit_left = -960
limit_top = -540
limit_right = 4096
limit_bottom = 540
position_smoothing_enabled = true
script = ExtResource("14_0bhws")
pan_speed = 10.0
[node name="PanRight" type="Area2D" parent="Camera2D" unique_id=1684320772]
position = Vector2(960, 0)
[node name="CollisionShape2D" type="CollisionShape2D" parent="Camera2D/PanRight" unique_id=1733069282]
shape = SubResource("RectangleShape2D_ya4ey")
[node name="PanLeft" type="Area2D" parent="Camera2D" unique_id=1942262155]
position = Vector2(-960, 0)
[node name="CollisionShape2D" type="CollisionShape2D" parent="Camera2D/PanLeft" unique_id=77276628]
shape = SubResource("RectangleShape2D_ya4ey")
[node name="AnimationPlayer" type="AnimationPlayer" parent="." unique_id=1813843404]
libraries/ = SubResource("AnimationLibrary_hxu8e")
[connection signal="mouse_entered" from="GuestList/Area2D" to="." method="_on_guest_list_mouse_entered"]
[connection signal="mouse_exited" from="GuestList/Area2D" to="." method="_on_guest_list_mouse_exited"]
[connection signal="mouse_entered" from="Camera2D/PanRight" to="Camera2D" method="_on_pan_right_mouse_entered"]
[connection signal="mouse_exited" from="Camera2D/PanRight" to="Camera2D" method="_on_pan_right_mouse_exited"]
[connection signal="mouse_entered" from="Camera2D/PanLeft" to="Camera2D" method="_on_pan_left_mouse_entered"]
[connection signal="mouse_exited" from="Camera2D/PanLeft" to="Camera2D" method="_on_pan_left_mouse_exited"]