Bugfixes in WindowSDL, Console. Added ShaderBuffer.

ChangeLog.md

@@ -2,6 +2,11 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20150103 ]
+    * Fixed bug in WindowSDL where resizing only worked after calling it two times.
+    * Fixed bug in Console that caused its window to get bigger after each launch.
+    * Added ShaderBuffer class.
+
     [ 20141231 ]
     * No longer using Exceptions.
     * Moved OpenGL related code from Window into Shader, imguiShader in UI.

include/system/Shader.h

@@ -17,7 +17,7 @@
 
 class ShaderBuffer {
   public:
-    ShaderBuffer() : buffer(0), created(false) { }
+    ShaderBuffer();
     ~ShaderBuffer();
 
     void bufferData(int elem, int size, void* data);
@@ -32,7 +32,6 @@ class ShaderBuffer {
 
   private:
     unsigned int buffer;
-    bool created;
 };
 
 class Shader {

src/Console.cpp

@@ -71,15 +71,15 @@ void Console::callback(ImGuiTextEditCallbackData* data) {
 }
 
 void Console::display() {
-    if (ImGui::Begin("Console", nullptr, ImVec2(600, 400), -1.0f)) {
+    if (ImGui::Begin("Console", nullptr, ImVec2(600, 400))) {
         if (lastLogLength != getLog().size()) {
             lastLogLength = getLog().size();
             scrollToBottom = true;
         }
 
-        ImGui::BeginChild("ConsoleText", ImVec2(ImGui::GetWindowWidth(), ImGui::GetWindowSize().y - 70));
+        ImGui::BeginChild("ConsoleText", ImVec2(0, -ImGui::GetTextLineSpacing() * 2));
         for (unsigned long i = 0; i < getLog().size(); i++) {
-            ImGui::Text("%s", getLog().get(i).c_str());
+            ImGui::TextUnformatted(getLog().get(i).c_str());
         }
         if (scrollToBottom) {
             ImGui::SetScrollPosHere();

src/RunTime.cpp

@@ -114,13 +114,13 @@ void RunTime::display() {
         if (ImGui::InputInt("Width##runtime", &w, 10, 100, ImGuiInputTextFlags_EnterReturnsTrue)) {
             if (w < 1)
                 w = 1;
-            Window::setSize(glm::vec2(w, Window::getSize().y));
+            Window::setSize(glm::i32vec2(w, Window::getSize().y));
         }
         int h = Window::getSize().y;
         if (ImGui::InputInt("Height##runtime", &h, 10, 100, ImGuiInputTextFlags_EnterReturnsTrue)) {
             if (h < 1)
                 h = 1;
-            Window::setSize(glm::vec2(Window::getSize().x, h));
+            Window::setSize(glm::i32vec2(Window::getSize().x, h));
         }
 
         static int fr = 0;

src/UI.cpp

@@ -206,7 +206,7 @@ void UI::display() {
     Console::display();
 
     static bool showTestWindow = false;
-    if (ImGui::Begin("Engine")) {
+    if (ImGui::Begin("Engine", nullptr, ImVec2(400, 400))) {
         Render::displayUI();
         RunTime::display();
         SoundManager::display();

src/system/Shader.cpp

@@ -11,18 +11,15 @@
 #include "system/Window.h"
 #include "system/Shader.h"
 
+ShaderBuffer::ShaderBuffer() : buffer(0) {
+    glGenBuffers(1, &buffer);
+}
+
 ShaderBuffer::~ShaderBuffer() {
-    if (created) {
-        glDeleteBuffers(1, &buffer);
-    }
+    glDeleteBuffers(1, &buffer);
 }
 
 void ShaderBuffer::bufferData(int elem, int size, void* data) {
-    if (!created) {
-        glGenBuffers(1, &buffer);
-        created = true;
-    }
-
     glBindBuffer(GL_ARRAY_BUFFER, buffer);
     glBufferData(GL_ARRAY_BUFFER, elem * size, data, GL_STATIC_DRAW);
 }

src/system/WindowSDL.cpp

@@ -500,7 +500,7 @@ void WindowSDL::setSize(glm::i32vec2 s) {
     assert((s.x > 0) && (s.y > 0));
     if (window) {
         if ((s.x != size.x) || (s.y != size.y)) {
-            SDL_SetWindowSize(window, size.x, size.y);
+            SDL_SetWindowSize(window, s.x, s.y);
         }
     }
     size = s;