halbear/Terrain4J_Experimental_branch
halbear/Terrain4J_Experimental_branch
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity Actions

refactoring stuff

Browse source
This commit is contained in:
Halbear 2026-09-15 11:38:44 +01:00
parent 04befce27d
commit fa7bf893e7
54 changed files with 200 additions and 256 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/EngineResources/shaders/scene_fragment.glsl
View file

@ -1,6 +1,6 @@
#version 450
const int MAX_TEXTURES = 512;
const int MAX_TEXTURES = 128;
layout(location = 0) in vec4 inPos;
layout(location = 1) in vec3 inNormal;

2
resources/EngineResources/shaders/scene_fragment_deferred.glsl
View file

@ -1,6 +1,6 @@
#version 450
const int MAX_TEXTURES = 512;
const int MAX_TEXTURES = 128;
layout(location = 0) in vec4 inPos;

BIN
resources/EngineResources/shaders/scene_fragment_deferred.glsl.spv
View file

Binary file not shown.

2
resources/EngineResources/shaders/scene_opaque_fragment.glsl
View file

@ -1,6 +1,6 @@
#version 450
const int MAX_TEXTURES = 512;
const int MAX_TEXTURES = 128;
layout(location = 0) in vec4 inPos;

2
resources/EngineResources/shaders/scene_opaque_fragment_deferred.glsl
View file

@ -1,6 +1,6 @@
#version 450
const int MAX_TEXTURES = 512;
const int MAX_TEXTURES = 128;
layout(location = 0) in vec4 inPos;
layout(location = 1) in vec3 inNormal;

2
resources/EngineResources/shaders/scene_translucent_fragment.glsl
View file

@ -1,6 +1,6 @@
#version 450
const int MAX_TEXTURES = 512;
const int MAX_TEXTURES = 128;
layout(location = 0) in vec4 inPos;
layout(location = 1) in vec3 inNormal;

2
resources/EngineResources/shaders/scene_translucent_fragment_deferred.glsl
View file

@ -1,6 +1,6 @@
#version 450
const int MAX_TEXTURES = 512;
const int MAX_TEXTURES = 128;
layout(location = 0) in vec4 inPos;
layout(location = 1) in vec3 inNormal;

2
resources/EngineResources/shaders/screen_space_reflection_frag.glsl
View file

@ -52,7 +52,7 @@ void main() {
float NoV = clamp(dot(worldNormal, viewDirToCamera), 0.0, 1.0);
float fresnel = pow(1.0 - NoV, 5.0);
float materialReflection = reflectiveness + refractiveness - 1;
float materialReflection = reflectiveness + (refractiveness - 1.05);
materialReflection *= mix(0.75, 1.0, metallic);
materialReflection *= smoothstep(0.7, 0.05, roughness);
materialReflection *= mix(0.45, 1.0, fresnel);

2
resources/EngineResources/shaders/shadow_frag.glsl
View file

@ -1,7 +1,7 @@
#version 450
// Keep in sync manually with Java code
const int MAX_TEXTURES = 512;
const int MAX_TEXTURES = 128;
layout (location = 0) in vec2 inTextCoords;
layout (location = 1) in flat uint inMaterialIdx;

2
resources/EngineResources/shaders/skybox_fragment.glsl
View file

@ -7,5 +7,5 @@ layout(location = 1) out vec4 outColor;
layout(set = 2, binding = 0) uniform samplerCube skyboxSampler;
void main() {
outColor = texture(skyboxSampler, outTexCoords);// * vec4(3,1.0,0.65,1);
outColor = texture(skyboxSampler, outTexCoords); //* vec4(0.0,0.05,0.1,1);
}

14
resources/models/cube/Cube_mat.json
View file

@ -11,7 +11,7 @@
"W": 1.0
},
"Roughness": 0.0,
"Metallic": 1.0,
"Metallic": 0.0,
"EmissiveTexture": "",
"EmissiveColour": {
"X": 0.0,
@ -30,7 +30,7 @@
"W": 1.0
},
"Refractiveness": 1.0,
"Reflectiveness": 1.0
"Reflectiveness": 0.0
},
{
"ID": "Cube-mat-1",
@ -44,7 +44,7 @@
"W": 1.0
},
"Roughness": 0.0,
"Metallic": 1.0,
"Metallic": 0.0,
"EmissiveTexture": "",
"EmissiveColour": {
"X": 0.0,
@ -63,7 +63,7 @@
"W": 1.0
},
"Refractiveness": 1.0,
"Reflectiveness": 1.0
"Reflectiveness": 0.0
},
{
"ID": "Cube-mat-2",
@ -77,7 +77,7 @@
"W": 1.0
},
"Roughness": 0.0,
"Metallic": 1.0,
"Metallic": 0.0,
"EmissiveTexture": "",
"EmissiveColour": {
"X": 0.0,
@ -88,7 +88,7 @@
"TranslucencyTexture": "",
"Translucency": 0.0,
"OpacityTexture": "",
"Opacity": 1.0,
"Opacity": 0.0,
"ColorTransparency": {
"X": 0.0,
"Y": 0.0,
@ -96,6 +96,6 @@
"W": 1.0
},
"Refractiveness": 1.0,
"Reflectiveness": 1.0
"Reflectiveness": 0.0
}
]