Directories

Author: sdavydouski

CMakeLists.txt

@@ -5,7 +5,7 @@ find_package(OpenGL REQUIRED)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
 
-set(SOURCES src/main.cpp src/WindowManager.cpp src/WindowManager.h src/Window.cpp src/Window.h src/Shader.cpp src/Shader.h src/ShaderType.h src/ShaderProgram.cpp src/ShaderProgram.h src/FileManager.cpp src/FileManager.h src/Texture.cpp src/Texture.h src/ResourceManager.cpp src/ResourceManager.h src/InputManager.cpp src/InputManager.h src/EventHandlers.h src/Game.cpp src/Game.h src/GameState.h src/SpriteRenderer.cpp src/SpriteRenderer.h src/Singleton.h src/GameObject.cpp src/GameObject.h src/Brick.cpp src/Brick.h src/GameLevel.cpp src/GameLevel.h src/Player.cpp src/Player.h src/Ball.cpp src/Ball.h src/Direction.h src/Collision.h src/CollisionDetector.cpp src/CollisionDetector.h)
+set(SOURCES src/main.cpp src/WindowManager.cpp src/WindowManager.h src/Window.cpp src/Window.h src/graphics/Shader.cpp src/graphics/Shader.h src/graphics/ShaderType.h src/graphics/ShaderProgram.cpp src/graphics/ShaderProgram.h src/FileManager.cpp src/FileManager.h src/graphics/Texture.cpp src/graphics/Texture.h src/ResourceManager.cpp src/ResourceManager.h src/input/InputManager.cpp src/input/InputManager.h src/input/EventHandlers.h src/Game.cpp src/Game.h src/game/GameState.h src/graphics/SpriteRenderer.cpp src/graphics/SpriteRenderer.h src/Singleton.h src/game/GameObject.cpp src/game/GameObject.h src/game/Brick.cpp src/game/Brick.h src/game/GameLevel.cpp src/game/GameLevel.h src/game/Player.cpp src/game/Player.h src/game/Ball.cpp src/game/Ball.h src/physics/Direction.h src/physics/Collision.h src/physics/CollisionDetector.cpp src/physics/CollisionDetector.h src/graphics/Particle.h src/graphics/ParticleEmitter.cpp src/graphics/ParticleEmitter.h)
 
 # GLFW build configuration
 

resources/shaders/particle/shader.frag

@@ -0,0 +1,11 @@
+#version 330 core
+
+in vec2 uv;
+out vec4 finalColor;
+
+uniform sampler2D sprite;
+uniform vec4 particleColor;
+
+void main() {
+    finalColor = texture(sprite, uv) * particleColor;
+}

resources/shaders/particle/shader.vert

@@ -0,0 +1,16 @@
+#version 330 core
+
+// <vec2 position, vec2 texCoords>
+layout (location = 0) in vec4 vertex;
+
+out vec2 uv;
+
+uniform mat4 projection;
+uniform vec2 offset;
+
+float scale = 10.0f;
+
+void main() {
+    uv = vertex.zw;
+    gl_Position = projection * vec4(vertex.xy * scale + offset, 0.0f, 1.0f);
+}

resources/shaders/sprite/shader.frag

@@ -7,5 +7,5 @@ uniform sampler2D image;
 uniform vec3 color;
 
 void main() {
-    finalColor = vec4(color, 1.0f) * texture(image, uv);
+    finalColor = texture(image, uv) * vec4(color, 1.0f);
 }

src/Game.cpp

@@ -1,18 +1,18 @@
 #include "Game.h"
-#include "ShaderProgram.h"
-#include "Shader.h"
-#include "ShaderType.h"
+#include "graphics/ShaderProgram.h"
+#include "graphics/Shader.h"
+#include "graphics/ShaderType.h"
 #include "Window.h"
-#include "Collision.h"
-#include "Direction.h"
-#include "CollisionDetector.h"
+#include "physics/Collision.h"
+#include "physics/Direction.h"
+#include "physics/CollisionDetector.h"
 #include <glm/mat4x4.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 #include <tuple>
 #include <cmath>
 #include <iostream>
 
-const glm::vec2 INITIAL_BALL_VELOCITY(250.0f, -650.0f);
+const glm::vec2 INITIAL_BALL_VELOCITY(200.0f, -550.0f);
 float INITIAL_PLAYER_VELOCITY = 500.0f;
 
 Game::Game(int width, int height, bool isFullScreen)

src/Game.h

@@ -1,15 +1,15 @@
 #pragma once
 
 #include <GL/glew.h>
-#include "GameState.h"
-#include "SpriteRenderer.h"
+#include "game/GameState.h"
+#include "graphics/SpriteRenderer.h"
 #include "ResourceManager.h"
-#include "InputManager.h"
+#include "input/InputManager.h"
 #include "WindowManager.h"
 #include "Window.h"
-#include "GameLevel.h"
-#include "Player.h"
-#include "Ball.h"
+#include "game/GameLevel.h"
+#include "game/Player.h"
+#include "game/Ball.h"
 #include <memory>
 #include <vector>
 

src/ResourceManager.cpp

@@ -1,7 +1,7 @@
 #include "ResourceManager.h"
-#include "ShaderProgram.h"
-#include "Shader.h"
-#include "Texture.h"
+#include "graphics/ShaderProgram.h"
+#include "graphics/Shader.h"
+#include "graphics/Texture.h"
 #include "FileManager.h"
 #include <memory>
 #include <string>

src/ResourceManager.h

@@ -1,9 +1,9 @@
 #pragma once
 
 #include "Singleton.h"
-#include "ShaderProgram.h"
-#include "Shader.h"
-#include "Texture.h"
+#include "graphics/ShaderProgram.h"
+#include "graphics/Shader.h"
+#include "graphics/Texture.h"
 #include <GL/glew.h>
 #include <memory>
 #include <map>

src/Window.cpp

@@ -1,5 +1,5 @@
 #include "Window.h"
-#include "InputManager.h"
+#include "input/InputManager.h"
 #include <iostream>
 
 Window::Window(int width, int height, const std::string& title, bool isFullScreen, bool vsync)