introduced new bugs

src/Shape.cpp

@@ -0,0 +1,113 @@
+#include "Shapes.hpp"
+
+#include "Util.hpp"
+
+Shape::Shape()
+{
+	shader = lol::ShaderManager::GetInstance().Get(SHAPE_ID);
+	if (shader == nullptr)
+	{
+		shader = std::make_shared<lol::Shader>(
+			R"(
+				#version 460 core
+	
+				layout (location = 0) in vec3 pos;
+				
+				uniform mat4 model;
+				uniform mat4 view;
+				uniform mat4 projection;
+
+				void main()
+				{
+					gl_Position = projection * view * model * vec4(pos, 1.0f);
+				}
+			)",
+			R"(
+				#version 460 core
+	
+				out vec4 FragColor;
+				
+				void main()
+				{
+					FragColor = vec4(1.0f);
+				}
+			)"
+			);
+
+		lol::ShaderManager::GetInstance().Register(SHAPE_ID, shader);
+	}
+}
+
+void Shape::PreRender(const lol::CameraBase& camera) const
+{
+	shader->SetUniform("model", transformation);
+	shader->SetUniform("view", camera.GetView());
+	shader->SetUniform("projection", camera.GetProjection());
+}
+
+Cube::Cube()
+{
+	vao = lol::VAOManager::GetInstance().Get(CUBE_ID);
+	if (vao == nullptr)
+	{
+		std::shared_ptr<lol::VertexBuffer> vbo = std::make_shared<lol::VertexBuffer>(8 * 3,
+			std::vector<float> {
+				-1.0f, -1.0f, -1.0f,
+				 1.0f, -1.0f, -1.0f,
+				 1.0f,  1.0f, -1.0f,
+				-1.0f,  1.0f, -1.0f,
+				-1.0f, -1.0f,  1.0f,
+				 1.0f, -1.0f,  1.0f,
+				 1.0f,  1.0f,  1.0f,
+				-1.0f,  1.0f,  1.0f
+			}
+		);
+		vbo->SetLayout({{lol::Type::Float, 3, false}});
+
+		std::shared_ptr<lol::ElementBuffer> ebo = std::make_shared<lol::ElementBuffer>(6 * 3 * 2,
+			std::vector<unsigned int> {
+				0, 1, 3, 3, 1, 2,
+				1, 5, 2, 2, 5, 6,
+				5, 4, 6, 6, 4, 7,
+				4, 0, 7, 7, 0, 3,
+				3, 2, 7, 7, 2, 6,
+				4, 5, 0, 0, 5, 1
+			}
+		);
+
+		vao = std::make_shared<lol::VertexArray>(vbo, ebo);
+		lol::VAOManager::GetInstance().Register(CUBE_ID, vao);
+	}
+}
+
+Pyramid::Pyramid()
+{
+	vao = lol::VAOManager::GetInstance().Get(PYRAMID_ID);
+	if (vao == nullptr)
+	{
+		std::shared_ptr<lol::VertexBuffer> vbo = std::make_shared<lol::VertexBuffer>(5 * 3,
+			std::vector<float> {
+				-1.0f, -0.86f, 1.0f,
+				1.0f, -0.86f, 1.0f,
+				-1.0f, -0.86f, -1.0f,
+				1.0f, -0.86f, -1.0f,
+				0.0f, 0.86f, 0.0f,
+		}
+		);
+		vbo->SetLayout({ {lol::Type::Float, 3, false} });
+
+		std::shared_ptr<lol::ElementBuffer> ebo = std::make_shared<lol::ElementBuffer>(18,
+			std::vector<unsigned int> {
+				0, 2, 1,
+				1, 2, 3,
+				0, 1, 4,
+				1, 3, 4,
+				3, 2, 4,
+				2, 0, 4,
+		}
+		);
+
+		vao = std::make_shared<lol::VertexArray>(vbo, ebo);
+		lol::VAOManager::GetInstance().Register(PYRAMID_ID, vao);
+	}
+}