danchie/tekton
3
1
Fork 0
Code Issues 20 Pull Requests Actions Packages Projects 10 Releases 1 Wiki Activity

feat: implement water shader and environment for free mode arena

Browse Source
This commit is contained in:
Yogi Wiguna
2026-03-31 15:59:00 +08:00
parent 3454710f2c
commit 1e6da89fff
16 changed files with 337 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/graphics/vfx/effects/animation-head.tres
+90 -90
View File
@@ -6,7 +6,7 @@
[ext_resource type="Texture2D" uid="uid://b3yv677a4qidp" path="res://assets/graphics/vfx/effects/30sec_sprite.png" id="2_jmlpd"]
[ext_resource type="Texture2D" uid="uid://lykg7d54qrof" path="res://assets/graphics/vfx/effects/ghost.png" id="3_hg3tj"]
[ext_resource type="Texture2D" uid="uid://45twcoribm0b" path="res://assets/graphics/vfx/effects/speed.png" id="4_8bjou"]
[ext_resource type="Texture2D" uid="uid://bcyyxropbam50" path="res://assets/graphics/vfx/spawn_tiles_bottom.png" id="4_xd54h"]
[ext_resource type="Texture2D" uid="uid://d2lxk788w2cdw" path="res://assets/graphics/vfx/spawn_floor.png" id="4_iiy2r"]
[ext_resource type="Texture2D" uid="uid://c718e7y7qm03x" path="res://assets/graphics/vfx/effects/bullrun_ui.png" id="5_gsxsy"]
[ext_resource type="Texture2D" uid="uid://dun5j8mrxpumo" path="res://assets/graphics/vfx/effects/stunned.png" id="5_jmlpd"]
[ext_resource type="Texture2D" uid="uid://cjhatl26dafxx" path="res://assets/graphics/vfx/spawn_tiles_top.png" id="5_xd54h"]
@@ -527,148 +527,148 @@ atlas = ExtResource("1_gjs0m")
region = Rect2(2751, 0, 393, 408)
[sub_resource type="AtlasTexture" id="AtlasTexture_pfjl8"]
atlas = ExtResource("4_xd54h")
atlas = ExtResource("4_iiy2r")
region = Rect2(0, 0, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_6xsib"]
atlas = ExtResource("4_xd54h")
atlas = ExtResource("4_iiy2r")
region = Rect2(500, 0, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_vbb07"]
atlas = ExtResource("4_xd54h")
atlas = ExtResource("4_iiy2r")
region = Rect2(1000, 0, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_l8xtn"]
atlas = ExtResource("4_xd54h")
atlas = ExtResource("4_iiy2r")
region = Rect2(1500, 0, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_r8bp5"]
atlas = ExtResource("4_xd54h")
atlas = ExtResource("4_iiy2r")
region = Rect2(2000, 0, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_mlbks"]
atlas = ExtResource("4_xd54h")
atlas = ExtResource("4_iiy2r")
region = Rect2(2500, 0, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_dwn2k"]
atlas = ExtResource("4_xd54h")
region = Rect2(3000, 0, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_86ba4"]
atlas = ExtResource("4_xd54h")
region = Rect2(3500, 0, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_rfe3p"]
atlas = ExtResource("4_xd54h")
region = Rect2(4000, 0, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_fgkky"]
atlas = ExtResource("4_xd54h")
region = Rect2(4500, 0, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_yk5ks"]
atlas = ExtResource("4_xd54h")
region = Rect2(5000, 0, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_tt1sy"]
atlas = ExtResource("4_xd54h")
region = Rect2(5500, 0, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_ihxs7"]
atlas = ExtResource("4_xd54h")
atlas = ExtResource("4_iiy2r")
region = Rect2(0, 500, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_u6diu"]
atlas = ExtResource("4_xd54h")
[sub_resource type="AtlasTexture" id="AtlasTexture_86ba4"]
atlas = ExtResource("4_iiy2r")
region = Rect2(500, 500, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_xvgj3"]
atlas = ExtResource("4_xd54h")
[sub_resource type="AtlasTexture" id="AtlasTexture_rfe3p"]
atlas = ExtResource("4_iiy2r")
region = Rect2(1000, 500, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_nn6v3"]
atlas = ExtResource("4_xd54h")
[sub_resource type="AtlasTexture" id="AtlasTexture_fgkky"]
atlas = ExtResource("4_iiy2r")
region = Rect2(1500, 500, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_1qja4"]
atlas = ExtResource("4_xd54h")
[sub_resource type="AtlasTexture" id="AtlasTexture_yk5ks"]
atlas = ExtResource("4_iiy2r")
region = Rect2(2000, 500, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_s1ih8"]
atlas = ExtResource("4_xd54h")
[sub_resource type="AtlasTexture" id="AtlasTexture_tt1sy"]
atlas = ExtResource("4_iiy2r")
region = Rect2(2500, 500, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_1lb4f"]
atlas = ExtResource("4_xd54h")
region = Rect2(3000, 500, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_1evi6"]
atlas = ExtResource("4_xd54h")
region = Rect2(3500, 500, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_etlyi"]
atlas = ExtResource("4_xd54h")
region = Rect2(4000, 500, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_c3uep"]
atlas = ExtResource("4_xd54h")
region = Rect2(4500, 500, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_hchqc"]
atlas = ExtResource("4_xd54h")
region = Rect2(5000, 500, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_k6s2b"]
atlas = ExtResource("4_xd54h")
region = Rect2(5500, 500, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_wwuof"]
atlas = ExtResource("4_xd54h")
[sub_resource type="AtlasTexture" id="AtlasTexture_ihxs7"]
atlas = ExtResource("4_iiy2r")
region = Rect2(0, 1000, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_vqenf"]
atlas = ExtResource("4_xd54h")
[sub_resource type="AtlasTexture" id="AtlasTexture_u6diu"]
atlas = ExtResource("4_iiy2r")
region = Rect2(500, 1000, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_hehw1"]
atlas = ExtResource("4_xd54h")
[sub_resource type="AtlasTexture" id="AtlasTexture_xvgj3"]
atlas = ExtResource("4_iiy2r")
region = Rect2(1000, 1000, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_wmjgt"]
atlas = ExtResource("4_xd54h")
[sub_resource type="AtlasTexture" id="AtlasTexture_nn6v3"]
atlas = ExtResource("4_iiy2r")
region = Rect2(1500, 1000, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_euieq"]
atlas = ExtResource("4_xd54h")
[sub_resource type="AtlasTexture" id="AtlasTexture_1qja4"]
atlas = ExtResource("4_iiy2r")
region = Rect2(2000, 1000, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_r7q5m"]
atlas = ExtResource("4_xd54h")
[sub_resource type="AtlasTexture" id="AtlasTexture_s1ih8"]
atlas = ExtResource("4_iiy2r")
region = Rect2(2500, 1000, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_1lb4f"]
atlas = ExtResource("4_iiy2r")
region = Rect2(0, 1500, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_1evi6"]
atlas = ExtResource("4_iiy2r")
region = Rect2(500, 1500, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_etlyi"]
atlas = ExtResource("4_iiy2r")
region = Rect2(1000, 1500, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_c3uep"]
atlas = ExtResource("4_iiy2r")
region = Rect2(1500, 1500, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_hchqc"]
atlas = ExtResource("4_iiy2r")
region = Rect2(2000, 1500, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_k6s2b"]
atlas = ExtResource("4_iiy2r")
region = Rect2(2500, 1500, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_wwuof"]
atlas = ExtResource("4_iiy2r")
region = Rect2(0, 2000, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_vqenf"]
atlas = ExtResource("4_iiy2r")
region = Rect2(500, 2000, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_hehw1"]
atlas = ExtResource("4_iiy2r")
region = Rect2(1000, 2000, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_wmjgt"]
atlas = ExtResource("4_iiy2r")
region = Rect2(1500, 2000, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_euieq"]
atlas = ExtResource("4_iiy2r")
region = Rect2(2000, 2000, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_r7q5m"]
atlas = ExtResource("4_iiy2r")
region = Rect2(2500, 2000, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_4dgeb"]
atlas = ExtResource("4_xd54h")
region = Rect2(3000, 1000, 500, 500)
atlas = ExtResource("4_iiy2r")
region = Rect2(0, 2500, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_u3dcn"]
atlas = ExtResource("4_xd54h")
region = Rect2(3500, 1000, 500, 500)
atlas = ExtResource("4_iiy2r")
region = Rect2(500, 2500, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_che85"]
atlas = ExtResource("4_xd54h")
region = Rect2(4000, 1000, 500, 500)
atlas = ExtResource("4_iiy2r")
region = Rect2(1000, 2500, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_gijbg"]
atlas = ExtResource("4_xd54h")
region = Rect2(4500, 1000, 500, 500)
atlas = ExtResource("4_iiy2r")
region = Rect2(1500, 2500, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_bh7f8"]
atlas = ExtResource("4_xd54h")
region = Rect2(5000, 1000, 500, 500)
atlas = ExtResource("4_iiy2r")
region = Rect2(2000, 2500, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_faulb"]
atlas = ExtResource("4_xd54h")
region = Rect2(5500, 1000, 500, 500)
atlas = ExtResource("4_iiy2r")
region = Rect2(2500, 2500, 500, 500)
[sub_resource type="AtlasTexture" id="AtlasTexture_un3dc"]
atlas = ExtResource("5_xd54h")
assets/graphics/vfx/spawn_floor.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 MiB

assets/graphics/vfx/spawn_tiles_bottom.png.import → assets/graphics/vfx/spawn_floor.png.import
+4 -4
View File
@@ -2,8 +2,8 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://bcyyxropbam50"
path.s3tc="res://.godot/imported/spawn_tiles_bottom.png-bf5af9b1f572105fde872edff38e8188.s3tc.ctex"
uid="uid://d2lxk788w2cdw"
path.s3tc="res://.godot/imported/spawn_floor.png-932d516dabe821d5ec59606ca0d25279.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
@@ -11,8 +11,8 @@ metadata={
[deps]
source_file="res://assets/graphics/vfx/spawn_tiles_bottom.png"
dest_files=["res://.godot/imported/spawn_tiles_bottom.png-bf5af9b1f572105fde872edff38e8188.s3tc.ctex"]
source_file="res://assets/graphics/vfx/spawn_floor.png"
dest_files=["res://.godot/imported/spawn_floor.png-932d516dabe821d5ec59606ca0d25279.s3tc.ctex"]
[params]
assets/graphics/vfx/spawn_tiles_bottom.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 MiB

assets/models/arena/free_mode/level_water.gdshader
+83
View File
@@ -0,0 +1,83 @@
shader_type spatial;
render_mode cull_disabled;
uniform vec3 albedo : source_color;
uniform vec3 albedo2 : source_color;
uniform float metallic : hint_range(0.0, 1.0) = 0;
uniform float roughness : hint_range(0.0, 1.0) = 0.02;
uniform sampler2D wave;
uniform sampler2D texture_normal;
uniform sampler2D texture_normal2;
uniform vec2 wave_direction = vec2(2.0,0.0); // Direction of wave 1
uniform vec2 wave_direction2 = vec2(0.0,1.0); // Direction of wave 2
uniform float time_scale : hint_range(0.0, 0.2, 0.005) = 0.025; // Rate of movement multiplied by TIME
uniform float noise_scale = 10.0;
uniform float height_scale = 0.15;
uniform vec4 color_deep : source_color; // Deep depth color
uniform vec4 color_shallow : source_color; // Shallow depth color
uniform float beers_law = 2.0; // Beer's law application
uniform float depth_offset = -0.75; // Offset
uniform float edge_scale = 0.1;
uniform float near = 1.0;
uniform float far = 100.0;
uniform vec3 edge_color : source_color;
uniform sampler2D DEPTH_TEXTURE : hint_depth_texture, filter_linear_mipmap;
uniform sampler2D SCREEN_TEXTURE : hint_screen_texture, filter_linear_mipmap;
// Varying variables
varying float height;
varying vec3 world_pos;
float fresnel(float amount, vec3 normal, vec3 view)
{
return pow((1.0 - clamp(dot(normalize(normal), normalize(view)), 0.0, 1.0 )), amount);
}
float edge(float depth){
depth = 2.0 * depth - 1.0;
return near * far / (far + depth * (near - far));
}
void vertex() {
world_pos = (MODEL_MATRIX * vec4(VERTEX, 1.0)).xyz;
height = texture(wave, world_pos.xz / noise_scale + TIME * time_scale).r;
VERTEX.y += height * height_scale;
}
void fragment() {
// Depth variables and calc
float depth_texture = texture(DEPTH_TEXTURE, SCREEN_UV).r * 2.0 - 1.0;
float depth = PROJECTION_MATRIX[3][2] / (depth_texture + PROJECTION_MATRIX[2][2]);
float depth_blend = exp((depth+VERTEX.z + depth_offset) * -beers_law);
depth_blend = clamp(1.0 - depth_blend, 0.0, 1.0);
float depth_blend_power = clamp(pow(depth_blend, 2.5), 0.0, 1.0);
// Retrieving depth color and applying the deep and shallow colors
vec3 screen_color = textureLod(SCREEN_TEXTURE, SCREEN_UV, depth_blend_power * 2.5).rgb;
vec3 depth_color = mix(color_shallow.rgb, color_deep.rgb, depth_blend_power);
vec3 color = mix(screen_color * depth_color, depth_color * 0.25, depth_blend_power * 0.5);
// Getting edge depth calc
float z_depth = edge(texture(DEPTH_TEXTURE, SCREEN_UV).x);
float z_pos = edge(FRAGCOORD.z);
float z_dif = z_depth - z_pos;
// Time calculations for wave (normal map) movement
vec2 time = (TIME * wave_direction) * time_scale; // Movement rate of first wave
vec2 time2 = (TIME * wave_direction2) * time_scale; // Movement rate of second wave
// Blend normal maps into one
vec3 normal_blend = mix(texture(texture_normal,world_pos.xz + time).rgb, texture(texture_normal2,world_pos.xz + time2).rgb, 0.5);
// Calculate Fresnel
float fresnel = fresnel(5.0, NORMAL, VIEW);
vec3 surface_color = mix(albedo, albedo2, fresnel); // Interpolate albedo values by frensel
vec3 depth_color_adj = mix(edge_color, color, step(edge_scale, z_dif));
ALBEDO = clamp(surface_color + depth_color_adj,vec3(0.0),vec3(1.0));
METALLIC = metallic;
ROUGHNESS = roughness;
NORMAL_MAP = normal_blend;
}
assets/models/arena/free_mode/level_water.gdshader.uid
+1
View File
@@ -0,0 +1 @@
uid://chabrdico7377
assets/models/arena/free_mode/level_water.tres
+6
View File
@@ -0,0 +1,6 @@
[gd_resource type="PanoramaSkyMaterial" format=3 uid="uid://bdwxlbar41mxw"]
[ext_resource type="Texture2D" uid="uid://didk5l287jms7" path="res://assets/levels/level_water/sky_sea_01.png" id="1_f0k4a"]
[resource]
panorama = ExtResource("1_f0k4a")
assets/models/arena/free_mode/level_water_environment.tres
+13
View File
@@ -0,0 +1,13 @@
[gd_resource type="Environment" format=3 uid="uid://d07fd5dsr0xv"]
[ext_resource type="Material" uid="uid://bdwxlbar41mxw" path="res://assets/levels/level_water/level_water.tres" id="1_gsk4i"]
[sub_resource type="Sky" id="Sky_u7obs"]
sky_material = ExtResource("1_gsk4i")
[resource]
background_mode = 2
sky = SubResource("Sky_u7obs")
ambient_light_source = 3
ambient_light_color = Color(1, 1, 1, 1)
reflected_light_source = 2
assets/models/arena/free_mode/sky_sea_01.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 542 KiB

assets/models/arena/free_mode/sky_sea_01.png.import
+41
View File
@@ -0,0 +1,41 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dep1ng3aqb2jw"
path.s3tc="res://.godot/imported/sky_sea_01.png-02f4e2484e4bcee94a60ae25a0ef8549.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
[deps]
source_file="res://assets/models/arena/free_mode/sky_sea_01.png"
dest_files=["res://.godot/imported/sky_sea_01.png-02f4e2484e4bcee94a60ae25a0ef8549.s3tc.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0
assets/models/arena/free_mode/water_shader.tres
+38
View File
@@ -0,0 +1,38 @@
[gd_resource type="ShaderMaterial" format=3 uid="uid://xifgjdr8285d"]
[ext_resource type="Shader" uid="uid://chabrdico7377" path="res://assets/models/arena/free_mode/level_water.gdshader" id="1_nuaxy"]
[sub_resource type="FastNoiseLite" id="FastNoiseLite_s0tpp"]
noise_type = 0
seed = 5
frequency = 0.0166
metadata/_preview_in_3d_space_ = true
[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_6vard"]
noise = SubResource("FastNoiseLite_s0tpp")
seamless = true
as_normal_map = true
seamless_blend_skirt = 1.0
bump_strength = 25.6
[resource]
render_priority = 0
shader = ExtResource("1_nuaxy")
shader_parameter/albedo = Color(0.14, 0.382667, 0.7, 1)
shader_parameter/albedo2 = Color(0.54, 0.77, 1, 1)
shader_parameter/metallic = 0.0
shader_parameter/roughness = 0.02
shader_parameter/texture_normal = SubResource("NoiseTexture2D_6vard")
shader_parameter/wave_direction = Vector2(2, 0)
shader_parameter/wave_direction2 = Vector2(0, 1)
shader_parameter/time_scale = 0.025
shader_parameter/noise_scale = 10.0
shader_parameter/height_scale = 0.15
shader_parameter/color_deep = Color(0.513233, 0.513233, 0.513233, 1)
shader_parameter/color_shallow = Color(0.716296, 0.716296, 0.716296, 1)
shader_parameter/beers_law = 2.0
shader_parameter/depth_offset = -0.75
shader_parameter/edge_scale = 0.1
shader_parameter/near = 1.0
shader_parameter/far = 100.0
shader_parameter/edge_color = Color(0.215902, 0.215902, 0.215902, 1)