Fix deleted scene and add text to kaleido
This commit is contained in:
parent
32a517ec22
commit
2e91da4295
3 changed files with 155 additions and 10 deletions
50
entities/cool-orb.tscn
Normal file
50
entities/cool-orb.tscn
Normal file
|
@ -0,0 +1,50 @@
|
||||||
|
[gd_scene load_steps=5 format=3 uid="uid://ckffrweetb03k"]
|
||||||
|
|
||||||
|
[sub_resource type="Shader" id="Shader_jawsf"]
|
||||||
|
code = "shader_type spatial;
|
||||||
|
|
||||||
|
void vertex() {
|
||||||
|
// Called for every vertex the material is visible on.
|
||||||
|
}
|
||||||
|
|
||||||
|
void fragment() {
|
||||||
|
if (UV.x > 0.5) {
|
||||||
|
ALBEDO = vec3(0, 0.2, 1);
|
||||||
|
ROUGHNESS = 0.2;
|
||||||
|
RIM = 100.0;
|
||||||
|
} else {
|
||||||
|
ALBEDO = vec3(1, 0.2, 0);
|
||||||
|
ROUGHNESS = 0.2;
|
||||||
|
RIM = 100.0;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
//void light() {
|
||||||
|
// Called for every pixel for every light affecting the material.
|
||||||
|
// Uncomment to replace the default light processing function with this one.
|
||||||
|
//}
|
||||||
|
"
|
||||||
|
|
||||||
|
[sub_resource type="ShaderMaterial" id="ShaderMaterial_n6a3p"]
|
||||||
|
render_priority = 0
|
||||||
|
shader = SubResource("Shader_jawsf")
|
||||||
|
|
||||||
|
[sub_resource type="SphereMesh" id="SphereMesh_u77af"]
|
||||||
|
material = SubResource("ShaderMaterial_n6a3p")
|
||||||
|
|
||||||
|
[sub_resource type="Environment" id="Environment_n0bt7"]
|
||||||
|
background_mode = 1
|
||||||
|
|
||||||
|
[node name="Node3D" type="Node3D"]
|
||||||
|
|
||||||
|
[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
|
||||||
|
mesh = SubResource("SphereMesh_u77af")
|
||||||
|
|
||||||
|
[node name="Camera3D" type="Camera3D" parent="."]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 2.01451)
|
||||||
|
|
||||||
|
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
|
||||||
|
environment = SubResource("Environment_n0bt7")
|
||||||
|
|
||||||
|
[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
|
|
@ -1,4 +1,4 @@
|
||||||
[gd_scene load_steps=9 format=3 uid="uid://b761uk7sjprrp"]
|
[gd_scene load_steps=13 format=3 uid="uid://b761uk7sjprrp"]
|
||||||
|
|
||||||
[ext_resource type="Shader" path="res://assets/shaders/kaleidoscope.gdshader" id="1_nwvg1"]
|
[ext_resource type="Shader" path="res://assets/shaders/kaleidoscope.gdshader" id="1_nwvg1"]
|
||||||
[ext_resource type="PackedScene" uid="uid://qehbjfkqs5pl" path="res://entities/ParticlesCool.tscn" id="1_yc1r8"]
|
[ext_resource type="PackedScene" uid="uid://qehbjfkqs5pl" path="res://entities/ParticlesCool.tscn" id="1_yc1r8"]
|
||||||
|
@ -27,13 +27,53 @@ shader_parameter/sourceAngle = 0.0
|
||||||
[sub_resource type="ViewportTexture" id="ViewportTexture_1y4ry"]
|
[sub_resource type="ViewportTexture" id="ViewportTexture_1y4ry"]
|
||||||
viewport_path = NodePath("SubViewport")
|
viewport_path = NodePath("SubViewport")
|
||||||
|
|
||||||
|
[sub_resource type="Shader" id="Shader_mxtek"]
|
||||||
|
code = "shader_type canvas_item;
|
||||||
|
|
||||||
|
uniform bool enabled;
|
||||||
|
uniform sampler2D screen_texture : hint_screen_texture, repeat_disable, filter_nearest;
|
||||||
|
|
||||||
|
|
||||||
|
void vertex() {
|
||||||
|
// Called for every vertex the material is visible on.
|
||||||
|
}
|
||||||
|
|
||||||
|
void fragment() {
|
||||||
|
vec4 col = texture(TEXTURE,UV).rgba;
|
||||||
|
if (enabled) {
|
||||||
|
if (col.a != 0.0) {
|
||||||
|
col.a = 0.0;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
col.a = 1.0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
col.a = 0.0;
|
||||||
|
}
|
||||||
|
COLOR = col;
|
||||||
|
}
|
||||||
|
|
||||||
|
//void light() {
|
||||||
|
// Called for every pixel for every light affecting the CanvasItem.
|
||||||
|
// Uncomment to replace the default light processing function with this one.
|
||||||
|
//}
|
||||||
|
"
|
||||||
|
|
||||||
|
[sub_resource type="ShaderMaterial" id="ShaderMaterial_ahqjw"]
|
||||||
|
shader = SubResource("Shader_mxtek")
|
||||||
|
shader_parameter/enabled = null
|
||||||
|
|
||||||
|
[sub_resource type="ViewportTexture" id="ViewportTexture_b44mw"]
|
||||||
|
viewport_path = NodePath("TextViewPort")
|
||||||
|
|
||||||
[sub_resource type="Animation" id="Animation_olvxy"]
|
[sub_resource type="Animation" id="Animation_olvxy"]
|
||||||
resource_name = "kaleidoskope_1"
|
resource_name = "kaleidoskope_1"
|
||||||
length = 20.0
|
length = 20.0
|
||||||
tracks/0/type = "value"
|
tracks/0/type = "value"
|
||||||
tracks/0/imported = false
|
tracks/0/imported = false
|
||||||
tracks/0/enabled = true
|
tracks/0/enabled = true
|
||||||
tracks/0/path = NodePath("TextureRect:material:shader_parameter/segments")
|
tracks/0/path = NodePath("Kaleido:material:shader_parameter/segments")
|
||||||
tracks/0/interp = 1
|
tracks/0/interp = 1
|
||||||
tracks/0/loop_wrap = true
|
tracks/0/loop_wrap = true
|
||||||
tracks/0/keys = {
|
tracks/0/keys = {
|
||||||
|
@ -45,7 +85,7 @@ tracks/0/keys = {
|
||||||
tracks/1/type = "value"
|
tracks/1/type = "value"
|
||||||
tracks/1/imported = false
|
tracks/1/imported = false
|
||||||
tracks/1/enabled = true
|
tracks/1/enabled = true
|
||||||
tracks/1/path = NodePath("TextureRect:material:shader_parameter/sourceAngle")
|
tracks/1/path = NodePath("Kaleido:material:shader_parameter/sourceAngle")
|
||||||
tracks/1/interp = 1
|
tracks/1/interp = 1
|
||||||
tracks/1/loop_wrap = true
|
tracks/1/loop_wrap = true
|
||||||
tracks/1/keys = {
|
tracks/1/keys = {
|
||||||
|
@ -57,7 +97,7 @@ tracks/1/keys = {
|
||||||
tracks/2/type = "value"
|
tracks/2/type = "value"
|
||||||
tracks/2/imported = false
|
tracks/2/imported = false
|
||||||
tracks/2/enabled = true
|
tracks/2/enabled = true
|
||||||
tracks/2/path = NodePath("TextureRect:material:shader_parameter/sourceOffset")
|
tracks/2/path = NodePath("Kaleido:material:shader_parameter/sourceOffset")
|
||||||
tracks/2/interp = 1
|
tracks/2/interp = 1
|
||||||
tracks/2/loop_wrap = true
|
tracks/2/loop_wrap = true
|
||||||
tracks/2/keys = {
|
tracks/2/keys = {
|
||||||
|
@ -66,13 +106,25 @@ tracks/2/keys = {
|
||||||
"update": 0,
|
"update": 0,
|
||||||
"values": [Vector2(0.5, 0.5), Vector2(0.5, 0.5), Vector2(0.5, 0), Vector2(1, -1)]
|
"values": [Vector2(0.5, 0.5), Vector2(0.5, 0.5), Vector2(0.5, 0), Vector2(1, -1)]
|
||||||
}
|
}
|
||||||
|
tracks/3/type = "value"
|
||||||
|
tracks/3/imported = false
|
||||||
|
tracks/3/enabled = true
|
||||||
|
tracks/3/path = NodePath("TextMask:material:shader_parameter/enabled")
|
||||||
|
tracks/3/interp = 1
|
||||||
|
tracks/3/loop_wrap = true
|
||||||
|
tracks/3/keys = {
|
||||||
|
"times": PackedFloat32Array(0, 11.8),
|
||||||
|
"transitions": PackedFloat32Array(1, 1),
|
||||||
|
"update": 1,
|
||||||
|
"values": [false, true]
|
||||||
|
}
|
||||||
|
|
||||||
[sub_resource type="Animation" id="Animation_1yxhh"]
|
[sub_resource type="Animation" id="Animation_1yxhh"]
|
||||||
length = 0.001
|
length = 0.001
|
||||||
tracks/0/type = "value"
|
tracks/0/type = "value"
|
||||||
tracks/0/imported = false
|
tracks/0/imported = false
|
||||||
tracks/0/enabled = true
|
tracks/0/enabled = true
|
||||||
tracks/0/path = NodePath("TextureRect:material:shader_parameter/segments")
|
tracks/0/path = NodePath("Kaleido:material:shader_parameter/segments")
|
||||||
tracks/0/interp = 1
|
tracks/0/interp = 1
|
||||||
tracks/0/loop_wrap = true
|
tracks/0/loop_wrap = true
|
||||||
tracks/0/keys = {
|
tracks/0/keys = {
|
||||||
|
@ -84,7 +136,7 @@ tracks/0/keys = {
|
||||||
tracks/1/type = "value"
|
tracks/1/type = "value"
|
||||||
tracks/1/imported = false
|
tracks/1/imported = false
|
||||||
tracks/1/enabled = true
|
tracks/1/enabled = true
|
||||||
tracks/1/path = NodePath("TextureRect:material:shader_parameter/sourceAngle")
|
tracks/1/path = NodePath("Kaleido:material:shader_parameter/sourceAngle")
|
||||||
tracks/1/interp = 1
|
tracks/1/interp = 1
|
||||||
tracks/1/loop_wrap = true
|
tracks/1/loop_wrap = true
|
||||||
tracks/1/keys = {
|
tracks/1/keys = {
|
||||||
|
@ -96,7 +148,7 @@ tracks/1/keys = {
|
||||||
tracks/2/type = "value"
|
tracks/2/type = "value"
|
||||||
tracks/2/imported = false
|
tracks/2/imported = false
|
||||||
tracks/2/enabled = true
|
tracks/2/enabled = true
|
||||||
tracks/2/path = NodePath("TextureRect:material:shader_parameter/sourceOffset")
|
tracks/2/path = NodePath("Kaleido:material:shader_parameter/sourceOffset")
|
||||||
tracks/2/interp = 1
|
tracks/2/interp = 1
|
||||||
tracks/2/loop_wrap = true
|
tracks/2/loop_wrap = true
|
||||||
tracks/2/keys = {
|
tracks/2/keys = {
|
||||||
|
@ -105,6 +157,18 @@ tracks/2/keys = {
|
||||||
"update": 0,
|
"update": 0,
|
||||||
"values": [Vector2(0.5, 0.5)]
|
"values": [Vector2(0.5, 0.5)]
|
||||||
}
|
}
|
||||||
|
tracks/3/type = "value"
|
||||||
|
tracks/3/imported = false
|
||||||
|
tracks/3/enabled = true
|
||||||
|
tracks/3/path = NodePath("TextMask:material:shader_parameter/enabled")
|
||||||
|
tracks/3/interp = 1
|
||||||
|
tracks/3/loop_wrap = true
|
||||||
|
tracks/3/keys = {
|
||||||
|
"times": PackedFloat32Array(0),
|
||||||
|
"transitions": PackedFloat32Array(1),
|
||||||
|
"update": 1,
|
||||||
|
"values": [null]
|
||||||
|
}
|
||||||
|
|
||||||
[sub_resource type="AnimationLibrary" id="AnimationLibrary_4qo5x"]
|
[sub_resource type="AnimationLibrary" id="AnimationLibrary_4qo5x"]
|
||||||
_data = {
|
_data = {
|
||||||
|
@ -112,6 +176,10 @@ _data = {
|
||||||
"kaleidoskope_1": SubResource("Animation_olvxy")
|
"kaleidoskope_1": SubResource("Animation_olvxy")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[sub_resource type="LabelSettings" id="LabelSettings_n61ct"]
|
||||||
|
font_size = 104
|
||||||
|
shadow_size = 0
|
||||||
|
|
||||||
[node name="KaleidoScope" type="Control"]
|
[node name="KaleidoScope" type="Control"]
|
||||||
layout_mode = 3
|
layout_mode = 3
|
||||||
anchors_preset = 15
|
anchors_preset = 15
|
||||||
|
@ -121,7 +189,7 @@ grow_horizontal = 2
|
||||||
grow_vertical = 2
|
grow_vertical = 2
|
||||||
script = SubResource("GDScript_mtsk5")
|
script = SubResource("GDScript_mtsk5")
|
||||||
|
|
||||||
[node name="TextureRect" type="TextureRect" parent="."]
|
[node name="Kaleido" type="TextureRect" parent="."]
|
||||||
material = SubResource("ShaderMaterial_a6cuy")
|
material = SubResource("ShaderMaterial_a6cuy")
|
||||||
layout_mode = 1
|
layout_mode = 1
|
||||||
anchors_preset = 15
|
anchors_preset = 15
|
||||||
|
@ -131,6 +199,16 @@ grow_horizontal = 2
|
||||||
grow_vertical = 2
|
grow_vertical = 2
|
||||||
texture = SubResource("ViewportTexture_1y4ry")
|
texture = SubResource("ViewportTexture_1y4ry")
|
||||||
|
|
||||||
|
[node name="TextMask" type="TextureRect" parent="."]
|
||||||
|
material = SubResource("ShaderMaterial_ahqjw")
|
||||||
|
layout_mode = 1
|
||||||
|
anchors_preset = 15
|
||||||
|
anchor_right = 1.0
|
||||||
|
anchor_bottom = 1.0
|
||||||
|
grow_horizontal = 2
|
||||||
|
grow_vertical = 2
|
||||||
|
texture = SubResource("ViewportTexture_b44mw")
|
||||||
|
|
||||||
[node name="SubViewport" type="SubViewport" parent="."]
|
[node name="SubViewport" type="SubViewport" parent="."]
|
||||||
size = Vector2i(1152, 648)
|
size = Vector2i(1152, 648)
|
||||||
|
|
||||||
|
@ -151,4 +229,23 @@ libraries = {
|
||||||
wait_time = 2.0
|
wait_time = 2.0
|
||||||
autostart = true
|
autostart = true
|
||||||
|
|
||||||
|
[node name="TextViewPort" type="SubViewport" parent="."]
|
||||||
|
transparent_bg = true
|
||||||
|
size = Vector2i(1152, 648)
|
||||||
|
|
||||||
|
[node name="Label" type="Label" parent="TextViewPort"]
|
||||||
|
anchors_preset = 8
|
||||||
|
anchor_left = 0.5
|
||||||
|
anchor_top = 0.5
|
||||||
|
anchor_right = 0.5
|
||||||
|
anchor_bottom = 0.5
|
||||||
|
offset_left = -286.0
|
||||||
|
offset_top = -44.0
|
||||||
|
offset_right = 286.0
|
||||||
|
offset_bottom = 44.0
|
||||||
|
grow_horizontal = 2
|
||||||
|
grow_vertical = 2
|
||||||
|
text = "THIS IS SOME TEXT"
|
||||||
|
label_settings = SubResource("LabelSettings_n61ct")
|
||||||
|
|
||||||
[connection signal="timeout" from="Timer" to="." method="_on_timer_timeout"]
|
[connection signal="timeout" from="Timer" to="." method="_on_timer_timeout"]
|
||||||
|
|
|
@ -4,7 +4,6 @@ var scene1: PackedScene = preload("res://entities/test.tscn");
|
||||||
var scene2: PackedScene = preload("res://entities/kaleido_scope.tscn");
|
var scene2: PackedScene = preload("res://entities/kaleido_scope.tscn");
|
||||||
var scene3: PackedScene = preload("res://entities/ParticlesCool.tscn");
|
var scene3: PackedScene = preload("res://entities/ParticlesCool.tscn");
|
||||||
var scene4: PackedScene = preload("res://entities/test.tscn")
|
var scene4: PackedScene = preload("res://entities/test.tscn")
|
||||||
var scene5: PackedScene = preload("res://entities/shape_dance.tscn");
|
|
||||||
|
|
||||||
|
|
||||||
# Called when the node enters the scene tree for the first time.
|
# Called when the node enters the scene tree for the first time.
|
||||||
|
@ -13,6 +12,5 @@ func _ready() -> void:
|
||||||
register_scene(scene2);
|
register_scene(scene2);
|
||||||
register_scene(scene3);
|
register_scene(scene3);
|
||||||
register_scene(scene4);
|
register_scene(scene4);
|
||||||
register_scene(scene5);
|
|
||||||
start_audio();
|
start_audio();
|
||||||
$AnimationPlayer.play("timeline");
|
$AnimationPlayer.play("timeline");
|
||||||
|
|
Loading…
Reference in a new issue