mirror of
https://github.com/Steffo99/pineapple-surf.git
synced 2024-11-21 23:34:21 +00:00
Add sea shader (and other misc changes)
This commit is contained in:
parent
153d3106cc
commit
2cb65f6130
5 changed files with 45 additions and 50 deletions
File diff suppressed because one or more lines are too long
14
island/Sea.gdshader
Normal file
14
island/Sea.gdshader
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
shader_type spatial;
|
||||||
|
|
||||||
|
uniform float speed_x;
|
||||||
|
uniform float speed_y;
|
||||||
|
uniform float size;
|
||||||
|
uniform sampler2D sea;
|
||||||
|
|
||||||
|
void fragment() {
|
||||||
|
float x = fract(UV.x * size + sin(TIME) * speed_x);
|
||||||
|
float y = fract(UV.y * size - TIME * 2.0 * speed_y);
|
||||||
|
|
||||||
|
vec4 color = texture(sea, vec2(x, y));
|
||||||
|
ALBEDO = vec3(color.r, color.g, color.b);
|
||||||
|
}
|
|
@ -4,25 +4,6 @@
|
||||||
[ext_resource type="Script" path="res://menu/Menu.gd" id="2_6amk3"]
|
[ext_resource type="Script" path="res://menu/Menu.gd" id="2_6amk3"]
|
||||||
[ext_resource type="Texture2D" uid="uid://bxyximtgui1ux" path="res://assets/grass_menu_tile.png" id="2_q14jx"]
|
[ext_resource type="Texture2D" uid="uid://bxyximtgui1ux" path="res://assets/grass_menu_tile.png" id="2_q14jx"]
|
||||||
|
|
||||||
[sub_resource type="GDScript" id="GDScript_25oo4"]
|
|
||||||
script/source = "extends Button
|
|
||||||
|
|
||||||
|
|
||||||
# Called when the node enters the scene tree for the first time.
|
|
||||||
func _ready() -> void:
|
|
||||||
pass # Replace with function body.
|
|
||||||
|
|
||||||
|
|
||||||
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
|
||||||
func _process(delta: float) -> void:
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
func _gui_input(event: InputEvent) -> void:
|
|
||||||
if event is InputEventMouseButton and event.button_index == MOUSE_BUTTON_LEFT:
|
|
||||||
get_tree().change_scene_to_file(\"res://island/Island.tscn\")
|
|
||||||
"
|
|
||||||
|
|
||||||
[node name="Menu" type="Control"]
|
[node name="Menu" type="Control"]
|
||||||
texture_filter = 1
|
texture_filter = 1
|
||||||
layout_mode = 3
|
layout_mode = 3
|
||||||
|
@ -36,7 +17,6 @@ theme = ExtResource("1_mkxnc")
|
||||||
script = ExtResource("2_6amk3")
|
script = ExtResource("2_6amk3")
|
||||||
|
|
||||||
[node name="Panel" type="TextureRect" parent="."]
|
[node name="Panel" type="TextureRect" parent="."]
|
||||||
layout_mode = 1
|
|
||||||
anchors_preset = 15
|
anchors_preset = 15
|
||||||
anchor_right = 1.0
|
anchor_right = 1.0
|
||||||
anchor_bottom = 1.0
|
anchor_bottom = 1.0
|
||||||
|
@ -46,7 +26,6 @@ texture = ExtResource("2_q14jx")
|
||||||
stretch_mode = 1
|
stretch_mode = 1
|
||||||
|
|
||||||
[node name="Content" type="VBoxContainer" parent="."]
|
[node name="Content" type="VBoxContainer" parent="."]
|
||||||
layout_mode = 1
|
|
||||||
anchors_preset = 15
|
anchors_preset = 15
|
||||||
anchor_right = 1.0
|
anchor_right = 1.0
|
||||||
anchor_bottom = 1.0
|
anchor_bottom = 1.0
|
||||||
|
@ -55,23 +34,29 @@ grow_vertical = 2
|
||||||
alignment = 1
|
alignment = 1
|
||||||
|
|
||||||
[node name="Authors" type="Label" parent="Content"]
|
[node name="Authors" type="Label" parent="Content"]
|
||||||
layout_mode = 2
|
offset_right = 284.0
|
||||||
|
offset_bottom = 18.0
|
||||||
text = "A game by Ichicoro and Steffo"
|
text = "A game by Ichicoro and Steffo"
|
||||||
horizontal_alignment = 1
|
horizontal_alignment = 1
|
||||||
|
|
||||||
[node name="Title" type="Label" parent="Content"]
|
[node name="Title" type="Label" parent="Content"]
|
||||||
layout_mode = 2
|
offset_top = 25.0
|
||||||
|
offset_right = 284.0
|
||||||
|
offset_bottom = 75.0
|
||||||
size_flags_vertical = 6
|
size_flags_vertical = 6
|
||||||
theme_override_font_sizes/font_size = 48
|
theme_override_font_sizes/font_size = 48
|
||||||
text = "Harvest"
|
text = "Harvest"
|
||||||
horizontal_alignment = 1
|
horizontal_alignment = 1
|
||||||
|
|
||||||
[node name="Control" type="Control" parent="Content"]
|
[node name="Control" type="Control" parent="Content"]
|
||||||
layout_mode = 2
|
layout_mode = 3
|
||||||
|
anchors_preset = 0
|
||||||
|
offset_top = 110.0
|
||||||
|
offset_right = 284.0
|
||||||
|
offset_bottom = 110.0
|
||||||
size_flags_vertical = 6
|
size_flags_vertical = 6
|
||||||
|
|
||||||
[node name="Play" type="Button" parent="Content/Control"]
|
[node name="Play" type="Button" parent="Content/Control"]
|
||||||
layout_mode = 1
|
|
||||||
anchors_preset = 8
|
anchors_preset = 8
|
||||||
anchor_left = 0.5
|
anchor_left = 0.5
|
||||||
anchor_top = 0.5
|
anchor_top = 0.5
|
||||||
|
@ -87,10 +72,11 @@ size_flags_horizontal = 4
|
||||||
size_flags_vertical = 4
|
size_flags_vertical = 4
|
||||||
theme_override_font_sizes/font_size = 0
|
theme_override_font_sizes/font_size = 0
|
||||||
text = "Play"
|
text = "Play"
|
||||||
script = SubResource("GDScript_25oo4")
|
|
||||||
|
|
||||||
[node name="Authors2" type="Label" parent="Content"]
|
[node name="Authors2" type="Label" parent="Content"]
|
||||||
layout_mode = 2
|
offset_top = 142.0
|
||||||
|
offset_right = 284.0
|
||||||
|
offset_bottom = 160.0
|
||||||
size_flags_vertical = 1
|
size_flags_vertical = 1
|
||||||
text = "Ludum Dare 52 - Harvest"
|
text = "Ludum Dare 52 - Harvest"
|
||||||
horizontal_alignment = 1
|
horizontal_alignment = 1
|
||||||
|
|
|
@ -143,7 +143,6 @@ grow_horizontal = 2
|
||||||
grow_vertical = 2
|
grow_vertical = 2
|
||||||
|
|
||||||
[node name="CameraViewportContainer" type="SubViewportContainer" parent="Head/Viewport"]
|
[node name="CameraViewportContainer" type="SubViewportContainer" parent="Head/Viewport"]
|
||||||
layout_mode = 1
|
|
||||||
anchors_preset = 15
|
anchors_preset = 15
|
||||||
anchor_right = 1.0
|
anchor_right = 1.0
|
||||||
anchor_bottom = 1.0
|
anchor_bottom = 1.0
|
||||||
|
@ -186,7 +185,7 @@ grow_vertical = 2
|
||||||
theme = SubResource("Theme_smyke")
|
theme = SubResource("Theme_smyke")
|
||||||
|
|
||||||
[node name="FPS_Label" type="Label" parent="HUD"]
|
[node name="FPS_Label" type="Label" parent="HUD"]
|
||||||
layout_mode = 1
|
visible = false
|
||||||
anchors_preset = 1
|
anchors_preset = 1
|
||||||
anchor_left = 1.0
|
anchor_left = 1.0
|
||||||
anchor_right = 1.0
|
anchor_right = 1.0
|
||||||
|
@ -199,7 +198,7 @@ horizontal_alignment = 2
|
||||||
script = SubResource("GDScript_iiadi")
|
script = SubResource("GDScript_iiadi")
|
||||||
|
|
||||||
[node name="PointsSpawner" type="Control" parent="HUD"]
|
[node name="PointsSpawner" type="Control" parent="HUD"]
|
||||||
layout_mode = 1
|
layout_mode = 3
|
||||||
anchors_preset = 8
|
anchors_preset = 8
|
||||||
anchor_left = 0.5
|
anchor_left = 0.5
|
||||||
anchor_top = 0.5
|
anchor_top = 0.5
|
||||||
|
@ -210,7 +209,7 @@ grow_vertical = 2
|
||||||
script = SubResource("GDScript_5d122")
|
script = SubResource("GDScript_5d122")
|
||||||
|
|
||||||
[node name="Speed_Label" type="Label" parent="HUD"]
|
[node name="Speed_Label" type="Label" parent="HUD"]
|
||||||
layout_mode = 1
|
visible = false
|
||||||
anchors_preset = 8
|
anchors_preset = 8
|
||||||
anchor_left = 0.5
|
anchor_left = 0.5
|
||||||
anchor_top = 0.5
|
anchor_top = 0.5
|
||||||
|
@ -227,7 +226,6 @@ vertical_alignment = 1
|
||||||
|
|
||||||
[node name="Panel" type="Panel" parent="HUD"]
|
[node name="Panel" type="Panel" parent="HUD"]
|
||||||
visible = false
|
visible = false
|
||||||
layout_mode = 1
|
|
||||||
anchors_preset = 3
|
anchors_preset = 3
|
||||||
anchor_left = 1.0
|
anchor_left = 1.0
|
||||||
anchor_top = 1.0
|
anchor_top = 1.0
|
||||||
|
@ -242,7 +240,6 @@ grow_vertical = 0
|
||||||
theme_override_styles/panel = SubResource("StyleBoxFlat_avmet")
|
theme_override_styles/panel = SubResource("StyleBoxFlat_avmet")
|
||||||
|
|
||||||
[node name="ColorRect" type="ColorRect" parent="HUD/Panel"]
|
[node name="ColorRect" type="ColorRect" parent="HUD/Panel"]
|
||||||
layout_mode = 1
|
|
||||||
anchors_preset = 15
|
anchors_preset = 15
|
||||||
anchor_right = 1.0
|
anchor_right = 1.0
|
||||||
anchor_bottom = 1.0
|
anchor_bottom = 1.0
|
||||||
|
@ -258,7 +255,6 @@ copy_mode = 2
|
||||||
[node name="SubViewportContainer" type="SubViewportContainer" parent="HUD"]
|
[node name="SubViewportContainer" type="SubViewportContainer" parent="HUD"]
|
||||||
visible = false
|
visible = false
|
||||||
show_behind_parent = true
|
show_behind_parent = true
|
||||||
layout_mode = 1
|
|
||||||
anchors_preset = 15
|
anchors_preset = 15
|
||||||
anchor_right = 1.0
|
anchor_right = 1.0
|
||||||
anchor_bottom = 1.0
|
anchor_bottom = 1.0
|
||||||
|
@ -281,7 +277,6 @@ MainCamera = NodePath("../../../../Head/Viewport/CameraViewportContainer/GameVie
|
||||||
|
|
||||||
[node name="Crosshair" type="ColorRect" parent="HUD"]
|
[node name="Crosshair" type="ColorRect" parent="HUD"]
|
||||||
material = SubResource("ShaderMaterial_2p6rt")
|
material = SubResource("ShaderMaterial_2p6rt")
|
||||||
layout_mode = 1
|
|
||||||
anchors_preset = 15
|
anchors_preset = 15
|
||||||
anchor_right = 1.0
|
anchor_right = 1.0
|
||||||
anchor_bottom = 1.0
|
anchor_bottom = 1.0
|
||||||
|
@ -297,7 +292,6 @@ scale = Vector2(7.21, 4.54)
|
||||||
|
|
||||||
[node name="GameFilter" type="ColorRect" parent="HUD"]
|
[node name="GameFilter" type="ColorRect" parent="HUD"]
|
||||||
visible = false
|
visible = false
|
||||||
layout_mode = 1
|
|
||||||
anchors_preset = 15
|
anchors_preset = 15
|
||||||
anchor_right = 1.0
|
anchor_right = 1.0
|
||||||
anchor_bottom = 1.0
|
anchor_bottom = 1.0
|
||||||
|
|
|
@ -79,4 +79,5 @@ jump={
|
||||||
|
|
||||||
[rendering]
|
[rendering]
|
||||||
|
|
||||||
|
renderer/rendering_method="gl_compatibility"
|
||||||
environment/defaults/default_clear_color=Color(0.231373, 0.490196, 0.309804, 1)
|
environment/defaults/default_clear_color=Color(0.231373, 0.490196, 0.309804, 1)
|
||||||
|
|
Loading…
Reference in a new issue