1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 21:13:05 +01:00

Rename CopyFramebufferShader to ApplyPaletteShader

This commit is contained in:
LRFLEW
2017-10-25 01:47:43 -05:00
committed by Michał Janiszewski
parent 50600f6195
commit 778cb9d024
7 changed files with 25 additions and 26 deletions

View File

@@ -16,7 +16,7 @@
#ifndef DISABLE_OPENGL
#include "CopyFramebufferShader.h"
#include "ApplyPaletteShader.h"
struct VDStruct
{
@@ -32,7 +32,7 @@ constexpr VDStruct VertexData[4] =
{ 1.0f, 1.0f, 1.0f, 1.0f },
};
CopyFramebufferShader::CopyFramebufferShader() : OpenGLShaderProgram("copyframebuffer")
ApplyPaletteShader::ApplyPaletteShader() : OpenGLShaderProgram("applypalette")
{
GetLocations();
@@ -53,13 +53,13 @@ CopyFramebufferShader::CopyFramebufferShader() : OpenGLShaderProgram("copyframeb
glUniform1i(uTexture, 0);
}
CopyFramebufferShader::~CopyFramebufferShader()
ApplyPaletteShader::~ApplyPaletteShader()
{
glDeleteBuffers(1, &_vbo);
glDeleteVertexArrays(1, &_vao);
}
void CopyFramebufferShader::GetLocations()
void ApplyPaletteShader::GetLocations()
{
uTexture = GetUniformLocation("uTexture");
uPalette = GetUniformLocation("uPalette");
@@ -68,17 +68,17 @@ void CopyFramebufferShader::GetLocations()
vTextureCoordinate = GetAttributeLocation("vTextureCoordinate");
}
void CopyFramebufferShader::SetTexture(GLuint texture)
void ApplyPaletteShader::SetTexture(GLuint texture)
{
OpenGLAPI::SetTexture(0, GL_TEXTURE_2D, texture);
}
void CopyFramebufferShader::SetPalette(const vec4 * glPalette)
void ApplyPaletteShader::SetPalette(const vec4 * glPalette)
{
glUniform4fv(uPalette, 256, (const GLfloat *)glPalette);
}
void CopyFramebufferShader::Draw()
void ApplyPaletteShader::Draw()
{
glBindVertexArray(_vao);
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);

View File

@@ -19,7 +19,7 @@
#include "GLSLTypes.h"
#include "OpenGLShaderProgram.h"
class CopyFramebufferShader final : public OpenGLShaderProgram
class ApplyPaletteShader final : public OpenGLShaderProgram
{
private:
GLuint uTexture;
@@ -32,8 +32,8 @@ private:
GLuint _vao;
public:
CopyFramebufferShader();
~CopyFramebufferShader() override;
ApplyPaletteShader();
~ApplyPaletteShader() override;
void SetTexture(GLuint texture);
void SetPalette(const vec4 * glPalette);

View File

@@ -39,7 +39,7 @@
#include "GLSLTypes.h"
#include "OpenGLAPI.h"
#include "OpenGLFramebuffer.h"
#include "CopyFramebufferShader.h"
#include "ApplyPaletteShader.h"
#include "DrawCommands.h"
#include "DrawLineShader.h"
#include "DrawRectShader.h"
@@ -139,7 +139,7 @@ private:
OpenGLDrawingContext * _drawingContext;
CopyFramebufferShader * _copyFramebufferShader = nullptr;
ApplyPaletteShader * _applyPaletteShader = nullptr;
OpenGLFramebuffer * _screenFramebuffer = nullptr;
OpenGLFramebuffer * _scaleFramebuffer = nullptr;
@@ -159,7 +159,7 @@ public:
~OpenGLDrawingEngine() override
{
delete _copyFramebufferShader;
delete _applyPaletteShader;
delete _screenFramebuffer;
delete _drawingContext;
@@ -191,7 +191,7 @@ public:
_drawingContext->Initialise();
_copyFramebufferShader = new CopyFramebufferShader();
_applyPaletteShader = new ApplyPaletteShader();
}
void Resize(uint32 width, uint32 height) override
@@ -218,8 +218,8 @@ public:
colour.a / 255.0f };
}
_copyFramebufferShader->Use();
_copyFramebufferShader->SetPalette(GLPalette);
_applyPaletteShader->Use();
_applyPaletteShader->SetPalette(GLPalette);
_drawingContext->ResetPalette();
}
@@ -254,9 +254,9 @@ public:
_screenFramebuffer->Bind();
}
_copyFramebufferShader->Use();
_copyFramebufferShader->SetTexture(_drawingContext->GetFinalFramebuffer().GetTexture());
_copyFramebufferShader->Draw();
_applyPaletteShader->Use();
_applyPaletteShader->SetTexture(_drawingContext->GetFinalFramebuffer().GetTexture());
_applyPaletteShader->Draw();
if (_scaleFramebuffer != nullptr)
{

View File

@@ -16,7 +16,6 @@
#ifndef DISABLE_OPENGL
#include "CopyFramebufferShader.h"
#include "OpenGLFramebuffer.h"
#include "SwapFramebuffer.h"