Framebuffer update linux build working

Gui_Panel_Refactor
Joey Pollack 4 years ago
parent 7039b1e26b
commit 10c773fce1

@ -0,0 +1 @@
.file "core.cpp"

@ -0,0 +1,12 @@
[Window][Debug##Default]
Pos=60,60
Size=400,400
Collapsed=0
[Window][Dear ImGui Demo]
Pos=708,10
Size=550,680
Collapsed=0
[Docking][Data]

@ -29,12 +29,13 @@ namespace lunarium
void GLAPIENTRY MessageCallback(GLenum source, GLenum type, GLuint id, void GLAPIENTRY MessageCallback(GLenum source, GLenum type, GLuint id,
GLenum severity, GLsizei length, const GLchar* message, const void* userParam) GLenum severity, GLsizei length, const GLchar* message, const void* userParam)
{ {
uint32_t level = LogLevel::OGL_DEBUG;
if (type == GL_DEBUG_TYPE_ERROR) if (type == GL_DEBUG_TYPE_ERROR)
{ {
Logger::Log(LogCategory::GRAPHICS, LogLevel::ERROR, "OPENGL ERROR"); level = LogLevel::ERROR;
} }
Logger::Log(LogCategory::GRAPHICS, LogLevel::OGL_DEBUG, Logger::Log(LogCategory::GRAPHICS, level,
"%s (type: %s, source: %s, severity: %s), message: %s", "%s (type: %s, source: %s, severity: %s), message: %s",
(type == GL_DEBUG_TYPE_ERROR ? "** GL ERROR **" : ""), (type == GL_DEBUG_TYPE_ERROR ? "** GL ERROR **" : ""),
OglGraphics::mDebugMsgSources[source].c_str(), OglGraphics::mDebugMsgSources[source].c_str(),
@ -151,17 +152,14 @@ namespace lunarium
glBindFramebuffer(GL_FRAMEBUFFER, 0); glBindFramebuffer(GL_FRAMEBUFFER, 0);
glBindTexture(GL_TEXTURE_2D, fb->Texture.GetGLTextureID()); glBindTexture(GL_TEXTURE_2D, fb->Texture.GetGLTextureID());
if (fb->Texture.GetFormat() == ImageFormat::RGBA) GLenum format = GL_RGBA;
if (fb->Texture.GetFormat() == ImageFormat::RGB)
{ {
glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, (void*)fb->Buffer); format = GL_RGB;
Logger::Log(LogCategory::GRAPHICS, LogLevel::INFO, "RGBA ID: %d", mActiveFrameBuffer);
}
else if (fb->Texture.GetFormat() == ImageFormat::RGB)
{
glGetTexImage(GL_TEXTURE_2D, 0, GL_RGB, GL_UNSIGNED_BYTE, (void*)fb->Buffer);
Logger::Log(LogCategory::GRAPHICS, LogLevel::INFO, "RGB ID: %d", mActiveFrameBuffer);
} }
glGetTexImage(GL_TEXTURE_2D, 0, format, GL_UNSIGNED_BYTE, (void*)fb->Buffer);
fb->Texture.SetData(fb->Buffer); fb->Texture.SetData(fb->Buffer);
return &fb->Texture; return &fb->Texture;

@ -89,4 +89,4 @@ namespace lunarium
} }
} }
} }
#endif GRID_H_ #endif // GRID_H_

@ -50,10 +50,10 @@ namespace lunarium
return res.Type == ResultType::OK; return res.Type == ResultType::OK;
} }
// bool Failed(OpRes&& res) bool Failed(OpRes&& res)
// { {
// return res.Type == ResultType::FAIL; return res.Type == ResultType::FAIL;
// } }
bool Failed(OpRes& res) bool Failed(OpRes& res)
{ {

@ -42,7 +42,7 @@ namespace lunarium
bool IsOK(OpRes&& res); bool IsOK(OpRes&& res);
bool IsOK(OpRes& res); bool IsOK(OpRes& res);
//bool Failed(OpRes&& res); bool Failed(OpRes&& res);
bool Failed(OpRes& res); bool Failed(OpRes& res);
} }

@ -10,4 +10,4 @@ target_include_directories(tester
PUBLIC ../../../external/box2d/include PUBLIC ../../../external/box2d/include
) )
target_link_libraries(tester box2d) target_link_libraries(tester box2d utils)
Loading…
Cancel
Save