Complete main menu without event bindings.

This commit is contained in:
2015-09-25 01:26:47 +02:00
parent b83de44715
commit 5f1963b8bc
40 changed files with 627 additions and 496 deletions
+6 -8
View File
@@ -79,13 +79,10 @@ file(GLOB SOURCE_FILES_Sound
)
source_group(Sound FILES ${SOURCE_FILES_Sound})
#file(GLOB SOURCE_FILES_GUI
# "${INCLUDE_PATH}/GUI/*.h"
# "GUI/*.cpp"
#)
set(SOURCE_FILES_GUI
"${INCLUDE_PATH}/GUI/Frame.h"
../../include/GUI/Button.h)
file(GLOB SOURCE_FILES_GUI
"${INCLUDE_PATH}/GUI/*.h"
"GUI/*.cpp"
)
source_group(GUI FILES ${SOURCE_FILES_GUI})
set(SOURCE_FILES
@@ -102,7 +99,8 @@ set(SOURCE_FILES
if(CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
set(STATIC_LIBRARY_FLAGS "${STATIC_LIBRARY_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
set(STATIC_LIBRARY_FLAGS "${STATIC_LIBRARY_FLAGS}")
endif()
add_library(game ${SOURCE_FILES})
+7 -2
View File
@@ -477,7 +477,6 @@ void dd::Renderer::DebugKeys()
void dd::Renderer::DrawGUI(dd::RenderQueue& rq)
{
glBindFramebuffer(GL_FRAMEBUFFER, m_fbDeferred3);
glEnable(GL_SCISSOR_TEST);
glDisable(GL_CULL_FACE);
glCullFace(GL_BACK);
glDisable(GL_DEPTH_TEST);
@@ -492,6 +491,7 @@ void dd::Renderer::DrawGUI(dd::RenderQueue& rq)
for (auto &job : rq) {
auto frameJob = std::dynamic_pointer_cast<FrameJob>(job);
if (frameJob) {
FrameJob jobCopy = *(frameJob.get());
glm::mat4 viewMatrix = glm::mat4(1); //frameJob->ViewMatrix;
glm::mat4 PV = glm::mat4(1); //frameJob->ProjectionMatrix * viewMatrix;
glm::mat4 modelMatrix = glm::mat4(1); //frameJob->ModelMatrix;
@@ -510,7 +510,12 @@ void dd::Renderer::DrawGUI(dd::RenderQueue& rq)
Rectangle& vp = frameJob->Viewport;
glViewport(vp.X, m_Resolution.Height - vp.Y - vp.Height, vp.Width, vp.Height);
Rectangle& sc = frameJob->Scissor;
glScissor(sc.X, m_Resolution.Height - sc.Y - sc.Height, sc.Width, sc.Height);
if (sc == Rectangle()) {
glDisable(GL_SCISSOR_TEST);
} else {
glEnable(GL_SCISSOR_TEST);
glScissor(sc.X, m_Resolution.Height - sc.Y - sc.Height, sc.Width, sc.Height);
}
glBindVertexArray(m_ScreenQuad);
glDrawArrays(GL_TRIANGLES, 0, 6);
+3
View File
@@ -31,6 +31,9 @@ dd::Texture::Texture(std::string path)
}
}
this->Width = image->Width;
this->Height = image->Height;
GLint format;
switch (image->Format) {
case Image::ImageFormat::RGB: