Unarelith/OpenMiner
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Vertex] Default AO value is now 4.

Browse Source
This commit is contained in:
Quentin Bazin 2021-06-17 18:10:45 +02:00
parent 341e8fa2e0
commit 90e2d38c33
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/shaders/game.v.glsl
View File

@ -48,7 +48,7 @@ void main() {
v_texCoord = texCoord; v_texCoord = texCoord;
v_lightValue = lightValue; v_lightValue = lightValue;
if (ambientOcclusion != 5) { if (ambientOcclusion != 4) {
const float aovalues[] = float[](0.4, 0.6, 0.8, 1.0); const float aovalues[] = float[](0.4, 0.6, 0.8, 1.0);
v_ambientOcclusion = aovalues[int(ambientOcclusion)]; v_ambientOcclusion = aovalues[int(ambientOcclusion)];
} else { } else {

2
source/client/core/Vertex.hpp
View File

@ -35,7 +35,7 @@ struct Vertex {
GLfloat color[4] = {0, 0, 0, 1}; GLfloat color[4] = {0, 0, 0, 1};
GLfloat normal[3] = {0, 0, 0}; GLfloat normal[3] = {0, 0, 0};
GLfloat lightValue[2] = {-1, -1}; GLfloat lightValue[2] = {-1, -1};
GLfloat ambientOcclusion = 5; GLfloat ambientOcclusion = 4;
}; };
#endif // VERTEX_HPP_ #endif // VERTEX_HPP_

4
source/client/world/ChunkMeshBuilder.cpp
View File

@ -283,7 +283,7 @@ inline void ChunkMeshBuilder::addCubeFace(s8f x, s8f y, s8f z, s8f f, ChunkMeshB
auto addVertex = [&](u8 v) { auto addVertex = [&](u8 v) {
if (Config::ambientOcclusion != 1 || blockState.isLightSource()) if (Config::ambientOcclusion != 1 || blockState.isLightSource())
vertices[v].ambientOcclusion = 5; vertices[v].ambientOcclusion = 4;
if (blockState.drawType() == BlockDrawType::Liquid) if (blockState.drawType() == BlockDrawType::Liquid)
job.vertices[ChunkMeshLayer::Liquid].emplace_back(vertices[v]); job.vertices[ChunkMeshLayer::Liquid].emplace_back(vertices[v]);
@ -369,7 +369,7 @@ inline void ChunkMeshBuilder::addCross(s8f x, s8f y, s8f z, ChunkMeshBuildingJob
vertices[v].lightValue[0] = job.chunkData.getSunlight(x, y, z); vertices[v].lightValue[0] = job.chunkData.getSunlight(x, y, z);
vertices[v].lightValue[1] = job.chunkData.getTorchlight(x, y, z); vertices[v].lightValue[1] = job.chunkData.getTorchlight(x, y, z);
vertices[v].ambientOcclusion = 5; vertices[v].ambientOcclusion = 4;
} }
job.vertices[ChunkMeshLayer::Flora].emplace_back(vertices[0]); job.vertices[ChunkMeshLayer::Flora].emplace_back(vertices[0]);