Removed unused stuff [skip ci]

include/Room.h

@@ -46,7 +46,6 @@ class Room {
     void addSprite(RoomSprite* s) { sprites.emplace_back(s); }
     void addModel(StaticModel* s) { models.emplace_back(s); }
     void addSector(Sector* s) { sectors.emplace_back(s); }
-    void addLight(Light* l) { lights.emplace_back(l); }
 
     void addPortal(Portal* p) { portals.emplace_back(p); }
     unsigned long sizePortals() { return portals.size(); }
@@ -80,7 +79,6 @@ class Room {
     std::vector<std::unique_ptr<StaticModel>> models;
     std::vector<std::unique_ptr<Portal>> portals;
     std::vector<std::unique_ptr<Sector>> sectors;
-    std::vector<std::unique_ptr<Light>> lights;
 
     static bool showBoundingBox;
     static bool showRoomModels;

include/RoomData.h

@@ -97,35 +97,6 @@ class Portal {
 
 // --------------------------------------
 
-class Light {
-  public:
-    /*!
-     * \brief Type a light can be of
-     */
-    typedef enum {
-        typePoint       = 1, //!< Point light
-        typeSpot        = 2, //!< Spot light
-        typeDirectional = 3  //!< Directional light
-    } LightType;
-
-    void getPos(float p[4]);
-    void getDir(float d[3]);
-    float getAtt();
-    void getColor(float c[4]);
-    float getCutoff();
-    LightType getType();
-
-  private:
-    float pos[4]; //! Light position in 3 space
-    float dir[3]; //! Light direction
-    float att;
-    float color[4]; //! Color of light
-    float cutoff; //! Fade out distance
-    LightType type; //! Type of light
-};
-
-// --------------------------------------
-
 class Sector {
   public:
     Sector(float f, float c, bool w) : floor(f), ceiling(c), wall(w) { }

include/global.h

@@ -109,7 +109,7 @@ typedef enum {
 
 template<typename T, typename U>
 [[noreturn]] void assertEqualImplementation(const char* exp, T a, U b, const char* file, int line,
-                                            const char* str = nullptr) {
+        const char* str = nullptr) {
     const unsigned int maxSize = 128;
     void* callstack[maxSize];
     int frames = backtrace(callstack, maxSize);

include/utils/pixel.h

@@ -11,8 +11,6 @@
 unsigned char* generateColorTexture(const unsigned char* rgba, unsigned int width,
                                     unsigned int height, unsigned int bpp);
 
-void bgr2rgb24(unsigned char* image, unsigned int w, unsigned int h);
-void bgra2rgba32(unsigned char* image, unsigned int w, unsigned int h);
 void argb2rgba32(unsigned char* image, unsigned int w, unsigned int h);
 
 // Returns newly allocated buffer

src/RoomData.cpp

@@ -95,40 +95,6 @@ void RoomSprite::display(glm::mat4 VP) {
 
 // ----------------------------------------------------------------------------
 
-void Light::getPos(float p[4]) {
-    p[0] = pos[0];
-    p[1] = pos[1];
-    p[2] = pos[2];
-    p[3] = pos[3];
-}
-
-void Light::getDir(float d[3]) {
-    d[0] = dir[0];
-    d[1] = dir[1];
-    d[2] = dir[2];
-}
-
-float Light::getAtt() {
-    return att;
-}
-
-void Light::getColor(float c[4]) {
-    c[0] = color[0];
-    c[1] = color[1];
-    c[2] = color[2];
-    c[3] = color[3];
-}
-
-float Light::getCutoff() {
-    return cutoff;
-}
-
-Light::LightType Light::getType() {
-    return type;
-}
-
-// ----------------------------------------------------------------------------
-
 float Sector::getFloor() {
     return floor;
 }

src/TextureManager.cpp

@@ -297,7 +297,8 @@ glm::vec4 TextureManager::getPalette(int index) {
     return colorPalette[index];
 }
 
-void TextureManager::addIndexedTexture(unsigned char* image, unsigned int width, unsigned int height) {
+void TextureManager::addIndexedTexture(unsigned char* image, unsigned int width,
+                                       unsigned int height) {
     unsigned char* img = new unsigned char[width * height];
     for (unsigned int i = 0; i < (width * height); i++)
         img[i] = image[i];

src/system/Shader.cpp

@@ -343,7 +343,7 @@ void Shader::drawGL(ShaderBuffer& vertices, ShaderBuffer& uvs, ShaderBuffer& ind
 
         unsigned int sz = vertices.getSize();
         glm::vec3* buffer = new glm::vec3[sz];
-    glBindBuffer(GL_ARRAY_BUFFER, vertices.getBuffer());
+        glBindBuffer(GL_ARRAY_BUFFER, vertices.getBuffer());
         glGetBufferSubData(GL_ARRAY_BUFFER, 0, sz * sizeof(glm::vec3), buffer);
 
         Log::get(LOG_DEBUG) << "drawGL Vertex dump:" << Log::endl;

src/utils/pixel.cpp

@@ -24,32 +24,6 @@ unsigned char* generateColorTexture(const unsigned char* rgba, unsigned int widt
     return image;
 }
 
-void bgr2rgb24(unsigned char* image, unsigned int w, unsigned int h) {
-    assert(image != nullptr);
-    assert(w > 0);
-    assert(h > 0);
-
-    for (unsigned int i = 0; i < (w * h); ++i) {
-        /* 24-bit BGR to RGB */
-        unsigned char swap = image[(i * 3) + 2];
-        image[(i * 3) + 2] = image[i * 3];
-        image[i * 3] = swap;
-    }
-}
-
-void bgra2rgba32(unsigned char* image, unsigned int w, unsigned int h) {
-    assert(image != nullptr);
-    assert(w > 0);
-    assert(h > 0);
-
-    for (unsigned int i = 0; i < (w * h); ++i) {
-        /* 32-bit BGRA to RGBA */
-        unsigned char swap = image[(i * 4) + 2];
-        image[(i * 4) + 2] = image[(i * 4)];
-        image[i * 4] = swap;
-    }
-}
-
 void argb2rgba32(unsigned char* image, unsigned int w, unsigned int h) {
     assert(image != nullptr);
     assert(w > 0);