feat: new models, fixed popup containers

assets/materials/mat_fluid.tres

@@ -0,0 +1,12 @@
+[gd_resource type="ShaderMaterial" format=3 uid="uid://dl0lyxgl6wmtp"]
+
+[ext_resource type="Shader" uid="uid://djb4t6pw03tow" path="res://shaders/fluid.gdshader" id="1_6yqam"]
+
+[resource]
+resource_local_to_scene = true
+render_priority = 0
+shader = ExtResource("1_6yqam")
+shader_parameter/albedo_color = Color(0, 0, 0, 1)
+shader_parameter/fill = 0.0
+shader_parameter/wave_intensity = 0.0
+shader_parameter/remap_for_mesh = false

assets/materials/mat_glass.tres

@@ -6,3 +6,7 @@ transparency = 4
 cull_mode = 2
 albedo_color = Color(0.9063318, 0.9063318, 0.9063318, 0.25)
 roughness = 0.0
+rim_enabled = true
+rim = 0.05
+clearcoat_enabled = true
+refraction_scale = -0.22

assets/materials/mat_metal.tres

@@ -4,3 +4,7 @@
 albedo_color = Color(0.5689727, 0.56897277, 0.5689727, 1)
 metallic = 1.0
 roughness = 0.59
+anisotropy_enabled = true
+anisotropy = 0.4
+ao_light_affect = 1.0
+stencil_flags = 2

assets/models/BigFlask.glb.import

