fix config and merge
This commit is contained in:
parent
16a1852139
commit
4762dca758
3 changed files with 10 additions and 9 deletions
|
@ -1,6 +1,6 @@
|
|||
[window]
|
||||
width = 2560
|
||||
height = 1440
|
||||
width = 1920
|
||||
height = 1080
|
||||
fullscreen = true
|
||||
borderless = false
|
||||
position_x = 0
|
||||
|
@ -10,3 +10,4 @@ monitor = 0
|
|||
max_framerate = 60
|
||||
vertical_sync = true
|
||||
resolution_scale = 1.0
|
||||
# We ran out of time, so the demo won't display correctly on anything other than 1080p
|
||||
|
|
|
@ -200,7 +200,7 @@ tracks/0/keys = {
|
|||
"times": PackedFloat32Array(0, 0.5, 4.5, 5),
|
||||
"transitions": PackedFloat32Array(1, 1, 1, 1),
|
||||
"update": 0,
|
||||
"values": [Vector2(872, -797), Vector2(1387, -531), Vector2(1387, -531), Vector2(872, -797)]
|
||||
"values": [Vector2(872, -797), Vector2(1452, -497), Vector2(1452, -497), Vector2(872, -797)]
|
||||
}
|
||||
tracks/1/type = "value"
|
||||
tracks/1/imported = false
|
||||
|
@ -608,10 +608,10 @@ layout_mode = 1
|
|||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
offset_left = -341.0
|
||||
offset_top = -1424.0
|
||||
offset_right = -341.0
|
||||
offset_bottom = -1424.0
|
||||
offset_left = 1387.0
|
||||
offset_top = -531.0
|
||||
offset_right = 1387.0
|
||||
offset_bottom = -531.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
rotation = 0.477038
|
||||
|
|
|
@ -29,7 +29,7 @@ func _ready() -> void:
|
|||
shaders.push_back(shader);
|
||||
|
||||
for i: int in 3:
|
||||
var material: ShaderMaterial = ShaderMaterial.new();
|
||||
material = ShaderMaterial.new();
|
||||
var shader: Shader = shaders.pick_random();
|
||||
material.shader = shader.duplicate();
|
||||
|
||||
|
@ -51,7 +51,7 @@ func _ready() -> void:
|
|||
\"kaleidoscope\":
|
||||
shaders.remove_at(shaders.find(shader, 0));
|
||||
print(\"kaleidoscope\")
|
||||
material.set_shader_parameter(\"segments\", float(randi_range(3.0, 5.0)));
|
||||
material.set_shader_parameter(\"segments\", float(randi_range(3, 5)));
|
||||
|
||||
\"pixelsort\":
|
||||
shaders.remove_at(shaders.find(shader, 0));
|
||||
|
|
Loading…
Reference in a new issue