From 722dca31a7fb360fc42341ec793ff6b22da89807 Mon Sep 17 00:00:00 2001 From: Nitwel Date: Thu, 2 May 2024 11:02:47 +0200 Subject: [PATCH] improve mini view --- app/content/entities/timer/timer.tscn | 8 ++++---- app/content/entities/weather/weather.tscn | 2 +- app/content/system/dot/dot.tscn | 2 ++ app/content/system/house/mini/mini_wall.tres | 2 +- app/content/system/house/mini/miniature.gd | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/content/entities/timer/timer.tscn b/app/content/entities/timer/timer.tscn index 1f25692..1eba549 100644 --- a/app/content/entities/timer/timer.tscn +++ b/app/content/entities/timer/timer.tscn @@ -10,7 +10,7 @@ [sub_resource type="BoxShape3D" id="BoxShape3D_3qyo4"] size = Vector3(0.32, 0.16, 0.02) -[sub_resource type="ShaderMaterial" id="ShaderMaterial_mq5r1"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_h0yvw"] resource_local_to_scene = true render_priority = 10 shader = ExtResource("6_40cd1") @@ -25,7 +25,7 @@ shader_parameter/corner_radius = 0.8 shader_parameter/roughness = 0.3 shader_parameter/grain_amount = 0.02 -[sub_resource type="QuadMesh" id="QuadMesh_x7s0p"] +[sub_resource type="QuadMesh" id="QuadMesh_a23j8"] size = Vector2(0.32, 0.16) [node name="Timer" type="StaticBody3D" groups=["entity"]] @@ -78,7 +78,7 @@ label = "stop" icon = true [node name="Panel" parent="." instance=ExtResource("5_j3gsb")] -material_override = SubResource("ShaderMaterial_mq5r1") -mesh = SubResource("QuadMesh_x7s0p") +material_override = SubResource("ShaderMaterial_h0yvw") +mesh = SubResource("QuadMesh_a23j8") size = Vector2(0.32, 0.16) corner_radius = 0.8 diff --git a/app/content/entities/weather/weather.tscn b/app/content/entities/weather/weather.tscn index b49b3a3..1123a29 100644 --- a/app/content/entities/weather/weather.tscn +++ b/app/content/entities/weather/weather.tscn @@ -30427,7 +30427,7 @@ pixel_size = 0.001 render_priority = 15 sprite_frames = SubResource("SpriteFrames_71wxj") animation = &"sleet" -frame_progress = 0.23404 +frame_progress = 0.689981 [node name="WeatherLabel" type="Label3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.05, 0.02, 0) diff --git a/app/content/system/dot/dot.tscn b/app/content/system/dot/dot.tscn index 5d307ed..58ceac5 100644 --- a/app/content/system/dot/dot.tscn +++ b/app/content/system/dot/dot.tscn @@ -20,6 +20,8 @@ shape = SubResource("SphereShape3D_3wgjq") [node name="Label3D" type="Label3D" parent="."] pixel_size = 0.002 billboard = 1 +render_priority = 15 +outline_render_priority = 14 text = "lightbulb" font = ExtResource("4_504vw") font_size = 100 diff --git a/app/content/system/house/mini/mini_wall.tres b/app/content/system/house/mini/mini_wall.tres index c2f5e4d..1ae9ebb 100644 --- a/app/content/system/house/mini/mini_wall.tres +++ b/app/content/system/house/mini/mini_wall.tres @@ -4,7 +4,7 @@ [ext_resource type="Texture2D" uid="uid://bbuq4wn7e5o2q" path="res://content/system/house/mini/temp_gradient.tres" id="2_3lwi8"] [resource] -render_priority = 10 +render_priority = 9 shader = ExtResource("1_sbr3e") shader_parameter/data = PackedFloat32Array() shader_parameter/data_size = 0 diff --git a/app/content/system/house/mini/miniature.gd b/app/content/system/house/mini/miniature.gd index 70d0e26..b35e403 100644 --- a/app/content/system/house/mini/miniature.gd +++ b/app/content/system/house/mini/miniature.gd @@ -31,7 +31,7 @@ var base_scale = { HeatmapType.HUMIDITY: Vector2(0.0, 100.0) } var selected_scale = R.state(Vector2(0.0, 1.0)) -var opacity = R.state(30) +var opacity = R.state(70) var heatmap_type = R.state(HeatmapType.NONE) var small = R.state(false) @@ -106,7 +106,7 @@ func _ready(): camera_position.y *= 0.5 camera_direction.y=0 - var target_position=camera_position + camera_direction.normalized() * 0.2 + var target_position=camera_position + camera_direction.normalized() * 0.5 var new_position=target_position - center * 0.1 tween.tween_property(small_node, "scale", Vector3(0.1, 0.1, 0.1), 0.5)