@@ -0,0 +1,45 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://cvnsptgj1pkhj"
+path="res://.godot/imported/BigFlask.glb-f337251fae0672db3f1f3be331175d23.scn"
+
+[deps]
+
+source_file="res://assets/models/BigFlask.glb"
+dest_files=["res://.godot/imported/BigFlask.glb-f337251fae0672db3f1f3be331175d23.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/root_script=null
+mesh_library/use_node_names_as_mesh_names=false
+array_mesh/deduplicate_surfaces=true
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+nodes/use_name_suffixes=true
+nodes/use_node_type_suffixes=true
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+materials/extract=0
+materials/extract_format=0
+materials/extract_path=""
+_subresources={}
+gltf/naming_version=2
+gltf/embedded_image_handling=1
+gltf/texture_map_mode=1

assets/models/Buretka.glb.import

@@ -0,0 +1,62 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://hki6yjhrgpsl"
+path="res://.godot/imported/Buretka.glb-fcf890692b1ac4b4bc0b9cafee3fc0c5.scn"
+
+[deps]
+
+source_file="res://assets/models/Buretka.glb"
+dest_files=["res://.godot/imported/Buretka.glb-fcf890692b1ac4b4bc0b9cafee3fc0c5.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/root_script=null
+mesh_library/use_node_names_as_mesh_names=false
+array_mesh/deduplicate_surfaces=true
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+nodes/use_name_suffixes=true
+nodes/use_node_type_suffixes=true
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+materials/extract=0
+materials/extract_format=0
+materials/extract_path=""
+_subresources={
+"materials": {
+"@MATERIAL:2": {
+"use_external/enabled": true,
+"use_external/path": "uid://64m17act0kwu"
+},
+"Fluid": {
+"use_external/enabled": true,
+"use_external/fallback_path": "res://assets/materials/mat_fluid.tres",
+"use_external/path": "uid://dl0lyxgl6wmtp"
+},
+"Glass": {
+"use_external/enabled": true,
+"use_external/fallback_path": "res://assets/materials/mat_glass.tres",
+"use_external/path": "uid://64m17act0kwu"
+}
+}
+}
+gltf/naming_version=2
+gltf/embedded_image_handling=1
+gltf/texture_map_mode=1

assets/models/Burner.glb.import

@@ -0,0 +1,62 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://dy3qofc76rm13"
+path="res://.godot/imported/Burner.glb-2bccac84191d819fef2d0e9655ddc4f5.scn"
+
+[deps]
+
+source_file="res://assets/models/Burner.glb"
+dest_files=["res://.godot/imported/Burner.glb-2bccac84191d819fef2d0e9655ddc4f5.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/root_script=null
+mesh_library/use_node_names_as_mesh_names=false
+array_mesh/deduplicate_surfaces=true
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+nodes/use_name_suffixes=true
+nodes/use_node_type_suffixes=true
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+materials/extract=0
+materials/extract_format=0
+materials/extract_path=""
+_subresources={
+"materials": {
+"@MATERIAL:2": {
+"use_external/enabled": true,
+"use_external/path": "uid://64m17act0kwu"
+},
+"mat_glass": {
+"use_external/enabled": true,
+"use_external/fallback_path": "res://assets/materials/mat_glass.tres",
+"use_external/path": "uid://64m17act0kwu"
+},
+"nat_metal2": {
+"use_external/enabled": true,
+"use_external/fallback_path": "res://assets/materials/mat_metal.tres",
+"use_external/path": "uid://b2h6brwubdafv"
+}
+}
+}
+gltf/naming_version=2
+gltf/embedded_image_handling=1
+gltf/texture_map_mode=1

assets/models/ChemicalBottle.glb.import

@@ -0,0 +1,45 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://d0biw0xdewmvj"
+path="res://.godot/imported/ChemicalBottle.glb-08d78faf7335679f5838b9a3d7cacddb.scn"
+
+[deps]
+
+source_file="res://assets/models/ChemicalBottle.glb"
+dest_files=["res://.godot/imported/ChemicalBottle.glb-08d78faf7335679f5838b9a3d7cacddb.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/root_script=null
+mesh_library/use_node_names_as_mesh_names=false
+array_mesh/deduplicate_surfaces=true
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+nodes/use_name_suffixes=true
+nodes/use_node_type_suffixes=true
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+materials/extract=0
+materials/extract_format=0
+materials/extract_path=""
+_subresources={}
+gltf/naming_version=2
+gltf/embedded_image_handling=1
+gltf/texture_map_mode=1

assets/models/Chemistry.glb.import

@@ -1,110 +0,0 @@
-[remap]
-
-importer="scene"
-importer_version=1
-type="PackedScene"
-uid="uid://bx5wihgk668w1"
-path="res://.godot/imported/Chemistry.glb-8fa27a23d9fb0d06abbb958b7e8c5388.scn"
-
-[deps]
-
-source_file="res://assets/models/Chemistry.glb"
-dest_files=["res://.godot/imported/Chemistry.glb-8fa27a23d9fb0d06abbb958b7e8c5388.scn"]
-
-[params]
-
-nodes/root_type=""
-nodes/root_name=""
-nodes/root_script=null
-nodes/apply_root_scale=true
-nodes/root_scale=1.0
-nodes/import_as_skeleton_bones=false
-nodes/use_name_suffixes=true
-nodes/use_node_type_suffixes=true
-meshes/ensure_tangents=true
-meshes/generate_lods=true
-meshes/create_shadow_meshes=true
-meshes/light_baking=1
-meshes/lightmap_texel_size=0.2
-meshes/force_disable_compression=false
-skins/use_named_skins=true
-animation/import=true
-animation/fps=30
-animation/trimming=false
-animation/remove_immutable_tracks=true
-animation/import_rest_as_RESET=false
-import_script/path=""
-materials/extract=0
-materials/extract_format=0
-materials/extract_path=""
-_subresources={
-"materials": {
-"@MATERIAL:3": {
-"use_external/enabled": true,
-"use_external/path": "uid://64m17act0kwu"
-},
-"mat_glass": {
-"use_external/enabled": true,
-"use_external/fallback_path": "res://assets/materials/mat_glass.tres",
-"use_external/path": "uid://64m17act0kwu"
-}
-},
-"meshes": {
-"Chemistry_Circle_001": {
-"generate/lightmap_uv": 0,
-"generate/lods": 0,
-"generate/shadow_meshes": 0,
-"lods/normal_merge_angle": 20.0,
-"save_to_file/enabled": true,
-"save_to_file/fallback_path": "res://assets/meshes/jar_fill.res",
-"save_to_file/path": "uid://dxeseuqcwne1m"
-},
-"Chemistry_Circle_003": {
-"generate/lightmap_uv": 0,
-"generate/lods": 0,
-"generate/shadow_meshes": 0,
-"lods/normal_merge_angle": 20.0,
-"save_to_file/enabled": true,
-"save_to_file/fallback_path": "res://assets/meshes/jar.res",
-"save_to_file/path": "uid://dddqboph2ygmw"
-},
-"Chemistry_Sphere_001": {
-"generate/lightmap_uv": 0,
-"generate/lods": 0,
-"generate/shadow_meshes": 0,
-"lods/normal_merge_angle": 20.0,
-"save_to_file/enabled": true,
-"save_to_file/fallback_path": "res://assets/meshes/spoon.res",
-"save_to_file/path": "uid://cdvben7q8oxgf"
-},
-"Chemistry_Sphere_003": {
-"generate/lightmap_uv": 0,
-"generate/lods": 0,
-"generate/shadow_meshes": 0,
-"lods/normal_merge_angle": 20.0,
-"save_to_file/enabled": true,
-"save_to_file/fallback_path": "res://assets/meshes/big_flask_fill.res",
-"save_to_file/path": "uid://q71x8vx4dkis"
-},
-"Chemistry_Sphere_004": {
-"generate/lightmap_uv": 0,
-"generate/lods": 0,
-"generate/shadow_meshes": 0,
-"lods/normal_merge_angle": 20.0,
-"save_to_file/enabled": true,
-"save_to_file/fallback_path": "res://assets/meshes/big_flask.res",
-"save_to_file/path": "uid://bsigmbc20m6pn"
-},
-"Chemistry_Sphere_005": {
-"generate/lightmap_uv": 0,
-"generate/lods": 0,
-"generate/shadow_meshes": 0,
-"lods/normal_merge_angle": 20.0,
-"save_to_file/enabled": true,
-"save_to_file/fallback_path": "res://assets/meshes/spoon_fill.res",
-"save_to_file/path": "uid://n4ibk6y8t7h3"
-}
-}
-}
-gltf/naming_version=2
-gltf/embedded_image_handling=1

assets/models/Cylinder.glb.import

@@ -0,0 +1,58 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://ywpr88b2rtwu"
+path="res://.godot/imported/Cylinder.glb-ae0ab36716a808850d1320b06205bce0.scn"
+
+[deps]
+
+source_file="res://assets/models/Cylinder.glb"
+dest_files=["res://.godot/imported/Cylinder.glb-ae0ab36716a808850d1320b06205bce0.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/root_script=null
+mesh_library/use_node_names_as_mesh_names=false
+array_mesh/deduplicate_surfaces=true
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+nodes/use_name_suffixes=true
+nodes/use_node_type_suffixes=true
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+materials/extract=0
+materials/extract_format=0
+materials/extract_path=""
+_subresources={
+"materials": {
+"Fluid": {
+"use_external/enabled": true,
+"use_external/fallback_path": "res://assets/materials/mat_fluid.tres",
+"use_external/path": "uid://dl0lyxgl6wmtp"
+},
+"Glass": {
+"use_external/enabled": true,
+"use_external/fallback_path": "res://assets/materials/mat_glass.tres",
+"use_external/path": "uid://64m17act0kwu"
+}
+}
+}
+gltf/naming_version=2
+gltf/embedded_image_handling=1
+gltf/texture_map_mode=1

assets/models/Glass.glb.import

@@ -0,0 +1,45 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://bhl1mrm626kup"
+path="res://.godot/imported/Glass.glb-49313b40e00c22fcac9cdf3252eda971.scn"
+
+[deps]
+
+source_file="res://assets/models/Glass.glb"
+dest_files=["res://.godot/imported/Glass.glb-49313b40e00c22fcac9cdf3252eda971.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/root_script=null
+mesh_library/use_node_names_as_mesh_names=false
+array_mesh/deduplicate_surfaces=true
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+nodes/use_name_suffixes=true
+nodes/use_node_type_suffixes=true
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+materials/extract=0
+materials/extract_format=0
+materials/extract_path=""
+_subresources={}
+gltf/naming_version=2
+gltf/embedded_image_handling=1
+gltf/texture_map_mode=1

assets/models/Holder.glb.import

@@ -0,0 +1,45 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://cvu53tuyy1j5w"
+path="res://.godot/imported/Holder.glb-44e63a9eb0eb8fdc7fb783f81e41f9f1.scn"
+
+[deps]
+
+source_file="res://assets/models/Holder.glb"
+dest_files=["res://.godot/imported/Holder.glb-44e63a9eb0eb8fdc7fb783f81e41f9f1.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/root_script=null
+mesh_library/use_node_names_as_mesh_names=false
+array_mesh/deduplicate_surfaces=true
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+nodes/use_name_suffixes=true
+nodes/use_node_type_suffixes=true
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+materials/extract=0
+materials/extract_format=0
+materials/extract_path=""
+_subresources={}
+gltf/naming_version=2
+gltf/embedded_image_handling=1
+gltf/texture_map_mode=1

assets/models/Jar.glb.import

@@ -0,0 +1,45 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://doyfucxvjnpif"
+path="res://.godot/imported/Jar.glb-e2505bcdeb56a40300586541c985bcaa.scn"
+
+[deps]
+
+source_file="res://assets/models/Jar.glb"
+dest_files=["res://.godot/imported/Jar.glb-e2505bcdeb56a40300586541c985bcaa.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/root_script=null
+mesh_library/use_node_names_as_mesh_names=false
+array_mesh/deduplicate_surfaces=true
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+nodes/use_name_suffixes=true
+nodes/use_node_type_suffixes=true
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+materials/extract=0
+materials/extract_format=0
+materials/extract_path=""
+_subresources={}
+gltf/naming_version=2
+gltf/embedded_image_handling=1
+gltf/texture_map_mode=1

assets/models/Pipette.glb.import

@@ -0,0 +1,58 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://dygs35xtllb3"
+path="res://.godot/imported/Pipette.glb-e5c5cac5890699ef600f6b7ac9f6338e.scn"
+
+[deps]
+
+source_file="res://assets/models/Pipette.glb"
+dest_files=["res://.godot/imported/Pipette.glb-e5c5cac5890699ef600f6b7ac9f6338e.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/root_script=null
+mesh_library/use_node_names_as_mesh_names=false
+array_mesh/deduplicate_surfaces=true
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+nodes/use_name_suffixes=true
+nodes/use_node_type_suffixes=true
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+materials/extract=0
+materials/extract_format=0
+materials/extract_path=""
+_subresources={
+"materials": {
+"Fluid": {
+"use_external/enabled": true,
+"use_external/fallback_path": "res://assets/materials/mat_fluid.tres",
+"use_external/path": "uid://dl0lyxgl6wmtp"
+},
+"Glass": {
+"use_external/enabled": true,
+"use_external/fallback_path": "res://assets/materials/mat_glass.tres",
+"use_external/path": "uid://64m17act0kwu"
+}
+}
+}
+gltf/naming_version=2
+gltf/embedded_image_handling=1
+gltf/texture_map_mode=1

assets/models/Plate.glb.import

@@ -0,0 +1,45 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://b1mtw7de7pcsc"
+path="res://.godot/imported/Plate.glb-323fd6697b2e4cb3875f352cbb2eb40c.scn"
+
+[deps]
+
+source_file="res://assets/models/Plate.glb"
+dest_files=["res://.godot/imported/Plate.glb-323fd6697b2e4cb3875f352cbb2eb40c.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/root_script=null
+mesh_library/use_node_names_as_mesh_names=false
+array_mesh/deduplicate_surfaces=true
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+nodes/use_name_suffixes=true
+nodes/use_node_type_suffixes=true
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+materials/extract=0
+materials/extract_format=0
+materials/extract_path=""
+_subresources={}
+gltf/naming_version=2
+gltf/embedded_image_handling=1
+gltf/texture_map_mode=1

assets/models/Spoon.glb.import

@@ -0,0 +1,45 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://c4oalb6kr7b4k"
+path="res://.godot/imported/Spoon.glb-6ee7757fd7415a89197b9c0fbf683591.scn"
+
+[deps]
+
+source_file="res://assets/models/Spoon.glb"
+dest_files=["res://.godot/imported/Spoon.glb-6ee7757fd7415a89197b9c0fbf683591.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/root_script=null
+mesh_library/use_node_names_as_mesh_names=false
+array_mesh/deduplicate_surfaces=true
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+nodes/use_name_suffixes=true
+nodes/use_node_type_suffixes=true
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+materials/extract=0
+materials/extract_format=0
+materials/extract_path=""
+_subresources={}
+gltf/naming_version=2
+gltf/embedded_image_handling=1
+gltf/texture_map_mode=1

assets/models/Wash.glb.import

@@ -0,0 +1,45 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://dp03knoewdjw0"
+path="res://.godot/imported/Wash.glb-da6ba355b6ea2ba3ac29a7d7c1aaea83.scn"
+
+[deps]
+
+source_file="res://assets/models/Wash.glb"
+dest_files=["res://.godot/imported/Wash.glb-da6ba355b6ea2ba3ac29a7d7c1aaea83.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/root_script=null
+mesh_library/use_node_names_as_mesh_names=false
+array_mesh/deduplicate_surfaces=true
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+nodes/use_name_suffixes=true
+nodes/use_node_type_suffixes=true
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+materials/extract=0
+materials/extract_format=0
+materials/extract_path=""
+_subresources={}
+gltf/naming_version=2
+gltf/embedded_image_handling=1
+gltf/texture_map_mode=1

assets/models/Weights.glb.import

@@ -0,0 +1,45 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://dnfqwy55mx68a"
+path="res://.godot/imported/Weights.glb-74a0e8bcdcb9e5e5a2d40bab05da4be3.scn"
+
+[deps]
+
+source_file="res://assets/models/Weights.glb"
+dest_files=["res://.godot/imported/Weights.glb-74a0e8bcdcb9e5e5a2d40bab05da4be3.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/root_script=null
+mesh_library/use_node_names_as_mesh_names=false
+array_mesh/deduplicate_surfaces=true
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+nodes/use_name_suffixes=true
+nodes/use_node_type_suffixes=true
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+materials/extract=0
+materials/extract_format=0
+materials/extract_path=""
+_subresources={}
+gltf/naming_version=2
+gltf/embedded_image_handling=1
+gltf/texture_map_mode=1

assets/source_models/ChemistryPack1.blend.import

@@ -0,0 +1,63 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://dqkomvsapshni"
+path="res://.godot/imported/ChemistryPack1.blend-979bb8ede97c7f45d70a391ca4e2a908.scn"
+
+[deps]
+
+source_file="res://assets/source_models/ChemistryPack1.blend"
+dest_files=["res://.godot/imported/ChemistryPack1.blend-979bb8ede97c7f45d70a391ca4e2a908.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/root_script=null
+mesh_library/use_node_names_as_mesh_names=false
+array_mesh/deduplicate_surfaces=true
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+nodes/use_name_suffixes=true
+nodes/use_node_type_suffixes=true
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+materials/extract=0
+materials/extract_format=0
+materials/extract_path=""
+_subresources={}
+blender/nodes/visible=0
+blender/nodes/active_collection_only=false
+blender/nodes/punctual_lights=true
+blender/nodes/cameras=true
+blender/nodes/custom_properties=true
+blender/nodes/modifiers=1
+blender/meshes/vertex_colors=1
+blender/meshes/uvs=true
+blender/meshes/normals=true
+blender/meshes/export_geometry_nodes_instances=false
+blender/meshes/gpu_instances=false
+blender/meshes/tangents=true
+blender/meshes/skins=2
+blender/meshes/export_bones_deforming_mesh_only=false
+blender/materials/unpack_enabled=true
+blender/materials/export_materials=1
+blender/animation/limit_playback=true
+blender/animation/always_sample=true
+blender/animation/group_tracks=true
+gltf/naming_version=2
+gltf/texture_map_mode=1

assets/source_models/ChemistryPack2.blend.import

@@ -0,0 +1,63 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://dg2nlsi7uist5"
+path="res://.godot/imported/ChemistryPack2.blend-2b9a925cd9aa8c3b21ddbd6273ebe978.scn"
+
+[deps]
+
+source_file="res://assets/source_models/ChemistryPack2.blend"
+dest_files=["res://.godot/imported/ChemistryPack2.blend-2b9a925cd9aa8c3b21ddbd6273ebe978.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/root_script=null
+mesh_library/use_node_names_as_mesh_names=false
+array_mesh/deduplicate_surfaces=true
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+nodes/use_name_suffixes=true
+nodes/use_node_type_suffixes=true
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+materials/extract=0
+materials/extract_format=0
+materials/extract_path=""
+_subresources={}
+blender/nodes/visible=0
+blender/nodes/active_collection_only=false
+blender/nodes/punctual_lights=true
+blender/nodes/cameras=true
+blender/nodes/custom_properties=true
+blender/nodes/modifiers=1
+blender/meshes/vertex_colors=1
+blender/meshes/uvs=true
+blender/meshes/normals=true
+blender/meshes/export_geometry_nodes_instances=false
+blender/meshes/gpu_instances=false
+blender/meshes/tangents=true
+blender/meshes/skins=2
+blender/meshes/export_bones_deforming_mesh_only=false
+blender/materials/unpack_enabled=true
+blender/materials/export_materials=1
+blender/animation/limit_playback=true
+blender/animation/always_sample=true
+blender/animation/group_tracks=true
+gltf/naming_version=2
+gltf/texture_map_mode=1

assets/source_models/ChemistryPack3.blend.import

@@ -0,0 +1,63 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://csuijece70l3w"
+path="res://.godot/imported/ChemistryPack3.blend-132e8477f2b87d6bf811aa2797eb9b8d.scn"
+
+[deps]
+
+source_file="res://assets/source_models/ChemistryPack3.blend"
+dest_files=["res://.godot/imported/ChemistryPack3.blend-132e8477f2b87d6bf811aa2797eb9b8d.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/root_script=null
+mesh_library/use_node_names_as_mesh_names=false
+array_mesh/deduplicate_surfaces=true
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+nodes/use_name_suffixes=true
+nodes/use_node_type_suffixes=true
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+materials/extract=0
+materials/extract_format=0
+materials/extract_path=""
+_subresources={}
+blender/nodes/visible=0
+blender/nodes/active_collection_only=false
+blender/nodes/punctual_lights=true
+blender/nodes/cameras=true
+blender/nodes/custom_properties=true
+blender/nodes/modifiers=1
+blender/meshes/vertex_colors=1
+blender/meshes/uvs=true
+blender/meshes/normals=true
+blender/meshes/export_geometry_nodes_instances=false
+blender/meshes/gpu_instances=false
+blender/meshes/tangents=true
+blender/meshes/skins=2
+blender/meshes/export_bones_deforming_mesh_only=false
+blender/materials/unpack_enabled=true
+blender/materials/export_materials=1
+blender/animation/limit_playback=true
+blender/animation/always_sample=true
+blender/animation/group_tracks=true
+gltf/naming_version=2
+gltf/texture_map_mode=1

assets/source_models/Spoon.glb.import

@@ -0,0 +1,45 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://bx1gfw8fwrmnv"
+path="res://.godot/imported/Spoon.glb-656742f2d9208cfa88874a4d0c99ba2b.scn"
+
+[deps]
+
+source_file="res://assets/source_models/Spoon.glb"
+dest_files=["res://.godot/imported/Spoon.glb-656742f2d9208cfa88874a4d0c99ba2b.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/root_script=null
+mesh_library/use_node_names_as_mesh_names=false
+array_mesh/deduplicate_surfaces=true
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+nodes/use_name_suffixes=true
+nodes/use_node_type_suffixes=true
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+materials/extract=0
+materials/extract_format=0
+materials/extract_path=""
+_subresources={}
+gltf/naming_version=2
+gltf/embedded_image_handling=1
+gltf/texture_map_mode=1

assets/substances/MethylOrange.tres

@@ -16,5 +16,4 @@ color_influence = 0.9
 color = Color(1, 0.26666665, 0, 1)
 pHColor = SubResource("Gradient_iruga")
 prefer_scientific_name = true
-is_solution = true
 metadata/_custom_type_script = "uid://b8q5buwgvppyh"

assets/substances/Phenolphtalein.tres

@@ -16,5 +16,4 @@ color_influence = 0.9
 color = Color(1, 1, 1, 0.43529412)
 pHColor = SubResource("Gradient_td2hf")
 prefer_scientific_name = true
-is_solution = true
 metadata/_custom_type_script = "uid://b8q5buwgvppyh"

scenes/flask.tscn

@@ -3,7 +3,7 @@
 [ext_resource type="Script" uid="uid://bjnv2g1ni0525" path="res://src/drag/draggable_object.gd" id="1_0xufn"]
 [ext_resource type="Material" uid="uid://64m17act0kwu" path="res://assets/materials/mat_glass.tres" id="2_dbm1u"]
 [ext_resource type="Script" uid="uid://dig825r70a0sn" path="res://src/substance_display.gd" id="3_0xufn"]
-[ext_resource type="Shader" uid="uid://djb4t6pw03tow" path="res://shaders/fluid.gdshader" id="4_ailwx"]
+[ext_resource type="Material" uid="uid://dl0lyxgl6wmtp" path="res://assets/materials/mat_fluid.tres" id="3_wadb5"]
 [ext_resource type="Script" uid="uid://bl0ojhc0thk1p" path="res://src/interactible/interactible.gd" id="4_dbm1u"]
 [ext_resource type="Texture2D" uid="uid://cw3jw8qbvj3fv" path="res://assets/textures/solid.png" id="4_h7awq"]
 [ext_resource type="Script" uid="uid://duirfi4j26g2i" path="res://src/interactible/flask_interaction.gd" id="5_pmegg"]
@@ -50,14 +50,6 @@ _surfaces = [{
 blend_shape_mode = 0
 shadow_mesh = SubResource("ArrayMesh_1ouf4")
 
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_ailwx"]
-resource_local_to_scene = true
-render_priority = 0
-shader = ExtResource("4_ailwx")
-shader_parameter/albedo_color = Color(0, 0, 0, 1)
-shader_parameter/fill = 0.0
-shader_parameter/wave_intensity = 0.0
-
 [sub_resource type="CylinderMesh" id="CylinderMesh_h7awq"]
 top_radius = 0.772
 bottom_radius = 0.772
@@ -120,7 +112,7 @@ skeleton = NodePath("")
 
 [node name="FillLiquid" type="MeshInstance3D" parent="Flash" unique_id=439339804 node_paths=PackedStringArray("particle_collision")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.8061247, 0)
-material_override = SubResource("ShaderMaterial_ailwx")
+material_override = ExtResource("3_wadb5")
 mesh = SubResource("CylinderMesh_h7awq")
 skeleton = NodePath("")
 script = ExtResource("3_0xufn")

scenes/flask_hold_area.tscn

@@ -11,7 +11,7 @@ transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 0, 0
 script = ExtResource("1_p5tus")
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="." unique_id=565290681]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.046020508, 0)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.486, 0)
 shape = SubResource("CylinderShape3D_ig37s")
 debug_color = Color(0, 0.5950001, 0.7, 1)
 

scenes/flask_holder.tscn

@@ -18,16 +18,16 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.32885742, 0)
 shape = SubResource("BoxShape3D_a7l4b")
 
 [node name="FlaskHoldArea" parent="." unique_id=1519161328 instance=ExtResource("2_ewrbt")]
-transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, -0.41687107, 0.45590642, 0.0024570525)
+transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, -0.41687107, 0.029960334, 0.0024570525)
 
 [node name="FlaskHoldArea2" parent="." unique_id=456473283 instance=ExtResource("2_ewrbt")]
-transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, -0.21569425, 0.45590642, 0.0024570525)
+transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, -0.21569425, 0.029960334, 0.0024570525)
 
 [node name="FlaskHoldArea3" parent="." unique_id=1702091089 instance=ExtResource("2_ewrbt")]
-transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 0.0042236447, 0.45590642, 0.0024570525)
+transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 0.0042236447, 0.029960334, 0.0024570525)
 
 [node name="FlaskHoldArea4" parent="." unique_id=939138817 instance=ExtResource("2_ewrbt")]
-transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 0.21210945, 0.45590642, 0.0024570525)
+transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 0.21210945, 0.029960334, 0.0024570525)
 
 [node name="FlaskHoldArea5" parent="." unique_id=568099085 instance=ExtResource("2_ewrbt")]
-transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 0.4127617, 0.45590642, 0.0024570525)
+transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 0.4127617, 0.029960334, 0.0024570525)

scenes/popup_container.tscn

@@ -1,8 +1,8 @@
-[gd_scene load_steps=2 format=3 uid="uid://bcj0mesdlfsfj"]
+[gd_scene format=3 uid="uid://bcj0mesdlfsfj"]
 
 [ext_resource type="Script" uid="uid://c4tsyohkw45p4" path="res://src/ui/popup_container.gd" id="1_xul1r"]
 
-[node name="PopupContainer" type="Panel"]
+[node name="PopupContainer" type="Panel" unique_id=1864257996]
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
@@ -11,7 +11,7 @@ grow_horizontal = 2
 grow_vertical = 2
 script = ExtResource("1_xul1r")
 
-[node name="ScrollContainer" type="ScrollContainer" parent="."]
+[node name="ScrollContainer" type="ScrollContainer" parent="." unique_id=1290239698]
 layout_mode = 1
 anchors_preset = -1
 anchor_right = 0.97900003
@@ -21,22 +21,21 @@ grow_horizontal = 2
 grow_vertical = 2
 horizontal_scroll_mode = 0
 
-[node name="VBoxContainer" type="VBoxContainer" parent="ScrollContainer"]
+[node name="VBoxContainer" type="VBoxContainer" parent="ScrollContainer" unique_id=1896392321]
 layout_mode = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
 
-[node name="Label" type="Label" parent="."]
+[node name="Label" type="Label" parent="." unique_id=1563593386]
 layout_mode = 1
 anchors_preset = -1
-anchor_left = 0.97900003
+anchor_left = 1.0
-anchor_top = 0.0014401659
 anchor_right = 1.0
 anchor_bottom = 1.0
-offset_left = -0.28308105
+offset_left = -25.0
-offset_top = 647.0668
+offset_top = 648.0
-offset_right = 622.0668
+offset_right = 622.97095
-offset_bottom = 49.0
+offset_bottom = 59.0
 grow_vertical = 2
 rotation = -1.5707964
 text = "Инструменты

scenes/ui.tscn

@@ -54,26 +54,24 @@ script = ExtResource("1_8dubc")
 [node name="Reagents" parent="." unique_id=1303212589 instance=ExtResource("1_nt7q6")]
 layout_mode = 1
 anchors_preset = -1
-anchor_left = -0.14756945
+anchor_left = -0.34635416
 anchor_top = 0.055555556
 anchor_right = 0.0
 anchor_bottom = 0.69753087
 text = "Вещества"
 metadata/_edit_use_anchors_ = true
 
-[node name="ScrollContainer" parent="Reagents" index="0"]
+[node name="ScrollContainer" parent="Reagents" index="0" unique_id=1290239698]
 anchor_right = 0.87200004
 offset_right = -0.040008545
 
-[node name="Label" parent="Reagents" index="1"]
+[node name="Label" parent="Reagents" index="1" unique_id=1563593386]
-anchor_left = 0.8717948
+anchor_top = 0.25133452
-anchor_top = 0.29071665
+anchor_bottom = 0.726
-anchor_right = 0.99700004
-anchor_bottom = 0.76000005
-offset_left = 0.0
 offset_top = 197.44484
-offset_right = 173.02982
+offset_right = 201.11682
-offset_bottom = 48.876526
+offset_bottom = 58.98401
+grow_vertical = 1
 
 [node name="Generator" type="Node" parent="Reagents" unique_id=670239833]
 script = ExtResource("2_x4jx1")
@@ -81,25 +79,20 @@ script = ExtResource("2_x4jx1")
 [node name="Intruments" parent="." unique_id=1127354373 instance=ExtResource("1_nt7q6")]
 layout_mode = 1
 anchors_preset = -1
-anchor_left = -0.14756945
+anchor_left = -0.34600002
 anchor_top = 0.69753087
 anchor_right = 0.0
+offset_left = -0.4079895
 text = "Инструменты"
-metadata/_edit_use_anchors_ = true
 
-[node name="ScrollContainer" parent="Intruments" index="0"]
+[node name="ScrollContainer" parent="Intruments" index="0" unique_id=1290239698]
 anchor_right = 0.87200004
 offset_right = -0.040008545
 
-[node name="Label" parent="Intruments" index="1"]
+[node name="Label" parent="Intruments" index="1" unique_id=1563593386]
-anchor_left = 0.8717948
+anchor_top = -0.165
-anchor_top = 0.040587522
+offset_top = 228.34001
-anchor_right = 0.99700004
+offset_right = 203.31677
-anchor_bottom = 1.059
-offset_left = 0.0
-offset_top = 199.64479
-offset_right = 175.22977
-offset_bottom = 49.03595
 
 [node name="Generator" type="Node" parent="Intruments" unique_id=1693437228]
 script = ExtResource("11_vdcm2")

shaders/fluid.gdshader

@@ -5,13 +5,19 @@ render_mode cull_back, blend_mix;
 uniform vec4 albedo_color: source_color;
 uniform float fill: hint_range(0.0, 1.0, 0.01) = 0.;
 uniform float wave_intensity: hint_range(0.0, 1.0, 0.01) = 0.;
+uniform bool remap_for_mesh;
 
 const float MAX_AMPLITUDE = 0.1;
 const float MAX_SPEED = 2.;
 
 void vertex() {
 	if (VERTEX.y > 0.) {
-		VERTEX.y *= (fill - 0.5) * 2.;
+		if (remap_for_mesh) {
+			VERTEX.y *= fill;
+		}
+		else {
+			VERTEX.y *= (fill - 0.5) * 2.;
+		}
 		VERTEX.y += sin((TIME+VERTEX.x+VERTEX.z)*wave_intensity*MAX_SPEED) * MAX_AMPLITUDE * wave_intensity;
 	}
 }