From 9f85b82133365f00938a5751c546f7d4d863eb2d Mon Sep 17 00:00:00 2001 From: Nordup Date: Wed, 18 Sep 2024 21:01:48 +0400 Subject: [PATCH] changing filter in render result, fix empty exit_gate --- app/scenes/menu_body/world.tscn | 5 +++-- app/scripts/api/analytics/analytics_sender_gate.gd | 2 ++ app/scripts/ui/world/world_ui.gd | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/scenes/menu_body/world.tscn b/app/scenes/menu_body/world.tscn index 2b54c4c..5efae97 100644 --- a/app/scenes/menu_body/world.tscn +++ b/app/scenes/menu_body/world.tscn @@ -276,7 +276,7 @@ _data = { "initial": SubResource("Animation_77flb") } -[node name="World" type="Control"] +[node name="World" type="Control" node_paths=PackedStringArray("render_result")] layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 @@ -289,6 +289,7 @@ script = ExtResource("12_jdwjt") ui_events = ExtResource("9_ir58h") gate_events = ExtResource("2_q7cvi") command_events = ExtResource("6_18mgg") +render_result = NodePath("HBoxContainer/WorldCanvas/RenderResult") [node name="GateLoader" type="Node" parent="."] script = ExtResource("1_uxhy6") @@ -336,7 +337,7 @@ ui_events = ExtResource("9_ir58h") splash_screen = ExtResource("10_23bjc") [node name="RenderResult" type="TextureRect" parent="HBoxContainer/WorldCanvas"] -texture_filter = 1 +texture_filter = 2 material = SubResource("ShaderMaterial_be6ex") layout_mode = 1 anchors_preset = 15 diff --git a/app/scripts/api/analytics/analytics_sender_gate.gd b/app/scripts/api/analytics/analytics_sender_gate.gd index 816a234..9b82a8a 100644 --- a/app/scripts/api/analytics/analytics_sender_gate.gd +++ b/app/scripts/api/analytics/analytics_sender_gate.gd @@ -43,6 +43,8 @@ func send_gate_enter() -> void: func send_gate_exit() -> void: + if gate_url.is_empty(): return + var time_spend = int(Time.get_ticks_msec() / 1000) - gate_open_time analytics.send_event(AnalyticsEvents.gate_exit(gate_url, time_spend)) gate_url = "" diff --git a/app/scripts/ui/world/world_ui.gd b/app/scripts/ui/world/world_ui.gd index d081189..731bb50 100644 --- a/app/scripts/ui/world/world_ui.gd +++ b/app/scripts/ui/world/world_ui.gd @@ -3,6 +3,7 @@ extends Control @export var ui_events: UiEvents @export var gate_events: GateEvents @export var command_events: CommandEvents +@export var render_result: RenderResult var mouse_mode: int = Input.MOUSE_MODE_VISIBLE var _visible: bool = true @@ -32,6 +33,7 @@ func show_ui() -> void: Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE) ui_events.ui_mode_changed_emit(UiEvents.UiMode.INITIAL) + render_result.texture_filter = CanvasItem.TEXTURE_FILTER_LINEAR func hide_ui() -> void: @@ -40,3 +42,4 @@ func hide_ui() -> void: Input.set_mouse_mode(mouse_mode) ui_events.ui_mode_changed_emit(UiEvents.UiMode.FULL_SCREEN) + render_result.texture_filter = CanvasItem.TEXTURE_FILTER_NEAREST