Working on basic rendering #4

* Added a basic material abstraction
* Started implementation of RenderTarget (such as render textures)

.gitmodules

@@ -19,3 +19,9 @@
 [submodule "assimp"]
 	path = libs/assimp
 	url = https://github.com/assimp/assimp.git
+[submodule "libs/steam-audio"]
+	path = libs/steam-audio
+	url = https://github.com/ValveSoftware/steam-audio.git
+[submodule "libs/physx"]
+	path = libs/physx
+	url = https://git.barink.dev/Nigel/PhysX.git

BarinkEngine/BarinkEngine.cpp

@@ -1,8 +1,8 @@
 #include "BarinkEngine.h"
+#include <phonon.h>
 
 EngineStatistics* ES;
 
-
 int main(int argc, char* argv[]) {
 	// Setup performance sampler 
 	PerfomanceSamplerInit();
@@ -18,6 +18,8 @@ int main(int argc, char* argv[]) {
 
 	GUIManager GUISystem = GUIManager(&MainWindow);
 
+
+
 	// First call to setup game
 	Start();
 

BarinkEngine/Include/BarinkEngine.h

@@ -4,6 +4,7 @@
 #include "graphics/Window.h"
 #include "graphics/Camera.h"
 #include "graphics/Renderable.h"
+#include "Graphics/Material.h"
 #include "spdlog/spdlog.h"
 
 #include "Input/InputManager.h"
@@ -12,6 +13,7 @@
 #include "Scene.h"
 #include "PerfCounter.h"
 
+
 extern void Start();
 extern void Update();
 extern void ImmediateGraphicsDraw();

BarinkEngine/Include/Graphics/Material.h

@@ -0,0 +1,19 @@
+#pragma once
+#include <glm/glm.hpp>
+#include <string>
+#include "Shader.h"
+
+class Material {
+public:
+	Material(const Shader& shader);
+	
+	void Apply();
+	
+	glm::vec3 Color;
+
+
+private:
+	const Shader& shader;
+	
+
+};

BarinkEngine/Include/Graphics/RenderSurface.h

@@ -0,0 +1,30 @@
+#pragma once
+#include "BarinkEngine.h"
+#include <vector>;
+class RenderSurface 
+{
+public:
+	RenderSurface();
+	~RenderSurface();
+
+	void Draw();
+
+private:
+	// would normally be a material
+	// however rendersurface is special and
+	// thus does not contain a material
+	Shader* shader;
+
+	// Basically a mesh
+	std::vector<glm::vec3> verts;
+	std::vector<unsigned int > indices;
+
+
+	Buffer vertexBuffer;
+	Buffer elementBuffer;
+
+	VertexArray VAO;
+
+
+
+};

BarinkEngine/Include/Graphics/Renderable.h

@@ -2,14 +2,26 @@
 #include <vector>
 #include "Mesh.h"
 #include "Buffer.h"
+#include "Material.h"
 #include "VertexArray.h"
 #include "Scene.h"
 
+
 class Renderable  : public SceneNode {
 public:
+	/*
+	* NOTE: Should combine into a Mesh!!
+	*/
 	Buffer vertexBuffer;
 	Buffer elementBuffer;
 	VertexArray VAO;
+
+
+	Material* material;
+
+	
+	Shader* shader;
+
 	~Renderable();
 
 	static Renderable* Load();

BarinkEngine/Include/Graphics/Shader.h

@@ -15,12 +15,12 @@ class Shader {
     public:
         Shader(const std::string vertexShaderPath, const std::string fragmentShaderPath);
         void Use();
-        void setUniformMat4(std::string uniformName, glm::mat4 matrix4);
-        void setUniformVec4(std::string uniformName, glm::vec4 vector4);
-        void setUniformVec3(std::string uniformName, glm::vec3 vector3);
-        void setUniformVec2(std::string uniformName, glm::vec2 vector2);
-        void setUniformFloat(std::string uniformName, float value);
-        void setUniformInt(std::string uniformName, int value);
+        void setUniformMat4(std::string uniformName, glm::mat4 matrix4)const;
+        void setUniformVec4(std::string uniformName, glm::vec4 vector4)const;
+        void setUniformVec3(std::string uniformName, glm::vec3 vector3)const;
+        void setUniformVec2(std::string uniformName, glm::vec2 vector2)const;
+        void setUniformFloat(std::string uniformName, float value)const;
+        void setUniformInt(std::string uniformName, int value) const ;
 
 
 };

BarinkEngine/Input/InputManager.cpp

@@ -2,7 +2,6 @@
 
 void BarinkEngine::InputManager::PollEvents()
 {
-
 	for (std::vector<BarinkWindow*>::iterator it = windows.begin(); it != windows.end(); ++it) {
 		(*it)->Poll();
 	}

BarinkEngine/graphics/Material.cpp

@@ -0,0 +1,10 @@
+#include "../Include/Graphics/Material.h"
+
+Material::Material(const Shader& shader) :
+shader(shader) {
+}
+
+
+void Material::Apply() {
+	shader.setUniformVec3("Color", Color);
+}

BarinkEngine/graphics/RenderSurface.cpp

@@ -0,0 +1,46 @@
+#include "Graphics/RenderSurface.h";
+
+RenderSurface::RenderSurface(){
+	shader = new Shader("build/SandboxAppliction/Debug/renderSuface.vs", "build/SandboxApplication/Debug/renderSurface.fs");
+
+
+
+	verts = std::vector<glm::vec3>{
+		{-0.5f, 0.5f, 0.0f}, // 0
+		{-0.5f, -0.5f, 0.0f}, // 1
+		{0.5f, -0.5f, 0.0f}, // 2
+		{0.5f, 0.5f, 0.0f}, // 3 
+	};
+
+	indices = std::vector<unsigned int>{
+		0,2,1,
+		0,3,2
+	};
+
+	VAO.Create();
+	VAO.Bind();
+
+	vertexBuffer.createBuffer();
+	vertexBuffer.Bind(false);
+	vertexBuffer.setBufferData(&verts[0], verts.size() * sizeof(glm::vec3), false);
+
+	elementBuffer.createBuffer();
+	elementBuffer.Bind(true);
+	elementBuffer.setBufferData(&indices[0], indices.size() * sizeof(unsigned int), true);
+
+	VAO.AttachAttribute(0, 3, 0);
+
+	vertexBuffer.Unbind(false);
+	VAO.Unbind();
+
+
+
+}
+
+RenderSurface::~RenderSurface() {
+	delete shader;
+}
+
+void RenderSurface::Draw() {
+	
+}

BarinkEngine/graphics/Renderer.cpp

@@ -12,6 +12,7 @@ BarinkEngine::Renderer::~Renderer()
 
 void BarinkEngine::Renderer::Render()
 {
+
 	for (auto model : models) {
 		model->Draw();
 	}

BarinkEngine/graphics/Shader.cpp

@@ -96,29 +96,29 @@ void Shader::Use()
 }
 
 
-void Shader::setUniformMat4(std::string uniformName, glm::mat4 matrix4) 
+void Shader::setUniformMat4(std::string uniformName, glm::mat4 matrix4) const
 {    
     glUniformMatrix4fv(glGetUniformLocation(id, uniformName.c_str()), 1, GL_FALSE, glm::value_ptr(matrix4));
 }
-void Shader::setUniformVec4(std::string uniformName, glm::vec4 vector4) 
+void Shader::setUniformVec4(std::string uniformName, glm::vec4 vector4) const
 {
     glUniform4fv(glGetUniformLocation(id, uniformName.c_str()), 1, glm::value_ptr(vector4));
 }
-void Shader::setUniformVec3(std::string uniformName, glm::vec3 vector3) 
+void Shader::setUniformVec3(std::string uniformName, glm::vec3 vector3) const
 {
     glUniform3fv(glGetUniformLocation(id, uniformName.c_str()), 1, glm::value_ptr(vector3));
 }
-void Shader::setUniformVec2(std::string uniformName, glm::vec2 vector2) 
+void Shader::setUniformVec2(std::string uniformName, glm::vec2 vector2) const
 {
     glUniform2fv(glGetUniformLocation(id, uniformName.c_str()),1, glm::value_ptr(vector2));
 }
 
-void Shader::setUniformFloat(std::string uniformName, float value) 
+void Shader::setUniformFloat(std::string uniformName, float value) const
 {
     glUniform1f(glGetUniformLocation(id, uniformName.c_str()), value);
 }
 
-void Shader::setUniformInt(std::string uniformName, int value) 
+void Shader::setUniformInt(std::string uniformName, int value) const
 {
     glUniform1i(glGetUniformLocation(id, uniformName.c_str()), value);
 }

BarinkEngine/graphics/shaders/RenderSurfaceFrag.shader

@@ -0,0 +1,11 @@
+#version 440 core
+layout (location = 0) in vec2 aPos;
+layout (location = 1) in vec2 aTexCoords;
+
+
+out vec2 aTexCoords;
+
+void main(){
+  gl_Position = vec4(aPos.xy , 0.0 ,1.0);
+  aTexCoords = aTexCoords;
+}

BarinkEngine/graphics/shaders/RenderSurfaceVert.shader

@@ -0,0 +1,11 @@
+#version 440 core
+out vec4 FragColor;
+
+in vec2 TexCoords;
+
+uniform sampler2D screenTexture;
+
+
+void main(){
+  FragColor = texture(screenTexture, aTexCoords);
+}

BarinkEngine/graphics/window.cpp

@@ -36,6 +36,9 @@ Width(width), Height(height), FullScreen(false){
 		exit(-1);
 	}
 
+	// Set vsync off !! 
+	glfwSwapInterval(0);
+
 	VulkanSupported = glfwVulkanSupported();
 
 	glfwGetFramebufferSize(window, &Width, &Height);

BarinkEngine/premake5.lua

@@ -11,6 +11,8 @@ project "BarinkEngine"
     "../libs/glm",
     "../libs/GorillaAudio/include",
 
+    "../libs/physx/physx/include",
+    "../libs/steam-audio/include",
     "../libs/assimp/include",
     "../libs/glad/include",
     "../libs/glfw/include",
@@ -22,6 +24,7 @@ project "BarinkEngine"
   }
 
   libdirs {
+    "../libs/steam-audio/lib/windows-x64",
     "../libs/lua",
     "../libs/spdlog/build/Release",
     "../libs/assimp/lib/Debug",
@@ -30,6 +33,7 @@ project "BarinkEngine"
   }
 
   links {
+    "phonon",
     "lua54",
     "spdlog",
     "assimp-vc143-mtd",
@@ -56,3 +60,10 @@ project "BarinkEngine"
 
   ok, err = os.copyfile("graphics/shaders/vertex.shader", "../build/SandboxApplication/Debug/test.vs")
   if err then error("Copy vertex shader source failed!") end
+
+  ok, err = os.copyfile("graphics/shaders/RenderSurfaceFrag.shader", "../build/SandboxApplication/Debug/RenderSurface.fs")
+  if err then error("Copy fragment shader source failed!") end
+
+  ok, err = os.copyfile("graphics/shaders/RenderSurfaceVert.shader", "../build/SandboxApplication/Debug/RenderSurface.vs")
+  if err then error("Copy vertex shader source failed!") end
+

SandboxApplication/GUI.cpp

@@ -6,6 +6,10 @@ void CameraTool(Camera* cam) {
 
     ImGui::SliderFloat("Zoom:", &cam->Zoom, 10, 190);
 
+    ImGui::InputFloat3("Position:", &cam->Position[0]);
+
+    ImGui::InputFloat3("Rotation:", &cam->Rotation[0]);
+
     ImGui::End();
 }
 

SandboxApplication/Sandbox.cpp

@@ -11,12 +11,17 @@ Renderable* Cube;
 Renderable* Cube2;
 
 Shader* shader;
+Material* matCube;
+Material* matCube2;
 
 char* code = new char[254];
 
+
 const std::string vertexShaderSource = "build/SandboxApplication/Debug/test.vs";
 const std::string fragmentShaderSource = "build/SandboxApplication/Debug/test.fs";
 
+
+
 /*
 * Runs once at startup 
 * - USe to initialize the game/sandbox/demo
@@ -47,9 +52,13 @@ void Start() {
    // Walk scene graph
     PrintSceneTree(scene.GetRoot(),0);
 
-
     shader = new Shader(vertexShaderSource, fragmentShaderSource);
 
+    matCube = new Material(*shader);
+    matCube->Color = glm::vec3(1.0, 0.0, 0.0);
+
+    matCube2 = new Material(*shader);
+    matCube2->Color = glm::vec3(0.0, 1.0f, 0.0);
 
     /*
     * load meshes 
@@ -113,12 +122,12 @@ void Update()
     shader->setUniformMat4("P", projection);
     shader->setUniformMat4("M", CalculateModelMat(Cube->transform));
     shader->setUniformMat4("V", cam->GetViewMatrix());
-    shader->setUniformVec3("MatColour", glm::vec3(1.0f, 0.0f, 0.0f));
+    matCube->Apply();
 
     Cube->Draw();
 
     shader->setUniformMat4("M", CalculateModelMat(Cube2->transform));
-    shader->setUniformVec3("MatColour", glm::vec3(0.0f, 1.0f, 0.0f));
+    matCube2->Apply();
 
     Cube2->Draw();
 
@@ -139,5 +148,8 @@ void Stop() {
     delete Cube2;
     delete Cube;
 
+    delete matCube;
+    delete matCube2;
+
     delete shader;
 }

libs/physx

@@ -0,0 +1 @@
+Subproject commit c3d5537bdebd6f5cd82fcaf87474b838fe6fd5fa

libs/steam-audio

@@ -0,0 +1 @@
+Subproject commit de6414694deccde57396c95dc44f8cc5f7d790f5