From a425f6226722a374204a701a3aa846aec3bdfaa5 Mon Sep 17 00:00:00 2001 From: Rendo Date: Mon, 15 Dec 2025 08:44:19 +0500 Subject: [PATCH] Colors --- assets/substances/MethylOrange.tres | 1 + assets/substances/Phenolphtalein.tres | 1 + project.godot | 3 ++- scenes/flask.tscn | 9 ++++++++- src/inventory.gd | 6 +++--- src/resources/substance.gd | 1 + src/runtime_substance_data.gd | 7 +++++++ src/runtime_substance_data.gd.uid | 1 + src/substance_holder.gd | 2 +- 9 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 src/runtime_substance_data.gd create mode 100644 src/runtime_substance_data.gd.uid diff --git a/assets/substances/MethylOrange.tres b/assets/substances/MethylOrange.tres index fe25dc5..85cbf9a 100644 --- a/assets/substances/MethylOrange.tres +++ b/assets/substances/MethylOrange.tres @@ -10,4 +10,5 @@ melting_point = 300.0 boiling_point = 520.0 color = Color(1, 0.26666665, 0, 1) prefer_scientific_name = true +is_solution = true metadata/_custom_type_script = "uid://b8q5buwgvppyh" diff --git a/assets/substances/Phenolphtalein.tres b/assets/substances/Phenolphtalein.tres index b89fb80..6d71db1 100644 --- a/assets/substances/Phenolphtalein.tres +++ b/assets/substances/Phenolphtalein.tres @@ -10,4 +10,5 @@ melting_point = 278.0 boiling_point = 557.8 color = Color(1, 1, 1, 0.43529412) prefer_scientific_name = true +is_solution = true metadata/_custom_type_script = "uid://b8q5buwgvppyh" diff --git a/project.godot b/project.godot index 1af40d1..677580d 100644 --- a/project.godot +++ b/project.godot @@ -36,4 +36,5 @@ drag_camera={ [rendering] -renderer/rendering_method="mobile" +renderer/rendering_method="gl_compatibility" +renderer/rendering_method.mobile="gl_compatibility" diff --git a/scenes/flask.tscn b/scenes/flask.tscn index ede41ea..e1a9c60 100644 --- a/scenes/flask.tscn +++ b/scenes/flask.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=3 uid="uid://bjxjcx2qu16q5"] +[gd_scene load_steps=12 format=3 uid="uid://bjxjcx2qu16q5"] [ext_resource type="Script" uid="uid://bjnv2g1ni0525" path="res://src/drag/draggable_object.gd" id="1_0xufn"] [ext_resource type="PackedScene" uid="uid://b6ydpkle2ol20" path="res://assets/models/FlaskNew.glb" id="2_h7awq"] @@ -6,6 +6,7 @@ [ext_resource type="Script" uid="uid://ctu7escah5lo1" path="res://src/interactible/interaction_source.gd" id="4_kkw7a"] [ext_resource type="Script" uid="uid://e8xu57ewvb5a" path="res://src/interactible/proximity_rotator.gd" id="5_rqua0"] [ext_resource type="Script" uid="uid://dteb2xxl8gixp" path="res://src/ui/slider_display.gd" id="6_wadb5"] +[ext_resource type="Script" uid="uid://82ettbegollp" path="res://src/inventory.gd" id="7_h7awq"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_vcwhe"] radius = 0.1 @@ -86,6 +87,12 @@ suffix = "%" layout_mode = 2 size_flags_horizontal = 3 +[node name="Inventory" type="Node" parent="."] +unique_name_in_owner = true +script = ExtResource("7_h7awq") +open_on_top = true +metadata/_custom_type_script = "uid://82ettbegollp" + [connection signal="drag_ended" from="." to="InteractionArea" method="request_interaction"] [connection signal="interaction_reciever_entered" from="InteractionArea" to="ProximityRotator" method="_on_interaction_area_interaction_reciever_entered"] [connection signal="interaction_reciever_exited" from="InteractionArea" to="ProximityRotator" method="_on_interaction_area_interaction_reciever_exited"] diff --git a/src/inventory.gd b/src/inventory.gd index 3f0798a..11606db 100644 --- a/src/inventory.gd +++ b/src/inventory.gd @@ -1,6 +1,6 @@ extends Node +class_name Inventory + @export var open_on_top: bool -var liquids -var solids -var gasses +var inventory: Array[RuntimeSubstanceData] diff --git a/src/resources/substance.gd b/src/resources/substance.gd index 40f17fb..7f76033 100644 --- a/src/resources/substance.gd +++ b/src/resources/substance.gd @@ -8,6 +8,7 @@ class_name Substance @export var boiling_point: float @export var color: Color @export var prefer_scientific_name: bool +@export var is_solution: bool func get_formula() -> StringName: return scientific_name if prefer_scientific_name else formula diff --git a/src/runtime_substance_data.gd b/src/runtime_substance_data.gd new file mode 100644 index 0000000..2ff1edc --- /dev/null +++ b/src/runtime_substance_data.gd @@ -0,0 +1,7 @@ +extends RefCounted + +class_name RuntimeSubstanceData + +var substance: Substance +var amount: float +var temperature: float = 20.0 diff --git a/src/runtime_substance_data.gd.uid b/src/runtime_substance_data.gd.uid new file mode 100644 index 0000000..8f2bb16 --- /dev/null +++ b/src/runtime_substance_data.gd.uid @@ -0,0 +1 @@ +uid://coq5iah4er0lc diff --git a/src/substance_holder.gd b/src/substance_holder.gd index 8f1b675..7bffcb7 100644 --- a/src/substance_holder.gd +++ b/src/substance_holder.gd @@ -7,5 +7,5 @@ func _ready() -> void: if substance: var jar_fill_material = $"../JarFill".material_override jar_fill_material.albedo_color = substance.color - if substance.melting_point > 20: + if substance.melting_point > 20 and not substance.is_solution: jar_fill_material.albedo_texture = preload("res://assets/textures/solid.png")