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

[BlockCursor] Small visual tweaks.

Browse Source
This commit is contained in:
Quentin Bazin 2020-03-05 23:55:59 +01:00
parent ffb33ef866
commit 2fd6a7450c
2 changed files with 55 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
client/source/hud/BlockCursor.cpp
View File

@ -41,42 +41,44 @@
#include "Hotbar.hpp" #include "Hotbar.hpp"
#include "Registry.hpp" #include "Registry.hpp"
// Same order as enum BlockFace in TilesDef.hpp
static float cubeCoords[6 * 4 * 3] = { static float cubeCoords[6 * 4 * 3] = {
// Right // West
1, 1, 1,
1, 1, 0,
1, 0, 0,
1, 0, 1,
// Top
1, 1, 1,
0, 1, 1,
0, 1, 0,
1, 1, 0,
// Back
1, 1, 1,
1, 0, 1,
0, 0, 1,
0, 1, 1,
// Left
0, 1, 1,
0, 1, 0, 0, 1, 0,
0, 0, 0, 0, 0, 0,
0, 0, 1, 0, 0, 1,
0, 1, 1,
// East
1, 0, 0,
1, 1, 0,
1, 1, 1,
1, 0, 1,
// South
0, 0, 0,
1, 0, 0,
1, 0, 1,
0, 0, 1,
// North
1, 1, 0,
0, 1, 0,
0, 1, 1,
1, 1, 1,
// Bottom // Bottom
1, 0, 1,
0, 0, 1,
0, 0, 0,
1, 0, 0, 1, 0, 0,
// Front
0, 0, 0, 0, 0, 0,
0, 1, 0, 0, 1, 0,
1, 1, 0, 1, 1, 0,
1, 0, 0,
// Top
0, 0, 1,
1, 0, 1,
1, 1, 1,
0, 1, 1,
}; };
void BlockCursor::onEvent(const SDL_Event &event, const Hotbar &hotbar) { void BlockCursor::onEvent(const SDL_Event &event, const Hotbar &hotbar) {
@ -218,7 +220,7 @@ void BlockCursor::updateAnimationVertexBuffer(const Block &block, int animationP
vertices[i].coord3d[0] = cubeCoords[i * 3] * block.boundingBox().sizeX + block.boundingBox().x; vertices[i].coord3d[0] = cubeCoords[i * 3] * block.boundingBox().sizeX + block.boundingBox().x;
vertices[i].coord3d[1] = cubeCoords[i * 3 + 1] * block.boundingBox().sizeY + block.boundingBox().y; vertices[i].coord3d[1] = cubeCoords[i * 3 + 1] * block.boundingBox().sizeY + block.boundingBox().y;
vertices[i].coord3d[2] = cubeCoords[i * 3 + 2] * block.boundingBox().sizeZ + block.boundingBox().z; vertices[i].coord3d[2] = cubeCoords[i * 3 + 2] * block.boundingBox().sizeZ + block.boundingBox().z;
vertices[i].coord3d[3] = -1; vertices[i].coord3d[3] = -2;
} }
GLfloat color[4] = {1, 1, 1, 0.5}; GLfloat color[4] = {1, 1, 1, 0.5};
@ -257,16 +259,22 @@ void BlockCursor::draw(gk::RenderTarget &target, gk::RenderStates states) const
gk::Vector3d cameraPosition = m_player.camera().getDPosition(); gk::Vector3d cameraPosition = m_player.camera().getDPosition();
states.transform.translate(m_selectedBlock.x - cameraPosition.x, m_selectedBlock.y - cameraPosition.y, m_selectedBlock.z - cameraPosition.z); states.transform.translate(m_selectedBlock.x - cameraPosition.x, m_selectedBlock.y - cameraPosition.y, m_selectedBlock.z - cameraPosition.z);
target.draw(m_vbo, GL_LINES, 0, 24, states); glCheck(glPolygonMode(GL_FRONT_AND_BACK, GL_LINE));
target.draw(m_vbo, GL_QUADS, 0, 24, states);
glCheck(glPolygonMode(GL_FRONT_AND_BACK, GL_FILL));
if (m_animationStart > 0) { if (m_animationStart > 0) {
glCheck(glBlendFunc(GL_DST_COLOR, GL_ZERO)); glCheck(glEnable(GL_CULL_FACE));
states.texture = &gk::ResourceHandler::getInstance().get<gk::Texture>("texture-block_destroy"); // FIXME // glCheck(glBlendFunc(GL_DST_COLOR, GL_ZERO));
// FIXME
states.texture = &gk::ResourceHandler::getInstance().get<gk::Texture>("texture-block_destroy");
target.draw(m_animationVBO, GL_QUADS, 0, 24, states); target.draw(m_animationVBO, GL_QUADS, 0, 24, states);
glCheck(glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA));
// glCheck(glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA));
} }
glCheck(glEnable(GL_CULL_FACE));
glCheck(glEnable(GL_POLYGON_OFFSET_FILL)); glCheck(glEnable(GL_POLYGON_OFFSET_FILL));
} }

18
resources/shaders/game.f.glsl
View File

@ -26,16 +26,28 @@ void main() {
float lightCheck = floor(v_lightValue.x + 0.5); float lightCheck = floor(v_lightValue.x + 0.5);
// Discard if the pixel is too far away // Discard if the pixel is too far away
if(blockFace != -1. && v_dist > u_renderDistance) discard; if(blockFace > -1. && v_dist > u_renderDistance) discard;
// Get current pixel color and apply multiplier on grayscale textures // Get current pixel color and apply multiplier on grayscale textures
vec4 color = getColor(); vec4 color = getColor();
if (blockFace != -1 && color != v_color && color.r == color.g && color.g == color.b) { if (blockFace > -1 && color != v_color && color.r == color.g && color.g == color.b) {
color *= v_color; color *= v_color;
} }
// Block breaking animation
if (blockFace == -2 && color.a != 0.) {
if (color.r < 0.5) {
color.rgb = 0.5 * color.rgb;
color.a -= 0.2;
}
else {
color.rgb = 0.8 * color.rgb;
color.a -= 0.7;
}
}
// Very cheap "transparency": don't draw pixels with a low alpha value // Very cheap "transparency": don't draw pixels with a low alpha value
if(color.a < 0.3 && blockFace != -1.) discard; if(color.a < 0.3 && blockFace > -1.) discard;
// FIXME: FINISH THIS WITH PROPER CODE AND SUN BASIC DISPLAY // FIXME: FINISH THIS WITH PROPER CODE AND SUN BASIC DISPLAY
// int maxTime = 5 * 1000; // int maxTime = 5 * 1000;