From 39b5cb57573ef13fa15bf13c6d938959114fa3c4 Mon Sep 17 00:00:00 2001 From: betalars Date: Wed, 5 Jul 2023 23:17:08 +0200 Subject: [PATCH] finalizing lava lamp --- .../youth_room/import/materials/metal.tres | 2 +- .../youth_room/lava-lamp.tscn | 126 ++++++++++++++++++ .../youth_room/shaders/falling-lava.res | Bin 279406 -> 279370 bytes .../youth_room/shaders/lava-glass.res | Bin 38469 -> 38435 bytes .../youth_room/shaders/lava-lamp.gdshader | 24 ++++ .../youth_room/shaders/lava-metal.res | Bin 294126 -> 294126 bytes .../youth_room/shaders/lavalamp.tres | 56 -------- .../youth_room/shaders/raising-lava.res | Bin 446393 -> 446357 bytes 8 files changed, 151 insertions(+), 57 deletions(-) create mode 100644 src/base-environments/youth_room/lava-lamp.tscn create mode 100644 src/base-environments/youth_room/shaders/lava-lamp.gdshader delete mode 100644 src/base-environments/youth_room/shaders/lavalamp.tres diff --git a/src/base-environments/youth_room/import/materials/metal.tres b/src/base-environments/youth_room/import/materials/metal.tres index ed79d28..116e077 100644 --- a/src/base-environments/youth_room/import/materials/metal.tres +++ b/src/base-environments/youth_room/import/materials/metal.tres @@ -6,4 +6,4 @@ cull_mode = 2 vertex_color_use_as_albedo = true albedo_color = Color(0.906332, 0.906332, 0.906332, 1) metallic = 1.0 -roughness = 0.334862 +roughness = 0.4 diff --git a/src/base-environments/youth_room/lava-lamp.tscn b/src/base-environments/youth_room/lava-lamp.tscn new file mode 100644 index 0000000..f33908a --- /dev/null +++ b/src/base-environments/youth_room/lava-lamp.tscn @@ -0,0 +1,126 @@ +[gd_scene load_steps=15 format=3 uid="uid://bigr0lnen1xdh"] + +[ext_resource type="ArrayMesh" uid="uid://cbbreijekdjel" path="res://base-environments/youth_room/shaders/raising-lava.res" id="1_kkx3t"] +[ext_resource type="ArrayMesh" uid="uid://7bpgy7uud2ai" path="res://base-environments/youth_room/shaders/falling-lava.res" id="2_tokpx"] +[ext_resource type="Shader" uid="uid://bcuduhlnij5mc" path="res://base-environments/youth_room/shaders/glass.tres" id="3_e48d5"] +[ext_resource type="ArrayMesh" uid="uid://dpof211rbvl30" path="res://base-environments/youth_room/shaders/lava-glass.res" id="4_bg48h"] +[ext_resource type="Shader" path="res://base-environments/youth_room/shaders/lava-lamp.gdshader" id="4_y2lnx"] +[ext_resource type="ArrayMesh" uid="uid://bsxcltpxwi5c2" path="res://base-environments/youth_room/shaders/lava-metal.res" id="5_4c8kc"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_7uei1"] +albedo_color = Color(0.933333, 0.933333, 0.933333, 1) +metallic = 1.0 +roughness = 0.4 + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_2vmtt"] +render_priority = 0 +shader = ExtResource("3_e48d5") +shader_parameter/glass_tint = Color(0.631373, 0.584314, 0.376471, 1) +shader_parameter/lightcolor = Color(1.5, 2, 0.76, 1) + +[sub_resource type="Gradient" id="Gradient_r18tr"] +colors = PackedColorArray(0.705882, 6.36471, 0.211765, 1, 0.279697, 0.985193, 0.315141, 1) + +[sub_resource type="GradientTexture2D" id="GradientTexture2D_42bqf"] +gradient = SubResource("Gradient_r18tr") + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_31q3g"] +render_priority = 0 +shader = ExtResource("4_y2lnx") +shader_parameter/drop_size = 0.015 +shader_parameter/stretch_compensatioon = 35.0 +shader_parameter/fill = 0.655 +shader_parameter/speed = 0.01 +shader_parameter/brightness = 1.0 +shader_parameter/gradient = SubResource("GradientTexture2D_42bqf") + +[sub_resource type="Animation" id="Animation_0ijgr"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:rotation") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector3(0, 0, 0)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("../falling:rotation") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector3(0, 0, 0)] +} + +[sub_resource type="Animation" id="Animation_ovxyq"] +resource_name = "lavalamp" +length = 60.0 +loop_mode = 1 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:rotation") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 60), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Vector3(0, 6.28319, 0), Vector3(0, 0, 0)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("../falling:rotation") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0, 60), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Vector3(0, 6.28319, 0), Vector3(0, 0, 0)] +} + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_88lyq"] +_data = { +"RESET": SubResource("Animation_0ijgr"), +"lavalamp": SubResource("Animation_ovxyq") +} + +[node name="Lava-metal" type="MeshInstance3D"] +material_override = SubResource("StandardMaterial3D_7uei1") +mesh = ExtResource("5_4c8kc") + +[node name="Lava-glass" type="MeshInstance3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1.02, 0, 0, 0, 1, 0, 0.193229, 0) +material_override = SubResource("ShaderMaterial_2vmtt") +mesh = ExtResource("4_bg48h") +skeleton = NodePath("") + +[node name="raising" type="MeshInstance3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.188474, 0) +material_override = SubResource("ShaderMaterial_31q3g") +mesh = ExtResource("2_tokpx") +skeleton = NodePath("") + +[node name="AnimationPlayer" type="AnimationPlayer" parent="."] +root_node = NodePath("../raising") +autoplay = "lavalamp" +libraries = { +"": SubResource("AnimationLibrary_88lyq") +} + +[node name="falling" type="MeshInstance3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.188474, 0) +material_override = SubResource("ShaderMaterial_31q3g") +mesh = ExtResource("1_kkx3t") +skeleton = NodePath("") diff --git a/src/base-environments/youth_room/shaders/falling-lava.res b/src/base-environments/youth_room/shaders/falling-lava.res index 34c012a1e351ea26bbc627bff7d163f7148e43c3..9c768a514ca4c249af3025cb3b69cdebc77d05e0 100644 GIT binary patch delta 62 zcmaFYCU~k%a6>p3d%B^yVJ^ek$#Gn=?8$j$$=M7Sz-;qOlhj;>qs^zd+D~yY0x=U1 MGjBh|#j?Z#0I4?>fB*mh delta 122 zcmX@rCit#Ra6>p3d$B=@MKQz0$#Gn={-vhn=BW%{xER2|21pjA7F+4-CnXlA>ZazE zWftY<<)-G96zf;!mzHG27v<;Y>KA7urlb}X>!&5=*geuCF%k7F}!SE#?`)z RixG&KfS7svGA@=S767=LDZ&5% diff --git a/src/base-environments/youth_room/shaders/lava-glass.res b/src/base-environments/youth_room/shaders/lava-glass.res index 6fd69b353745304153e5d134e3dc5f94264696c6..af3aa5a54873de39b03bb615522bfa9bf985b776 100644 GIT binary patch delta 46 zcmX@QhH3E{rVZg->?P$H*~ScOC&zKgvgf1~mSi(r0J9Sf49s&G4sJfdRoe{!h8qxG delta 104 zcmZ3yhUw@UrVZg-?D?ie23ZW}C&zKg`eu}snVU0w;$i>;D 1.0/drop_size)); + +} diff --git a/src/base-environments/youth_room/shaders/lava-metal.res b/src/base-environments/youth_room/shaders/lava-metal.res index 365633678ef7b9c0ea47214e691535d041d5a04f..5f7cd438d18dfaae1c33e28a3cf19ddca5955584 100644 GIT binary patch delta 56 zcmaF&Q}EqS!42VDtQln$`6ZKMxa3(=OD#+)CpQ3DW@e_@=FLmE+Lv%K0x=U1GjCtQ I#o|>20BST7n*aa+ delta 56 zcmaF&Q}EqS!42VDtVX3Nso9fbxa3()&C~PBCN}_C20B7=hM8iRKJzC&zKgvgf2%rkgQb0JBSqDos)u6q`?RwV&c*1Y#y2 RW(HywAZFcuii_?25dd377{dSn delta 130 zcmbO_UwY?!=?&pr?8d1Dsl^NzC&zKg`WqD`rerdF;bH&-8z5PfT5P4SpOjdfs+*cu zmRXdamz$bbQmkK@Us{q8UzDGpt6!Xvn37sltY4IvS)7@duA7rsmZ%5R$Kcw$jH`Va X7b6fe0WmWWvj8#c_GMgb?~ecg1c@w-