Code cleanup

Author: sdavydouski

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016 Sergey Davydovsky
+Copyright (c) 2016 - 2017 Sergey Davydovsky
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

resources/audio/background.ogg

@@ -54,14 +54,14 @@ void AssetsLoader::loadTextures() {
        96, 32, 4, GL_RGBA);
     ResourceManager::Instance().createTexture("particle",
        OFFSET + "resources/textures/particle.png",
-       500, 500, 4, GL_RGBA);
+       50, 50, 4, GL_RGBA);
     ResourceManager::Instance().createTexture("powerUp",
         OFFSET + "resources/textures/powerup.png",
         16, 32, 4, GL_RGBA);
 }
 
 void AssetsLoader::loadAudioFiles() {
-    // https://opengameart.org/content/cyberpunk-moonlight-sonata
+    // https://opengameart.org/content/tower-defense-theme
     AudioManager::Instance().createSource("background", OFFSET + "resources/audio/background.ogg", true);
     AudioManager::Instance().createSource("bleep", OFFSET + "resources/audio/bleep.ogg", false);
     AudioManager::Instance().createSource("bleepPaddle", OFFSET + "resources/audio/bleep_paddle.ogg", false);

resources/textures/particle.png

@@ -1,7 +1,6 @@
 #include "Window.h"
 #include "input/InputManager.h"
 #include "utils/FileManager.h"
-#include "AssetsLoader.h"
 #include <iostream>
 
 Window::Window(int width, int height, const std::string& title, bool isFullScreen, bool vsync)
@@ -17,12 +16,6 @@ Window::Window(int width, int height, const std::string& title, bool isFullScree
      }
 
     glfwSetInputMode(window_, GLFW_CURSOR, GLFW_CURSOR_HIDDEN);
-    
-    GLFWimage icon;
-    icon.width = 58;
-    icon.height = 58;
-    icon.pixels = FileManager::readImage(AssetsLoader::OFFSET + "resources/textures/ball.png", icon.width, icon.height, 4);
-    glfwSetWindowIcon(window_, 1, &icon);
 
     if (!isFullScreen) {
         // Center window on screen

src/AssetsLoader.cpp

@@ -1,17 +1,12 @@
 #include "GameObject.h"
-#include <iostream>
 
 GameObject::GameObject(const glm::vec2& position,
                        const glm::vec2& size,
                        const glm::vec3& color,
                        Texture* sprite)
-    : position_(position), size_(size), color_(color), sprite_(sprite) {
-    //std::cout << "GameObject constructor" << std::endl;
-}
+    : position_(position), size_(size), color_(color), sprite_(sprite) {}
 
-GameObject::~GameObject() {
-    //std::cout << "GameObject destructor" << std::endl;
-}
+GameObject::~GameObject() {}
 
 void GameObject::render(const SpriteRenderer& renderer) {
     renderer.renderSprite(sprite_, position_, size_, color_);

src/Window.cpp

@@ -45,7 +45,7 @@ void PowerUp::update(float delta, Player& player, Ball& ball, PostProcessor& pos
     }
 }
 
-void PowerUp::activate(Player& player, Ball& ball, PostProcessor& postProcessor, const glm::vec2 scales) {
+void PowerUp::activate(Player& player, Ball& ball, PostProcessor& postProcessor, const glm::vec2& scales) {
     isActivated_ = true;
     isDestroyed_ = true;
 

src/game/GameObject.cpp

@@ -21,7 +21,7 @@ class PowerUp: public GameObject {
     ~PowerUp();
 
     void update(float delta, Player& player, Ball& ball, PostProcessor& postProcessor);
-    void activate(Player& player, Ball& ball, PostProcessor& postProcessor, const glm::vec2 scales);
+    void activate(Player& player, Ball& ball, PostProcessor& postProcessor, const glm::vec2& scales);
 
     // getters
     PowerUpType type() const { return type_; }

src/game/PowerUp.cpp

@@ -11,4 +11,4 @@ struct Particle {
     float lifespan;
 
     Particle() : position(0.0f), velocity(0.0f), color(1.0f), lifespan(0.0f) {}
-};
+};

src/game/PowerUp.h

@@ -5,7 +5,6 @@
 #include <iostream>
 #include <string>
 #include <vector>
-#include <stdexcept>
 
 Shader::Shader(ShaderType type, const std::string& path) {
     auto source = FileManager::readAsText(path);
@@ -34,7 +33,6 @@ void Shader::checkCompilationStatus() const {
         std::vector<GLchar> errorLog(static_cast<GLuint>(LOG_LENGTH));
 
         glGetShaderInfoLog(id_, LOG_LENGTH, nullptr, &errorLog[0]);
-        std::cerr << &errorLog[0] << std::endl;
-        throw std::runtime_error("Shader compilation failed");
+        std::cerr << "Shader compilation failed" << std::endl << &errorLog[0] << std::endl;
     }
 }

src/graphics/Particle.h

@@ -3,7 +3,6 @@
 #include <glm/glm.hpp>
 #include <glm/gtc/type_ptr.hpp>
 #include <iostream>
-#include <stdexcept>
 #include <vector>
 
 ShaderProgram::ShaderProgram(const Shader& vertexShader, const Shader& fragmentShader) {
@@ -125,8 +124,7 @@ void ShaderProgram::checkLinkageStatus() const {
         std::vector<GLchar> errorLog((GLuint) LOG_LENGTH);
 
         glGetProgramInfoLog(id_, LOG_LENGTH, nullptr, &errorLog[0]);
-        std::cerr << &errorLog[0] << std::endl;
-        throw std::runtime_error("Shader program linkage failed");
+        std::cerr << "Shader program linkage failed" << std::endl << &errorLog[0] << std::endl;
     }
 }
 

src/graphics/Shader.cpp

@@ -47,7 +47,7 @@ unsigned char* FileManager::readImage(const std::string& path,
                                       GLint channels,
                                       bool flip) {
     stbi_set_flip_vertically_on_load(flip);
-    unsigned char* image = stbi_load(path.c_str(), &width, &height, &channels, 0);
+    auto image = stbi_load(path.c_str(), &width, &height, &channels, 0);
     if (image == nullptr) {
         std::cerr << "Unable to open image file " << path << std::endl
                   << "Reason: " << stbi_failure_reason() << std::endl;