Using stb_image, stb_image_write. New imgui version.

ChangeLog.md

@@ -2,6 +2,13 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20141229 ]
+    * Removed utils/png, utils/tga image readers
+    * Included current stb_image, stb_image_write and stb_textedit
+    * Now using stb_image for all image loading (except pcx format)
+    * Now storing screenshots in PNG format
+    * Updated imgui
+
     [ 20141228 ]
     * Room Bounding Boxes are now visualized in Wireframe mode (again).
     * Window/WindowSDL/WindowGLFW are now completely static.

README.md

@@ -46,7 +46,6 @@ Basically, OpenRaider depends on the following:
 * SDL2 or GLFW
 * SDL2-TTF (optional, doesn’t work with GLFW, needed if you want to use TTF fonts)
 * OpenAL & ALUT (optional, needed for sound output)
-* libpng (optional)
 
 On Mac OS X 10.9 / 10.10 with [XCode](https://developer.apple.com/xcode/) and [MacPorts](http://www.macports.org) installed, the following should be enough to get all dependencies that are available as port:
 

TODO.md

@@ -8,10 +8,8 @@
 
 ## Bugs
 
-* Screenshots are sometimes not written, sometimes distorted?
+* Screenshots are sometimes distorted?
     * Seems to happen if OpenRaider.ini sets a resolution larger than the window can be
-* When the freeGLUT windowing interface is used, the first pressed button seems to be repeated
-    * Replace freeGLUT with glfw?
 
 ## Cmake
 
@@ -24,6 +22,4 @@
 * Depend on physfs for easier file location management
 * Depend on libcdio, use it to read original CDs or CUE/TOC/ISO images
 * Add ability to play the FMVs. Format? VLC can play them!
-* Cut TGA image reader, currently only used for menu background?!
-    * Need useful, always available image writer alternative for screenshots then
 

include/Render.h

@@ -29,6 +29,7 @@ class Render {
     static void setMode(RenderMode m);
 
     static void display();
+    static void displayUI();
 
     static void clearRoomList();
 

include/TextureManager.h

@@ -107,10 +107,7 @@ class TextureManager {
 
   private:
     std::vector<unsigned int>& getIds(TextureStorage s);
-
-    int loadTGA(const char* filename, TextureStorage s, int slot);
     int loadPCX(const char* filename, TextureStorage s, int slot);
-    int loadPNG(const char* filename, TextureStorage s, int slot);
 
     std::vector<unsigned int> mTextureIdsGame;
     std::vector<unsigned int> mTextureIdsSystem;

include/UI.h

@@ -13,7 +13,7 @@
 #include <memory>
 #include <tuple>
 
-#include "imgui/imgui.h"
+class ImDrawList;
 
 class UI {
   public:

include/config.h.in

@@ -19,7 +19,6 @@ extern const char* DEFAULT_CONFIG_FILE;
 extern const char* INSTALL_PREFIX;
 
 #cmakedefine USING_AL
-#cmakedefine USING_PNG
 #cmakedefine USING_SDL
 #cmakedefine USING_SDL_FONT
 #cmakedefine USING_GLFW

include/utils/png.h

@@ -1,49 +0,0 @@
-/*!
- * \file include/utils/png.h
- * \brief PNG image reader
- *
- * \author xythobuz
- */
-
-#ifndef _UTILS_PNG_H_
-#define _UTILS_PNG_H_
-
-#include "TextureManager.h"
-
-/*!
- * \brief Check if a file is a valid PNG image
- * \param filename path of file to read
- * \returns 0 on success
- */
-int pngCheck(const char* filename);
-
-/*!
- * \brief Load a PNG image file into an RGBA buffer
- * \param filename path of file to read
- * \param image place where allocated buffer of size (width * height * 4) will be allocated
- * \param width place where image width will be stored
- * \param height place where image height will be stored
- * \param mode place where Color Mode of image will be stored
- * \param bpp place where pixel width will be stored (8, 24, 32)
- * \returns 0 on success
- */
-int pngLoad(const char* filename, unsigned char** image,
-            unsigned int* width, unsigned int* height,
-            TextureManager::ColorMode* mode, unsigned int* bpp);
-
-/*!
- * \brief Create a PNG image file from an RGBA buffer
- * \param filename path of file to create
- * \param image buffer of size (width * height * 4)
- * \param width image width
- * \param height image height
- * \param mode color mode
- * \param bpp bits per pixel (8, 24, 32)
- * \returns 0 on success
- */
-int pngSave(const char* filename, unsigned char* image,
-            unsigned int width, unsigned int height,
-            TextureManager::ColorMode mode, unsigned int bpp);
-
-#endif
-

include/utils/tga.h

@@ -1,43 +0,0 @@
-/*!
- * \file include/utils/tga.h
- * \brief TGA image reader/writer
- *
- * \author Mongoose
- * \author xythobuz
- */
-#ifndef _UTILS_TGA_H
-#define _UTILS_TGA_H
-
-/*!
- * \brief Check if a file is a valid TGA image
- * \param filename path to file
- * \returns 0 if valid, else error condition
- */
-int tgaCheck(const char* filename);
-
-/*!
- * \brief Load a TGA image from file
- * \param filename path to file
- * \param image Where the pixmap will be stored (or nullptr)
- * \param width where the width will be stored
- * \param height where the height will be stored
- * \param type where the type will be stored (tga_type_t)
- * \returns 0 on success, else error condition
- */
-int tgaLoad(const char* filename, unsigned char** image,
-            unsigned int* width, unsigned int* height, char* type);
-
-/*!
- * \brief Save a pixel buffer into a file on disk
- * \param filename path to file
- * \param image pixmap to be stored
- * \param width width of pixmap/image
- * \param height height of pixmap/image
- * \param type tga type to use
- * \returns 0 on success, else error condition
- */
-int tgaSave(const char* filename, unsigned char* image,
-            unsigned int width, unsigned int height, char type);
-
-#endif
-

src/CMakeLists.txt

@@ -46,14 +46,6 @@ if (OPENAL_FOUND)
     endif (ALUT_FOUND)
 endif (OPENAL_FOUND)
 
-# Add PNG Library
-find_package (PNG)
-if (PNG_FOUND)
-    include_directories (SYSTEM ${PNG_INCLUDE_DIRS})
-    set (LIBS ${LIBS} ${PNG_LIBRARIES})
-    add_definitions (${PNG_DEFINITIONS})
-endif (PNG_FOUND)
-
 # Add GLM Library
 find_package (GLM REQUIRED)
 if (GLM_FOUND)
@@ -115,12 +107,6 @@ else (SDL2_FOUND AND NOT FORCE_GLFW)
     endif (GLFW_FOUND)
 endif (SDL2_FOUND AND NOT FORCE_GLFW)
 
-if (PNG_FOUND)
-    set (USING_PNG TRUE)
-else (PNG_FOUND)
-    set (USING_PNG FALSE)
-endif (PNG_FOUND)
-
 #################################################################
 
 # Check for header/function presence

src/Console.cpp

@@ -7,6 +7,8 @@
 
 #include <cstring>
 
+#include "imgui/imgui.h"
+
 #include "global.h"
 #include "Log.h"
 #include "UI.h"

src/Render.cpp

@@ -10,17 +10,17 @@
 #include <sstream>
 #include <glm/gtc/matrix_transform.hpp>
 
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
+#include "imgui/imgui.h"
+#include "stb/stb_image_write.h"
 
 #include "global.h"
 #include "Camera.h"
 #include "Game.h"
-#include "utils/strings.h"
-#include "utils/tga.h"
+#include "Log.h"
+#include "UI.h"
 #include "World.h"
 #include "system/Window.h"
+#include "utils/strings.h"
 #include "Render.h"
 
 RenderMode Render::mode = RenderMode::Disabled;
@@ -131,32 +131,42 @@ void Render::buildRoomList(int room) {
 }
 
 void Render::screenShot(const char* filenameBase) {
-    /*
-    int sz = Window::getSize().x * Window::getSize().y;
-    unsigned char* image = new unsigned char[sz * 3];
-    static int count = 0;
-    bool done = false;
-
     assert(filenameBase != nullptr);
 
+    int w = Window::getSize().x;
+    int h = Window::getSize().y;
+    int sz = w * h;
+    unsigned char* image = new unsigned char[sz * 3];
+    glReadPixels(0, 0, w, h, GL_RGB, GL_UNSIGNED_BYTE, image);
+
+    unsigned char* buffer = new unsigned char[sz * 3];
+    for (int x = 0; x < w; x++) {
+        for (int y = 0; y < h; y++) {
+            buffer[3 * (x + (y * w))] = image[3 * (x + ((h - y - 1) * w))];
+            buffer[(3 * (x + (y * w))) + 1] = image[(3 * (x + ((h - y - 1) * w))) + 1];
+            buffer[(3 * (x + (y * w))) + 2] = image[(3 * (x + ((h - y - 1) * w))) + 2];
+        }
+    }
+
     // Don't overwrite files
-    std::ostringstream filename;
+    static int count = 0;
+    bool done = false;
+    std::string f;
     while (!done) {
-        filename << filenameBase << "-" << count++ << ".tga";
+        std::ostringstream filename;
+        filename << filenameBase << "-" << count++ << ".png";
+        f = filename.str();
+        std::ifstream fs(f);
+        done = !fs.good();
+        fs.close();
+    }
 
-        FILE* f = fopen(filename.str().c_str(), "rb");
-        if (f) {
-            fclose(f);
-        } else {
-            done = true;
-        }
+    if (!stbi_write_png(f.c_str(), w, h, 3, buffer, 0)) {
+        getLog() << "Error saving image \"" << f << "\"!" << Log::endl;
     }
 
-    glReadPixels(0, 0, Window::getSize().x, Window::getSize().y, GL_BGR_EXT, GL_UNSIGNED_BYTE,
-                 image);
-    tgaSave(filename.str().c_str(), image, Window::getSize().x, Window::getSize().y, 0);
     delete [] image;
-    */
+    delete [] buffer;
 }
 
 void Render::drawTexture(float x, float y, float w, float h, glm::vec4 color,
@@ -186,3 +196,41 @@ void Render::drawTexture(float x, float y, float w, float h, glm::vec4 color,
     Window::drawTextGL(vertices, uvs, color, texture);
 }
 
+void Render::displayUI() {
+    static const int modeStringCount = 5;
+    static const char* modeStrings[modeStringCount] = {
+        "Disable", "Splash", "Texture", "Wireframe", "Solid"
+    };
+
+    if (ImGui::CollapsingHeader("Render Settings")) {
+        int item = 0;
+        if (mode == RenderMode::LoadScreen)
+            item = 1;
+        else if (mode == RenderMode::Texture)
+            item = 2;
+        else if (mode == RenderMode::Wireframe)
+            item = 3;
+        else if (mode == RenderMode::Solid)
+            item = 4;
+        if (ImGui::Combo("Mode", &item, modeStrings, modeStringCount)) {
+            if (item == 0)
+                mode = RenderMode::Disabled;
+            else if (item == 1)
+                mode = RenderMode::LoadScreen;
+            else if (item == 2)
+                mode = RenderMode::Texture;
+            else if (item == 3)
+                mode = RenderMode::Wireframe;
+            else if (item == 4)
+                mode = RenderMode::Solid;
+        }
+
+        bool updateViewFrustum = Camera::getUpdateViewFrustum();
+        if (ImGui::Checkbox("Update Frustum##runtime", &updateViewFrustum)) {
+            Camera::setUpdateViewFrustum(updateViewFrustum);
+        }
+        ImGui::SameLine();
+        ImGui::Checkbox("Show Frustum##runtime", &displayViewFrustum);
+    }
+}
+

src/RunTime.cpp

@@ -5,9 +5,10 @@
  * \author xythobuz
  */
 
+#include "imgui/imgui.h"
+
 #include "global.h"
 #include "Camera.h"
-#include "Render.h"
 #include "UI.h"
 #include "system/Sound.h"
 #include "system/Window.h"
@@ -65,10 +66,13 @@ void RunTime::setKeyBinding(ActionEvents event, KeyboardButton button) {
 
 void RunTime::updateFPS() {
     frameCount++;
+    frameCount2++;
+
     lastFrameTime = systemTimerGet() - lastTime;
     frameTimeSum += lastFrameTime;
     frameTimeSum2 += lastFrameTime;
     lastTime = systemTimerGet();
+
     if (frameTimeSum >= 200) {
         fps = frameCount * (1000 / frameTimeSum);
         frameCount = frameTimeSum = 0;
@@ -78,20 +82,13 @@ void RunTime::updateFPS() {
         history.push_back(frameCount2);
         frameCount2 = frameTimeSum2 = 0;
     }
-    frameCount2++;
 }
 
 void RunTime::display() {
     if (ImGui::CollapsingHeader("RunTime Settings")) {
-        bool showFPS = getShowFPS();
-        if (ImGui::Checkbox("Show FPS##runtime", &showFPS)) {
-            setShowFPS(showFPS);
-        }
+        ImGui::Checkbox("Show FPS##runtime", &showFPS);
         ImGui::SameLine();
-        bool running = isRunning();
-        if (ImGui::Checkbox("Running (!)##runtime", &running)) {
-            setRunning(running);
-        }
+        ImGui::Checkbox("Running (!)##runtime", &gameIsRunning);
         ImGui::SameLine();
         bool sound = Sound::getEnabled();
         if (ImGui::Checkbox("Sound##runtime", &sound)) {
@@ -103,16 +100,6 @@ void RunTime::display() {
             Window::setFullscreen(fullscreen);
         }
 
-        bool updateViewFrustum = Camera::getUpdateViewFrustum();
-        if (ImGui::Checkbox("Update Frustum##runtime", &updateViewFrustum)) {
-            Camera::setUpdateViewFrustum(updateViewFrustum);
-        }
-        ImGui::SameLine();
-        bool displayViewFrustum = Render::getDisplayViewFrustum();
-        if (ImGui::Checkbox("Show Frustum##runtime", &displayViewFrustum)) {
-            Render::setDisplayViewFrustum(displayViewFrustum);
-        }
-
         float vol = Sound::getVolume();
         if (ImGui::InputFloat("Volume##runtime", &vol, 0.0f, 0.0f, 3,
                               ImGuiInputTextFlags_EnterReturnsTrue)) {
@@ -191,19 +178,19 @@ void RunTime::display() {
 
     if (ImGui::CollapsingHeader("Performance")) {
         ImGui::Text("Uptime: %lums", systemTimerGet());
-        ImGui::Text("Frames per Second: %luFPS", getFPS());
-        if (getHistoryFPS().size() > 1) {
+        ImGui::Text("Frames per Second: %luFPS", fps);
+        if (history.size() > 1) {
             static bool scroll = true;
             if (scroll) {
-                int offset = getHistoryFPS().size() - 1;
+                int offset = history.size() - 1;
                 if (offset > 10)
                     offset = 10;
-                ImGui::PlotLines("FPS", &getHistoryFPS()[1],
-                                 getHistoryFPS().size() - 1,
-                                 getHistoryFPS().size() - offset - 1);
+                ImGui::PlotLines("FPS", &history[1],
+                                 history.size() - 1,
+                                 history.size() - offset - 1);
             } else {
-                ImGui::PlotLines("FPS", &getHistoryFPS()[1],
-                                 getHistoryFPS().size() - 1);
+                ImGui::PlotLines("FPS", &history[1],
+                                 history.size() - 1);
             }
             ImGui::SameLine();
             ImGui::Checkbox("Scroll##fpsscroll", &scroll);

src/SoundManager.cpp

@@ -5,6 +5,8 @@
  * \author xythobuz
  */
 
+#include "imgui/imgui.h"
+
 #include "global.h"
 #include "UI.h"
 #include "system/Sound.h"

src/TextureManager.cpp

@@ -11,19 +11,16 @@
 #include <stdio.h>
 #include <stdarg.h>
 
+#include "stb/stb_image.h"
+
 #include "global.h"
 #include "Log.h"
 #include "RunTime.h"
 #include "utils/pcx.h"
 #include "utils/pixel.h"
 #include "utils/strings.h"
-#include "utils/tga.h"
 #include "TextureManager.h"
 
-#ifdef USING_PNG
-#include "utils/png.h"
-#endif
-
 glm::vec2 TextureTile::getUV(unsigned int i) {
     glm::vec2 uv(vertices.at(i).xPixel,
                  vertices.at(i).yPixel);
@@ -150,9 +147,9 @@ int TextureManager::initializeSplash() {
 
     //! \fixme Temporary?
     std::string filename = RunTime::getPakDir() + "/tr2/TITLE.PCX";
-    if (loadPCX(filename.c_str(), TextureStorage::SYSTEM, TEXTURE_SPLASH) < 0) {
+    if (loadImage(filename.c_str(), TextureStorage::SYSTEM, TEXTURE_SPLASH) < 0) {
         filename = RunTime::getDataDir() + "/splash.tga";
-        if (loadTGA(filename.c_str(), TextureStorage::SYSTEM, TEXTURE_SPLASH) < 0) {
+        if (loadImage(filename.c_str(), TextureStorage::SYSTEM, TEXTURE_SPLASH) < 0) {
             return -2;
         }
     }
@@ -241,100 +238,56 @@ void TextureManager::bindTextureId(unsigned int n, TextureStorage s, unsigned in
 }
 
 int TextureManager::loadImage(const char* filename, TextureStorage s, int slot) {
+    //! \todo case insensitive compare
+
     if (stringEndsWith(filename, ".pcx") || stringEndsWith(filename, ".PCX")) {
         return loadPCX(filename, s, slot);
-    } else if (stringEndsWith(filename, ".png") || stringEndsWith(filename, ".PNG")) {
-        return loadPNG(filename, s, slot);
-    } else if (stringEndsWith(filename, ".tga") || stringEndsWith(filename, ".TGA")) {
-        return loadTGA(filename, s, slot);
     } else {
-        getLog() << "No known image file type? (" << filename << ")" << Log::endl;
-    }
-
-    return -1;
-}
-
-int TextureManager::loadPCX(const char* filename, TextureStorage s, int slot) {
-    assert(filename != nullptr);
-    assert(filename[0] != '\0');
-
-    unsigned char* image;
-    unsigned int w, h, bpp;
-    ColorMode c;
-    int id = -1;
-    int error = pcxLoad(filename, &image, &w, &h, &c, &bpp);
-
-    if (error == 0) {
-        unsigned char* image2 = scaleBuffer(image, &w, &h, bpp);
-        if (image2) {
-            delete [] image;
-            image = image2;
+        int x, y, n;
+        unsigned char* data = stbi_load(filename, &x, &y, &n, 0);
+        if (data) {
+            if ((n < 3) || (n > 4)) {
+                getLog() << "Image \"" << filename << "\" has unsupported format ("
+                         << n << ")!" << Log::endl;
+                stbi_image_free(data);
+                return -2;
+            }
+            int id = loadBufferSlot(data, x, y, (n == 3) ? ColorMode::RGB : ColorMode::RGBA,
+                                    (n == 3) ? 24 : 32, s, slot);
+            stbi_image_free(data);
+            return id;
+        } else {
+            getLog() << "Can't load image \"" << filename << "\"!" << Log::endl;
+            return -1;
         }
-        id = loadBufferSlot(image, w, h, c, bpp, s, slot);
-        delete [] image;
     }
-
-    return id;
 }
 
-int TextureManager::loadPNG(const char* filename, TextureStorage s, int slot) {
-#ifdef USING_PNG
+int TextureManager::loadPCX(const char* filename, TextureStorage s, int slot) {
     assert(filename != nullptr);
     assert(filename[0] != '\0');
 
-    if (pngCheck(filename) != 0) {
-        return -1;
-    }
-
-    unsigned char* image;
-    unsigned int w, h, bpp;
-    ColorMode c;
-    int id = -1;
-    int error = pngLoad(filename, &image, &w, &h, &c, &bpp);
-
-    if (error == 0) {
-        unsigned char* image2 = scaleBuffer(image, &w, &h, bpp);
-        if (image2) {
+    int error = pcxCheck(filename);
+    if (!error) {
+        unsigned char* image;
+        unsigned int w, h, bpp;
+        ColorMode c;
+
+        error = pcxLoad(filename, &image, &w, &h, &c, &bpp);
+        if (!error) {
+            unsigned char* image2 = scaleBuffer(image, &w, &h, bpp);
+            if (image2) {
+                delete [] image;
+                image = image2;
+            }
+            int id = loadBufferSlot(image, w, h, c, bpp, s, slot);
             delete [] image;
-            image = image2;
+            return id;
         }
-        id = loadBufferSlot(image, w, h, c, bpp, s, slot);
-        delete [] image;
-    }
 
-    return id;
-#else
-    getLog() << "No PNG support available (" << filename << ")" << Log::endl;
-    return -1;
-#endif
-}
-
-int TextureManager::loadTGA(const char* filename, TextureStorage s, int slot) {
-    assert(filename != nullptr);
-    assert(filename[0] != '\0');
-
-    unsigned char* image;
-    unsigned int w, h;
-    char type;
-    int id = -1;
-
-    if (!tgaCheck(filename)) {
-        tgaLoad(filename, &image, &w, &h, &type);
-
-        unsigned char* image2 = scaleBuffer(image, &w, &h, (type == 2) ? 32 : 24);
-        if (image2) {
-            delete [] image;
-            image = image2;
-        }
-        if (image) {
-            id = loadBufferSlot(image, w, h,
-                                (type == 2) ? ColorMode::RGBA : ColorMode::RGB,
-                                (type == 2) ? 32 : 24,
-                                s, slot);
-            delete [] image;
-        }
+        return -5;
     }
 
-    return id;
+    return -4;
 }
 

src/UI.cpp

@@ -8,6 +8,9 @@
 #include <algorithm>
 #include <cstring>
 
+#include "imgui/imgui.h"
+#include "stb/stb_image.h"
+
 #include "global.h"
 #include "Camera.h"
 #include "Console.h"
@@ -25,9 +28,6 @@
 #include "utils/time.h"
 #include "UI.h"
 
-#define STB_IMAGE_IMPLEMENTATION
-#include "imgui/stb_image.h"
-
 bool UI::visible = false;
 unsigned int UI::fontTex;
 std::string UI::iniFilename;
@@ -191,7 +191,9 @@ void UI::display() {
 
     Console::display();
 
+    static bool showTestWindow = false;
     if (ImGui::Begin("Engine")) {
+        Render::displayUI();
         RunTime::display();
         SoundManager::display();
 
@@ -422,10 +424,17 @@ void UI::display() {
             //                   " the left side and scale with the size of this window!");
             //ImGui::Separator();
             ImGui::ShowUserGuide();
+            ImGui::Separator();
+            if (ImGui::Button("Show/Hide Test Window")) {
+                showTestWindow = !showTestWindow;
+            }
         }
     }
     ImGui::End();
 
+    if (showTestWindow)
+        ImGui::ShowTestWindow();
+
     ImGui::Render();
 }
 

src/commands/CommandEngine.cpp

@@ -51,8 +51,8 @@ std::string CommandScreenshot::brief() {
 
 void CommandScreenshot::printHelp() {
     getLog() << "sshot-Command Usage:" << Log::endl;
-    getLog() << "  sshot [debug|menu] [debug|menu]" << Log::endl;
-    getLog() << "Add console/menu to capture them too" << Log::endl;
+    getLog() << "  sshot" << Log::endl;
+    getLog() << "You wont be able to capture imgui..." << Log::endl;
 }
 
 int CommandScreenshot::execute(std::istream& args) {
@@ -65,30 +65,7 @@ int CommandScreenshot::execute(std::istream& args) {
     filename += "/sshots/";
     filename += VERSION_SHORT;
 
-    std::string temp, temp2;
-    args >> temp >> temp2;
-
-    UI::setVisible(false);
-    getMenu().setVisible(false);
-
-    if (temp == "debug")
-        UI::setVisible(true);
-    else if (temp == "menu")
-        getMenu().setVisible(true);
-
-    if (temp2 == "debug")
-        UI::setVisible(true);
-    else if (temp2 == "menu")
-        getMenu().setVisible(true);
-
-    renderFrame();
-    renderFrame(); // Double buffered
     Render::screenShot(filename.c_str());
-
-    getMenu().setVisible(false);
-    UI::setVisible(true);
-
-    getLog() << "Screenshot stored..." << Log::endl;
     return 0;
 }
 
@@ -103,7 +80,7 @@ std::string CommandQuit::brief() {
 }
 
 int CommandQuit::execute(std::istream& args) {
-    exit(0);
+    RunTime::setRunning(false);
     return 0;
 }
 

src/deps/CMakeLists.txt

@@ -1,6 +1,7 @@
 # Source files
 set (DEPS_SRCS ${DEPS_SRCS} "commander/commander.c" "commander/commander.h")
-set (DEPS_SRCS ${DEPS_SRCS} "imgui/imgui.cpp" "imgui/imgui.h" "imgui/imconfig.h")
+set (DEPS_SRCS ${DEPS_SRCS} "imgui/imgui.cpp" "imgui/imgui.h" "imgui/imconfig.h" "imgui/stb_textedit.h")
+set (DEPS_SRCS ${DEPS_SRCS} "stb/stb.cpp" "stb/stb_image.h" "stb/stb_image_write.h")
 
 # Add library
 add_library (OpenRaider_deps OBJECT ${DEPS_SRCS})

src/deps/imgui/imconfig.h

@@ -12,7 +12,8 @@
 //#define ImVector  MyVector
 
 //---- Define assertion handler. Defaults to calling assert().
-//#define IM_ASSERT(_EXPR)  MyAssert(_EXPR)
+#include "global.h"
+#define IM_ASSERT(_EXPR)  assert(_EXPR)
 
 //---- Don't implement default clipboard handlers for Windows (so as not to link with OpenClipboard() and others Win32 functions)
 //#define IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCS
@@ -20,6 +21,9 @@
 //---- Include imgui_user.inl at the end of imgui.cpp so you can include code that extends ImGui using its private data/functions.
 //#define IMGUI_INCLUDE_IMGUI_USER_INL
 
+//---- Include imgui_user.h at the end of imgui.h
+//#define IMGUI_INCLUDE_IMGUI_USER_H
+
 //---- Define implicit cast operators to convert back<>forth from your math types and ImVec2/ImVec4.
 /*
 #define IM_VEC2_CLASS_EXTRA                                                 \

src/deps/imgui/imgui.h

@@ -1,4 +1,4 @@
-// ImGui library v1.18 wip
+// ImGui library v1.19 wip
 // See .cpp file for commentary.
 // See ImGui::ShowTestWindow() for sample code.
 // Read 'Programmer guide' in .cpp for notes on how to setup ImGui in your codebase.
@@ -37,6 +37,7 @@ typedef int ImGuiStyleVar;          // enum ImGuiStyleVar_
 typedef int ImGuiKey;               // enum ImGuiKey_
 typedef int ImGuiColorEditMode;     // enum ImGuiColorEditMode_
 typedef int ImGuiWindowFlags;       // enum ImGuiWindowFlags_
+typedef int ImGuiSetCondition;      // enum ImGuiSetCondition_
 typedef int ImGuiInputTextFlags;    // enum ImGuiInputTextFlags_
 struct ImGuiTextEditCallbackData;
 
@@ -117,7 +118,7 @@ public:
     inline void                 pop_back()                      { IM_ASSERT(Size > 0); Size--; }
 
     inline iterator             erase(const_iterator it)        { IM_ASSERT(it >= begin() && it < end()); const ptrdiff_t off = it - begin(); memmove(Data + off, Data + off + 1, (Size - (size_t)off - 1) * sizeof(value_type)); Size--; return Data + off; }
-    inline void                 insert(const_iterator it, const value_type& v)  { IM_ASSERT(it >= begin() && it <= end()); const ptrdiff_t off = it - begin(); if (Size == Capacity) reserve(Capacity ? Capacity * 2 : 4); if (off < (int)Size) memmove(Data + off + 1, Data + off, (Size - (size_t)off) * sizeof(value_type)); Data[off] = v; Size++; }
+    inline iterator             insert(const_iterator it, const value_type& v)  { IM_ASSERT(it >= begin() && it <= end()); const ptrdiff_t off = it - begin(); if (Size == Capacity) reserve(Capacity ? Capacity * 2 : 4); if (off < (int)Size) memmove(Data + off + 1, Data + off, (Size - (size_t)off) * sizeof(value_type)); Data[off] = v; Size++; return Data + off; }
 };
 #endif // #ifndef ImVector
 
@@ -127,7 +128,7 @@ public:
 // - struct ImGuiTextBuffer             // Text buffer for logging/accumulating text
 // - struct ImGuiStorage                // Custom key value storage (if you need to alter open/close states manually)
 // - struct ImDrawList                  // Draw command list
-// - struct ImBitmapFont                // Bitmap font loader
+// - struct ImFont                      // Bitmap font loader
 
 // ImGui End-user API
 // In a namespace so that user can add extra functions (e.g. Value() helpers for your vector or common types)
@@ -144,16 +145,11 @@ namespace ImGui
     IMGUI_API void          ShowTestWindow(bool* open = NULL);
 
     // Window
-    IMGUI_API bool          Begin(const char* name = "Debug", bool* open = NULL, ImVec2 size = ImVec2(0,0), float fill_alpha = -1.0f, ImGuiWindowFlags flags = 0);    // return false when window is collapsed, so you can early out in your code.
+    IMGUI_API bool          Begin(const char* name = "Debug", bool* p_opened = NULL, ImVec2 size = ImVec2(0,0), float fill_alpha = -1.0f, ImGuiWindowFlags flags = 0);// return false when window is collapsed, so you can early out in your code. passing 'bool* p_opened' displays a Close button on the upper-right corner of the window, the pointed value will be set to false when the button is pressed.
     IMGUI_API void          End();
     IMGUI_API void          BeginChild(const char* str_id, ImVec2 size = ImVec2(0,0), bool border = false, ImGuiWindowFlags extra_flags = 0);                         // size==0.0f: use remaining window size, size<0.0f: use remaining window size minus abs(size). on each axis.
     IMGUI_API void          EndChild();
     IMGUI_API bool          GetWindowIsFocused();
-    IMGUI_API ImVec2        GetWindowSize();
-    IMGUI_API float         GetWindowWidth();
-    IMGUI_API void          SetWindowSize(const ImVec2& size);                                  // set to ImVec2(0,0) to force an auto-fit
-    IMGUI_API ImVec2        GetWindowPos();                                                     // you should rarely need/care about the window position, but it can be useful if you want to use your own drawing.
-    IMGUI_API void          SetWindowPos(const ImVec2& pos);                                    // set current window pos.
     IMGUI_API ImVec2        GetContentRegionMax();                                              // window or current column boundaries
     IMGUI_API ImVec2        GetWindowContentRegionMin();                                        // window boundaries
     IMGUI_API ImVec2        GetWindowContentRegionMax();
@@ -161,11 +157,22 @@ namespace ImGui
     IMGUI_API ImFont*       GetWindowFont();
     IMGUI_API float         GetWindowFontSize();
     IMGUI_API void          SetWindowFontScale(float scale);                                    // per-window font scale. Adjust IO.FontGlobalScale if you want to scale all windows.
+    IMGUI_API ImVec2        GetWindowPos();                                                     // you should rarely need/care about the window position, but it can be useful if you want to do your own drawing.
+    IMGUI_API ImVec2        GetWindowSize();                                                    // get current window position.
+    IMGUI_API float         GetWindowWidth();
+    IMGUI_API bool          GetWindowCollapsed();
+    IMGUI_API void          SetWindowPos(const ImVec2& pos, ImGuiSetCondition cond = 0);        // set current window position - call within Begin()/End().
+    IMGUI_API void          SetWindowSize(const ImVec2& size, ImGuiSetCondition cond = 0);      // set current window size. set to ImVec2(0,0) to force an auto-fit
+    IMGUI_API void          SetWindowCollapsed(bool collapsed, ImGuiSetCondition cond = 0);     // set current window collapsed state.
+    IMGUI_API void          SetNextWindowPos(const ImVec2& pos, ImGuiSetCondition cond = 0);    // set next window position - call before Begin().
+    IMGUI_API void          SetNextWindowSize(const ImVec2& size, ImGuiSetCondition cond = 0);  // set next window size. set to ImVec2(0,0) to force an auto-fit
+    IMGUI_API void          SetNextWindowCollapsed(bool collapsed, ImGuiSetCondition cond = 0); // set next window collapsed state.
+
     IMGUI_API void          SetScrollPosHere();                                                 // adjust scrolling position to center into the current cursor position.
-    IMGUI_API void          SetKeyboardFocusHere(int offset = 0);                               // focus keyboard on the next widget. Use 'offset' to access sub components of a multiple component widget.
+    IMGUI_API void          SetKeyboardFocusHere(int offset = 0);                               // focus keyboard on the next widget. Use positive 'offset' to access sub components of a multiple component widget.
     IMGUI_API void          SetTreeStateStorage(ImGuiStorage* tree);                            // replace tree state storage with our own (if you want to manipulate it yourself, typically clear subsection of it).
     IMGUI_API ImGuiStorage* GetTreeStateStorage();
-    
+
     IMGUI_API void          PushItemWidth(float item_width);                                    // width of items for the common item+label case. default to ~2/3 of windows width.
     IMGUI_API void          PopItemWidth();
     IMGUI_API float         GetItemWidth();
@@ -204,10 +211,13 @@ namespace ImGui
     IMGUI_API float         GetTextLineHeight();
 
     // ID scopes
-    IMGUI_API void          PushID(const char* str_id);
+    // If you are creating repeated widgets in a loop you most likely want to push a unique identifier so ImGui can differentiate them.
+    IMGUI_API void          PushID(const char* str_id);                                         // push identifier into the ID stack. IDs are hash of the *entire* stack!
     IMGUI_API void          PushID(const void* ptr_id);
     IMGUI_API void          PushID(const int int_id);
     IMGUI_API void          PopID();
+    IMGUI_API ImGuiID       GetID(const char* str_id);                                          // calculate unique ID (hash of whole ID stack + given parameter). useful if you want to query into ImGuiStorage yourself. otherwise rarely needed.
+    IMGUI_API ImGuiID       GetID(const void* ptr_id);
 
     // Widgets
     IMGUI_API void          Text(const char* fmt, ...);
@@ -261,8 +271,7 @@ namespace ImGui
     IMGUI_API void          TreePop();
     IMGUI_API void          OpenNextNode(bool open);                                            // force open/close the next TreeNode or CollapsingHeader
 
-    // Value helper output "name: value"
-    // Freely declare your own in the ImGui namespace.
+    // Value helper output "name: value". tip: freely declare your own within the ImGui namespace!
     IMGUI_API void          Value(const char* prefix, bool b);
     IMGUI_API void          Value(const char* prefix, int v);
     IMGUI_API void          Value(const char* prefix, unsigned int v);
@@ -277,7 +286,6 @@ namespace ImGui
     IMGUI_API void          LogToClipboard(int max_depth = -1);
 
     // Utilities
-    IMGUI_API void          SetNewWindowDefaultPos(const ImVec2& pos);                          // set position of window that do
     IMGUI_API bool          IsItemHovered();                                                    // was the last item active area hovered by mouse?
     IMGUI_API bool          IsItemFocused();                                                    // was the last item focused for keyboard input?
     IMGUI_API ImVec2        GetItemBoxMin();                                                    // get bounding box of last item
@@ -295,7 +303,7 @@ namespace ImGui
     IMGUI_API int           GetFrameCount();
     IMGUI_API const char*   GetStyleColorName(ImGuiCol idx);
     IMGUI_API void          GetDefaultFontData(const void** fnt_data, unsigned int* fnt_size, const void** png_data, unsigned int* png_size);
-    IMGUI_API ImVec2        CalcTextSize(const char* text, const char* text_end = NULL, bool hide_text_after_double_hash = true, float wrap_width = -1.0f);
+    IMGUI_API ImVec2        CalcTextSize(const char* text, const char* text_end = NULL, bool hide_text_after_double_hash = false, float wrap_width = -1.0f);
 
 } // namespace ImGui
 
@@ -310,11 +318,12 @@ enum ImGuiWindowFlags_
     ImGuiWindowFlags_NoScrollbar            = 1 << 4,
     ImGuiWindowFlags_NoScrollWithMouse      = 1 << 5,
     ImGuiWindowFlags_AlwaysAutoResize       = 1 << 6,
-    ImGuiWindowFlags_ChildWindow            = 1 << 7,   // For internal use by BeginChild()
-    ImGuiWindowFlags_ChildWindowAutoFitX    = 1 << 8,   // For internal use by BeginChild()
-    ImGuiWindowFlags_ChildWindowAutoFitY    = 1 << 9,   // For internal use by BeginChild()
-    ImGuiWindowFlags_ComboBox               = 1 << 10,  // For internal use by ComboBox()
-    ImGuiWindowFlags_Tooltip                = 1 << 11   // For internal use by Render() when using Tooltip
+    ImGuiWindowFlags_NoSavedSettings        = 1 << 7,   // Never load/save settings in .ini file
+    ImGuiWindowFlags_ChildWindow            = 1 << 8,   // For internal use by BeginChild()
+    ImGuiWindowFlags_ChildWindowAutoFitX    = 1 << 9,   // For internal use by BeginChild()
+    ImGuiWindowFlags_ChildWindowAutoFitY    = 1 << 10,  // For internal use by BeginChild()
+    ImGuiWindowFlags_ComboBox               = 1 << 11,  // For internal use by ComboBox()
+    ImGuiWindowFlags_Tooltip                = 1 << 12   // For internal use by Render() when using Tooltip
 };
 
 // Flags for ImGui::InputText()
@@ -327,7 +336,7 @@ enum ImGuiInputTextFlags_
     ImGuiInputTextFlags_EnterReturnsTrue    = 1 << 3,   // Return 'true' when Enter is pressed (as opposed to when the value was modified)
     ImGuiInputTextFlags_CallbackCompletion  = 1 << 4,   // Call user function on pressing TAB (for completion handling)
     ImGuiInputTextFlags_CallbackHistory     = 1 << 5,   // Call user function on pressing Up/Down arrows (for history handling)
-    ImGuiInputTextFlags_CallbackAlways      = 1 << 6    // Call user function every frame
+    ImGuiInputTextFlags_CallbackAlways      = 1 << 6    // Call user function every time
     //ImGuiInputTextFlags_AlignCenter       = 1 << 6,
 };
 
@@ -403,6 +412,7 @@ enum ImGuiStyleVar_
 {
     ImGuiStyleVar_Alpha,             // float
     ImGuiStyleVar_WindowPadding,     // ImVec2
+    ImGuiStyleVar_WindowRounding,    // float
     ImGuiStyleVar_FramePadding,      // ImVec2
     ImGuiStyleVar_ItemSpacing,       // ImVec2
     ImGuiStyleVar_ItemInnerSpacing,  // ImVec2
@@ -419,6 +429,15 @@ enum ImGuiColorEditMode_
     ImGuiColorEditMode_HEX = 2
 };
 
+// Condition flags for ImGui::SetWindow***() and SetNextWindow***() functions
+// Those functions treat 0 as a shortcut to ImGuiSetCondition_Always
+enum ImGuiSetCondition_
+{
+    ImGuiSetCondition_Always              = 1 << 0, // Set the variable
+    ImGuiSetCondition_FirstUseThisSession = 1 << 1, // Only set the variable on the first call for this window (once per session)
+    ImGuiSetCondition_FirstUseEver        = 1 << 2, // Only set the variable if the window doesn't exist in the .ini file
+};
+
 struct ImGuiStyle
 {
     float       Alpha;                      // Global alpha applies to everything in ImGui
@@ -449,9 +468,9 @@ struct ImGuiIO
 
     ImVec2      DisplaySize;                // <unset>                  // Display size, in pixels. For clamping windows positions.
     float       DeltaTime;                  // = 1.0f/60.0f             // Time elapsed since last frame, in seconds.
-    float       IniSavingRate;              // = 5.0f                   // Maximum time between saving .ini file, in seconds. Set to a negative value to disable .ini saving.
-    const char* IniFilename;                // = "imgui.ini"            // Absolute path to .ini file.
-    const char* LogFilename;                // = "imgui_log.txt"        // Absolute path to .log file.
+    float       IniSavingRate;              // = 5.0f                   // Maximum time between saving .ini file, in seconds.
+    const char* IniFilename;                // = "imgui.ini"            // Path to .ini file. NULL to disable .ini saving.
+    const char* LogFilename;                // = "imgui_log.txt"        // Path to .log file (default parameter to ImGui::LogToFile when no file is specified).
     float       MouseDoubleClickTime;       // = 0.30f                  // Time for a double-click, in seconds.
     float       MouseDoubleClickMaxDist;    // = 6.0f                   // Distance threshold to stay in to validate a double-click, in pixels.
     int         KeyMap[ImGuiKey_COUNT];     // <unset>                  // Map of indices into the KeysDown[512] entries array
@@ -480,7 +499,7 @@ struct ImGuiIO
     void*       (*MemReallocFn)(void* ptr, size_t sz);
     void        (*MemFreeFn)(void* ptr);
 
-    // Optional: notify OS Input Method Editor of text input position (e.g. when using Japanese/Chinese inputs, otherwise this isn't needed)
+    // Optional: notify OS Input Method Editor of the screen position of your cursor for text input position (e.g. when using Japanese/Chinese inputs in Windows)
     void        (*ImeSetInputScreenPosFn)(int x, int y);
 
     //------------------------------------------------------------------
@@ -588,22 +607,38 @@ struct ImGuiTextBuffer
 };
 
 // Helper: Key->value storage
-// - Store collapse state for a tree
-// - Store color edit options, etc.
+// - Store collapse state for a tree (Int 0/1)
+// - Store color edit options (Int using values in ImGuiColorEditMode enum).
+// - Custom user storage for temporary values.
 // Typically you don't have to worry about this since a storage is held within each Window.
-// Declare your own storage if you want to manipulate the open/close state of a particular sub-tree in your interface.
+// Declare your own storage if:
+// - You want to manipulate the open/close state of a particular sub-tree in your interface (tree node uses Int 0/1 to store their state).
+// - You want to store custom debug data easily without adding or editing structures in your code.
 struct ImGuiStorage
 {
-    struct Pair { ImU32 key; int val; };
+    struct Pair 
+    { 
+        ImGuiID key; 
+        union { int val_i; float val_f; };        
+        Pair(ImGuiID _key, int _val_i) { key = _key; val_i = _val_i; } 
+        Pair(ImGuiID _key, float _val_f) { key = _key; val_f = _val_f; } 
+    };
     ImVector<Pair>    Data;
 
+    // - Get***() functions find pair, never add/allocate. Pairs are sorted so a query is O(log N)
+    // - Set***() functions find pair, insertion on demand if missing.
+    // - Get***Ptr() functions find pair, insertion on demand if missing, return pointer. Useful if you intend to do Get+Set. 
+    //   A typical use case where this is very convenient:
+    //      float* pvar = ImGui::GetIntPtr(key); ImGui::SliderInt("var", pvar, 0, 100); some_var += *pvar;
+    // - Sorted insertion is costly but should amortize. A typical frame shouldn't need to insert any new pair.
     IMGUI_API void    Clear();
-    IMGUI_API int     GetInt(ImU32 key, int default_val = 0);
-    IMGUI_API void    SetInt(ImU32 key, int val);
-    IMGUI_API void    SetAllInt(int val);
-
-    IMGUI_API int*    Find(ImU32 key);
-    IMGUI_API void    Insert(ImU32 key, int val);
+    IMGUI_API int     GetInt(ImGuiID key, int default_val = 0) const;
+    IMGUI_API void    SetInt(ImGuiID key, int val);
+    IMGUI_API int*    GetIntPtr(ImGuiID key, int default_val = 0);
+    IMGUI_API float   GetFloat(ImGuiID key, float default_val = 0.0f) const;
+    IMGUI_API void    SetFloat(ImGuiID key, float val);
+    IMGUI_API float*  GetFloatPtr(ImGuiID key, float default_val = 0);
+    IMGUI_API void    SetAllInt(int val);    // Use on your own storage if you know only integer are being stored.
 };
 
 // Shared state of InputText(), passed to callback when a ImGuiInputTextFlags_Callback* flag is used.
@@ -651,8 +686,8 @@ IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT;
 #endif
 
 // Draw command list
-// This is the low-level list of polygon that ImGui:: functions are filling. At the end of the frame, all command lists are passed to your ImGuiIO::RenderDrawListFn function for rendering.
-// Each ImGui window contains its own ImDrawList.
+// This is the low-level list of polygon that ImGui:: functions are creating. At the end of the frame, all command lists are passed to your ImGuiIO::RenderDrawListFn function for rendering.
+// At the moment, each ImGui window contains its own ImDrawList but they could potentially be merged.
 // If you want to add custom rendering within a window, you can use ImGui::GetWindowDrawList() to access the current draw list and add your own primitives.
 // You can interleave normal ImGui:: calls and adding primitives to the current draw list.
 // Note that this only gives you access to rendering polygons. If your intent is to create custom widgets and the publicly exposed functions/data aren't sufficient, you can add code in imgui_user.inl
@@ -686,7 +721,7 @@ struct ImDrawList
     IMGUI_API void  AddText(ImFont* font, float font_size, const ImVec2& pos, ImU32 col, const char* text_begin, const char* text_end = NULL, float wrap_width = 0.0f);
 };
 
-// Optional bitmap font data loader & renderer into vertices
+// Bitmap font data loader & renderer into vertices
 // Using the .fnt format exported by BMFont
 //  - tool: http://www.angelcode.com/products/bmfont
 //  - file-format: http://www.angelcode.com/products/bmfont/doc/file_format.html
@@ -778,3 +813,10 @@ struct ImFont
     };
 #pragma pack(pop)
 };
+
+//---- Include imgui_user.h at the end of imgui.h
+//---- So you can include code that extends ImGui using any of the types declared above.
+//---- (also convenient for user to only explicitly include vanilla imgui.h)
+#ifdef IMGUI_INCLUDE_IMGUI_USER_H
+#include "imgui_user.h"
+#endif

src/deps/imgui/stb_textedit.h

@@ -1,4 +1,4 @@
-// stb_textedit.h - v1.4  - public domain - Sean Barrett
+// stb_textedit.h - v1.5  - public domain - Sean Barrett
 // Development of this library was sponsored by RAD Game Tools
 //
 // This C header file implements the guts of a multi-line text-editing
@@ -30,6 +30,7 @@
 //
 // VERSION HISTORY
 //
+//   1.5  (2014-09-10) add support for secondary keys for OS X
 //   1.4  (2014-08-17) fix signed/unsigned warnings
 //   1.3  (2014-06-19) fix mouse clicking to round to nearest char boundary
 //   1.2  (2014-05-27) fix some RAD types that had crept into the new code
@@ -43,6 +44,7 @@
 //
 //   Ulf Winklemann: move-by-word in 1.1
 //   Scott Graham: mouse selection bugfix in 1.3
+//   Fabian Giesen: secondary key inputs in 1.5
 //
 // USAGE
 //
@@ -142,6 +144,10 @@
 //                                 required for WORDLEFT/WORDRIGHT
 //    STB_TEXTEDIT_K_WORDLEFT    keyboard input to move cursor left one word // e.g. ctrl-LEFT
 //    STB_TEXTEDIT_K_WORDRIGHT   keyboard input to move cursor right one word // e.g. ctrl-RIGHT
+//    STB_TEXTEDIT_K_LINESTART2  secondary keyboard input to move cursor to start of line
+//    STB_TEXTEDIT_K_LINEEND2    secondary keyboard input to move cursor to end of line
+//    STB_TEXTEDIT_K_TEXTSTART2  secondary keyboard input to move cursor to start of text
+//    STB_TEXTEDIT_K_TEXTEND2    secondary keyboard input to move cursor to end of text
 //
 // Todo:
 //    STB_TEXTEDIT_K_PGUP        keyboard input to move cursor up a page
@@ -917,23 +923,35 @@ retry:
          state->has_preferred_x = 0;
          break;
          
+#ifdef STB_TEXTEDIT_K_TEXTSTART2
+      case STB_TEXTEDIT_K_TEXTSTART2:
+#endif
       case STB_TEXTEDIT_K_TEXTSTART:
          state->cursor = state->select_start = state->select_end = 0;
          state->has_preferred_x = 0;
          break;
 
+#ifdef STB_TEXTEDIT_K_TEXTEND2
+      case STB_TEXTEDIT_K_TEXTEND2:
+#endif
       case STB_TEXTEDIT_K_TEXTEND:
          state->cursor = STB_TEXTEDIT_STRINGLEN(str);
          state->select_start = state->select_end = 0;
          state->has_preferred_x = 0;
          break;
         
+#ifdef STB_TEXTEDIT_K_TEXTSTART2
+      case STB_TEXTEDIT_K_TEXTSTART2 | STB_TEXTEDIT_K_SHIFT:
+#endif
       case STB_TEXTEDIT_K_TEXTSTART | STB_TEXTEDIT_K_SHIFT:
          stb_textedit_prep_selection_at_cursor(state);
          state->cursor = state->select_end = 0;
          state->has_preferred_x = 0;
          break;
 
+#ifdef STB_TEXTEDIT_K_TEXTEND2
+      case STB_TEXTEDIT_K_TEXTEND2 | STB_TEXTEDIT_K_SHIFT:
+#endif
       case STB_TEXTEDIT_K_TEXTEND | STB_TEXTEDIT_K_SHIFT:
          stb_textedit_prep_selection_at_cursor(state);
          state->cursor = state->select_end = STB_TEXTEDIT_STRINGLEN(str);
@@ -941,6 +959,9 @@ retry:
          break;
 
 
+#ifdef STB_TEXTEDIT_K_LINESTART2
+      case STB_TEXTEDIT_K_LINESTART2:
+#endif
       case STB_TEXTEDIT_K_LINESTART: {
          StbFindState find;
          stb_textedit_clamp(str, state);
@@ -951,6 +972,9 @@ retry:
          break;
       }
 
+#ifdef STB_TEXTEDIT_K_LINEEND2
+      case STB_TEXTEDIT_K_LINEEND2:
+#endif
       case STB_TEXTEDIT_K_LINEEND: {
          StbFindState find;
          stb_textedit_clamp(str, state);
@@ -961,6 +985,9 @@ retry:
          break;
       }
 
+#ifdef STB_TEXTEDIT_K_LINESTART2
+      case STB_TEXTEDIT_K_LINESTART2 | STB_TEXTEDIT_K_SHIFT:
+#endif
       case STB_TEXTEDIT_K_LINESTART | STB_TEXTEDIT_K_SHIFT: {
          StbFindState find;
          stb_textedit_clamp(str, state);
@@ -971,6 +998,9 @@ retry:
          break;
       }
 
+#ifdef STB_TEXTEDIT_K_LINEEND2
+      case STB_TEXTEDIT_K_LINEEND2 | STB_TEXTEDIT_K_SHIFT:
+#endif
       case STB_TEXTEDIT_K_LINEEND | STB_TEXTEDIT_K_SHIFT: {
          StbFindState find;
          stb_textedit_clamp(str, state);

src/deps/stb/stb.cpp

@@ -0,0 +1,16 @@
+/*!
+ * \file src/deps/stb/stb.cpp
+ * \brief stb implementation
+ *
+ * \author xythobuz
+ */
+
+#include "global.h"
+
+#define STB_IMAGE_IMPLEMENTATION
+#define STBI_ASSERT(x) assert(x)
+#include "stb/stb_image.h"
+
+#define STB_IMAGE_WRITE_IMPLEMENTATION
+#include "stb/stb_image_write.h"
+

src/deps/stb/stb_image_write.h

@@ -0,0 +1,525 @@
+/* stb_image_write - v0.95 - public domain - http://nothings.org/stb/stb_image_write.h
+   writes out PNG/BMP/TGA images to C stdio - Sean Barrett 2010
+                            no warranty implied; use at your own risk
+
+
+Before including,
+
+    #define STB_IMAGE_WRITE_IMPLEMENTATION
+
+in the file that you want to have the implementation.
+
+Will probably not work correctly with strict-aliasing optimizations.
+
+
+ABOUT:
+
+   This header file is a library for writing images to C stdio. It could be
+   adapted to write to memory or a general streaming interface; let me know.
+
+   The PNG output is not optimal; it is 20-50% larger than the file
+   written by a decent optimizing implementation. This library is designed
+   for source code compactness and simplicitly, not optimal image file size
+   or run-time performance.
+
+USAGE:
+
+   There are three functions, one for each image file format:
+
+     int stbi_write_png(char const *filename, int w, int h, int comp, const void *data, int stride_in_bytes);
+     int stbi_write_bmp(char const *filename, int w, int h, int comp, const void *data);
+     int stbi_write_tga(char const *filename, int w, int h, int comp, const void *data);
+
+   Each function returns 0 on failure and non-0 on success.
+
+   The functions create an image file defined by the parameters. The image
+   is a rectangle of pixels stored from left-to-right, top-to-bottom.
+   Each pixel contains 'comp' channels of data stored interleaved with 8-bits
+   per channel, in the following order: 1=Y, 2=YA, 3=RGB, 4=RGBA. (Y is
+   monochrome color.) The rectangle is 'w' pixels wide and 'h' pixels tall.
+   The *data pointer points to the first byte of the top-left-most pixel.
+   For PNG, "stride_in_bytes" is the distance in bytes from the first byte of
+   a row of pixels to the first byte of the next row of pixels.
+
+   PNG creates output files with the same number of components as the input.
+   The BMP format expands Y to RGB in the file format and does not
+   output alpha.
+
+   PNG supports writing rectangles of data even when the bytes storing rows of
+   data are not consecutive in memory (e.g. sub-rectangles of a larger image),
+   by supplying the stride between the beginning of adjacent rows. The other
+   formats do not. (Thus you cannot write a native-format BMP through the BMP
+   writer, both because it is in BGR order and because it may have padding
+   at the end of the line.)
+*/
+
+#ifndef INCLUDE_STB_IMAGE_WRITE_H
+#define INCLUDE_STB_IMAGE_WRITE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern int stbi_write_png(char const *filename, int w, int h, int comp, const void *data, int stride_in_bytes);
+extern int stbi_write_bmp(char const *filename, int w, int h, int comp, const void *data);
+extern int stbi_write_tga(char const *filename, int w, int h, int comp, const void *data);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif//INCLUDE_STB_IMAGE_WRITE_H
+
+#ifdef STB_IMAGE_WRITE_IMPLEMENTATION
+
+#include <stdarg.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#ifndef STBI_ASSERT
+#include <assert.h>
+#define STBI_ASSERT(x) assert(x)
+#endif
+
+typedef unsigned int stbiw_uint32;
+typedef int stb_image_write_test[sizeof(stbiw_uint32)==4 ? 1 : -1];
+
+static void writefv(FILE *f, const char *fmt, va_list v)
+{
+   while (*fmt) {
+      switch (*fmt++) {
+         case ' ': break;
+         case '1': { unsigned char x = (unsigned char) va_arg(v, int); fputc(x,f); break; }
+         case '2': { int x = va_arg(v,int); unsigned char b[2];
+                     b[0] = (unsigned char) x; b[1] = (unsigned char) (x>>8);
+                     fwrite(b,2,1,f); break; }
+         case '4': { stbiw_uint32 x = va_arg(v,int); unsigned char b[4];
+                     b[0]=(unsigned char)x; b[1]=(unsigned char)(x>>8);
+                     b[2]=(unsigned char)(x>>16); b[3]=(unsigned char)(x>>24);
+                     fwrite(b,4,1,f); break; }
+         default:
+            STBI_ASSERT(0);
+            return;
+      }
+   }
+}
+
+static void write3(FILE *f, unsigned char a, unsigned char b, unsigned char c)
+{
+   unsigned char arr[3];
+   arr[0] = a, arr[1] = b, arr[2] = c;
+   fwrite(arr, 3, 1, f);
+}
+
+static void write_pixels(FILE *f, int rgb_dir, int vdir, int x, int y, int comp, void *data, int write_alpha, int scanline_pad)
+{
+   unsigned char bg[3] = { 255, 0, 255}, px[3];
+   stbiw_uint32 zero = 0;
+   int i,j,k, j_end;
+
+   if (y <= 0)
+      return;
+
+   if (vdir < 0)
+      j_end = -1, j = y-1;
+   else
+      j_end =  y, j = 0;
+
+   for (; j != j_end; j += vdir) {
+      for (i=0; i < x; ++i) {
+         unsigned char *d = (unsigned char *) data + (j*x+i)*comp;
+         if (write_alpha < 0)
+            fwrite(&d[comp-1], 1, 1, f);
+         switch (comp) {
+            case 1:
+            case 2: fwrite(d, 1, 1, f);
+                    break;
+            case 4:
+               if (!write_alpha) {
+                  // composite against pink background
+                  for (k=0; k < 3; ++k)
+                     px[k] = bg[k] + ((d[k] - bg[k]) * d[3])/255;
+                  write3(f, px[1-rgb_dir],px[1],px[1+rgb_dir]);
+                  break;
+               }
+               /* FALLTHROUGH */
+            case 3:
+               write3(f, d[1-rgb_dir],d[1],d[1+rgb_dir]);
+               break;
+         }
+         if (write_alpha > 0)
+            fwrite(&d[comp-1], 1, 1, f);
+      }
+      fwrite(&zero,scanline_pad,1,f);
+   }
+}
+
+static int outfile(char const *filename, int rgb_dir, int vdir, int x, int y, int comp, void *data, int alpha, int pad, const char *fmt, ...)
+{
+   FILE *f;
+   if (y < 0 || x < 0) return 0;
+   f = fopen(filename, "wb");
+   if (f) {
+      va_list v;
+      va_start(v, fmt);
+      writefv(f, fmt, v);
+      va_end(v);
+      write_pixels(f,rgb_dir,vdir,x,y,comp,data,alpha,pad);
+      fclose(f);
+   }
+   return f != NULL;
+}
+
+int stbi_write_bmp(char const *filename, int x, int y, int comp, const void *data)
+{
+   int pad = (-x*3) & 3;
+   return outfile(filename,-1,-1,x,y,comp,(void *) data,0,pad,
+           "11 4 22 4" "4 44 22 444444",
+           'B', 'M', 14+40+(x*3+pad)*y, 0,0, 14+40,  // file header
+            40, x,y, 1,24, 0,0,0,0,0,0);             // bitmap header
+}
+
+int stbi_write_tga(char const *filename, int x, int y, int comp, const void *data)
+{
+   int has_alpha = (comp == 2 || comp == 4);
+   int colorbytes = has_alpha ? comp-1 : comp;
+   int format = colorbytes < 2 ? 3 : 2; // 3 color channels (RGB/RGBA) = 2, 1 color channel (Y/YA) = 3
+   return outfile(filename, -1,-1, x, y, comp, (void *) data, has_alpha, 0,
+                  "111 221 2222 11", 0,0,format, 0,0,0, 0,0,x,y, (colorbytes+has_alpha)*8, has_alpha*8);
+}
+
+// stretchy buffer; stbiw__sbpush() == vector<>::push_back() -- stbiw__sbcount() == vector<>::size()
+#define stbiw__sbraw(a) ((int *) (a) - 2)
+#define stbiw__sbm(a)   stbiw__sbraw(a)[0]
+#define stbiw__sbn(a)   stbiw__sbraw(a)[1]
+
+#define stbiw__sbneedgrow(a,n)  ((a)==0 || stbiw__sbn(a)+n >= stbiw__sbm(a))
+#define stbiw__sbmaybegrow(a,n) (stbiw__sbneedgrow(a,(n)) ? stbiw__sbgrow(a,n) : 0)
+#define stbiw__sbgrow(a,n)  stbiw__sbgrowf((void **) &(a), (n), sizeof(*(a)))
+
+#define stbiw__sbpush(a, v)      (stbiw__sbmaybegrow(a,1), (a)[stbiw__sbn(a)++] = (v))
+#define stbiw__sbcount(a)        ((a) ? stbiw__sbn(a) : 0)
+#define stbiw__sbfree(a)         ((a) ? free(stbiw__sbraw(a)),0 : 0)
+
+static void *stbiw__sbgrowf(void **arr, int increment, int itemsize)
+{
+   int m = *arr ? 2*stbiw__sbm(*arr)+increment : increment+1;
+   void *p = realloc(*arr ? stbiw__sbraw(*arr) : 0, itemsize * m + sizeof(int)*2);
+   STBI_ASSERT(p);
+   if (p) {
+      if (!*arr) ((int *) p)[1] = 0;
+      *arr = (void *) ((int *) p + 2);
+      stbiw__sbm(*arr) = m;
+   }
+   return *arr;
+}
+
+static unsigned char *stbiw__zlib_flushf(unsigned char *data, unsigned int *bitbuffer, int *bitcount)
+{
+   while (*bitcount >= 8) {
+      stbiw__sbpush(data, (unsigned char) *bitbuffer);
+      *bitbuffer >>= 8;
+      *bitcount -= 8;
+   }
+   return data;
+}
+
+static int stbiw__zlib_bitrev(int code, int codebits)
+{
+   int res=0;
+   while (codebits--) {
+      res = (res << 1) | (code & 1);
+      code >>= 1;
+   }
+   return res;
+}
+
+static unsigned int stbiw__zlib_countm(unsigned char *a, unsigned char *b, int limit)
+{
+   int i;
+   for (i=0; i < limit && i < 258; ++i)
+      if (a[i] != b[i]) break;
+   return i;
+}
+
+static unsigned int stbiw__zhash(unsigned char *data)
+{
+   stbiw_uint32 hash = data[0] + (data[1] << 8) + (data[2] << 16);
+   hash ^= hash << 3;
+   hash += hash >> 5;
+   hash ^= hash << 4;
+   hash += hash >> 17;
+   hash ^= hash << 25;
+   hash += hash >> 6;
+   return hash;
+}
+
+#define stbiw__zlib_flush() (out = stbiw__zlib_flushf(out, &bitbuf, &bitcount))
+#define stbiw__zlib_add(code,codebits) \
+      (bitbuf |= (code) << bitcount, bitcount += (codebits), stbiw__zlib_flush())
+#define stbiw__zlib_huffa(b,c)  stbiw__zlib_add(stbiw__zlib_bitrev(b,c),c)
+// default huffman tables
+#define stbiw__zlib_huff1(n)  stbiw__zlib_huffa(0x30 + (n), 8)
+#define stbiw__zlib_huff2(n)  stbiw__zlib_huffa(0x190 + (n)-144, 9)
+#define stbiw__zlib_huff3(n)  stbiw__zlib_huffa(0 + (n)-256,7)
+#define stbiw__zlib_huff4(n)  stbiw__zlib_huffa(0xc0 + (n)-280,8)
+#define stbiw__zlib_huff(n)  ((n) <= 143 ? stbiw__zlib_huff1(n) : (n) <= 255 ? stbiw__zlib_huff2(n) : (n) <= 279 ? stbiw__zlib_huff3(n) : stbiw__zlib_huff4(n))
+#define stbiw__zlib_huffb(n) ((n) <= 143 ? stbiw__zlib_huff1(n) : stbiw__zlib_huff2(n))
+
+#define stbiw__ZHASH   16384
+
+unsigned char * stbi_zlib_compress(unsigned char *data, int data_len, int *out_len, int quality)
+{
+   static unsigned short lengthc[] = { 3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258, 259 };
+   static unsigned char  lengtheb[]= { 0,0,0,0,0,0,0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4,  4,  5,  5,  5,  5,  0 };
+   static unsigned short distc[]   = { 1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577, 32768 };
+   static unsigned char  disteb[]  = { 0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13 };
+   unsigned int bitbuf=0;
+   int i,j, bitcount=0;
+   unsigned char *out = NULL;
+   unsigned char **hash_table[stbiw__ZHASH]; // 64KB on the stack!
+   if (quality < 5) quality = 5;
+
+   stbiw__sbpush(out, 0x78);   // DEFLATE 32K window
+   stbiw__sbpush(out, 0x5e);   // FLEVEL = 1
+   stbiw__zlib_add(1,1);  // BFINAL = 1
+   stbiw__zlib_add(1,2);  // BTYPE = 1 -- fixed huffman
+
+   for (i=0; i < stbiw__ZHASH; ++i)
+      hash_table[i] = NULL;
+
+   i=0;
+   while (i < data_len-3) {
+      // hash next 3 bytes of data to be compressed
+      int h = stbiw__zhash(data+i)&(stbiw__ZHASH-1), best=3;
+      unsigned char *bestloc = 0;
+      unsigned char **hlist = hash_table[h];
+      int n = stbiw__sbcount(hlist);
+      for (j=0; j < n; ++j) {
+         if (hlist[j]-data > i-32768) { // if entry lies within window
+            int d = stbiw__zlib_countm(hlist[j], data+i, data_len-i);
+            if (d >= best) best=d,bestloc=hlist[j];
+         }
+      }
+      // when hash table entry is too long, delete half the entries
+      if (hash_table[h] && stbiw__sbn(hash_table[h]) == 2*quality) {
+         memcpy(hash_table[h], hash_table[h]+quality, sizeof(hash_table[h][0])*quality);
+         stbiw__sbn(hash_table[h]) = quality;
+      }
+      stbiw__sbpush(hash_table[h],data+i);
+
+      if (bestloc) {
+         // "lazy matching" - check match at *next* byte, and if it's better, do cur byte as literal
+         h = stbiw__zhash(data+i+1)&(stbiw__ZHASH-1);
+         hlist = hash_table[h];
+         n = stbiw__sbcount(hlist);
+         for (j=0; j < n; ++j) {
+            if (hlist[j]-data > i-32767) {
+               int e = stbiw__zlib_countm(hlist[j], data+i+1, data_len-i-1);
+               if (e > best) { // if next match is better, bail on current match
+                  bestloc = NULL;
+                  break;
+               }
+            }
+         }
+      }
+
+      if (bestloc) {
+         int d = (int) (data+i - bestloc); // distance back
+         STBI_ASSERT(d <= 32767 && best <= 258);
+         for (j=0; best > lengthc[j+1]-1; ++j);
+         stbiw__zlib_huff(j+257);
+         if (lengtheb[j]) stbiw__zlib_add(best - lengthc[j], lengtheb[j]);
+         for (j=0; d > distc[j+1]-1; ++j);
+         stbiw__zlib_add(stbiw__zlib_bitrev(j,5),5);
+         if (disteb[j]) stbiw__zlib_add(d - distc[j], disteb[j]);
+         i += best;
+      } else {
+         stbiw__zlib_huffb(data[i]);
+         ++i;
+      }
+   }
+   // write out final bytes
+   for (;i < data_len; ++i)
+      stbiw__zlib_huffb(data[i]);
+   stbiw__zlib_huff(256); // end of block
+   // pad with 0 bits to byte boundary
+   while (bitcount)
+      stbiw__zlib_add(0,1);
+
+   for (i=0; i < stbiw__ZHASH; ++i)
+      (void) stbiw__sbfree(hash_table[i]);
+
+   {
+      // compute adler32 on input
+      unsigned int i=0, s1=1, s2=0, blocklen = data_len % 5552;
+      int j=0;
+      while (j < data_len) {
+         for (i=0; i < blocklen; ++i) s1 += data[j+i], s2 += s1;
+         s1 %= 65521, s2 %= 65521;
+         j += blocklen;
+         blocklen = 5552;
+      }
+      stbiw__sbpush(out, (unsigned char) (s2 >> 8));
+      stbiw__sbpush(out, (unsigned char) s2);
+      stbiw__sbpush(out, (unsigned char) (s1 >> 8));
+      stbiw__sbpush(out, (unsigned char) s1);
+   }
+   *out_len = stbiw__sbn(out);
+   // make returned pointer freeable
+   memmove(stbiw__sbraw(out), out, *out_len);
+   return (unsigned char *) stbiw__sbraw(out);
+}
+
+unsigned int stbiw__crc32(unsigned char *buffer, int len)
+{
+   static unsigned int crc_table[256];
+   unsigned int crc = ~0u;
+   int i,j;
+   if (crc_table[1] == 0)
+      for(i=0; i < 256; i++)
+         for (crc_table[i]=i, j=0; j < 8; ++j)
+            crc_table[i] = (crc_table[i] >> 1) ^ (crc_table[i] & 1 ? 0xedb88320 : 0);
+   for (i=0; i < len; ++i)
+      crc = (crc >> 8) ^ crc_table[buffer[i] ^ (crc & 0xff)];
+   return ~crc;
+}
+
+#define stbiw__wpng4(o,a,b,c,d) ((o)[0]=(unsigned char)(a),(o)[1]=(unsigned char)(b),(o)[2]=(unsigned char)(c),(o)[3]=(unsigned char)(d),(o)+=4)
+#define stbiw__wp32(data,v) stbiw__wpng4(data, (v)>>24,(v)>>16,(v)>>8,(v));
+#define stbiw__wptag(data,s) stbiw__wpng4(data, s[0],s[1],s[2],s[3])
+
+static void stbiw__wpcrc(unsigned char **data, int len)
+{
+   unsigned int crc = stbiw__crc32(*data - len - 4, len+4);
+   stbiw__wp32(*data, crc);
+}
+
+static unsigned char stbiw__paeth(int a, int b, int c)
+{
+   int p = a + b - c, pa = abs(p-a), pb = abs(p-b), pc = abs(p-c);
+   if (pa <= pb && pa <= pc) return (unsigned char) a;
+   if (pb <= pc) return (unsigned char) b;
+   return (unsigned char) c;
+}
+
+unsigned char *stbi_write_png_to_mem(unsigned char *pixels, int stride_bytes, int x, int y, int n, int *out_len)
+{
+   int ctype[5] = { -1, 0, 4, 2, 6 };
+   unsigned char sig[8] = { 137,80,78,71,13,10,26,10 };
+   unsigned char *out,*o, *filt, *zlib;
+   signed char *line_buffer;
+   int i,j,k,p,zlen;
+
+   if (stride_bytes == 0)
+      stride_bytes = x * n;
+
+   filt = (unsigned char *) malloc((x*n+1) * y); if (!filt) return 0;
+   line_buffer = (signed char *) malloc(x * n); if (!line_buffer) { free(filt); return 0; }
+   for (j=0; j < y; ++j) {
+      static int mapping[] = { 0,1,2,3,4 };
+      static int firstmap[] = { 0,1,0,5,6 };
+      int *mymap = j ? mapping : firstmap;
+      int best = 0, bestval = 0x7fffffff;
+      for (p=0; p < 2; ++p) {
+         for (k= p?best:0; k < 5; ++k) {
+            int type = mymap[k],est=0;
+            unsigned char *z = pixels + stride_bytes*j;
+            for (i=0; i < n; ++i)
+               switch (type) {
+                  case 0: line_buffer[i] = z[i]; break;
+                  case 1: line_buffer[i] = z[i]; break;
+                  case 2: line_buffer[i] = z[i] - z[i-stride_bytes]; break;
+                  case 3: line_buffer[i] = z[i] - (z[i-stride_bytes]>>1); break;
+                  case 4: line_buffer[i] = (signed char) (z[i] - stbiw__paeth(0,z[i-stride_bytes],0)); break;
+                  case 5: line_buffer[i] = z[i]; break;
+                  case 6: line_buffer[i] = z[i]; break;
+               }
+            for (i=n; i < x*n; ++i) {
+               switch (type) {
+                  case 0: line_buffer[i] = z[i]; break;
+                  case 1: line_buffer[i] = z[i] - z[i-n]; break;
+                  case 2: line_buffer[i] = z[i] - z[i-stride_bytes]; break;
+                  case 3: line_buffer[i] = z[i] - ((z[i-n] + z[i-stride_bytes])>>1); break;
+                  case 4: line_buffer[i] = z[i] - stbiw__paeth(z[i-n], z[i-stride_bytes], z[i-stride_bytes-n]); break;
+                  case 5: line_buffer[i] = z[i] - (z[i-n]>>1); break;
+                  case 6: line_buffer[i] = z[i] - stbiw__paeth(z[i-n], 0,0); break;
+               }
+            }
+            if (p) break;
+            for (i=0; i < x*n; ++i)
+               est += abs((signed char) line_buffer[i]);
+            if (est < bestval) { bestval = est; best = k; }
+         }
+      }
+      // when we get here, best contains the filter type, and line_buffer contains the data
+      filt[j*(x*n+1)] = (unsigned char) best;
+      memcpy(filt+j*(x*n+1)+1, line_buffer, x*n);
+   }
+   free(line_buffer);
+   zlib = stbi_zlib_compress(filt, y*( x*n+1), &zlen, 8); // increase 8 to get smaller but use more memory
+   free(filt);
+   if (!zlib) return 0;
+
+   // each tag requires 12 bytes of overhead
+   out = (unsigned char *) malloc(8 + 12+13 + 12+zlen + 12);
+   if (!out) return 0;
+   *out_len = 8 + 12+13 + 12+zlen + 12;
+
+   o=out;
+   memcpy(o,sig,8); o+= 8;
+   stbiw__wp32(o, 13); // header length
+   stbiw__wptag(o, "IHDR");
+   stbiw__wp32(o, x);
+   stbiw__wp32(o, y);
+   *o++ = 8;
+   *o++ = (unsigned char) ctype[n];
+   *o++ = 0;
+   *o++ = 0;
+   *o++ = 0;
+   stbiw__wpcrc(&o,13);
+
+   stbiw__wp32(o, zlen);
+   stbiw__wptag(o, "IDAT");
+   memcpy(o, zlib, zlen); o += zlen; free(zlib);
+   stbiw__wpcrc(&o, zlen);
+
+   stbiw__wp32(o,0);
+   stbiw__wptag(o, "IEND");
+   stbiw__wpcrc(&o,0);
+
+   STBI_ASSERT(o == out + *out_len);
+
+   return out;
+}
+
+int stbi_write_png(char const *filename, int x, int y, int comp, const void *data, int stride_bytes)
+{
+   FILE *f;
+   int len;
+   unsigned char *png = stbi_write_png_to_mem((unsigned char *) data, stride_bytes, x, y, comp, &len);
+   if (!png) return 0;
+   f = fopen(filename, "wb");
+   if (!f) { free(png); return 0; }
+   fwrite(png, 1, len, f);
+   fclose(f);
+   free(png);
+   return 1;
+}
+#endif // STB_IMAGE_WRITE_IMPLEMENTATION
+
+/* Revision history
+
+      0.95 (2014-08-17)
+		       add monochrome TGA output
+      0.94 (2014-05-31)
+             rename private functions to avoid conflicts with stb_image.h
+      0.93 (2014-05-27)
+             warning fixes
+      0.92 (2010-08-01)
+             casts to unsigned char to fix warnings
+      0.91 (2010-07-17)
+             first public release
+      0.90   first internal release
+*/

src/system/FontImGui.cpp

@@ -5,6 +5,8 @@
  * \author xythobuz
  */
 
+#include "imgui/imgui.h"
+
 #include "global.h"
 #include "UI.h"
 #include "system/FontImGui.h"

src/utils/CMakeLists.txt

@@ -7,13 +7,8 @@ set (UTIL_SRCS ${UTIL_SRCS} "FolderRecursive.cpp")
 set (UTIL_SRCS ${UTIL_SRCS} "pcx.cpp" "../../include/utils/pcx.h")
 set (UTIL_SRCS ${UTIL_SRCS} "pixel.cpp" "../../include/utils/pixel.h")
 set (UTIL_SRCS ${UTIL_SRCS} "strings.cpp" "../../include/utils/strings.h")
-set (UTIL_SRCS ${UTIL_SRCS} "tga.cpp" "../../include/utils/tga.h")
 set (UTIL_SRCS ${UTIL_SRCS} "time.cpp" "../../include/utils/time.h")
 
-if (USING_PNG)
-    set (UTIL_SRCS ${UTIL_SRCS} "png.cpp" "../../include/utils/png.h")
-endif (USING_PNG)
-
 # Add library
 add_library (OpenRaider_utils OBJECT ${UTIL_SRCS})
 

src/utils/png.cpp

@@ -1,261 +0,0 @@
-/*!
- * \file src/utils/png.cpp
- * \brief PNG image reader
- *
- * https://github.com/DavidEGrayson/ahrs-visualizer/blob/master/png_texture.cpp
- * http://zarb.org/~gc/html/libpng.html
- *
- * \author xythobuz
- */
-
-#include <png.h>
-#include <cstdio>
-#include <iostream>
-
-#include "global.h"
-#include "utils/pixel.h"
-#include "utils/png.h"
-
-int pngCheck(const char* filename) {
-    png_byte header[8];
-
-    assert(filename != nullptr);
-    assert(filename[0] != '\0');
-
-    FILE* fp = fopen(filename, "rb");
-    if (fp == nullptr) {
-        std::cout << "Could not open " << filename << std::endl;
-        return -1;
-    }
-
-    fread(header, 1, 8, fp);
-    fclose(fp);
-
-    if (png_sig_cmp(header, 0, 8)) {
-        std::cout << "File " << filename << " is not a PNG." << std::endl;
-        return -2;
-    }
-
-    return 0;
-}
-
-int pngLoad(const char* filename, unsigned char** image,
-            unsigned int* width, unsigned int* height,
-            TextureManager::ColorMode* mode, unsigned int* bpp) {
-    png_byte header[8];
-
-    assert(filename != nullptr);
-    assert(filename[0] != '\0');
-    assert(image != nullptr);
-    assert(width != nullptr);
-    assert(height != nullptr);
-    assert(mode != nullptr);
-    assert(bpp != nullptr);
-
-    FILE* fp = fopen(filename, "rb");
-    if (fp == nullptr) {
-        std::cout << "Could not open " << filename << std::endl;
-        return -1;
-    }
-
-    fread(header, 1, 8, fp);
-
-    if (png_sig_cmp(header, 0, 8)) {
-        std::cout << "File " << filename << " is not a PNG." << std::endl;
-        fclose(fp);
-        return -2;
-    }
-
-    png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr);
-    if (!png_ptr) {
-        std::cout << "png_create_read_struct returned 0." << std::endl;
-        fclose(fp);
-        return -3;
-    }
-
-    png_infop info_ptr = png_create_info_struct(png_ptr);
-    if (!info_ptr) {
-        std::cout << "png_create_info_struct returned 0." << std::endl;
-        png_destroy_read_struct(&png_ptr, (png_infopp)nullptr, (png_infopp)nullptr);
-        fclose(fp);
-        return -4;
-    }
-
-    png_infop end_info = png_create_info_struct(png_ptr);
-    if (!end_info) {
-        std::cout << "png_create_info_struct returned 0." << std::endl;
-        png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) nullptr);
-        fclose(fp);
-        return -5;
-    }
-
-    if (setjmp(png_jmpbuf(png_ptr))) {
-        std::cout << "Error from libpng" << std::endl;
-        png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
-        fclose(fp);
-        return -6;
-    }
-
-    png_init_io(png_ptr, fp);
-    png_set_sig_bytes(png_ptr, 8);
-    png_read_info(png_ptr, info_ptr);
-
-    int bit_depth, color_type;
-    png_uint_32 tmpWidth, tmpHeight;
-
-    png_get_IHDR(png_ptr, info_ptr, &tmpWidth, &tmpHeight, &bit_depth, &color_type,
-                 nullptr, nullptr, nullptr);
-
-    *width = tmpWidth;
-    *height = tmpHeight;
-
-    if (bit_depth != 8) {
-        std::cout << filename << ": Unsupported bit depth " << bit_depth << ".  Must be 8." << std::endl;
-        return -7;
-    }
-
-    png_read_update_info(png_ptr, info_ptr);
-
-    png_size_t rowbytes = png_get_rowbytes(png_ptr, info_ptr);
-
-    png_byte* image_data = new png_byte[(rowbytes** height) + 15];
-    png_bytep* row_pointers = new png_bytep[*height];
-
-    for (unsigned int i = 0; i < *height; i++)
-        row_pointers[*height - 1 - i] = image_data + i * rowbytes;
-
-    png_read_image(png_ptr, row_pointers);
-
-    png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
-    delete [] row_pointers;
-    fclose(fp);
-
-    if (color_type == PNG_COLOR_TYPE_RGB) {
-        *mode = TextureManager::ColorMode::RGB;
-        *bpp = 24;
-    } else if (color_type == PNG_COLOR_TYPE_RGB_ALPHA) {
-        *mode = TextureManager::ColorMode::RGBA;
-        *bpp = 32;
-    } else {
-        std::cout << filename << ": Unknown libpng color type " << color_type << std::endl;
-        delete [] image_data;
-        return -8;
-    }
-
-    // Flip
-    *image = new unsigned char[*width** height * (*bpp / 8)];
-    for (unsigned int y = 0; y < (*height); y++) {
-        for (unsigned int x = 0; x < (*width); x++) {
-            (*image)[((y** width) + x) * (*bpp / 8)]
-                = image_data[(((*height - y - 1)** width) + x) * (*bpp / 8)];
-            (*image)[(((y** width) + x) * (*bpp / 8)) + 1]
-                = image_data[((((*height - y - 1)** width) + x) * (*bpp / 8)) + 1];
-            (*image)[(((y** width) + x) * (*bpp / 8)) + 2]
-                = image_data[((((*height - y - 1)** width) + x) * (*bpp / 8)) + 2];
-            (*image)[(((y** width) + x) * (*bpp / 8)) + 3]
-                = image_data[((((*height - y - 1)** width) + x) * (*bpp / 8)) + 3];
-        }
-    }
-
-    delete [] image_data;
-    return 0;
-}
-
-int pngSave(const char* filename, unsigned char* image,
-            unsigned int width, unsigned int height,
-            TextureManager::ColorMode mode, unsigned int bpp) {
-    assert(filename != nullptr);
-    assert(filename[0] != '\0');
-    assert(image != nullptr);
-    assert(width > 0);
-    assert(height > 0);
-
-    FILE* fp = fopen(filename, "wb");
-    if (!fp) {
-        std::cout << "File " << filename << " could not be opened for writing" << std::endl;
-        return -1;
-    }
-
-    png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr);
-
-    if (!png_ptr) {
-        std::cout << "png_create_write_struct failed" << std::endl;
-        fclose(fp);
-        return -2;
-    }
-
-    png_infop info_ptr = png_create_info_struct(png_ptr);
-    if (!info_ptr) {
-        std::cout << "png_create_info_struct failed" << std::endl;
-        fclose(fp);
-        return -3;
-    }
-
-    if (setjmp(png_jmpbuf(png_ptr))) {
-        std::cout << "Error during init_io" << std::endl;
-        fclose(fp);
-        return -4;
-    }
-
-    png_init_io(png_ptr, fp);
-
-    if (setjmp(png_jmpbuf(png_ptr))) {
-        std::cout << "Error during writing header" << std::endl;
-        fclose(fp);
-        return -5;
-    }
-
-    int color_type;
-    if (((mode == TextureManager::ColorMode::RGB)
-         || (mode == TextureManager::ColorMode::BGR)) && (bpp == 24)) {
-        if (mode == TextureManager::ColorMode::BGR) {
-            bgr2rgb24(image, width, height);
-        }
-        color_type = PNG_COLOR_TYPE_RGB;
-    } else if (((mode == TextureManager::ColorMode::RGBA)
-                || (mode == TextureManager::ColorMode::BGRA)) && (bpp == 32)) {
-        if (mode == TextureManager::ColorMode::BGRA) {
-            bgra2rgba32(image, width, height);
-        }
-        color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-    } else {
-        std::cout << "Error invalid color mode" << std::endl;
-        fclose(fp);
-        return -6;
-    }
-
-    png_set_IHDR(png_ptr, info_ptr, width, height,
-                 8, color_type, PNG_INTERLACE_NONE,
-                 PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
-
-    png_write_info(png_ptr, info_ptr);
-
-    png_bytep* row_pointers = new png_bytep[height];
-
-    for (unsigned int i = 0; i < height; i++)
-        row_pointers[height - 1 - i] = image + (i * width * 4);
-
-    if (setjmp(png_jmpbuf(png_ptr))) {
-        std::cout << "Error during writing bytes" << std::endl;
-        delete [] row_pointers;
-        fclose(fp);
-        return -7;
-    }
-
-    png_write_image(png_ptr, row_pointers);
-
-    if (setjmp(png_jmpbuf(png_ptr))) {
-        std::cout << "Error during end of write" << std::endl;
-        delete [] row_pointers;
-        fclose(fp);
-        return -8;
-    }
-
-    png_write_end(png_ptr, nullptr);
-
-    delete [] row_pointers;
-    fclose(fp);
-
-    return 0;
-}
-

src/utils/tga.cpp

@@ -1,415 +0,0 @@
-/*!
- * \file src/utils/tga.cpp
- * \brief TGA image reader/writer
- *
- * \todo type should pass more info (2 bits for RGBA|RGB|GREY; val for depth)
- *
- * \author Mongoose
- * \author xythobuz
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-
-#include "global.h"
-#include "utils/tga.h"
-
-typedef enum {
-    //TGA_TYPE__NO_DATA    = 0,
-    //TGA_TYPE__MAPPED     = 1,
-    TGA_TYPE__COLOR      = 2,
-    TGA_TYPE__GREYSCALE  = 3,
-    //TGA_TYPE__MAPPED_RLE = 9,
-    TGA_TYPE__COLOR_RLE  = 10
-} tga_type_t;
-
-typedef struct {
-    unsigned char comment_lenght;   //!< Number of bytes in comment
-    unsigned char colormap_type;    //!< 0 No colormap; 1 Has colormap
-    unsigned char image_type;       //!< 1 Colormapped; 2 Unmapped; 9 Colormapped RLE; 10 Unmapped RLE
-    unsigned short colormap_index;  //!< Index of first color map entry
-    unsigned short colormap_lenght; //!< Number of color map entries
-    unsigned char colormap_bbp;     //!< 16, 24, or 32 bits per pixel format
-    unsigned short origin_x;        //!< X coor of lower-left corner
-    unsigned short origin_y;        //!< Y coor of lower-left corner
-    unsigned short width;           //!< Width in pixels
-    unsigned short height;          //!< Height in pixels
-    unsigned char bpp;              //!< Number of bits in a pixel index
-    unsigned char desc_flags;       //!< Various magic bits
-} tga_t;
-
-int tgaCheck(const char* filename) {
-    char buffer[10];
-
-    assert(filename != nullptr);
-    assert(filename[0] != '\0');
-
-    FILE* f = fopen(filename, "rb");
-    if (!f) {
-        printf("tgaCheck> File not found\n");
-        return -1;
-    }
-
-    /* Read the header */
-    fseek(f, 0, SEEK_SET);
-    fread(buffer, 8, 1, f);
-
-    // buffer[1] = 0 - Means not color mapped (1 would mean mapped)
-    if (!(buffer[1] == 0 && (buffer[2] == TGA_TYPE__COLOR ||
-                             //buffer[2] == TGA_TYPE__GREYSCALE ||
-                             buffer[2] == TGA_TYPE__COLOR_RLE))) {
-        printf("tgaCheck> Inavlid or unknown TGA format.\n");
-        fclose(f);
-        return -2;
-    }
-
-    fclose(f);
-    return 0;
-}
-
-int tgaLoad(const char* filename, unsigned char** image, unsigned int* width, unsigned int* height,
-            char* type) {
-    tga_t header;
-    char comment[256];
-    unsigned char pixel[4];
-    unsigned char* swap_row = nullptr;
-    unsigned char tmp, packet;
-    bool must_flip = 0;
-    unsigned int size;
-    unsigned int i, j;
-
-    assert(filename != nullptr);
-    assert(filename[0] != '\0');
-    assert(image != nullptr);
-    assert(width != nullptr);
-    assert(height != nullptr);
-    assert(type != nullptr);
-
-    FILE* f = fopen(filename, "rb");
-    if (!f) {
-        printf("tgaLoad> File not found\n");
-        return -1;
-    }
-
-    fseek(f, 0, SEEK_SET);
-
-    // Read TGA header
-    fread(&header.comment_lenght, 1, 1, f);
-    fread(&header.colormap_type, 1, 1, f);
-    fread(&header.image_type, 1, 1, f);
-    fread(&header.colormap_index, 2, 1, f);
-    fread(&header.colormap_lenght, 2, 1, f);
-    fread(&header.colormap_bbp, 1, 1, f);
-
-    fread(&tmp, 1, 1, f);
-    header.origin_x = tmp;
-    fread(&tmp, 1, 1, f);
-    header.origin_x += tmp * 256;
-
-    fread(&tmp, 1, 1, f);
-    header.origin_y = tmp;
-    fread(&tmp, 1, 1, f);
-    header.origin_y += tmp * 256;
-
-    fread(&tmp, 1, 1, f);
-    header.width = tmp;
-    fread(&tmp, 1, 1, f);
-    header.width += tmp * 256;
-
-    fread(&tmp, 1, 1, f);
-    header.height = tmp;
-    fread(&tmp, 1, 1, f);
-    header.height += tmp * 256;
-
-    fread(&header.bpp, 1, 1, f);
-    fread(&header.desc_flags, 1, 1, f);
-
-    *width = header.width;
-    *height = header.height;
-
-    switch (header.bpp) {
-        case 32:
-            *type = 2; //32;
-            break;
-        case 24:
-            *type = 1; //24;
-            break;
-        case 8:
-        default:
-            *type = 0; //8;
-            break;
-    }
-
-#ifdef DEBUG_TGA
-    printf("TGA [%ix%i@%ibpp, %it, %ix, %iy, %uf]\n",
-           header.width, header.height, header.bpp, header.image_type,
-           header.origin_x, header.origin_y,
-           header.desc_flags);
-#endif
-
-    // Comments can be 0 - 255
-    if (header.comment_lenght) {
-        fread(&comment, 1, header.comment_lenght, f);
-        for (i = 0; i < 255; ++i) {
-            if (!(comment[i] > 32 && comment[i] < 127))
-                comment[i] = '.'; // print a dot for invalid text
-        }
-        comment[255] = 0;
-        printf("Comment: '%s'\n", comment);
-    }
-
-    *image = nullptr;
-    size = header.width * header.height;
-
-    if (!size || (!(header.colormap_type == 0 && (header.image_type == 2
-                    || header.image_type == 10)))) {
-        fprintf(stderr, "tgaLoad> Unknown image format.\n");
-        fclose(f);
-        return -2;
-    }
-
-    // Mongoose: Added 'screen origin bit' support back here
-    if (!(header.desc_flags & 32)) {
-        must_flip = true;
-    }
-
-    switch (header.bpp) {
-        case 32:
-            size *= 4;
-            *image = new unsigned char [size];
-            switch (header.image_type) {
-                case TGA_TYPE__COLOR_RLE:
-                    for (i = 0; i < size;) {
-                        fread(&packet, 1, 1, f);
-                        if (packet & 0x80) { // Run Length
-                            packet = (packet & 0x7F) + 1;
-                            fread(&pixel, 4, 1, f);
-                            for (j = 0; j < packet; j++) {
-                                (*image)[i++] = pixel[2];
-                                (*image)[i++] = pixel[1];
-                                (*image)[i++] = pixel[0];
-                                (*image)[i++] = pixel[3];
-                            }
-                        } else { // RAW
-                            packet = (packet & 0x7F) + 1;
-                            for (j = 0; j < packet; j++) {
-                                fread(&pixel, 4, 1, f);
-                                (*image)[i++] = pixel[2];
-                                (*image)[i++] = pixel[1];
-                                (*image)[i++] = pixel[0];
-                                (*image)[i++] = pixel[3];
-                            }
-                        }
-                    }
-                    break;
-                case TGA_TYPE__COLOR:
-                    if (fread((*image), size, 1, f) < 1) {
-                        fprintf(stderr, "tgaLoad> Image fread failed.\n");
-                        delete [] *image;
-                        fclose(f);
-                        return -4;
-                    }
-                    for (i = 0; i < size; i += 4) {
-                        tmp = (*image)[i];
-                        (*image)[i] = (*image)[i + 2];
-                        (*image)[i + 2] = tmp;
-                    }
-                    break;
-                default:
-                    ;
-            }
-            if (must_flip) {
-                swap_row = new unsigned char [header.width * 4];
-                for (i = 0, j = header.height - 1; (int)i < header.height / 2; i++, j--) {
-                    memcpy(swap_row, &(*image)[i * header.width * 4], header.width * 4);
-                    memcpy(&(*image)[i * header.width * 4], &(*image)[j * header.width * 4],
-                           header.width * 4);
-                    memcpy(&(*image)[j * header.width * 4], swap_row, header.width * 4);
-                }
-                delete [] swap_row;
-            }
-            break;
-        case 24:
-            size *= 3;
-            *image = new unsigned char [size];
-            switch (header.image_type) {
-                case TGA_TYPE__COLOR_RLE:
-                    for (i = 0; i < size;) {
-                        fread(&packet, 1, 1, f);
-                        if (packet & 0x80) { // Run Length
-                            packet = (packet & 0x7F) + 1;
-                            fread(&pixel, 3, 1, f);
-                            for (j = 0; j < packet; j++) {
-                                (*image)[i++] = pixel[2];
-                                (*image)[i++] = pixel[1];
-                                (*image)[i++] = pixel[0];
-                            }
-                        } else { // RAW
-                            packet = (packet & 0x7F) + 1;
-                            for (j = 0; j < packet; j++) {
-                                fread(&pixel, 3, 1, f);
-                                (*image)[i++] = pixel[2];
-                                (*image)[i++] = pixel[1];
-                                (*image)[i++] = pixel[0];
-                            }
-                        }
-                    }
-                    break;
-                case TGA_TYPE__COLOR:
-                    if (fread((*image), size, 1, f) < 1) {
-                        fprintf(stderr, "tgaLoad> Image fread failed.\n");
-                        delete [] *image;
-                        fclose(f);
-                        return -4;
-                    }
-                    for (i = 0; i < size; i += 3) {
-                        tmp = (*image)[i];
-                        (*image)[i] = (*image)[i + 2];
-                        (*image)[i + 2] = tmp;
-                    }
-                    break;
-                default:
-                    ;
-            }
-            if (must_flip) {
-                swap_row = new unsigned char [header.width * 3];
-                for (i = 0, j = header.height - 1; (int)i < header.height / 2; i++, j--) {
-                    memcpy(swap_row, &(*image)[i * header.width * 3], header.width * 3);
-                    memcpy(&(*image)[i * header.width * 3], &(*image)[j * header.width * 3],
-                           header.width * 3);
-                    memcpy(&(*image)[j * header.width * 3], swap_row, header.width * 3);
-                }
-                delete [] swap_row;
-            }
-            break;
-        case 8:
-            printf("tgaLoad> 8bpp Not implemented\n");
-            break;
-        default:
-            ;
-    }
-
-#ifdef DEBUG_TGA
-    char c;
-    printf("TGA Comment: ");
-    while (fread(&c, 1, 1, f) == 1) {
-        printf("%c", c);
-    }
-    printf("\n");
-#endif
-
-    fclose(f);
-    return 0;
-}
-
-int tgaSave(const char* filename, unsigned char* image, unsigned int width, unsigned int height,
-            char type) {
-    tga_t header;
-    unsigned int size;
-    char comment[64];
-    //unsigned int i;
-    //unsigned char tmp;
-
-    assert(filename != nullptr);
-    assert(filename[0] != '\0');
-    assert(image != nullptr);
-    assert(width > 0);
-    assert(height > 0);
-
-    FILE* f = fopen(filename, "wb");
-    if (!f) {
-        printf("tgaSave> File not found\n");
-        return -1;
-    }
-
-    strncpy(comment, "OpenRaider TGA", 63);
-    comment[63] = 0;
-
-    header.comment_lenght = (unsigned char)strlen(comment);
-    header.colormap_type = 0;
-
-    // No colormaps
-    header.colormap_index = 0;
-    header.colormap_lenght = 0;
-    header.colormap_bbp = 0;
-
-    header.origin_x = header.origin_y = 0;
-    header.width = (unsigned short)width;
-    header.height = (unsigned short)height;
-
-    header.desc_flags = 0;
-
-    switch (type) {
-        case 4:
-            header.image_type = TGA_TYPE__COLOR;
-            header.desc_flags = 32;
-            header.bpp = 32;
-            break;
-        case 2:
-            header.bpp = 32;
-            break;
-        case 1:
-            header.image_type = TGA_TYPE__GREYSCALE;
-            header.bpp = 8;
-            break;
-        default:
-            header.image_type = TGA_TYPE__COLOR;
-            header.bpp = 24;
-    }
-
-    // Write TGA header
-    fwrite(&header.comment_lenght, 1, 1, f);
-    fwrite(&header.colormap_type, 1, 1, f);
-    fwrite(&header.image_type, 1, 1, f);
-    fwrite(&header.colormap_index, 2, 1, f);
-    fwrite(&header.colormap_lenght, 2, 1, f);
-    fwrite(&header.colormap_bbp, 1, 1, f);
-    fwrite(&header.origin_x, 2, 1, f);
-    fwrite(&header.origin_y, 2, 1, f);
-    fwrite(&header.width, 2, 1, f);
-    fwrite(&header.height, 2, 1, f);
-    fwrite(&header.bpp, 1, 1, f);
-    fwrite(&header.desc_flags, 1, 1, f);
-
-    // Write comment
-    fwrite(&comment, 1, header.comment_lenght, f);
-
-    switch (header.bpp) {
-        case 32:
-            size = header.width * header.height * 4;
-
-            //for (i = 0; i < size; i += 4)
-            //{
-            //  tmp = image[i];
-            //  image[i] = image[i + 2];
-            //  image[i + 2] = tmp;
-            //}
-            break;
-        case 24:
-            size = header.width * header.height * 3;
-
-            //for (i = 0; i < size; i += 3)
-            //{
-            //  tmp = image[i];
-            //  image[i] = image[i + 2];
-            //  image[i + 2] = tmp;
-            //}
-            break;
-        case 8:
-        default:
-            size = header.width * header.height;
-            break;
-    }
-
-    // Write image data
-    if (fwrite(image, size, 1, f) < 1) {
-        perror("tgaSave> Disk write failed.\n");
-        fclose(f);
-        return -2;
-    }
-
-    fclose(f);
-    return 0;
-}
-