Rokojori
/
rokojori-action-library-examples
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated Islands

This commit is contained in:
Josef 2025-03-27 19:31:20 +01:00
parent 271412d932
commit 068e072388
4 changed files with 151 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

270
Packed/Island/Island.tscn
View File

File diff suppressed because one or more lines are too long

BIN
Packed/Island/OceanWater.material
View File

Binary file not shown.

17
Packed/Island/TerrainShader.gdshader
View File

@ -44,6 +44,7 @@ uniform float normalMinDistance = 5;
uniform float normalMaxDistance = 100; uniform float normalMaxDistance = 100;
uniform float normalMinValue = 0.5; uniform float normalMinValue = 0.5;
uniform float normalMaxValue = 1; uniform float normalMaxValue = 1;
uniform float normalPower:hint_range(0,1) = 1;
uniform float rim : hint_range(0.0, 1.0, 0.01); uniform float rim : hint_range(0.0, 1.0, 0.01);
uniform float rim_tint : hint_range(0.0, 1.0, 0.01); uniform float rim_tint : hint_range(0.0, 1.0, 0.01);
@ -73,6 +74,7 @@ uniform vec3 uv2_offset;
varying float cameraDistanceFactor; varying float cameraDistanceFactor;
uniform float terrainUVScale = 1; uniform float terrainUVScale = 1;
varying float camDist;
void vertex() void vertex()
{ {
@ -102,11 +104,11 @@ void vertex()
vec3 worldPosition = localToWorld( VERTEX, MODEL_MATRIX ); vec3 worldPosition = localToWorld( VERTEX, MODEL_MATRIX );
terrainUV = heightMapUV( worldPosition, terrainSize, terrainOffset ); terrainUV = heightMapUV( worldPosition, terrainSize, terrainOffset );
//vec4 heightMapData = texture( terrain, terrainUV ); float heightMapDataRaw = texture( terrain, terrainUV ).r;
float tx = texelVertexSpread / 2048.0; float tx = texelVertexSpread / 2048.0;
vec3 camPosWorld = ( vec4( 0, 0, 0, 1 ) * INV_VIEW_MATRIX ).xyz;
float cameraDistance = length( worldPosition - CAMERA_POSITION_WORLD ); float cameraDistance = length( (worldPosition + vec3( 0.0, heightMapDataRaw, 0.0 )) - CAMERA_POSITION_WORLD );
float txCam = texelVertexSpreadCamAmount * pow( cameraDistance / texelVertexSpreadCamDistance, texelVertexSpreadCamPower ); float txCam = texelVertexSpreadCamAmount * pow( cameraDistance / texelVertexSpreadCamDistance, texelVertexSpreadCamPower );
txCam /= 2048.0; txCam /= 2048.0;
txCam = min( txCam, 1.0/100.0 ); txCam = min( txCam, 1.0/100.0 );
@ -115,8 +117,10 @@ void vertex()
worldPosition.y += heightMapData.r * terrainMaxHeight; worldPosition.y += heightMapData.r * terrainMaxHeight;
camDist = cameraDistance;
cameraDistanceFactor = mapClamped( cameraDistance, normalMinDistance, normalMaxDistance, normalMinValue, normalMaxValue ); float cDNormalized = normalizeToRange01( cameraDistance, normalMinDistance, normalMaxDistance );
cDNormalized = mix( cDNormalized, cDNormalized * cDNormalized * cDNormalized, normalPower );
cameraDistanceFactor = mix( normalMinValue, normalMaxValue, cDNormalized );
// (dx, dy, dz) // (dx, dy, dz)
VERTEX.y += heightMapData.r * terrainMaxHeight; VERTEX.y += heightMapData.r * terrainMaxHeight;
@ -163,7 +167,7 @@ void fragment() {
NORMAL_MAP_DEPTH = normal_scale * cameraDistanceFactor; NORMAL_MAP_DEPTH = normal_scale * cameraDistanceFactor;
// Rim: Enabled // Rim: Enabled
/* /*
vec2 rim_tex = triplanar_texture(texture_rim, uv1_power_normal, uv1_triplanar_pos).xy; vec2 rim_tex = triplanar_texture(texture_rim, uv1_power_normal, uv1_triplanar_pos).xy;
RIM = rim * rim_tex.x; RIM = rim * rim_tex.x;
RIM_TINT = rim_tint * rim_tex.y; RIM_TINT = rim_tint * rim_tex.y;
@ -179,4 +183,5 @@ void fragment() {
vec3 detail_norm = mix(NORMAL_MAP, detail_norm_tex.rgb, detail_tex.a); vec3 detail_norm = mix(NORMAL_MAP, detail_norm_tex.rgb, detail_tex.a);
//NORMAL_MAP = mix(NORMAL_MAP, detail_norm, detail_mask_tex.r); //NORMAL_MAP = mix(NORMAL_MAP, detail_norm, detail_mask_tex.r);
ALBEDO.rgb = mix(ALBEDO.rgb, detail, detail_mask_tex.r); ALBEDO.rgb = mix(ALBEDO.rgb, detail, detail_mask_tex.r);
//ALBEDO.rgb = vec3( 0.0, 0.0, pow( camDist / 2000.0, 5) );
} }

2
addons/rokojori_action_library

@ -1 +1 @@
Subproject commit 560668edf8d4aa94e14517409aa4969badfe4700 Subproject commit 74e78d9d8365a0b1e89f73e2c298c41ef337b545