Working on skybox

Former-commit-id: ea5dbd3

Author: russkev

README.md

@@ -1,4 +1,8 @@
-# gl_engine
+# GL Engine
+GL Engine is simple real time rendering engine built with C++ and OpenGL. The 
+aim of the project is to get acquainted with OpenGL and use it to implement some
+advanced real time lighting features.
+
   - Working with OpenGL to create a functional realtime rendering engine.
 
   - OpenGL version: 4.40
@@ -9,7 +13,7 @@
 
   - SDL for window display.
 
-## Current features:
+# Features
  - Cameras
     - Target camera for orbiting
     - Free camera
@@ -35,16 +39,25 @@
     - Deferred rendering
     - Screen space ambient occlusion
     - Glow effect
-    
-## Screenshots
+
+# Screenshots
 ![Demo 01](https://raw.githubusercontent.com/russkev/opengl/master/screenshots/demo_01.jpg)
 ![Demo 02](https://raw.githubusercontent.com/russkev/opengl/master/screenshots/demo_02.jpg)
 ![Demo 04](https://raw.githubusercontent.com/russkev/opengl/master/screenshots/demo_04.jpg)
 ![Demo 05](https://raw.githubusercontent.com/russkev/opengl/master/screenshots/demo_05.jpg)
 ![Demo 06](https://raw.githubusercontent.com/russkev/opengl/master/screenshots/demo_06.jpg)
 ![Demo 07](https://raw.githubusercontent.com/russkev/opengl/master/screenshots/demo_07a.jpg)
 
-## Big thank you to:
-  - [Aleksandras Ševčenko](https://github.com/Coldberg) for being an excellent guide while I've been fumbling around.
-  - [Joey Devries](https://joeydevries.com/#home) for his excellent tutorials and his example game engine here on github.
+
+# Included Libraries
+ - Glew
+ - GLM
+ - SDL
+ - ZLib
+
+# Acknowledgements
+  - [Aleksandras Ševčenko](https://github.com/Coldberg) has been an excellent guide while I've been fumbling around.
+
+# References
+  - [Joey Devries](https://joeydevries.com/#home) has some excellent tutorials and an example game engine here on github.
   - [OpenGL Tutorial](http://www.opengl-tutorial.org/). Another excellent resource.

data/Skybox.frag

@@ -5,6 +5,7 @@ out layout(location = 0) vec4 frag_color;
 in vec3 uv;
 
 uniform samplerCube skybox;
+//uniform sampler2D skybox;
 
 void main()
 {

gl_demo/scenes/SkyBoxDemo.h

@@ -20,7 +20,7 @@ namespace gl_demo
 		targetCam.focus(glm::vec3{ 0.0f, 0.0f, 0.0f });
 		targetCam.set_clip_far(1000.0f);
 
-		glen::Texture uv_template_texture{ "leather_09_diffuse.tga" };
+		//glen::Texture uv_template_texture{ "leather_09_diffuse.tga" };
 
 		glen::CubeMapMaterial skybox_material{ "Skybox Material" };
 		glen::Texture skybox_texture{ glen::Texture::create_cubemap_texture({
@@ -32,11 +32,17 @@ namespace gl_demo
 										"pond/negz.tga"
 										})};
 		glen::Mesh skybox_mesh = glen::Cube::create_cube();
+		skybox_mesh.reverse_triangles();
+		glm::mat4 skybox_transform = glm::translate(glm::mat4{ 1.0f  }, glm::vec3{ 0.0f, -1.0f, 0.0f });
+		skybox_mesh.transform(skybox_transform);
 		skybox_material.set_texture(skybox_material.k_skybox, &skybox_texture);
 		glen::MeshNode skybox_mesh_node{ "Skybox node", &skybox_mesh, &skybox_material };
 
 		glen::Renderer render{ &targetCam_node, glm::uvec2{ width, height } };
 		render.add_node(&skybox_mesh_node);
+		render.disable_ao();
+		render.disable_deferred_render();
+		render.disable_post_effects();
 
 		glen::Timer timer;
 

gl_engine/Readme.md

@@ -1,8 +1,19 @@
-## Guide for adding a new shader type
+# Guide for adding a new shader type
 1. In `../data` folder, create appropriate fragment / vertex / etc. shader(s).
 2. If a new type of texture is required, go to the factory inside `shading/Texture.h` and make a new create method there.
 3. Inside `shading/Texture.cpp`, fill out the definition with the appropriate set methods for the gl texture.
 4. Go to `material/MaterialLibrary.h` and make a new material that inherits from the `Material` class.
 5. Use `inline static const` to fill out the names of any uniforms you are using in the shader.
 6. Add update and init methods as required (see existing materials for examples).
 7. Giva a definition for these files in the `material/MaterialLibrary.cpp` file. Models and materials should have any matrix transform methods you require.
+
+## Textures
+Textures can be solid colours or files.
+
+#### Note about `m_data`:
+
+  This usually contains a pointer to the actual pixel data of the texture. 
+  However, if multiple image files are required (in the case of a skybox
+  for example), `m_data` will only point to the first image. If more are needed, 
+  it is better to cycle through the vector m_surface and access the data from
+  each element using `m_surface.at(i)->data`.

gl_engine/material/MaterialLibrary.cpp

@@ -352,12 +352,16 @@ namespace glen
 
 	void CubeMapMaterial::init()
 	{
-		set_uniform("skybox", 0);
+		//set_uniform("skybox", 0);
 	}
 
 	void CubeMapMaterial::update_view(const CameraNode* camera_node, const Node* model_node)
 	{
-		set_uniform(k_transform_model_to_projection, camera_node->world_to_projection() * model_node->world_to_node());
+		auto view = camera_node->world_to_cam();
+		auto projection = camera_node->camera()->cam_to_projection();
+		view = glm::mat4(glm::mat3(view));
+		//p_matrix = glm::mat4(glm::mat3(p_matrix));
+		set_uniform(k_transform_model_to_projection, projection * view);	
 	}
 
 	// DEPTH
@@ -374,7 +378,7 @@ namespace glen
 
 	void DepthMaterial::init()
 	{
-		set_uniform(k_transform_model_to_projection, glm::mat4{ 1.0f });
+		//
 	}
 
 	void DepthMaterial::update_view(const CameraNode* camera_node, const Node* mesh_node)

gl_engine/mesh/Mesh.cpp

@@ -100,16 +100,16 @@ namespace glen
 	// // ----- Triangles ----- // //
 	void Mesh::reverse_triangles()
 	{
-		auto length = m_vertices->size();
+		auto length = m_indices->size();
 		if (length % 3 != 0) 
 		{
 			printf("Mesh: %d does not appear to be triangles. Unable to reverse.", m_id);
 		}
-		for (auto i = 0; i < length; i+=3) 
+		for (auto i = 0; i < length; i+= 3) 
 		{
-			auto temp = m_vertices->at(i+2);
-			m_vertices->at(i + 2) = m_vertices->at(i + 3);
-			m_vertices->at(i + 3) = temp;
+			auto temp = m_indices->at(i + 1);
+			m_indices->at(i + 1) = m_indices->at(i + 2);
+			m_indices->at(i + 2) = temp;
 		}
 	}
 

gl_engine/render/Renderer.cpp

@@ -229,6 +229,8 @@ namespace glen
 	{
 		clear_screen();
 
+		//glDepthMask(false);
+
 		m_camera_node->update();
 
 		for (Material* material : m_materials)