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

fix for msvc weird defines

Browse Source
This commit is contained in:
milek7
2018-07-24 18:22:32 +02:00
parent 06de55f48c
commit 1aed27ad1f
1 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
renderer.cpp
View File

@@ -672,62 +672,62 @@ bool opengl_renderer::Render_reflections()
return true; return true;
} }
glm::mat4 opengl_renderer::perspective_projection(float fovy, float aspect, float near, float far) glm::mat4 opengl_renderer::perspective_projection(float fovy, float aspect, float znear, float zfar)
{ {
if (GLEW_ARB_clip_control) if (GLEW_ARB_clip_control)
{ {
const float f = 1.0f / tan(fovy / 2.0f); const float f = 1.0f / tan(fovy / 2.0f);
return glm::mat4( return glm::mat4( //
f / aspect, 0.0f, 0.0f, 0.0f, // f / aspect, 0.0f, 0.0f, 0.0f, //
0.0f, f, 0.0f, 0.0f, // 0.0f, f, 0.0f, 0.0f, //
0.0f, 0.0f, 0.0f, -1.0f, // 0.0f, 0.0f, 0.0f, -1.0f, //
0.0f, 0.0f, near, 0.0f // 0.0f, 0.0f, znear, 0.0f //
); );
} }
else else
return glm::mat4( // return glm::mat4( //
1.0f, 0.0f, 0.0f, 0.0f, // 1.0f, 0.0f, 0.0f, 0.0f, //
0.0f, 1.0f, 0.0f, 0.0f, // 0.0f, 1.0f, 0.0f, 0.0f, //
0.0f, 0.0f, -1.0f, 0.0f, // 0.0f, 0.0f, -1.0f, 0.0f, //
0.0f, 0.0f, 0.0f, 1.0f // 0.0f, 0.0f, 0.0f, 1.0f //
) * glm::perspective(fovy, aspect, near, far); ) *
glm::perspective(fovy, aspect, znear, zfar);
} }
glm::mat4 opengl_renderer::perpsective_frustumtest_projection(float fovy, float aspect, float near, float far) glm::mat4 opengl_renderer::perpsective_frustumtest_projection(float fovy, float aspect, float znear, float zfar)
{ {
if (GLEW_ARB_clip_control) if (GLEW_ARB_clip_control)
{
return glm::mat4( // return glm::mat4( //
1.0f, 0.0f, 0.0f, 0.0f, // 1.0f, 0.0f, 0.0f, 0.0f, //
0.0f, 1.0f, 0.0f, 0.0f, // 0.0f, 1.0f, 0.0f, 0.0f, //
0.0f, 0.0f, -0.5f, 0.0f, // 0.0f, 0.0f, -0.5f, 0.0f, //
0.0f, 0.0f, 0.5f, 1.0f // 0.0f, 0.0f, 0.5f, 1.0f //
) * glm::perspective(fovy, aspect, near, far); ) *
} glm::perspective(fovy, aspect, znear, zfar);
else else
return perspective_projection(fovy, aspect, near, far); return perspective_projection(fovy, aspect, znear, zfar);
} }
glm::mat4 opengl_renderer::ortho_projection(float l, float r, float b, float t, float near, float far) glm::mat4 opengl_renderer::ortho_projection(float l, float r, float b, float t, float znear, float zfar)
{ {
glm::mat4 proj = glm::ortho(l, r, b, t, near, far); glm::mat4 proj = glm::ortho(l, r, b, t, znear, zfar);
if (GLEW_ARB_clip_control) if (GLEW_ARB_clip_control)
{
return glm::mat4( // return glm::mat4( //
1.0f, 0.0f, 0.0f, 0.0f, // 1.0f, 0.0f, 0.0f, 0.0f, //
0.0f, 1.0f, 0.0f, 0.0f, // 0.0f, 1.0f, 0.0f, 0.0f, //
0.0f, 0.0f, -0.5f, 0.0f, // 0.0f, 0.0f, -0.5f, 0.0f, //
0.0f, 0.0f, 0.5f, 1.0f // 0.0f, 0.0f, 0.5f, 1.0f //
) * proj; ) *
} proj;
else else
return glm::mat4( // return glm::mat4( //
1.0f, 0.0f, 0.0f, 0.0f, // 1.0f, 0.0f, 0.0f, 0.0f, //
0.0f, 1.0f, 0.0f, 0.0f, // 0.0f, 1.0f, 0.0f, 0.0f, //
0.0f, 0.0f, -1.0f, 0.0f, // 0.0f, 0.0f, -1.0f, 0.0f, //
0.0f, 0.0f, 0.0f, 1.0f // 0.0f, 0.0f, 0.0f, 1.0f //
) * proj; ) *
proj;
} }
void opengl_renderer::setup_pass(renderpass_config &Config, rendermode const Mode, float const Znear, float const Zfar, bool const Ignoredebug) void opengl_renderer::setup_pass(renderpass_config &Config, rendermode const Mode, float const Znear, float const Zfar, bool const Ignoredebug)
@@ -902,10 +902,10 @@ void opengl_renderer::setup_pass(renderpass_config &Config, rendermode const Mod
camera.position() = Global.pCameraPosition; camera.position() = Global.pCameraPosition;
World.Camera.SetMatrix(viewmatrix); World.Camera.SetMatrix(viewmatrix);
// projection // projection
float near = 0.1f * Global.ZoomFactor; float znear = 0.1f * Global.ZoomFactor;
float far = Config.draw_range * Global.fDistanceFactor; float zfar = Config.draw_range * Global.fDistanceFactor;
camera.projection() = perspective_projection(fovy, aspect, near, far); camera.projection() = perspective_projection(fovy, aspect, znear, zfar);
frustumtest_proj = perpsective_frustumtest_projection(fovy, aspect, near, far); frustumtest_proj = perpsective_frustumtest_projection(fovy, aspect, znear, zfar);
break; break;
} }
case rendermode::reflections: case rendermode::reflections:
@@ -917,10 +917,10 @@ void opengl_renderer::setup_pass(renderpass_config &Config, rendermode const Mod
auto const cubefaceindex = m_environmentcubetextureface; auto const cubefaceindex = m_environmentcubetextureface;
viewmatrix *= glm::lookAt(camera.position(), camera.position() + cubefacetargetvectors[cubefaceindex], cubefaceupvectors[cubefaceindex]); viewmatrix *= glm::lookAt(camera.position(), camera.position() + cubefacetargetvectors[cubefaceindex], cubefaceupvectors[cubefaceindex]);
// projection // projection
float near = 0.1f * Global.ZoomFactor; float znear = 0.1f * Global.ZoomFactor;
float far = Config.draw_range * Global.fDistanceFactor; float zfar = Config.draw_range * Global.fDistanceFactor;
camera.projection() = perspective_projection(glm::radians(90.f), 1.f, near, far); camera.projection() = perspective_projection(glm::radians(90.f), 1.f, znear, zfar);
frustumtest_proj = perpsective_frustumtest_projection(glm::radians(90.f), 1.f, near, far); frustumtest_proj = perpsective_frustumtest_projection(glm::radians(90.f), 1.f, znear, zfar);
break; break;
} }
default: default: