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

revert bad changes

Browse Source
This commit is contained in:
milek7
2018-10-18 21:18:52 +02:00
parent 48d5a2f591
commit 6cf93f5a6d
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
renderer.cpp
View File

@@ -143,10 +143,11 @@ bool opengl_renderer::Init(GLFWwindow *Window)
WriteLog("...gfx data pre-loading done"); WriteLog("...gfx data pre-loading done");
// prepare basic geometry chunks // prepare basic geometry chunks
float const size = 2.5f / 2.0f;
auto const geometrybank = m_geometry.create_bank(); auto const geometrybank = m_geometry.create_bank();
m_billboardgeometry = m_geometry.create_chunk( m_billboardgeometry = m_geometry.create_chunk(
gfx::vertex_array{ gfx::vertex_array{
{{-1.f, 1.f, 0.f}, glm::vec3(), {1.f, 1.f}}, {{1.f, 1.f, 0.f}, glm::vec3(), {0.f, 1.f}}, {{-1.f, -1.f, 0.f}, glm::vec3(), {1.f, 0.f}}, {{1.f, -1.f, 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}}},
geometrybank, GL_TRIANGLE_STRIP); geometrybank, GL_TRIANGLE_STRIP);
m_empty_vao = std::make_unique<gl::vao>(); m_empty_vao = std::make_unique<gl::vao>();
@@ -3277,7 +3278,6 @@ void opengl_renderer::Render_Alpha(TSubModel *Submodel)
m_billboard_shader->bind(); m_billboard_shader->bind();
Bind_Texture(0, m_glaretexture); Bind_Texture(0, m_glaretexture);
model_ubs.param[0] = glm::vec4(glm::vec3(Submodel->f4Diffuse), Submodel->fVisible * glarelevel); model_ubs.param[0] = glm::vec4(glm::vec3(Submodel->f4Diffuse), Submodel->fVisible * glarelevel);
model_ubs.param[1].x = 2.5f / 2.0f;
// main draw call // main draw call
draw(m_billboardgeometry); draw(m_billboardgeometry);

2
shaders/simpleuv.vert
View File

@@ -7,6 +7,6 @@ out vec2 f_coord;
void main() void main()
{ {
gl_Position = (projection * modelview) * vec4(v_vert * param[1].x, 1.0f); gl_Position = (projection * modelview) * vec4(v_vert, 1.0f);
f_coord = v_coord; f_coord = v_coord;
} }