From 072688c9c141040bb2389fc9352ef83194f3d7e9 Mon Sep 17 00:00:00 2001 From: Reed Date: Mon, 12 Jan 2026 14:04:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E6=A9=9F=E7=B3=BB=E7=B5=B1=E9=87=8D?= =?UTF-8?q?=E6=A7=8B=EF=BC=8C=E5=81=9A=E6=88=90=E6=8F=92=E4=BB=B6=E7=9A=84?= =?UTF-8?q?=E5=BD=A2=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- {_shared/camera => _camera}/CameraAnchor.tscn | 5 +- _camera/CameraSystem.gd | 265 ++++++++++++++++++ .../camera => _camera}/CameraSystem.gd.uid | 0 {_shared/camera => _camera}/CameraSystem.tscn | 4 +- .../camera => _camera}/camera_follower.gd | 0 .../camera => _camera}/camera_follower.gd.uid | 0 .../camera => _camera}/camera_follower.tscn | 2 +- .../camera_shake/CSP_HorizontalOnly.tres | 2 +- .../camera_shake/CSP_VerticalOnly.tres | 2 +- .../camera_shake/CSP_XY.tres | 2 +- .../camera_shake/CameraShakePlayer.gd | 0 .../camera_shake/CameraShakePlayer.gd.uid | 0 .../camera_shake/CameraShakePreset.gd | 0 .../camera_shake/CameraShakePreset.gd.uid | 0 _player/Avatar.tscn | 8 +- .../_prefabs/player/player_respawn_point.gd | 1 + _scene/level1/l0_s0.tscn | 2 +- _scene/level1/l1_s1.tscn | 2 +- _scene/level1/l1_s2.tscn | 3 +- _scene/level1/l1_s3.tscn | 2 +- _scene/level1/l1_s4.tscn | 2 +- _scene/level1/l1_s5.tscn | 2 +- _scene/level1/l1_s6.tscn | 2 +- _scene/level1/l1_s7.tscn | 2 +- _scene/level1/l1_s8.tscn | 2 +- _scene/level1/l1_s9.tscn | 6 +- _shared/{global_event.gd => GlobalEvent.gd} | 1 + ...global_event.gd.uid => GlobalEvent.gd.uid} | 0 _shared/camera/CameraSystem.gd | 207 -------------- addons/reedcamera/_data/CameraSystemConst.gd | 14 + .../reedcamera/_data/CameraSystemConst.gd.uid | 1 + addons/reedcamera/plugin.cfg | 7 + addons/reedcamera/reedcamera.gd | 22 ++ addons/reedcamera/reedcamera.gd.uid | 1 + .../reedcamera/scripts}/CameraAnchor.gd | 65 +++-- .../reedcamera/scripts}/CameraAnchor.gd.uid | 0 addons/reedcamera/scripts/ReedCameraGlobal.gd | 34 +++ .../scripts/ReedCameraGlobal.gd.uid | 1 + project.godot | 12 +- 39 files changed, 418 insertions(+), 263 deletions(-) rename {_shared/camera => _camera}/CameraAnchor.tscn (61%) create mode 100644 _camera/CameraSystem.gd rename {_shared/camera => _camera}/CameraSystem.gd.uid (100%) rename {_shared/camera => _camera}/CameraSystem.tscn (82%) rename {_shared/camera => _camera}/camera_follower.gd (100%) rename {_shared/camera => _camera}/camera_follower.gd.uid (100%) rename {_shared/camera => _camera}/camera_follower.tscn (83%) rename {_shared/camera => _camera}/camera_shake/CSP_HorizontalOnly.tres (81%) rename {_shared/camera => _camera}/camera_shake/CSP_VerticalOnly.tres (81%) rename {_shared/camera => _camera}/camera_shake/CSP_XY.tres (81%) rename {_shared/camera => _camera}/camera_shake/CameraShakePlayer.gd (100%) rename {_shared/camera => _camera}/camera_shake/CameraShakePlayer.gd.uid (100%) rename {_shared/camera => _camera}/camera_shake/CameraShakePreset.gd (100%) rename {_shared/camera => _camera}/camera_shake/CameraShakePreset.gd.uid (100%) rename _shared/{global_event.gd => GlobalEvent.gd} (95%) rename _shared/{global_event.gd.uid => GlobalEvent.gd.uid} (100%) delete mode 100644 _shared/camera/CameraSystem.gd create mode 100644 addons/reedcamera/_data/CameraSystemConst.gd create mode 100644 addons/reedcamera/_data/CameraSystemConst.gd.uid create mode 100644 addons/reedcamera/plugin.cfg create mode 100644 addons/reedcamera/reedcamera.gd create mode 100644 addons/reedcamera/reedcamera.gd.uid rename {_shared/camera => addons/reedcamera/scripts}/CameraAnchor.gd (69%) rename {_shared/camera => addons/reedcamera/scripts}/CameraAnchor.gd.uid (100%) create mode 100644 addons/reedcamera/scripts/ReedCameraGlobal.gd create mode 100644 addons/reedcamera/scripts/ReedCameraGlobal.gd.uid diff --git a/_shared/camera/CameraAnchor.tscn b/_camera/CameraAnchor.tscn similarity index 61% rename from _shared/camera/CameraAnchor.tscn rename to _camera/CameraAnchor.tscn index 0b83572..97880f8 100644 --- a/_shared/camera/CameraAnchor.tscn +++ b/_camera/CameraAnchor.tscn @@ -1,7 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://bflwr7cryd2l0"] -[ext_resource type="Script" uid="uid://dyxrydokgy0qs" path="res://_shared/camera/CameraAnchor.gd" id="1_dhu66"] +[ext_resource type="Script" uid="uid://dyxrydokgy0qs" path="res://addons/reedcamera/scripts/CameraAnchor.gd" id="1_1b11o"] [node name="CameraAnchor" type="Node2D"] -script = ExtResource("1_dhu66") -use_camera_limit = true +script = ExtResource("1_1b11o") diff --git a/_camera/CameraSystem.gd b/_camera/CameraSystem.gd new file mode 100644 index 0000000..e958f8f --- /dev/null +++ b/_camera/CameraSystem.gd @@ -0,0 +1,265 @@ +#'''全局的相机管理器 + # + #======= 外部调用函数 ======= + # +#''' +#@tool +#extends Node +# +#@onready var camera_2d: Camera2D = %Camera2D +#@onready var camera_shake_player: CameraShakePlayer = %CameraShakePlayer +# +#var _cached_anchors: Array[CameraAnchor] = [] +#var _current_anchor: CameraAnchor +#var _switch_tween: Tween +#var _player_remote: RemoteTransform2D +#var _base_camera_pos := Vector2.ZERO +# +###标记位，用来检测当前帧是否存在相机切换 +#var _switch_scheduled := false +#var _dirty := false +#var _screen_size : Vector2i +# +### 玩家关卡内静态相机 +#const CAMERA_FOLLOWER:= preload("res://camera/camera_follower.tscn") +# +#func _ready() -> void: + ## Setting default screensize + #_screen_size = Vector2i( + #ProjectSettings.get_setting("display/window/size/viewport_width"), + #ProjectSettings.get_setting("display/window/size/viewport_height") + #) +# + ## For editor + #if Engine.is_editor_hint(): + #ProjectSettings.settings_changed.connect(func(): + #_screen_size = Vector2i( + #ProjectSettings.get_setting("display/window/size/viewport_width"), + #ProjectSettings.get_setting("display/window/size/viewport_height") + #) + #) + ## For runtime + #else: + #get_tree().get_root().size_changed.connect(func(): + #_screen_size = get_viewport().get_visible_rect().size + #) +# +#func _editor_ready() -> void: + #ProjectSettings.settings_changed.connect(func(): + #_screen_size = Vector2i( + #ProjectSettings.get_setting("display/window/size/viewport_width"), + #ProjectSettings.get_setting("display/window/size/viewport_height") + #) + #) +# +#func _runtime_ready() -> void: + #get_tree().get_root().size_changed.connect(func(): + #_screen_size = get_viewport().get_visible_rect().size + #) +# +##func _process(delta): + ##if not Engine.is_editor_hint(): + ##_runtime_process(delta) + # +# +#func _runtime_process(delta): + #if not camera_2d: + #return +# + #var shake_offset := camera_shake_player.update(delta) + #camera_2d.global_position = _base_camera_pos + shake_offset +# +#func _on_player_spawned(new_player: Player) -> void: + #if _current_anchor and _current_anchor.follow_player: + #_bind_camera_follow_to_player(new_player) +# +#func _on_player_dead() -> void: + #return +# +### 绑定camera 到 player +#func _bind_camera_follow_to_player(player: Player) -> void: + #if _player_remote and is_instance_valid(_player_remote): + #_player_remote.queue_free() + #_player_remote = null +# + #if not is_instance_valid(player): + #return +# + #var rt := RemoteTransform2D.new() + #rt.name = "__CameraAnchorFollow" + #rt.remote_path = camera_2d.get_path() + #rt.update_position = true + #rt.update_rotation = false + #rt.update_scale = false +# + #player.add_child(rt) + #_player_remote = rt +# +### 外部获取玩家全局相机 +#func get_cached_camera() -> Camera2D: + #return camera_2d +# +### 注册一个相机锚点 +#func register_anchor(anchor: CameraAnchor) -> void: + #if anchor in _cached_anchors: + #return + #_cached_anchors.append(anchor) + #anchor.on_priority_change.connect(on_anchor_priority_changed) + #_request_evaluate() +# +### 当相机锚点的权重改变时，向管理器触发事件 +#func on_anchor_priority_changed(priority:int, anchor: CameraAnchor) -> void: + #_request_evaluate() +# +### 注销一个相机锚点 +#func unregister_anchor(anchor: CameraAnchor) -> void: + #_cached_anchors.erase(anchor) + #if _current_anchor == anchor: + #_current_anchor = null + #_request_evaluate() +# +#func _request_evaluate() -> void: + #_dirty = true + #if _switch_scheduled: + #return + #_switch_scheduled = true + #call_deferred("_commit_camera_anchor") +# +#func _commit_camera_anchor() -> void: + #_switch_scheduled = false + #if not _dirty: + #return + #_dirty = false +# + ## 清理无效 + #_cached_anchors = _cached_anchors.filter(func(a): return is_instance_valid(a)) +# + #var winner: CameraAnchor = _pick_best_anchor() +# + #if winner == null: + #return +# + #if winner == _current_anchor: + #return +# + #switch_anchor(winner) +# +#func _pick_best_anchor() -> CameraAnchor: + #var best: CameraAnchor = null + #var best_p := -INF +# + #for a in _cached_anchors: + #if not a.enabled: + #continue + #if a._priority > best_p: + #best_p = a._priority + #best = a +# + #return best +# +### 排序已有的锚点 +#func _sort_anchors() -> void: + #_cached_anchors.sort_custom(func(a, b): + #return a._priority > b._priority + #) +# +### 尝试自切换 +#func _try_auto_switch() -> void: + #for a in _cached_anchors: + #if a.enabled: + #switch_anchor(a) + #_current_anchor = a + #return +# +# +# +###应用Anchor的Limit +#func _apply_anchor_limits(anchor: CameraAnchor) -> void: + #if not camera_2d: + #return + #camera_2d.limit_left = anchor.global_position.x + anchor.limit_left + #camera_2d.limit_right = anchor.global_position.x + anchor.limit_right + #camera_2d.limit_top = anchor.global_position.y + anchor.limit_top + #camera_2d.limit_bottom = anchor.global_position.y + anchor.limit_bottom +# +#func _clear_camera_limits() -> void: + #if not camera_2d: + #return + #camera_2d.limit_left = -10000000 + #camera_2d.limit_right = 10000000 + #camera_2d.limit_top = -10000000 + #camera_2d.limit_bottom = 10000000 +# +### 切换相机 +#func switch_anchor(target_anchor: CameraAnchor) -> void: + #if target_anchor == null: + #return + #if target_anchor == _current_anchor: + #return + #if not is_instance_valid(camera_2d): + #return +# + ##优先清除已有的remote + #if _player_remote: + #_player_remote.queue_free() + #_player_remote = null + # + ## 中断旧 Tween + #if _switch_tween and _switch_tween.is_running(): + #_switch_tween.kill() + #_switch_tween = null +# + #var camera := camera_2d + #var blend_time : float = max(target_anchor.blend_time, 0.001) +# + #_clear_camera_limits() + # + #_switch_tween = get_tree().create_tween() + #_switch_tween.set_ignore_time_scale(true) + #_switch_tween.set_trans(Tween.TRANS_CUBIC) + #_switch_tween.set_ease(Tween.EASE_OUT) +# + ## ===== 位置 ===== + #_switch_tween.tween_property( + #self, + #"_base_camera_pos", + #target_anchor.global_position, + #blend_time + #) +# + ## ===== Zoom ===== + #_switch_tween.parallel().tween_property( + #camera, + #"zoom", + #target_anchor.zoom, + #blend_time * 1.5 + #) +# + ## 完成回调 + #_switch_tween.finished.connect(func(): + #_current_anchor = target_anchor + #_update_anchor_follow_state(target_anchor) + #_apply_anchor_limits(target_anchor) + #) +# + #_current_anchor = target_anchor +# +#func _update_anchor_follow_state(anchor: CameraAnchor) -> void: + #if not anchor.follow_player: + #return +# + #var player := GlobalEvent.get_player() + #if player: + #_bind_camera_follow_to_player(player) +# +## ========================== +## External API +## ========================== +### 重置所有的Camera的_priority +#func reset_all_camera_priority() -> void: + #for a in _cached_anchors: + #a._priority = 0 +# +### 返回屏幕比例 +#func get_screen_size() -> Vector2i: + #return _screen_size diff --git a/_shared/camera/CameraSystem.gd.uid b/_camera/CameraSystem.gd.uid similarity index 100% rename from _shared/camera/CameraSystem.gd.uid rename to _camera/CameraSystem.gd.uid diff --git a/_shared/camera/CameraSystem.tscn b/_camera/CameraSystem.tscn similarity index 82% rename from _shared/camera/CameraSystem.tscn rename to _camera/CameraSystem.tscn index 71a47d2..027cfc8 100644 --- a/_shared/camera/CameraSystem.tscn +++ b/_camera/CameraSystem.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://b8pv5wtbo0y20"] -[ext_resource type="Script" uid="uid://04mchxkp161a" path="res://_shared/camera/CameraSystem.gd" id="1_xxnab"] -[ext_resource type="Script" uid="uid://sfrjes1hq8b7" path="res://_shared/camera/camera_shake/CameraShakePlayer.gd" id="2_xxnab"] +[ext_resource type="Script" uid="uid://04mchxkp161a" path="res://_camera/CameraSystem.gd" id="1_xxnab"] +[ext_resource type="Script" uid="uid://sfrjes1hq8b7" path="res://_camera/camera_shake/CameraShakePlayer.gd" id="2_xxnab"] [node name="CameraSystem" type="Node"] script = ExtResource("1_xxnab") diff --git a/_shared/camera/camera_follower.gd b/_camera/camera_follower.gd similarity index 100% rename from _shared/camera/camera_follower.gd rename to _camera/camera_follower.gd diff --git a/_shared/camera/camera_follower.gd.uid b/_camera/camera_follower.gd.uid similarity index 100% rename from _shared/camera/camera_follower.gd.uid rename to _camera/camera_follower.gd.uid diff --git a/_shared/camera/camera_follower.tscn b/_camera/camera_follower.tscn similarity index 83% rename from _shared/camera/camera_follower.tscn rename to _camera/camera_follower.tscn index 58d041a..80dc727 100644 --- a/_shared/camera/camera_follower.tscn +++ b/_camera/camera_follower.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://bmb1en8itine5"] -[ext_resource type="Script" uid="uid://1xtjkoufyjlp" path="res://_shared/camera/camera_follower.gd" id="1_8rvp5"] +[ext_resource type="Script" uid="uid://1xtjkoufyjlp" path="res://_camera/camera_follower.gd" id="1_8rvp5"] [node name="CameraFollower" type="RemoteTransform2D"] update_rotation = false diff --git a/_shared/camera/camera_shake/CSP_HorizontalOnly.tres b/_camera/camera_shake/CSP_HorizontalOnly.tres similarity index 81% rename from _shared/camera/camera_shake/CSP_HorizontalOnly.tres rename to _camera/camera_shake/CSP_HorizontalOnly.tres index e4b0897..df4df76 100644 --- a/_shared/camera/camera_shake/CSP_HorizontalOnly.tres +++ b/_camera/camera_shake/CSP_HorizontalOnly.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="CameraShakePreset" load_steps=2 format=3 uid="uid://iv3hfxqm5503"] -[ext_resource type="Script" uid="uid://btm85tbxvjmex" path="res://_shared/camera/camera_shake/CameraShakePreset.gd" id="1_mwfjy"] +[ext_resource type="Script" uid="uid://btm85tbxvjmex" path="res://_camera/camera_shake/CameraShakePreset.gd" id="1_mwfjy"] [resource] script = ExtResource("1_mwfjy") diff --git a/_shared/camera/camera_shake/CSP_VerticalOnly.tres b/_camera/camera_shake/CSP_VerticalOnly.tres similarity index 81% rename from _shared/camera/camera_shake/CSP_VerticalOnly.tres rename to _camera/camera_shake/CSP_VerticalOnly.tres index cc16794..573480c 100644 --- a/_shared/camera/camera_shake/CSP_VerticalOnly.tres +++ b/_camera/camera_shake/CSP_VerticalOnly.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="CameraShakePreset" load_steps=2 format=3 uid="uid://bs3cqsp23047i"] -[ext_resource type="Script" uid="uid://btm85tbxvjmex" path="res://_shared/camera/camera_shake/CameraShakePreset.gd" id="1_pnkiv"] +[ext_resource type="Script" uid="uid://btm85tbxvjmex" path="res://_camera/camera_shake/CameraShakePreset.gd" id="1_pnkiv"] [resource] script = ExtResource("1_pnkiv") diff --git a/_shared/camera/camera_shake/CSP_XY.tres b/_camera/camera_shake/CSP_XY.tres similarity index 81% rename from _shared/camera/camera_shake/CSP_XY.tres rename to _camera/camera_shake/CSP_XY.tres index 26ac07b..633d0ad 100644 --- a/_shared/camera/camera_shake/CSP_XY.tres +++ b/_camera/camera_shake/CSP_XY.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="CameraShakePreset" load_steps=2 format=3 uid="uid://cs50mkt830f8r"] -[ext_resource type="Script" uid="uid://btm85tbxvjmex" path="res://_shared/camera/camera_shake/CameraShakePreset.gd" id="1_3oq5o"] +[ext_resource type="Script" uid="uid://btm85tbxvjmex" path="res://_camera/camera_shake/CameraShakePreset.gd" id="1_3oq5o"] [resource] script = ExtResource("1_3oq5o") diff --git a/_shared/camera/camera_shake/CameraShakePlayer.gd b/_camera/camera_shake/CameraShakePlayer.gd similarity index 100% rename from _shared/camera/camera_shake/CameraShakePlayer.gd rename to _camera/camera_shake/CameraShakePlayer.gd diff --git a/_shared/camera/camera_shake/CameraShakePlayer.gd.uid b/_camera/camera_shake/CameraShakePlayer.gd.uid similarity index 100% rename from _shared/camera/camera_shake/CameraShakePlayer.gd.uid rename to _camera/camera_shake/CameraShakePlayer.gd.uid diff --git a/_shared/camera/camera_shake/CameraShakePreset.gd b/_camera/camera_shake/CameraShakePreset.gd similarity index 100% rename from _shared/camera/camera_shake/CameraShakePreset.gd rename to _camera/camera_shake/CameraShakePreset.gd diff --git a/_shared/camera/camera_shake/CameraShakePreset.gd.uid b/_camera/camera_shake/CameraShakePreset.gd.uid similarity index 100% rename from _shared/camera/camera_shake/CameraShakePreset.gd.uid rename to _camera/camera_shake/CameraShakePreset.gd.uid diff --git a/_player/Avatar.tscn b/_player/Avatar.tscn index a0b6477..46c64c7 100644 --- a/_player/Avatar.tscn +++ b/_player/Avatar.tscn @@ -5,12 +5,12 @@ [ext_resource type="Script" uid="uid://15n8yfyr4eqj" path="res://_player/states/grounded.gd" id="2_5p50s"] [ext_resource type="Texture2D" uid="uid://doxhsab56pe50" path="res://_asset/all.png" id="2_8nsdm"] [ext_resource type="Script" uid="uid://dcfq4wnx2g6bs" path="res://_player/player_locomotion.gd" id="2_11vl8"] -[ext_resource type="Script" uid="uid://btm85tbxvjmex" path="res://_shared/camera/camera_shake/CameraShakePreset.gd" id="2_u7cua"] -[ext_resource type="Resource" uid="uid://iv3hfxqm5503" path="res://_shared/camera/camera_shake/CSP_HorizontalOnly.tres" id="3_1a1t3"] -[ext_resource type="Resource" uid="uid://bs3cqsp23047i" path="res://_shared/camera/camera_shake/CSP_VerticalOnly.tres" id="4_01uoa"] +[ext_resource type="Script" uid="uid://btm85tbxvjmex" path="res://_camera/camera_shake/CameraShakePreset.gd" id="2_u7cua"] +[ext_resource type="Resource" uid="uid://iv3hfxqm5503" path="res://_camera/camera_shake/CSP_HorizontalOnly.tres" id="3_1a1t3"] +[ext_resource type="Resource" uid="uid://bs3cqsp23047i" path="res://_camera/camera_shake/CSP_VerticalOnly.tres" id="4_01uoa"] [ext_resource type="Script" uid="uid://b5hkfpjbye70" path="res://_player/states/idle.gd" id="4_30i7g"] [ext_resource type="BlackboardPlan" uid="uid://nlw7rxugv5uh" path="res://_player/bbp_player.tres" id="4_mwufa"] -[ext_resource type="Resource" uid="uid://cs50mkt830f8r" path="res://_shared/camera/camera_shake/CSP_XY.tres" id="5_ciuu3"] +[ext_resource type="Resource" uid="uid://cs50mkt830f8r" path="res://_camera/camera_shake/CSP_XY.tres" id="5_ciuu3"] [ext_resource type="Script" uid="uid://bpd54nf8oxwsb" path="res://_player/states/player_hsm.gd" id="6_8q4ov"] [ext_resource type="Script" uid="uid://po21boe8iqcc" path="res://_player/states/move.gd" id="7_rrwxs"] [ext_resource type="Script" uid="uid://cjf7kds0cipkw" path="res://_tools/limbo_state_helper.gd" id="8_clxy3"] diff --git a/_props/_prefabs/player/player_respawn_point.gd b/_props/_prefabs/player/player_respawn_point.gd index af1faa2..a712331 100644 --- a/_props/_prefabs/player/player_respawn_point.gd +++ b/_props/_prefabs/player/player_respawn_point.gd @@ -101,4 +101,5 @@ func respawn_avatar() -> CharacterBody2D: new_avatar.position = self.global_position get_tree().current_scene.add_child(new_avatar) + GlobalEvent.player_spawned.emit(new_avatar) return new_avatar diff --git a/_scene/level1/l0_s0.tscn b/_scene/level1/l0_s0.tscn index d229f61..aad64c3 100644 --- a/_scene/level1/l0_s0.tscn +++ b/_scene/level1/l0_s0.tscn @@ -9,7 +9,7 @@ [ext_resource type="Script" uid="uid://fxpk2ot6otfh" path="res://addons/reedscene/act/Act.gd" id="8_0m4o0"] [ext_resource type="Script" uid="uid://baqgorvlumyju" path="res://addons/reedscene/act/SingleAct.gd" id="9_1oohu"] [ext_resource type="Script" uid="uid://pxjf5vst08eo" path="res://addons/reedscene/prop/PropManager.gd" id="10_g4f48"] -[ext_resource type="PackedScene" uid="uid://bflwr7cryd2l0" path="res://_shared/camera/CameraAnchor.tscn" id="11_o5yb1"] +[ext_resource type="PackedScene" uid="uid://bflwr7cryd2l0" path="res://_camera/CameraAnchor.tscn" id="11_o5yb1"] [ext_resource type="Script" uid="uid://b4menkyub4ce7" path="res://addons/reedscene/prop/PropComponent.gd" id="12_vhd7q"] [ext_resource type="Script" uid="uid://di41kt2tj34c2" path="res://addons/reedscene/prop/StateManager.gd" id="13_5fsuc"] [ext_resource type="Script" uid="uid://7lml6d1t5xtq" path="res://addons/reedscene/prop/PropState.gd" id="14_rxcsc"] diff --git a/_scene/level1/l1_s1.tscn b/_scene/level1/l1_s1.tscn index 9ea1c52..b9f4213 100644 --- a/_scene/level1/l1_s1.tscn +++ b/_scene/level1/l1_s1.tscn @@ -9,7 +9,7 @@ [ext_resource type="Script" uid="uid://fxpk2ot6otfh" path="res://addons/reedscene/act/Act.gd" id="5_ubvm0"] [ext_resource type="Script" uid="uid://baqgorvlumyju" path="res://addons/reedscene/act/SingleAct.gd" id="6_r0e2c"] [ext_resource type="Script" uid="uid://pxjf5vst08eo" path="res://addons/reedscene/prop/PropManager.gd" id="7_hd3du"] -[ext_resource type="PackedScene" uid="uid://bflwr7cryd2l0" path="res://_shared/camera/CameraAnchor.tscn" id="8_vjpkl"] +[ext_resource type="PackedScene" uid="uid://bflwr7cryd2l0" path="res://_camera/CameraAnchor.tscn" id="8_vjpkl"] [ext_resource type="Script" uid="uid://b4menkyub4ce7" path="res://addons/reedscene/prop/PropComponent.gd" id="9_ctwrc"] [ext_resource type="Script" uid="uid://di41kt2tj34c2" path="res://addons/reedscene/prop/StateManager.gd" id="10_0u6xi"] [ext_resource type="Script" uid="uid://7lml6d1t5xtq" path="res://addons/reedscene/prop/PropState.gd" id="11_hatj6"] diff --git a/_scene/level1/l1_s2.tscn b/_scene/level1/l1_s2.tscn index a5a3f32..503777a 100644 --- a/_scene/level1/l1_s2.tscn +++ b/_scene/level1/l1_s2.tscn @@ -9,7 +9,7 @@ [ext_resource type="Resource" uid="uid://bym4pb0ellj7b" path="res://_scene/scene_trigger_resource/default_switch.tres" id="5_fdfto"] [ext_resource type="Script" uid="uid://baqgorvlumyju" path="res://addons/reedscene/act/SingleAct.gd" id="6_agny0"] [ext_resource type="Script" uid="uid://pxjf5vst08eo" path="res://addons/reedscene/prop/PropManager.gd" id="7_8ou3l"] -[ext_resource type="PackedScene" uid="uid://bflwr7cryd2l0" path="res://_shared/camera/CameraAnchor.tscn" id="8_dq7pn"] +[ext_resource type="PackedScene" uid="uid://bflwr7cryd2l0" path="res://_camera/CameraAnchor.tscn" id="8_dq7pn"] [ext_resource type="Script" uid="uid://b4menkyub4ce7" path="res://addons/reedscene/prop/PropComponent.gd" id="9_fdfto"] [ext_resource type="Script" uid="uid://di41kt2tj34c2" path="res://addons/reedscene/prop/StateManager.gd" id="10_uerbs"] [ext_resource type="Script" uid="uid://7lml6d1t5xtq" path="res://addons/reedscene/prop/PropState.gd" id="11_w12cs"] @@ -160,6 +160,7 @@ state_id = 1 effects = Array[ExtResource("12_fmhh5")]([ExtResource("14_nnp13")]) [node name="PlayerTriggerVolumn" parent="Props" instance=ExtResource("15_lg3ok")] +visible = false position = Vector2(560, -480) [node name="CollisionShape2D" type="CollisionShape2D" parent="Props/PlayerTriggerVolumn"] diff --git a/_scene/level1/l1_s3.tscn b/_scene/level1/l1_s3.tscn index 76ef885..60b1479 100644 --- a/_scene/level1/l1_s3.tscn +++ b/_scene/level1/l1_s3.tscn @@ -9,7 +9,7 @@ [ext_resource type="Script" uid="uid://fxpk2ot6otfh" path="res://addons/reedscene/act/Act.gd" id="5_vajwc"] [ext_resource type="Script" uid="uid://baqgorvlumyju" path="res://addons/reedscene/act/SingleAct.gd" id="6_td1yf"] [ext_resource type="Script" uid="uid://pxjf5vst08eo" path="res://addons/reedscene/prop/PropManager.gd" id="7_pawhc"] -[ext_resource type="PackedScene" uid="uid://bflwr7cryd2l0" path="res://_shared/camera/CameraAnchor.tscn" id="8_x0ktb"] +[ext_resource type="PackedScene" uid="uid://bflwr7cryd2l0" path="res://_camera/CameraAnchor.tscn" id="8_x0ktb"] [ext_resource type="Script" uid="uid://b4menkyub4ce7" path="res://addons/reedscene/prop/PropComponent.gd" id="9_03jph"] [ext_resource type="Script" uid="uid://di41kt2tj34c2" path="res://addons/reedscene/prop/StateManager.gd" id="10_6tjqf"] [ext_resource type="Script" uid="uid://7lml6d1t5xtq" path="res://addons/reedscene/prop/PropState.gd" id="11_vl8fy"] diff --git a/_scene/level1/l1_s4.tscn b/_scene/level1/l1_s4.tscn index 6bb9e70..df0f09b 100644 --- a/_scene/level1/l1_s4.tscn +++ b/_scene/level1/l1_s4.tscn @@ -9,7 +9,7 @@ [ext_resource type="Script" uid="uid://pxjf5vst08eo" path="res://addons/reedscene/prop/PropManager.gd" id="5_qtvqv"] [ext_resource type="Resource" uid="uid://bym4pb0ellj7b" path="res://_scene/scene_trigger_resource/default_switch.tres" id="5_x87uk"] [ext_resource type="Script" uid="uid://baqgorvlumyju" path="res://addons/reedscene/act/SingleAct.gd" id="6_qtvqv"] -[ext_resource type="PackedScene" uid="uid://bflwr7cryd2l0" path="res://_shared/camera/CameraAnchor.tscn" id="8_6bhoi"] +[ext_resource type="PackedScene" uid="uid://bflwr7cryd2l0" path="res://_camera/CameraAnchor.tscn" id="8_6bhoi"] [ext_resource type="TileSet" uid="uid://doepkfp83k0lb" path="res://_tileset/test.tres" id="8_wofhb"] [ext_resource type="Script" uid="uid://b4menkyub4ce7" path="res://addons/reedscene/prop/PropComponent.gd" id="9_0dl6r"] [ext_resource type="Script" uid="uid://di41kt2tj34c2" path="res://addons/reedscene/prop/StateManager.gd" id="10_sv1n5"] diff --git a/_scene/level1/l1_s5.tscn b/_scene/level1/l1_s5.tscn index 0fa805a..e36160e 100644 --- a/_scene/level1/l1_s5.tscn +++ b/_scene/level1/l1_s5.tscn @@ -9,7 +9,7 @@ [ext_resource type="Script" uid="uid://fxpk2ot6otfh" path="res://addons/reedscene/act/Act.gd" id="7_c6mvs"] [ext_resource type="Script" uid="uid://baqgorvlumyju" path="res://addons/reedscene/act/SingleAct.gd" id="8_ug4by"] [ext_resource type="Script" uid="uid://pxjf5vst08eo" path="res://addons/reedscene/prop/PropManager.gd" id="9_c10nq"] -[ext_resource type="PackedScene" uid="uid://bflwr7cryd2l0" path="res://_shared/camera/CameraAnchor.tscn" id="10_xrx0u"] +[ext_resource type="PackedScene" uid="uid://bflwr7cryd2l0" path="res://_camera/CameraAnchor.tscn" id="10_xrx0u"] [ext_resource type="Script" uid="uid://b4menkyub4ce7" path="res://addons/reedscene/prop/PropComponent.gd" id="11_q6hv2"] [ext_resource type="Script" uid="uid://di41kt2tj34c2" path="res://addons/reedscene/prop/StateManager.gd" id="12_3vve2"] [ext_resource type="Script" uid="uid://7lml6d1t5xtq" path="res://addons/reedscene/prop/PropState.gd" id="13_fqjrf"] diff --git a/_scene/level1/l1_s6.tscn b/_scene/level1/l1_s6.tscn index 10e380f..d3a0f12 100644 --- a/_scene/level1/l1_s6.tscn +++ b/_scene/level1/l1_s6.tscn @@ -9,7 +9,7 @@ [ext_resource type="Script" uid="uid://fxpk2ot6otfh" path="res://addons/reedscene/act/Act.gd" id="7_u3uxu"] [ext_resource type="Script" uid="uid://baqgorvlumyju" path="res://addons/reedscene/act/SingleAct.gd" id="8_n5ng2"] [ext_resource type="Script" uid="uid://pxjf5vst08eo" path="res://addons/reedscene/prop/PropManager.gd" id="9_v8ejv"] -[ext_resource type="PackedScene" uid="uid://bflwr7cryd2l0" path="res://_shared/camera/CameraAnchor.tscn" id="10_fwa5x"] +[ext_resource type="PackedScene" uid="uid://bflwr7cryd2l0" path="res://_camera/CameraAnchor.tscn" id="10_fwa5x"] [ext_resource type="Script" uid="uid://b4menkyub4ce7" path="res://addons/reedscene/prop/PropComponent.gd" id="11_mlg0v"] [ext_resource type="Script" uid="uid://di41kt2tj34c2" path="res://addons/reedscene/prop/StateManager.gd" id="12_3yfjx"] [ext_resource type="Script" uid="uid://7lml6d1t5xtq" path="res://addons/reedscene/prop/PropState.gd" id="13_k40sn"] diff --git a/_scene/level1/l1_s7.tscn b/_scene/level1/l1_s7.tscn index 84fa3fc..e6afeb5 100644 --- a/_scene/level1/l1_s7.tscn +++ b/_scene/level1/l1_s7.tscn @@ -9,7 +9,7 @@ [ext_resource type="Script" uid="uid://fxpk2ot6otfh" path="res://addons/reedscene/act/Act.gd" id="7_u3uxu"] [ext_resource type="Script" uid="uid://baqgorvlumyju" path="res://addons/reedscene/act/SingleAct.gd" id="8_n5ng2"] [ext_resource type="Script" uid="uid://pxjf5vst08eo" path="res://addons/reedscene/prop/PropManager.gd" id="9_v8ejv"] -[ext_resource type="PackedScene" uid="uid://bflwr7cryd2l0" path="res://_shared/camera/CameraAnchor.tscn" id="10_fwa5x"] +[ext_resource type="PackedScene" uid="uid://bflwr7cryd2l0" path="res://_camera/CameraAnchor.tscn" id="10_fwa5x"] [ext_resource type="Script" uid="uid://b4menkyub4ce7" path="res://addons/reedscene/prop/PropComponent.gd" id="11_mlg0v"] [ext_resource type="Script" uid="uid://di41kt2tj34c2" path="res://addons/reedscene/prop/StateManager.gd" id="12_3yfjx"] [ext_resource type="Script" uid="uid://7lml6d1t5xtq" path="res://addons/reedscene/prop/PropState.gd" id="13_k40sn"] diff --git a/_scene/level1/l1_s8.tscn b/_scene/level1/l1_s8.tscn index fb2adc2..b8dd028 100644 --- a/_scene/level1/l1_s8.tscn +++ b/_scene/level1/l1_s8.tscn @@ -9,7 +9,7 @@ [ext_resource type="Script" uid="uid://fxpk2ot6otfh" path="res://addons/reedscene/act/Act.gd" id="7_o10qt"] [ext_resource type="Script" uid="uid://baqgorvlumyju" path="res://addons/reedscene/act/SingleAct.gd" id="8_nkrpp"] [ext_resource type="Script" uid="uid://pxjf5vst08eo" path="res://addons/reedscene/prop/PropManager.gd" id="9_ru3iu"] -[ext_resource type="PackedScene" uid="uid://bflwr7cryd2l0" path="res://_shared/camera/CameraAnchor.tscn" id="10_8v4hu"] +[ext_resource type="PackedScene" uid="uid://bflwr7cryd2l0" path="res://_camera/CameraAnchor.tscn" id="10_8v4hu"] [ext_resource type="Script" uid="uid://b4menkyub4ce7" path="res://addons/reedscene/prop/PropComponent.gd" id="11_nkttg"] [ext_resource type="Script" uid="uid://di41kt2tj34c2" path="res://addons/reedscene/prop/StateManager.gd" id="12_7fah6"] [ext_resource type="Script" uid="uid://7lml6d1t5xtq" path="res://addons/reedscene/prop/PropState.gd" id="13_ot6uu"] diff --git a/_scene/level1/l1_s9.tscn b/_scene/level1/l1_s9.tscn index 2f68abb..a6f00b5 100644 --- a/_scene/level1/l1_s9.tscn +++ b/_scene/level1/l1_s9.tscn @@ -3,13 +3,13 @@ [ext_resource type="Script" uid="uid://5e157vdk6175" path="res://addons/reedscene/scene/ReedScene.gd" id="1_7313i"] [ext_resource type="Script" uid="uid://bh066o84byplh" path="res://addons/reedscene/scene/ReedSceneID.gd" id="2_hxiiq"] [ext_resource type="Script" uid="uid://dn0ksjoswquf5" path="res://addons/reedscene/scene/SceneManager.gd" id="3_k2ysg"] -[ext_resource type="Script" uid="uid://ons77en82uls" path="res://addons/reedscene/scene/SceneTrigger.gd" id="4_ny1y7"] -[ext_resource type="Resource" uid="uid://gmaitie4ys4h" path="res://_shared/quick_scene_config/player_entered_act_1.tres" id="5_ri87v"] +[ext_resource type="Script" uid="uid://ons77en82uls" path="res://addons/reedscene/scene/scene_trigger/base/SceneTrigger.gd" id="4_ny1y7"] +[ext_resource type="Resource" path="res://_shared/quick_scene_config/player_entered_act_1.tres" id="5_ri87v"] [ext_resource type="Script" uid="uid://dsgl7lbyjsiif" path="res://addons/reedscene/act/ActManager.gd" id="6_esabr"] [ext_resource type="Script" uid="uid://fxpk2ot6otfh" path="res://addons/reedscene/act/Act.gd" id="7_2ws8l"] [ext_resource type="Script" uid="uid://baqgorvlumyju" path="res://addons/reedscene/act/SingleAct.gd" id="8_kk8q0"] [ext_resource type="Script" uid="uid://pxjf5vst08eo" path="res://addons/reedscene/prop/PropManager.gd" id="9_uiu2l"] -[ext_resource type="PackedScene" uid="uid://bflwr7cryd2l0" path="res://_shared/camera/CameraAnchor.tscn" id="10_npsqr"] +[ext_resource type="PackedScene" uid="uid://bflwr7cryd2l0" path="res://_camera/CameraAnchor.tscn" id="10_npsqr"] [ext_resource type="Script" uid="uid://b4menkyub4ce7" path="res://addons/reedscene/prop/PropComponent.gd" id="11_gkqbq"] [ext_resource type="Script" uid="uid://di41kt2tj34c2" path="res://addons/reedscene/prop/StateManager.gd" id="12_64ehn"] [ext_resource type="Script" uid="uid://7lml6d1t5xtq" path="res://addons/reedscene/prop/PropState.gd" id="13_a1xcn"] diff --git a/_shared/global_event.gd b/_shared/GlobalEvent.gd similarity index 95% rename from _shared/global_event.gd rename to _shared/GlobalEvent.gd index d018a9d..dfa9a06 100644 --- a/_shared/global_event.gd +++ b/_shared/GlobalEvent.gd @@ -1,5 +1,6 @@ extends Node +signal player_spawned(player: Player) signal player_dead(player: Player) var _cached_player_controller: PlayerController diff --git a/_shared/global_event.gd.uid b/_shared/GlobalEvent.gd.uid similarity index 100% rename from _shared/global_event.gd.uid rename to _shared/GlobalEvent.gd.uid diff --git a/_shared/camera/CameraSystem.gd b/_shared/camera/CameraSystem.gd deleted file mode 100644 index def8f48..0000000 --- a/_shared/camera/CameraSystem.gd +++ /dev/null @@ -1,207 +0,0 @@ -'''全局的相机管理器 - - ======= 外部调用函数 ======= - -''' -extends Node - -@onready var camera_2d: Camera2D = %Camera2D -@onready var camera_shake_player: CameraShakePlayer = %CameraShakePlayer - -var _cached_anchors: Array[CameraAnchor] = [] -var _current_anchor: CameraAnchor -var _switch_tween: Tween -var _player_remote: RemoteTransform2D -var _base_camera_pos := Vector2.ZERO - -##标记位，用来检测当前帧是否存在相机切换 -var _switch_scheduled := false -var _dirty := false - -## 玩家关卡内静态相机 -const CAMERA_FOLLOWER:= preload("res://_shared/camera/camera_follower.tscn") - -func _ready() -> void: - _base_camera_pos = camera_2d.global_position - -func _process(delta): - if not camera_2d: - return - - var shake_offset := camera_shake_player.update(delta) - camera_2d.global_position = _base_camera_pos + shake_offset - -## 外部获取玩家全局相机 -func get_cached_camera() -> Camera2D: - return camera_2d - -## 注册一个相机锚点 -func register_anchor(anchor: CameraAnchor) -> void: - if anchor in _cached_anchors: - return - _cached_anchors.append(anchor) - anchor.on_priority_change.connect(on_anchor_priority_changed) - _request_evaluate() - -## 当相机锚点的权重改变时，向管理器触发事件 -func on_anchor_priority_changed(priority:int, anchor: CameraAnchor) -> void: - _request_evaluate() - -## 注销一个相机锚点 -func unregister_anchor(anchor: CameraAnchor) -> void: - _cached_anchors.erase(anchor) - if _current_anchor == anchor: - _current_anchor = null - _request_evaluate() - -func _request_evaluate() -> void: - _dirty = true - if _switch_scheduled: - return - _switch_scheduled = true - call_deferred("_commit_camera_anchor") - -func _commit_camera_anchor() -> void: - _switch_scheduled = false - if not _dirty: - return - _dirty = false - - # 清理无效 - _cached_anchors = _cached_anchors.filter(func(a): return is_instance_valid(a)) - - var winner: CameraAnchor = _pick_best_anchor() - - if winner == null: - return - - if winner == _current_anchor: - return - - switch_anchor(winner) - -func _pick_best_anchor() -> CameraAnchor: - var best: CameraAnchor = null - var best_p := -INF - - for a in _cached_anchors: - if not a.enabled: - continue - if a._priority > best_p: - best_p = a._priority - best = a - - return best - -## 排序已有的锚点 -func _sort_anchors() -> void: - _cached_anchors.sort_custom(func(a, b): - return a._priority > b._priority - ) - -## 尝试自切换 -func _try_auto_switch() -> void: - for a in _cached_anchors: - if a.enabled: - switch_anchor(a) - _current_anchor = a - return - -## 重置所有的Camera的_priority -func reset_all_camera_priority() -> void: - for a in _cached_anchors: - a._priority = 0 - -##应用Anchor的Limit -func _apply_anchor_limits(anchor: CameraAnchor) -> void: - if not camera_2d: - return - camera_2d.limit_left = anchor.global_position.x + anchor.limit_left - camera_2d.limit_right = anchor.global_position.x + anchor.limit_right - camera_2d.limit_top = anchor.global_position.y + anchor.limit_top - camera_2d.limit_bottom = anchor.global_position.y + anchor.limit_bottom - -func _clear_camera_limits() -> void: - if not camera_2d: - return - camera_2d.limit_left = -10000000 - camera_2d.limit_right = 10000000 - camera_2d.limit_top = -10000000 - camera_2d.limit_bottom = 10000000 - -## 切换相机 -func switch_anchor(target_anchor: CameraAnchor) -> void: - if target_anchor == null: - return - if target_anchor == _current_anchor: - return - if not is_instance_valid(camera_2d): - return - - #优先清除已有的remote - if _player_remote: - _player_remote.queue_free() - _player_remote = null - - # 中断旧 Tween - if _switch_tween and _switch_tween.is_running(): - _switch_tween.kill() - _switch_tween = null - - var camera := camera_2d - var blend_time : float = max(target_anchor.blend_time, 0.001) - - _clear_camera_limits() - - _switch_tween = get_tree().create_tween() - _switch_tween.set_ignore_time_scale(true) - _switch_tween.set_trans(Tween.TRANS_CUBIC) - _switch_tween.set_ease(Tween.EASE_OUT) - - # ===== 位置 ===== - _switch_tween.tween_property( - self, - "_base_camera_pos", - target_anchor.global_position, - blend_time - ) - - # ===== Zoom ===== - _switch_tween.parallel().tween_property( - camera, - "zoom", - target_anchor.zoom, - blend_time * 1.5 - ) - - # 完成回调 - _switch_tween.finished.connect(func(): - _current_anchor = target_anchor - _update_anchor_follow_state(target_anchor) - _apply_anchor_limits(target_anchor) - ) - - _current_anchor = target_anchor - -func _update_anchor_follow_state(anchor: CameraAnchor) -> void: - # 先清理旧的 RemoteTransform - if _player_remote and is_instance_valid(_player_remote): - _player_remote.queue_free() - _player_remote = null - - if not anchor.follow_player: - return - - var p := GlobalEvent.get_player() - - if not p or not is_instance_valid(p): - push_warning("CameraAnchor wants to follow player, but player is not registered.") - return - - # 创建 RemoteTransform2D - var rt := RemoteTransform2D.new() - rt.name = "__CameraAnchorFollow" - rt.remote_path = camera_2d.get_path() - - p.add_child(rt) - _player_remote = rt diff --git a/addons/reedcamera/_data/CameraSystemConst.gd b/addons/reedcamera/_data/CameraSystemConst.gd new file mode 100644 index 0000000..88a49d5 --- /dev/null +++ b/addons/reedcamera/_data/CameraSystemConst.gd @@ -0,0 +1,14 @@ +@tool +extends RefCounted + +#region Constants + +const CAMERA_SYSTEM_NAME : StringName = "ReedCameraSystem" +const CAMERA_ANCHOR_NAME : StringName = "CameraAnchor" +const CAMERA_FOLLOWER_NAME : StringName = "CameraFollower" + +#endregion + +#region GroupName + +#endregion diff --git a/addons/reedcamera/_data/CameraSystemConst.gd.uid b/addons/reedcamera/_data/CameraSystemConst.gd.uid new file mode 100644 index 0000000..522ab59 --- /dev/null +++ b/addons/reedcamera/_data/CameraSystemConst.gd.uid @@ -0,0 +1 @@ +uid://bpsj1nyihan67 diff --git a/addons/reedcamera/plugin.cfg b/addons/reedcamera/plugin.cfg new file mode 100644 index 0000000..93892c6 --- /dev/null +++ b/addons/reedcamera/plugin.cfg @@ -0,0 +1,7 @@ +[plugin] + +name="ReedCamera" +description="Reed zhu 製作的用於平臺跳躍類游戲的簡易Camera2D插件" +author="ReedZhu" +version="" +script="reedcamera.gd" diff --git a/addons/reedcamera/reedcamera.gd b/addons/reedcamera/reedcamera.gd new file mode 100644 index 0000000..3cf469b --- /dev/null +++ b/addons/reedcamera/reedcamera.gd @@ -0,0 +1,22 @@ +@tool +extends EditorPlugin + +const REED_CAMERA_SYSTEM: StringName = "ReedCameraSystem" + +func _enable_plugin() -> void: + if not Engine.has_singleton(REED_CAMERA_SYSTEM): + add_autoload_singleton(REED_CAMERA_SYSTEM, "res://addons/reedcamera/scripts/ReedCameraGlobal.gd") + + +func _disable_plugin() -> void: + remove_autoload_singleton(REED_CAMERA_SYSTEM) + + +func _enter_tree() -> void: + # Initialization of the plugin goes here. + pass + + +func _exit_tree() -> void: + # Clean-up of the plugin goes here. + pass diff --git a/addons/reedcamera/reedcamera.gd.uid b/addons/reedcamera/reedcamera.gd.uid new file mode 100644 index 0000000..24a4175 --- /dev/null +++ b/addons/reedcamera/reedcamera.gd.uid @@ -0,0 +1 @@ +uid://dqmq1t1dmsy2 diff --git a/_shared/camera/CameraAnchor.gd b/addons/reedcamera/scripts/CameraAnchor.gd similarity index 69% rename from _shared/camera/CameraAnchor.gd rename to addons/reedcamera/scripts/CameraAnchor.gd index e254039..96f4dee 100644 --- a/_shared/camera/CameraAnchor.gd +++ b/addons/reedcamera/scripts/CameraAnchor.gd @@ -1,7 +1,10 @@ +##TODO:清楚掉這裏和PhantomCamera相關的部分 @tool @icon("uid://bsdmq0essfmpk") class_name CameraAnchor extends Node2D +const _CONSTANTS = preload("res://addons/reedcamera/_data/CameraSystemConst.gd") + @export_group("Anchor Config") ##该priority不会直接修改Anchor的priority，只用作初始化 @export var priority: int = 0 @@ -51,7 +54,7 @@ class_name CameraAnchor extends Node2D -var _pcam_manager: Node = null +var _camera_global : Node = null ## 编辑器预览面板设置 @export_group("Editor Preview") @@ -76,25 +79,22 @@ func _ready() -> void: _runtime_ready() func _enter_tree() -> void: - if Engine.is_editor_hint(): - _pcam_manager = Engine.get_singleton("PhantomCameraManager") - return - - CameraSystem.register_anchor(self) + if not Engine.is_editor_hint(): + pass + #CameraSystem.register_anchor(self) func _exit_tree() -> void: - if Engine.is_editor_hint(): - _pcam_manager = null - return - CameraSystem.unregister_anchor(self) + if not Engine.is_editor_hint(): + pass + #CameraSystem.unregister_anchor(self) func _draw() -> void: if not Engine.is_editor_hint(): return - if show_camera_preview and is_instance_valid(_pcam_manager): + if show_camera_preview: draw_rect( - _camera_frame_rect_like_phantom(), + _camera_frame_rect_draw(), preview_color, false, preview_line_width @@ -117,27 +117,42 @@ func _camera_limit_rect() -> Rect2: return Rect2(pos, size) -func _camera_frame_rect_like_phantom() -> Rect2: - # PhantomCamera 使用的是 manager.screen_size - var screen_size: Vector2 = _pcam_manager.screen_size +func _camera_frame_rect_draw() -> Rect2: + var cg = _get_camera_global() + if cg: + var screen_size: Vector2 = cg.get_screen_size() - var z := zoom - z.x = maxf(z.x, 0.001) - z.y = maxf(z.y, 0.001) + var z := zoom + z.x = maxf(z.x, 0.001) + z.y = maxf(z.y, 0.001) - var size := Vector2( - screen_size.x / z.x, - screen_size.y / z.y - ) + var size := Vector2( + screen_size.x / z.x, + screen_size.y / z.y + ) - # PhantomCamera：以自身为中心 - return Rect2(-size * 0.5, size) + # PhantomCamera：以自身为中心 + return Rect2(-size * 0.5, size) + + print("沒有找到全局相機") + return Rect2(Vector2.ZERO,Vector2.ZERO) func _runtime_ready() -> void: _priority = priority +##内部懶加載全局相機管理器 +func _get_camera_global() -> Object: + if _camera_global: + return _camera_global + + if Engine.has_singleton(_CONSTANTS.CAMERA_SYSTEM_NAME): + _camera_global = Engine.get_singleton(_CONSTANTS.CAMERA_SYSTEM_NAME) + print("") + + return _camera_global + func push_camera() -> void: - CameraSystem.reset_all_camera_priority() + #CameraSystem.reset_all_camera_priority() _priority = 1000 func pop_camera() -> void: diff --git a/_shared/camera/CameraAnchor.gd.uid b/addons/reedcamera/scripts/CameraAnchor.gd.uid similarity index 100% rename from _shared/camera/CameraAnchor.gd.uid rename to addons/reedcamera/scripts/CameraAnchor.gd.uid diff --git a/addons/reedcamera/scripts/ReedCameraGlobal.gd b/addons/reedcamera/scripts/ReedCameraGlobal.gd new file mode 100644 index 0000000..5b217d1 --- /dev/null +++ b/addons/reedcamera/scripts/ReedCameraGlobal.gd @@ -0,0 +1,34 @@ +@tool +extends Node + +const _CONSTANTS = preload("res://addons/reedcamera/_data/CameraSystemConst.gd") + +var _screen_size : Vector2i + +func _enter_tree() -> void: + if not Engine.has_singleton(_CONSTANTS.CAMERA_SYSTEM_NAME): + Engine.register_singleton(_CONSTANTS.CAMERA_SYSTEM_NAME, self) + +func _ready() -> void: + # Setting default screensize + _screen_size = Vector2i( + ProjectSettings.get_setting("display/window/size/viewport_width"), + ProjectSettings.get_setting("display/window/size/viewport_height") + ) + + # For editor + if Engine.is_editor_hint(): + ProjectSettings.settings_changed.connect(func(): + _screen_size = Vector2i( + ProjectSettings.get_setting("display/window/size/viewport_width"), + ProjectSettings.get_setting("display/window/size/viewport_height") + ) + ) + # For runtime + else: + get_tree().get_root().size_changed.connect(func(): + _screen_size = get_viewport().get_visible_rect().size + ) + +func get_screen_size() -> Vector2i: + return _screen_size diff --git a/addons/reedcamera/scripts/ReedCameraGlobal.gd.uid b/addons/reedcamera/scripts/ReedCameraGlobal.gd.uid new file mode 100644 index 0000000..fd68bd2 --- /dev/null +++ b/addons/reedcamera/scripts/ReedCameraGlobal.gd.uid @@ -0,0 +1 @@ +uid://dqtfis2553nhn diff --git a/project.godot b/project.godot index 53652a9..79fd9e2 100644 --- a/project.godot +++ b/project.godot @@ -10,15 +10,16 @@ config_version=5 [application] -config/name="PhantomAgnes" +config/name="godot-plateformer" run/main_scene="uid://3vc8ojbiyy5w" config/features=PackedStringArray("4.5", "Forward Plus") config/icon="res://icon.svg" [autoload] -CameraSystem="*res://_shared/camera/CameraSystem.tscn" -GlobalEvent="*res://_shared/global_event.gd" +ReedCameraSystem="*res://addons/reedcamera/scripts/ReedCameraGlobal.gd" +CameraSystem="*res://_camera/CameraSystem.tscn" +GlobalEvent="*res://_shared/GlobalEvent.gd" ReedVFX="*res://addons/reedfx/vfx/ReedVFXSystem.tscn" ReedSceneRegistry="*res://addons/reedscene/scene/SceneRegistry.gd" @@ -32,7 +33,7 @@ window/stretch/mode="canvas_items" [editor_plugins] -enabled=PackedStringArray("res://addons/reedcomponent/plugin.cfg", "res://addons/reedfx/plugin.cfg", "res://addons/reedinput/plugin.cfg", "res://addons/reedscene/plugin.cfg") +enabled=PackedStringArray("res://addons/reedcamera/plugin.cfg", "res://addons/reedcomponent/plugin.cfg", "res://addons/reedfx/plugin.cfg", "res://addons/reedinput/plugin.cfg", "res://addons/reedscene/plugin.cfg") [file_customization] @@ -42,9 +43,8 @@ folder_colors={ [global_group] -ROOM="房间分组，其下存在所有的Room" PLAYER="玩家分组，其下只存在玩家控制器" -GRAPABLE="" +GRAPABLE="進入該分組的Collision視爲可以被玩家抓握" PLAYER_RESPAWN="所有的PlayerRespawnPoint的绑定Group" [input]