eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 12:49:18 +02:00
Code Issues 123 Wiki Activity

translation fix, freespot and improvements

Browse Source
This commit is contained in:
milek7
2018-10-13 21:25:00 +02:00
parent 0496350696
commit d8b902a364
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
renderer.cpp
View File

@@ -135,7 +135,7 @@ bool opengl_renderer::Init(GLFWwindow *Window)
// prepare basic geometry chunks // prepare basic geometry chunks
auto const geometrybank = m_geometry.create_bank(); auto const geometrybank = m_geometry.create_bank();
float const size = 2.5f; float const size = 2.5f / 2.0f;
m_billboardgeometry = m_geometry.create_chunk( m_billboardgeometry = m_geometry.create_chunk(
gfx::vertex_array{ gfx::vertex_array{
{{-size, size, 0.f}, glm::vec3(), {1.f, 1.f}}, {{size, size, 0.f}, glm::vec3(), {0.f, 1.f}}, {{-size, -size, 0.f}, glm::vec3(), {1.f, 0.f}}, {{size, -size, 0.f}, glm::vec3(), {0.f, 0.f}}}, {{-size, size, 0.f}, glm::vec3(), {1.f, 1.f}}, {{size, size, 0.f}, glm::vec3(), {0.f, 1.f}}, {{-size, -size, 0.f}, glm::vec3(), {1.f, 0.f}}, {{size, -size, 0.f}, glm::vec3(), {0.f, 0.f}}},

6
shaders/freespot.frag
View File

@@ -9,10 +9,10 @@ void main()
{ {
float x = (gl_PointCoord.x - 0.5f) * 2.0f; float x = (gl_PointCoord.x - 0.5f) * 2.0f;
float y = (gl_PointCoord.y - 0.5f) * 2.0f; float y = (gl_PointCoord.y - 0.5f) * 2.0f;
float dist2 = abs(x * x + y * y); float dist = sqrt(x * x + y * y);
if (dist2 > 0.5f * 0.5f) if (dist > 0.5f)
discard; discard;
gl_FragData[0] = vec4(param[0].rgb * emission, param[0].a); gl_FragData[0] = vec4(param[0].rgb * emission, mix(param[0].a, 0.0f, dist * 2.0f));
#if MOTIONBLUR_ENABLED #if MOTIONBLUR_ENABLED
{ {
vec2 a = (f_clip_future_pos.xy / f_clip_future_pos.w) * 0.5 + 0.5;; vec2 a = (f_clip_future_pos.xy / f_clip_future_pos.w) * 0.5 + 0.5;;

2
translation.cpp
View File

@@ -73,7 +73,7 @@ init() {
"Tools", "Tools",
"Logging to log.txt", "Logging to log.txt",
"Screenshot", "Screenshot",
"Windows" "Windows",
"Log", "Log",
"Map", "Map",
"Mode windows", "Mode windows",