From 24773709120dcfc3d93956802cdb91b5df30e913 Mon Sep 17 00:00:00 2001
From: Robert <robert.trololo@gmail.com>
Date: Thu, 24 Sep 2020 23:16:26 +0200
Subject: [PATCH] Pushed latest changes (idk what they are)

---
 .gitignore                            | 3 ++-
 assets/shaders/textured.frag          | 3 ++-
 src/CMakeLists.txt                    | 2 +-
 src/main.cpp                          | 1 +
 src/objects/lighting/AmbientLight.cpp | 0
 src/objects/lighting/AmbientLight.hpp | 8 ++++++++
 src/objects/lighting/PointLight.cpp   | 5 +++++
 src/objects/lighting/PointLight.hpp   | 2 ++
 8 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 src/objects/lighting/AmbientLight.cpp
 create mode 100644 src/objects/lighting/AmbientLight.hpp

diff --git a/.gitignore b/.gitignore
index 6e7349f..4a10880 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .vs
 out
-*.json
\ No newline at end of file
+*.json
+build
diff --git a/assets/shaders/textured.frag b/assets/shaders/textured.frag
index 8b475e3..f8024e9 100644
--- a/assets/shaders/textured.frag
+++ b/assets/shaders/textured.frag
@@ -5,8 +5,9 @@ in vec2 vertexUV;
 out vec4 fragmentColor;
 
 uniform sampler2D modelTexture;
+uniform vec3 lightColor;
 
 void main()
 {
-	fragmentColor = texture(modelTexture, vertexUV);
+	fragmentColor = texture(modelTexture, vertexUV) * vec4(lightColor, 1.0f);
 }
\ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 45637f4..51a1fd9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,7 +3,7 @@ set(VENDOR ${CMAKE_SOURCE_DIR}/vendor)
 
 add_executable(example
 	"main.cpp"
-    "objects/lighting/PointLight.cpp")
+    "objects/lighting/PointLight.cpp" "objects/lighting/AmbientLight.cpp")
 
 file(GLOB SOURCE_FILES
 	"${VENDOR}/src/*.c"
diff --git a/src/main.cpp b/src/main.cpp
index b529cfd..f529d86 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -252,6 +252,7 @@ int main(int argc, char** argv)
 
 		texturedShader.Use();
 		texturedShader.SetUniformMat4("projection", &perspective[0][0]);
+		lightSource.Use(texturedShader);
 		cam.Use(texturedShader);
 		for (Cube* cube : cubes)
 			cube->Draw(texturedShader);
diff --git a/src/objects/lighting/AmbientLight.cpp b/src/objects/lighting/AmbientLight.cpp
new file mode 100644
index 0000000..e69de29
diff --git a/src/objects/lighting/AmbientLight.hpp b/src/objects/lighting/AmbientLight.hpp
new file mode 100644
index 0000000..e09bd30
--- /dev/null
+++ b/src/objects/lighting/AmbientLight.hpp
@@ -0,0 +1,8 @@
+#pragma once
+
+#include <glm/glm.hpp>
+
+class AmbientLight
+{
+
+};
\ No newline at end of file
diff --git a/src/objects/lighting/PointLight.cpp b/src/objects/lighting/PointLight.cpp
index 98a578c..c99c1f0 100644
--- a/src/objects/lighting/PointLight.cpp
+++ b/src/objects/lighting/PointLight.cpp
@@ -59,6 +59,11 @@ PointLight::PointLight(glm::vec3 position, glm::vec3 color, float intensity) :
 	transformation = glm::scale(transformation, glm::vec3(0.05f));
 }
 
+void PointLight::Use(const Shader& program)
+{
+	program.SetUniformFloat3("lightColor", &color[0]);
+}
+
 void PointLight::Draw(const Shader& program)
 {
 	program.SetUniformFloat3("color", &color[0]);
diff --git a/src/objects/lighting/PointLight.hpp b/src/objects/lighting/PointLight.hpp
index 44fbb14..fbf281c 100644
--- a/src/objects/lighting/PointLight.hpp
+++ b/src/objects/lighting/PointLight.hpp
@@ -13,6 +13,8 @@ public:
 	PointLight(glm::vec3 position, glm::vec3 color, float intensity);
 	~PointLight() = default;
 
+	void Use(const Shader& program);
+
 	void Draw(const Shader& program);
 
 private: