New antialiasing made
This commit is contained in:
vladislav.khorev committed
1 parent
bf04c70f50
commit
75b76fc236
13 files changed
+235
-1051
No files matched your search
+159
-214
@@ -11,15 +11,142 @@
|
||||
|
||||
TMyApplication* Application;
|
||||
|
||||
|
||||
#define AREATEX_WIDTH 160
|
||||
#define AREATEX_HEIGHT 560
|
||||
#define SEARCHTEX_WIDTH 66
|
||||
#define SEARCHTEX_HEIGHT 33
|
||||
#define USE_SHADER_X16
|
||||
|
||||
|
||||
GLuint area_tex;
|
||||
GLuint search_tex;
|
||||
#ifdef USE_SHADER_X16
|
||||
|
||||
|
||||
std::vector<TRenderPair> linesToRenderBoxesX16(const std::vector<std::pair<Vector2f, Vector2f>>& lineArr)
|
||||
{
|
||||
std::vector<TRenderPair> lineRenderPairArr;
|
||||
|
||||
size_t boxCount = lineArr.size() / 16;
|
||||
|
||||
if (lineArr.size() % 16 > 0)
|
||||
{
|
||||
boxCount++;
|
||||
}
|
||||
|
||||
lineRenderPairArr.resize(boxCount);
|
||||
|
||||
//Set some initial values:
|
||||
for (size_t i = 0; i < lineRenderPairArr.size(); i++)
|
||||
{
|
||||
|
||||
for (size_t j = 0; j < 16; j++)
|
||||
{
|
||||
lineRenderPairArr[i].first.Vec4Map["lineParams" + boost::lexical_cast<std::string>(j)] = Vector4f(0, 0, 9999, 0);
|
||||
}
|
||||
}
|
||||
|
||||
for (size_t i = 0; i < lineArr.size(); i++)
|
||||
{
|
||||
|
||||
size_t boxIndex = i / 16;
|
||||
|
||||
Vector2f startPoint = lineArr[i].first;
|
||||
Vector2f endPoint = lineArr[i].second;
|
||||
|
||||
|
||||
auto& pair = lineRenderPairArr[boxIndex];
|
||||
|
||||
|
||||
|
||||
pair.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(startPoint(0), startPoint(1), 0));
|
||||
pair.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(startPoint(0), endPoint(1), 0));
|
||||
pair.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(endPoint(0), endPoint(1), 0));
|
||||
pair.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(startPoint(0), startPoint(1), 0));
|
||||
pair.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(endPoint(0), endPoint(1), 0));
|
||||
pair.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(endPoint(0), startPoint(1), 0));
|
||||
|
||||
pair.second.Data.Vec4CoordArr[CONST_STRING_COLOR_ATTRIB].push_back(Vector4f(1, 0, 0, 1));
|
||||
pair.second.Data.Vec4CoordArr[CONST_STRING_COLOR_ATTRIB].push_back(Vector4f(1, 0, 0, 1));
|
||||
pair.second.Data.Vec4CoordArr[CONST_STRING_COLOR_ATTRIB].push_back(Vector4f(1, 0, 0, 1));
|
||||
pair.second.Data.Vec4CoordArr[CONST_STRING_COLOR_ATTRIB].push_back(Vector4f(1, 0, 0, 1));
|
||||
pair.second.Data.Vec4CoordArr[CONST_STRING_COLOR_ATTRIB].push_back(Vector4f(1, 0, 0, 1));
|
||||
pair.second.Data.Vec4CoordArr[CONST_STRING_COLOR_ATTRIB].push_back(Vector4f(1, 0, 0, 1));
|
||||
|
||||
Vector2f lineVec = endPoint - startPoint;
|
||||
Vector2f lineNormVec = { -lineVec(1), lineVec(0) };
|
||||
|
||||
lineNormVec.normalize();
|
||||
|
||||
//float distance = abs(normVec.x*(position.x - startPoint.x) + normVec.y*(position.y - startPoint.y));
|
||||
//distance = a*x + b*y + c, here we calculate a, b,c and pass them to shader
|
||||
float a = lineNormVec(0);
|
||||
float b = lineNormVec(1);
|
||||
float c = -(lineNormVec(0)*startPoint(0) + lineNormVec(1)*startPoint(1));
|
||||
|
||||
|
||||
pair.first.Vec4Map["lineParams" + boost::lexical_cast<std::string>(i % 16)] = Vector4f(a, b, c, 0);
|
||||
|
||||
}
|
||||
|
||||
for (auto& pair : lineRenderPairArr)
|
||||
{
|
||||
pair.second.RefreshBuffer();
|
||||
}
|
||||
|
||||
|
||||
return lineRenderPairArr;
|
||||
}
|
||||
|
||||
|
||||
#else
|
||||
|
||||
|
||||
std::vector<TRenderPair> linesToRenderBoxes(const std::vector<std::pair<Vector2f, Vector2f>>& lineArr)
|
||||
{
|
||||
std::vector<TRenderPair> lineRenderPairArr;
|
||||
|
||||
lineRenderPairArr.resize(lineArr.size());
|
||||
|
||||
for (size_t i = 0; i < lineArr.size(); i++)
|
||||
{
|
||||
|
||||
Vector2f startPoint = lineArr[i].first;
|
||||
Vector2f endPoint = lineArr[i].second;
|
||||
|
||||
|
||||
auto& pair = lineRenderPairArr[i];
|
||||
|
||||
|
||||
pair.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(startPoint(0), startPoint(1), 0));
|
||||
pair.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(startPoint(0), endPoint(1), 0));
|
||||
pair.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(endPoint(0), endPoint(1), 0));
|
||||
pair.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(startPoint(0), startPoint(1), 0));
|
||||
pair.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(endPoint(0), endPoint(1), 0));
|
||||
pair.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(endPoint(0), startPoint(1), 0));
|
||||
|
||||
pair.second.Data.Vec4CoordArr[CONST_STRING_COLOR_ATTRIB].push_back(Vector4f(1, 0, 0, 1));
|
||||
pair.second.Data.Vec4CoordArr[CONST_STRING_COLOR_ATTRIB].push_back(Vector4f(1, 0, 0, 1));
|
||||
pair.second.Data.Vec4CoordArr[CONST_STRING_COLOR_ATTRIB].push_back(Vector4f(1, 0, 0, 1));
|
||||
pair.second.Data.Vec4CoordArr[CONST_STRING_COLOR_ATTRIB].push_back(Vector4f(1, 0, 0, 1));
|
||||
pair.second.Data.Vec4CoordArr[CONST_STRING_COLOR_ATTRIB].push_back(Vector4f(1, 0, 0, 1));
|
||||
pair.second.Data.Vec4CoordArr[CONST_STRING_COLOR_ATTRIB].push_back(Vector4f(1, 0, 0, 1));
|
||||
|
||||
Vector2f lineVec = endPoint - startPoint;
|
||||
Vector2f lineNormVec = { -lineVec(1), lineVec(0) };
|
||||
|
||||
lineNormVec.normalize();
|
||||
|
||||
//float distance = abs(normVec.x*(position.x - startPoint.x) + normVec.y*(position.y - startPoint.y));
|
||||
//distance = a*x + b*y + c, here we calculate a, b,c and pass them to shader
|
||||
float a = lineNormVec(0);
|
||||
float b = lineNormVec(1);
|
||||
float c = -(lineNormVec(0)*startPoint(0) + lineNormVec(1)*startPoint(1));
|
||||
|
||||
pair.first.Vec4Map["lineParams"] = Vector4f(a, b, c, 0);
|
||||
|
||||
pair.second.RefreshBuffer();
|
||||
}
|
||||
|
||||
return lineRenderPairArr;
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
void TMyApplication::InnerInit()
|
||||
@@ -46,132 +173,50 @@ void TMyApplication::InnerInit()
|
||||
srand (static_cast<size_t>(time(NULL)));
|
||||
|
||||
ResourceManager->ShaderManager.AddShader("DefaultShader", "shader1vertex.txt", "shader1fragment.txt");
|
||||
ResourceManager->ShaderManager.AddShader("FrameShader", "frameshader_vertex.txt", "frameshader_fragment.txt");
|
||||
ResourceManager->ShaderManager.AddShader("ColorShader", "color_vertex.txt", "color_fragment.txt");
|
||||
|
||||
#ifdef USE_SHADER_X16
|
||||
ResourceManager->ShaderManager.AddShader("AntialiasingShader", "ms_vertex.txt", "ms_fragment_x16.txt");
|
||||
#else
|
||||
ResourceManager->ShaderManager.AddShader("AntialiasingShader", "ms_vertex.txt", "ms_fragment.txt");
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
ResourceManager->ShaderManager.AddShader("SmaaEdge", "smaa/edge_vertex.txt", "smaa/edge_fragment.txt");
|
||||
ResourceManager->ShaderManager.AddShader("SmaaBlend", "smaa/blend_vertex.txt", "smaa/blend_fragment.txt");
|
||||
ResourceManager->ShaderManager.AddShader("SmaaNeighborhood", "smaa/neighborhood_vertex.txt", "smaa/neighborhood_fragment.txt");
|
||||
|
||||
Renderer->PushShader("DefaultShader");
|
||||
|
||||
ResourceManager->TexList.AddTexture("console_bkg.bmp");
|
||||
|
||||
ResourceManager->FrameManager.AddFrameRenderBuffer("AlbedoBuffer", 512, 512);
|
||||
ResourceManager->FrameManager.AddFrameRenderBuffer("EdgeBuffer", 512, 512);
|
||||
ResourceManager->FrameManager.AddFrameRenderBuffer("BlendBuffer", 512, 512);
|
||||
|
||||
pair.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(0, 0, 0));
|
||||
pair.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(0, 512, 0));
|
||||
pair.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(512, 512, 0));
|
||||
pair.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(0, 0, 0));
|
||||
pair.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(512, 512, 0));
|
||||
pair.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(512, 0, 0));
|
||||
|
||||
std::vector<std::pair<Vector2f, Vector2f>> lineArr;
|
||||
|
||||
for (int i = 0; i < 10; i++)
|
||||
{
|
||||
lineArr.push_back({ {10.f + i * 20.f, 10.f}, { 20.f + i * 20.f, 400.f } });
|
||||
|
||||
lineArr.push_back({ { 20.f + i * 20.f, 400.f },{ 30.f + i * 20.f, 10.f } });
|
||||
};
|
||||
|
||||
|
||||
#ifdef USE_SHADER_X16
|
||||
lineRenderPairArr = linesToRenderBoxesX16(lineArr);
|
||||
|
||||
//Choose colored or black and white -- Vladislav Khorev vladislav.khorev@fishrungames.com
|
||||
#if 1
|
||||
pair.second.Data.Vec4CoordArr[CONST_STRING_COLOR_ATTRIB].push_back(Vector4f(1, 0, 0, 1));
|
||||
pair.second.Data.Vec4CoordArr[CONST_STRING_COLOR_ATTRIB].push_back(Vector4f(1, 0, 0, 1));
|
||||
pair.second.Data.Vec4CoordArr[CONST_STRING_COLOR_ATTRIB].push_back(Vector4f(0, 1, 0, 1));
|
||||
pair.second.Data.Vec4CoordArr[CONST_STRING_COLOR_ATTRIB].push_back(Vector4f(0, 0, 1, 1));
|
||||
pair.second.Data.Vec4CoordArr[CONST_STRING_COLOR_ATTRIB].push_back(Vector4f(0, 0, 1, 1));
|
||||
pair.second.Data.Vec4CoordArr[CONST_STRING_COLOR_ATTRIB].push_back(Vector4f(0, 1, 0, 1));
|
||||
#else
|
||||
|
||||
pair.second.Data.Vec4CoordArr[CONST_STRING_COLOR_ATTRIB].push_back(Vector4f(1, 1, 1, 1));
|
||||
pair.second.Data.Vec4CoordArr[CONST_STRING_COLOR_ATTRIB].push_back(Vector4f(1, 1, 1, 1));
|
||||
pair.second.Data.Vec4CoordArr[CONST_STRING_COLOR_ATTRIB].push_back(Vector4f(1, 1, 1, 1));
|
||||
pair.second.Data.Vec4CoordArr[CONST_STRING_COLOR_ATTRIB].push_back(Vector4f(0, 0, 0, 1));
|
||||
pair.second.Data.Vec4CoordArr[CONST_STRING_COLOR_ATTRIB].push_back(Vector4f(0, 0, 0, 1));
|
||||
pair.second.Data.Vec4CoordArr[CONST_STRING_COLOR_ATTRIB].push_back(Vector4f(0, 0, 0, 1));
|
||||
lineRenderPairArr = linesToRenderBoxes(lineArr);
|
||||
|
||||
#endif
|
||||
pair.first.ShaderName = "ColorShader";
|
||||
|
||||
pair.second.RefreshBuffer();
|
||||
|
||||
|
||||
|
||||
|
||||
rect.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(0, 0, 0));
|
||||
rect.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(0, 512, 0));
|
||||
rect.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(512, 512, 0));
|
||||
rect.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(512, 512, 0));
|
||||
rect.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(512, 0, 0));
|
||||
rect.second.Data.Vec3CoordArr[CONST_STRING_POSITION_ATTRIB].push_back(Vector3f(0, 0, 0));
|
||||
|
||||
rect.second.Data.Vec2CoordArr[CONST_STRING_TEXCOORD_ATTRIB].push_back(Vector2f(0, 0));
|
||||
rect.second.Data.Vec2CoordArr[CONST_STRING_TEXCOORD_ATTRIB].push_back(Vector2f(0, 1));
|
||||
rect.second.Data.Vec2CoordArr[CONST_STRING_TEXCOORD_ATTRIB].push_back(Vector2f(1, 1));
|
||||
rect.second.Data.Vec2CoordArr[CONST_STRING_TEXCOORD_ATTRIB].push_back(Vector2f(1, 1));
|
||||
rect.second.Data.Vec2CoordArr[CONST_STRING_TEXCOORD_ATTRIB].push_back(Vector2f(1, 0));
|
||||
rect.second.Data.Vec2CoordArr[CONST_STRING_TEXCOORD_ATTRIB].push_back(Vector2f(0, 0));
|
||||
|
||||
|
||||
rect.second.RefreshBuffer();
|
||||
|
||||
|
||||
Renderer->SetOrthoProjection();
|
||||
|
||||
Renderer->SetFullScreenViewport();
|
||||
|
||||
glDisable(GL_BLEND); //Don't forget to disable blending or whole thing will not work!!! -- Vladislav Khorev vladislav.khorev@fishrungames.com
|
||||
|
||||
Inited = true;
|
||||
|
||||
|
||||
|
||||
|
||||
//This is stuff from original https://github.com/scrawl/smaa-opengl
|
||||
//We must have these textures to be used for pattern matching or something -- Vladislav Khorev vladislav.khorev@fishrungames.com
|
||||
|
||||
unsigned char* buffer = 0;
|
||||
FILE* f = 0;
|
||||
|
||||
buffer = new unsigned char[1024 * 1024];
|
||||
f = fopen((ST::PathToResources + "smaa/smaa_area.raw").c_str(), "rb"); //rb stands for "read binary file"
|
||||
|
||||
if (!f)
|
||||
{
|
||||
std::cerr << "Couldn't open smaa_area.raw.\n";
|
||||
}
|
||||
|
||||
fread(buffer, AREATEX_WIDTH * AREATEX_HEIGHT * 2, 1, f);
|
||||
fclose(f);
|
||||
|
||||
f = 0;
|
||||
|
||||
glGenTextures(1, &area_tex);
|
||||
glBindTexture(GL_TEXTURE_2D, area_tex);
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
||||
glTexImage2D(GL_TEXTURE_2D, 0, GL_RG8, (GLsizei)AREATEX_WIDTH, (GLsizei)AREATEX_HEIGHT, 0, GL_RG, GL_UNSIGNED_BYTE, buffer);
|
||||
|
||||
f = fopen((ST::PathToResources + "smaa/smaa_search.raw").c_str(), "rb");
|
||||
|
||||
if (!f)
|
||||
{
|
||||
std::cerr << "Couldn't open smaa_search.raw.\n";
|
||||
}
|
||||
|
||||
fread(buffer, SEARCHTEX_WIDTH * SEARCHTEX_HEIGHT, 1, f);
|
||||
fclose(f);
|
||||
|
||||
f = 0;
|
||||
|
||||
glGenTextures(1, &search_tex);
|
||||
glBindTexture(GL_TEXTURE_2D, search_tex);
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
|
||||
glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, (GLsizei)SEARCHTEX_WIDTH, (GLsizei)SEARCHTEX_HEIGHT, 0, GL_RED, GL_UNSIGNED_BYTE, buffer);
|
||||
|
||||
delete[] buffer;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -183,10 +228,6 @@ void TMyApplication::InnerDeinit()
|
||||
{
|
||||
*Console<<"APP DEINIT\n";
|
||||
}
|
||||
|
||||
glDeleteTextures(1, &search_tex);
|
||||
glDeleteTextures(1, &area_tex);
|
||||
|
||||
}
|
||||
|
||||
void TMyApplication::InnerOnTapDown(Vector2f p)
|
||||
@@ -218,120 +259,24 @@ void TMyApplication::InnerDraw()
|
||||
{
|
||||
|
||||
//Render the frame
|
||||
Renderer->SwitchToFrameBuffer("AlbedoBuffer");
|
||||
Renderer->PushShader("AntialiasingShader");
|
||||
|
||||
Renderer->SetProjectionMatrix(512.f, 512.f);
|
||||
|
||||
glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
|
||||
glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
|
||||
glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
|
||||
CheckGlError("");
|
||||
|
||||
|
||||
for (auto& pair : lineRenderPairArr)
|
||||
{
|
||||
//Render here all objects that you want to have -- Vladislav Khorev vladislav.khorev@fishrungames.com
|
||||
TRenderParamsSetter params(pair.first);
|
||||
Renderer->DrawTriangleList(pair.second);
|
||||
}
|
||||
|
||||
CheckGlError("");
|
||||
|
||||
|
||||
//-------------------------
|
||||
//First pass - edge detection
|
||||
|
||||
Renderer->PushShader("SmaaEdge");
|
||||
|
||||
|
||||
Renderer->SwitchToFrameBuffer("EdgeBuffer");
|
||||
Renderer->SetProjectionMatrix(512.f, 512.f);
|
||||
|
||||
RenderUniform1i("albedo_tex", 0);
|
||||
|
||||
glActiveTexture(GL_TEXTURE0);
|
||||
glBindTexture(GL_TEXTURE_2D, ResourceManager->FrameManager.GetFrameTexture("AlbedoBuffer"));
|
||||
|
||||
|
||||
Renderer->DrawTriangleList(rect.second);
|
||||
|
||||
Renderer->PopShader();
|
||||
|
||||
CheckGlError("");
|
||||
|
||||
|
||||
//-------------------------
|
||||
//Second pass - blend plus pattern matching
|
||||
|
||||
Renderer->PushShader("SmaaBlend");
|
||||
|
||||
Renderer->SwitchToFrameBuffer("BlendBuffer");
|
||||
Renderer->SetProjectionMatrix(512.f, 512.f);
|
||||
glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
|
||||
|
||||
RenderUniform1i("edge_tex", 0);
|
||||
RenderUniform1i("area_tex", 1);
|
||||
RenderUniform1i("search_tex", 2);
|
||||
|
||||
glActiveTexture(GL_TEXTURE0);
|
||||
glBindTexture(GL_TEXTURE_2D, ResourceManager->FrameManager.GetFrameTexture("EdgeBuffer"));
|
||||
|
||||
glActiveTexture(GL_TEXTURE1);
|
||||
glBindTexture(GL_TEXTURE_2D, area_tex);
|
||||
|
||||
glActiveTexture(GL_TEXTURE2);
|
||||
glBindTexture(GL_TEXTURE_2D, search_tex);
|
||||
|
||||
Renderer->DrawTriangleList(rect.second);
|
||||
|
||||
Renderer->PopShader();
|
||||
|
||||
CheckGlError("");
|
||||
|
||||
#if 1
|
||||
//-------------------------
|
||||
//Last pass - neightborhood
|
||||
|
||||
Renderer->PushShader("SmaaNeighborhood");
|
||||
|
||||
Renderer->SwitchToScreen();
|
||||
Renderer->SetFullScreenViewport();
|
||||
Renderer->SetProjectionMatrix(512.f, 512.f);
|
||||
glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
|
||||
|
||||
RenderUniform1i("albedo_tex", 0);
|
||||
RenderUniform1i("blend_tex", 1);
|
||||
|
||||
glActiveTexture(GL_TEXTURE1);
|
||||
glBindTexture(GL_TEXTURE_2D, ResourceManager->FrameManager.GetFrameTexture("BlendBuffer"));
|
||||
|
||||
glActiveTexture(GL_TEXTURE0);
|
||||
glBindTexture(GL_TEXTURE_2D, ResourceManager->FrameManager.GetFrameTexture("AlbedoBuffer"));
|
||||
Renderer->DrawTriangleList(rect.second);
|
||||
|
||||
Renderer->PopShader();
|
||||
|
||||
CheckGlError("");
|
||||
#else
|
||||
|
||||
|
||||
//... or just render intermediate buffers to see what is going on
|
||||
Renderer->PushShader("DefaultShader");
|
||||
Renderer->SwitchToScreen();
|
||||
Renderer->SetFullScreenViewport();
|
||||
Renderer->SetProjectionMatrix(512.f, 512.f);
|
||||
|
||||
|
||||
glActiveTexture(GL_TEXTURE0);
|
||||
|
||||
//Choose any to render for debug:
|
||||
//glBindTexture(GL_TEXTURE_2D, ResourceManager->FrameManager.GetFrameTexture("AlbedoBuffer"));
|
||||
//glBindTexture(GL_TEXTURE_2D, ResourceManager->FrameManager.GetFrameTexture("EdgeBuffer"));
|
||||
glBindTexture(GL_TEXTURE_2D, ResourceManager->FrameManager.GetFrameTexture("BlendBuffer"));
|
||||
|
||||
Renderer->DrawTriangleList(rect.second);
|
||||
|
||||
Renderer->PopShader();
|
||||
|
||||
CheckGlError("");
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
|
||||
+1
-2
@@ -33,8 +33,7 @@ protected:
|
||||
bool Inited;
|
||||
|
||||
public:
|
||||
TRenderPair pair;
|
||||
TRenderPair rect;
|
||||
std::vector<TRenderPair> lineRenderPairArr;
|
||||
|
||||
bool Loaded;
|
||||
|
||||
|
||||
Reference in new issue
Block a user