PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: fix narrowing conversion double to float by using std math funcs

Browse Source 
Signed-off-by: Vyacheslav Ivanov <islavaivanov76@gmail.com>
This commit is contained in:
Vyacheslav Ivanov 2024-08-03 23:13:35 +03:00 committed by Pugemon
parent 4211275c11
commit e4f8625e2a
No known key found for this signature in database
GPG Key ID: 472FA343B3CC3287
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/graphics/render/Skybox.cpp
View File

@ -11,6 +11,7 @@
#include "../../window/Camera.hpp" #include "../../window/Camera.hpp"
#include "../../maths/UVRegion.hpp" #include "../../maths/UVRegion.hpp"
#include <cmath>
#include <iostream> #include <iostream>
#include <GL/glew.h> #include <GL/glew.h>
#include <glm/glm.hpp> #include <glm/glm.hpp>
@ -76,14 +77,14 @@ void Skybox::drawStars(float angle, float opacity) {
float rx = (random.randFloat()) - 0.5f; float rx = (random.randFloat()) - 0.5f;
float ry = (random.randFloat()) - 0.5f; float ry = (random.randFloat()) - 0.5f;
float z = (random.randFloat()) - 0.5f; float z = (random.randFloat()) - 0.5f;
float x = rx * sin(angle) + ry * -cos(angle); float x = rx * std::sin(angle) + ry * -std::cos(angle);
float y = rx * cos(angle) + ry * sin(angle); float y = rx * std::cos(angle) + ry * std::sin(angle);
float sopacity = random.randFloat(); float sopacity = random.randFloat();
if (y < 0.0f) if (y < 0.0f)
continue; continue;
sopacity *= (0.2f+sqrt(cos(angle))*0.5) - 0.05; sopacity *= (0.2f+std::sqrt(std::cos(angle))*0.5f) - 0.05f;
glm::vec4 tint (1,1,1, sopacity * opacity); glm::vec4 tint (1,1,1, sopacity * opacity);
batch3d->point(glm::vec3(x, y, z), tint); batch3d->point(glm::vec3(x, y, z), tint);
} }
@ -106,26 +107,26 @@ void Skybox::draw(
DrawContext ctx = pctx.sub(); DrawContext ctx = pctx.sub();
ctx.setBlendMode(BlendMode::addition); ctx.setBlendMode(BlendMode::addition);
auto shader = assets->get<Shader>("ui3d"); auto p_shader = assets->get<Shader>("ui3d");
shader->use(); p_shader->use();
shader->uniformMatrix("u_projview", camera->getProjView(false)); p_shader->uniformMatrix("u_projview", camera->getProjView(false));
shader->uniformMatrix("u_apply", glm::mat4(1.0f)); p_shader->uniformMatrix("u_apply", glm::mat4(1.0f));
batch3d->begin(); batch3d->begin();
float angle = daytime * M_PI * 2; float angle = daytime * float(M_PI) * 2.0f;
float opacity = glm::pow(1.0f-fog, 7.0f); float opacity = glm::pow(1.0f-fog, 7.0f);
for (auto& sprite : sprites) { for (auto& sprite : sprites) {
batch3d->texture(assets->get<Texture>(sprite.texture)); batch3d->texture(assets->get<Texture>(sprite.texture));
float sangle = daytime * M_PI*2 + sprite.phase; float sangle = daytime * float(M_PI)*2.0 + sprite.phase;
float distance = sprite.distance; float distance = sprite.distance;
glm::vec3 pos(-cos(sangle)*distance, sin(sangle)*distance, 0); glm::vec3 pos(-std::cos(sangle)*distance, std::sin(sangle)*distance, 0);
glm::vec3 up(-sin(-sangle), cos(-sangle), 0.0f); glm::vec3 up(-std::sin(-sangle), std::cos(-sangle), 0.0f);
glm::vec4 tint (1,1,1, opacity); glm::vec4 tint (1,1,1, opacity);
if (!sprite.emissive) { if (!sprite.emissive) {
tint *= 0.6f+cos(angle)*0.4; tint *= 0.6f+std::cos(angle)*0.4;
} }
batch3d->sprite(pos, glm::vec3(0, 0, 1), batch3d->sprite(pos, glm::vec3(0, 0, 1),
up, 1, 1, UVRegion(), tint); up, 1, 1, UVRegion(), tint);