AstralTransRocketries/Cubyz
1
0
Fork 0
mirror of https://github.com/PixelGuys/Cubyz.git synced 2025-09-12 05:53:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Forgot to commit shader changes.

Browse Source
This commit is contained in:
IntegratedQuantum 2022-09-29 13:10:11 +02:00
parent dbc416332a
commit e8e1fb401c
1 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
assets/cubyz/shaders/chunks/chunk_vertex.vs
View File

@ -9,8 +9,6 @@ out float outNormalVariation;
uniform mat4 projectionMatrix; uniform mat4 projectionMatrix;
uniform mat4 viewMatrix; uniform mat4 viewMatrix;
uniform vec3 modelPosition; uniform vec3 modelPosition;
uniform vec3 lowerBounds;
uniform vec3 upperBounds;
layout(std430, binding = 0) buffer _animationTimes layout(std430, binding = 0) buffer _animationTimes
{ {
@ -33,36 +31,44 @@ layout(std430, binding = 3) buffer _faceData
uniform int time; uniform int time;
const float[6] outNormalVariations = float[6]( const float[6] outNormalVariations = float[6](
0.9, //vec3(-1, 0, 0), 1.0, //vec3(0, 1, 0),
0.9, //vec3(1, 0, 0),
0.85, //vec3(0, 0, -1),
0.95, //vec3(0, 0, 1),
0.8, //vec3(0, -1, 0), 0.8, //vec3(0, -1, 0),
1.0 //vec3(0, 1, 0) 0.9, //vec3(1, 0, 0),
0.9, //vec3(-1, 0, 0),
0.95, //vec3(0, 0, 1),
0.8 //vec3(0, 0, -1)
); );
const vec3[6] normals = vec3[6]( const vec3[6] normals = vec3[6](
vec3(-1, 0, 0), vec3(0, 1, 0),
vec3(1, 0, 0),
vec3(0, 0, -1),
vec3(0, 0, 1),
vec3(0, -1, 0), vec3(0, -1, 0),
vec3(0, 1, 0) vec3(1, 0, 0),
vec3(-1, 0, 0),
vec3(0, 0, 1),
vec3(0, 0, -1)
);
const vec3[6] positionOffset = vec3[6](
vec3(0, 1, 0),
vec3(0, 0, 0),
vec3(1, 0, 0),
vec3(0, 0, 0),
vec3(0, 0, 1),
vec3(0, 0, 0)
); );
const ivec3[6] textureX = ivec3[6]( const ivec3[6] textureX = ivec3[6](
ivec3(0, 0, 1),
ivec3(0, 0, -1),
ivec3(-1, 0, 0),
ivec3(1, 0, 0), ivec3(1, 0, 0),
ivec3(-1, 0, 0), ivec3(-1, 0, 0),
ivec3(1, 0, 0) ivec3(0, 0, -1),
ivec3(0, 0, 1),
ivec3(1, 0, 0),
ivec3(-1, 0, 0)
); );
const ivec3[6] textureY = ivec3[6]( const ivec3[6] textureY = ivec3[6](
ivec3(0, -1, 0),
ivec3(0, -1, 0),
ivec3(0, -1, 0),
ivec3(0, -1, 0),
ivec3(0, 0, 1), ivec3(0, 0, 1),
ivec3(0, 0, 1) ivec3(0, 0, 1),
ivec3(0, -1, 0),
ivec3(0, -1, 0),
ivec3(0, -1, 0),
ivec3(0, -1, 0)
); );
void main() { void main() {
@ -76,26 +82,18 @@ void main() {
outTexCoord = vec2(float(vertexID>>1 & 1)*voxelSize, float(vertexID & 1)*voxelSize); outTexCoord = vec2(float(vertexID>>1 & 1)*voxelSize, float(vertexID & 1)*voxelSize);
vec3 position = vec3( vec3 position = vec3(
encodedPosition & 63, encodedPosition & 31,
encodedPosition >> 6 & 63, encodedPosition >> 5 & 31,
encodedPosition >> 12 & 63 encodedPosition >> 10 & 31
); );
position += positionOffset[normal];
position += vec3(equal(textureX[normal], ivec3(-1, -1, -1))) + (vertexID>>1 & 1)*textureX[normal]; position += vec3(equal(textureX[normal], ivec3(-1, -1, -1))) + (vertexID>>1 & 1)*textureX[normal];
position += vec3(equal(textureY[normal], ivec3(-1, -1, -1))) + (vertexID & 1)*textureY[normal]; position += vec3(equal(textureY[normal], ivec3(-1, -1, -1))) + (vertexID & 1)*textureY[normal];
// Only draw faces that are inside the bounds. The others will be clipped using GL_CLIP_DISTANCE0:
vec3 globalPosition = position*voxelSize + modelPosition; vec3 globalPosition = position*voxelSize + modelPosition;
vec4 mvPos = viewMatrix*vec4(globalPosition, 1); vec4 mvPos = viewMatrix*vec4(globalPosition, 1);
gl_Position = projectionMatrix*mvPos; gl_Position = projectionMatrix*mvPos;
outNormalVariation = outNormalVariations[normal]; outNormalVariation = outNormalVariations[normal];
mvVertexPos = mvPos.xyz; mvVertexPos = mvPos.xyz;
// Check if this vertex is outside the bounds that should be rendered:
globalPosition -= normals[normal]*0.5; // Prevent showing faces that are outside this chunkpiece.
if (globalPosition.x < lowerBounds.x || globalPosition.x > upperBounds.x
|| globalPosition.y < lowerBounds.y || globalPosition.y > upperBounds.y
|| globalPosition.z < lowerBounds.z || globalPosition.z > upperBounds.z) {
gl_Position.z = -1/0.0;
}
} }