Rendo/lab-electrolyte
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: new models, fixed popup containers

Browse source
This commit is contained in:
Rendo 2026-07-20 14:53:46 +05:00
commit 77b1a08234
51 changed files with 1116 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

185
scenes/burner.tscn
View file

File diff suppressed because one or more lines are too long

12
scenes/flask.tscn
View file

@ -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")

2
scenes/flask_hold_area.tscn
View file

@ -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)

10
scenes/flask_holder.tscn
View file

@ -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)

21
scenes/popup_container.tscn
View file

@ -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_top = 0.0014401659
anchor_left = 1.0
anchor_right = 1.0
anchor_bottom = 1.0
offset_left = -0.28308105
offset_top = 647.0668
offset_right = 622.0668
offset_bottom = 49.0
offset_left = -25.0
offset_top = 648.0
offset_right = 622.97095
offset_bottom = 59.0
grow_vertical = 2
rotation = -1.5707964
text = "Инструменты

37
scenes/ui.tscn
View file

@ -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"]
anchor_left = 0.8717948
anchor_top = 0.29071665
anchor_right = 0.99700004
anchor_bottom = 0.76000005
offset_left = 0.0
[node name="Label" parent="Reagents" index="1" unique_id=1563593386]
anchor_top = 0.25133452
anchor_bottom = 0.726
offset_top = 197.44484
offset_right = 173.02982
offset_bottom = 48.876526
offset_right = 201.11682
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"]
anchor_left = 0.8717948
anchor_top = 0.040587522
anchor_right = 0.99700004
anchor_bottom = 1.059
offset_left = 0.0
offset_top = 199.64479
offset_right = 175.22977
offset_bottom = 49.03595
[node name="Label" parent="Intruments" index="1" unique_id=1563593386]
anchor_top = -0.165
offset_top = 228.34001
offset_right = 203.31677
[node name="Generator" type="Node" parent="Intruments" unique_id=1693437228]
script = ExtResource("11_vdcm2")