Added based class for shadow map

Author: skdeng

.gitignore

@@ -1,2 +1,3 @@
+*.opensdf
 *.sdf
 /astria/Debug

Release/astria.exe

@@ -46,7 +46,7 @@ uniform Material mat;
 uniform FogParameters fogParams;
 
 uniform int bSkybox;
-uniform int bFog;
+uniform bool bFog;
 uniform bool bEnableNormalMap;
 
 smooth in vec2 vTexCoord;
@@ -64,7 +64,7 @@ void main()
 	{
 		vec3 vTexColor = sunLight.vColor * vec3(texture2D(mat.diffuse, vTexCoord));
 		outputColor = vec4(vTexColor * sunLight.fBrightness, 1.0f);
-		if(bFog == 1)
+		if(bFog)
 		{
 			float fFogCoord = 500 *250*fogParams.fDensity;
 			outputColor = mix(outputColor, fogParams.vFogColor, getFogFactor(fogParams, fFogCoord));
@@ -98,7 +98,7 @@ void main()
 
 	outputColor = vec4(vAmbientColor + vDiffuseColor + vSpecularColor, 1.0f);
 
-	if (bFog == 1)
+	if (bFog)
 	{
 		float fFogCoord = distance(vEyePosition, vWorldPos);
 		outputColor = mix(outputColor, fogParams.vFogColor, getFogFactor(fogParams, fFogCoord));

Release/astria.pdb

@@ -1,7 +1,6 @@
 #include "AppStateManager.h"
 #include "AppStateMain.h"
 #include "Main.h"
-#include "utils.h"
 #include "Stringify.h"
 
 CAppStateMain CAppStateMain::Instance;
@@ -168,7 +167,7 @@ void CAppStateMain::OnUpdate()
 	ParticleSnow.ChangePosition(glm::vec3(Position.x, Position.y + 200, Position.z));
 	ParticleSnow.SetMatrices(&ProjectionMatrix, &ViewMatrix, Direction);
 
-	float dist = Distance(FirePosition, Position);
+	float dist = glm::distance(FirePosition, Position);
 	int vol = 1/(dist - 50) * MIX_MAX_VOLUME;
 	SoundFire.SetVolume(vol);
 }
@@ -257,19 +256,12 @@ void CAppStateMain::OnRender()
 	//Render particles
 	float fps = CFPS::FPSControl.GetFPS();
 	float FrameInterval = 1 / fps;
-	TextureParticleEruption.Bind();
 	ParticleEruption.Update(FrameInterval);
 	ParticleEruption.Render();
-
-	TextureParticleSmoke.Bind();
 	ParticleSmoke.Update(FrameInterval);
 	ParticleSmoke.Render();
-
-	TextureParticleFire.Bind();
 	ParticleFire.Update(FrameInterval);
 	ParticleFire.Render();
-
-	TextureParticleSnow.Bind();
 	ParticleSnow.Update(FrameInterval);
 	ParticleSnow.Render();
 
@@ -288,6 +280,11 @@ void CAppStateMain::OnRender()
 	SDL_GL_SwapWindow(CMain::GetInstance()->GetWindow());
 }
 
+void CAppStateMain::RenderScene(CShaderProgram* modelProgram, CShaderProgram* instanceProgram, CShaderProgram* terrainProgram)
+{
+
+}
+
 int CAppStateMain::OnLoad()
 {
 	//Initialize GLEW
@@ -375,9 +372,18 @@ int CAppStateMain::OnLoad()
 
 	ModelMatrices.clear(); ModelMatrices.shrink_to_fit();
 
+	std::string ParticleShaders[] =
+	{
+		"shaders/particles_update.vert",
+		"shaders/particles_update.geom",
+		"shaders/particles_render.vert",
+		"shaders/particles_render.geom",
+		"shaders/particles_render.frag"
+	};
+
 	//Load particles
-	TextureParticleEruption.Load_2D("gfx/particle.bmp", true);
-	ParticleEruption.Init();
+	ParticleEruption.Init(ParticleShaders);
+	ParticleEruption.SetTexture("gfx/particle.bmp");
 	FirePosition = glm::vec3(64, 0, 193);
 	FirePosition.y = Map.GetHeight(FirePosition);
 	ParticleEruption.Set(
@@ -392,8 +398,8 @@ int CAppStateMain::OnLoad()
 		0.02,	//Spawn interval
 		1000);	//Count i.e. number generated per frame
 
-	TextureParticleFire.Load_2D("gfx/img/FireParticle.jpg", true);
-	ParticleFire.Init();
+	ParticleFire.Init(ParticleShaders);
+	ParticleFire.SetTexture("gfx/img/FireParticle.jpg");
 	ParticleFire.Set(
 		FirePosition,
 		glm::vec3(-7, 8, -7),
@@ -407,8 +413,8 @@ int CAppStateMain::OnLoad()
 		50);
 
 	FirePosition.y += 3;
-	TextureParticleSmoke.Load_2D("gfx/img/SmokeParticle.jpg", true);
-	ParticleSmoke.Init();
+	ParticleSmoke.Init(ParticleShaders);
+	ParticleSmoke.SetTexture("gfx/img/SmokeParticle.jpg");
 	ParticleSmoke.Set(
 		FirePosition,
 		glm::vec3(-5, 8, -5),
@@ -421,8 +427,8 @@ int CAppStateMain::OnLoad()
 		0.2,
 		10);
 
-	TextureParticleSnow.Load_2D("gfx/img/SnowParticle.png", true);
-	ParticleSnow.Init();
+	ParticleSnow.Init(ParticleShaders);
+	ParticleSnow.SetTexture("gfx/img/SnowParticle.png");
 	ParticleSnow.Set(
 		glm::vec3(0, 500, 0),
 		glm::vec3(-30, -20, -30),
@@ -460,7 +466,7 @@ int CAppStateMain::OnLoad()
 
 	SoundFire.Load("sound/fireplace.wav", 1);
 	//This is need so we dont hear the sound effect for a split second at the very beginning
-	float dist = Distance(FirePosition, Position);
+	float dist = glm::distance(FirePosition, Position);
 	int vol = 1 / (dist - 50) * MIX_MAX_VOLUME;
 	SoundFire.SetVolume(vol);
 	SoundFire.Play(-1);

Release/gfx/img/Thumbs.db

@@ -2,11 +2,11 @@
 #define _APP_STATE_GL_H_
 
 #include "AppState.h"
+#include "Common.h"
 #include "Shader.h"
 #include "Light.h"
 #include "Skybox.h"
 #include "HeightMap.h"
-#include "Params.h"
 #include "Model.h"
 #include "Water.h"
 #include "ParticleSystem.h"
@@ -32,10 +32,18 @@ class CAppStateMain : public CAppState
 
 	SDL_Texture* GetSnapshot();
 
+private:
+	//Private methods
+	int OnLoad();
+	void RenderScene(CShaderProgram* modelProgram, CShaderProgram* instanceProgram, CShaderProgram* terrainProgram);
+	//Event functions
+	void OnKeyDown(SDL_Keycode sym, Uint16 mod, SDL_Scancode scancode);
+	void OnKeyUp(SDL_Keycode sym, Uint16 mod, SDL_Scancode scancode);
+	void OnLoseFocus();
+
 private:
 	static CAppStateMain Instance;
 	int Loaded;
-	int OnLoad();
 	SDL_GLContext glContext;
 
 	const int OPENGL_MAJOR_VERSION = 3;
@@ -49,11 +57,6 @@ class CAppStateMain : public CAppState
 
 	bool MoveLeft, MoveRight, MoveUp, MoveDown;
 
-	//Event functions
-	void OnKeyDown(SDL_Keycode sym, Uint16 mod, SDL_Scancode scancode);
-	void OnKeyUp(SDL_Keycode sym, Uint16 mod, SDL_Scancode scancode);
-	void OnLoseFocus();
-
 	//Shaders & Shader programs
 	CShader ShaderVertex;
 	CShader ShaderFragment;

Release/gfx/img/sprites/Thumbs.db

@@ -21,9 +21,40 @@
 #include <glm\glm.hpp>
 #include <glm\gtc\matrix_transform.hpp>
 
+#include "Params.h"
+
 #define NDEBUG
 
 extern std::string HelpText;
 extern std::string CreditsText;
 
+//=====================
+//	HELPER FUNCTIONS  =
+//=====================
+
+//returns a random integer between x and y
+inline int RandInt(int x, int y) { return rand() % (y - x + 1) + x; }
+//returns a random float between zero and 1
+inline double RandFloat() { return (rand()) / (RAND_MAX + 1.0); }
+inline double RandFloatInterval(float min, float max) { float interval = max - min;	return min + interval*RandFloat(); }
+//returns a random bool
+inline bool RandBool(){ if (RandInt(0, 1)) return true;	else return false; }
+//returns a random float in the range -1 < n < 1
+inline double RandNormal() { return RandFloat() - RandFloat(); }
+//Clamp first argument between 2nd and 3rd arguments
+inline void Clamp(double &arg, double min, double max) { arg = arg <= min ? min : (arg >= max ? max : arg); }
+inline void Clamp(float &arg, float min, float max) { arg = arg <= min ? min : (arg >= max ? max : arg); }
+inline void Clamp(int &arg, int min, int max) { arg = arg <= min ? min : (arg >= max ? max : arg); }
+//Radian to degree
+inline double ToDeg(double radian) { return radian * 180 / CParams::Pi; }
+
+//Log functions
+inline void Error(const char* title, const char* text) { MessageBox(NULL, text, title, MB_ICONERROR); }
+inline void Error(const char* title, std::string text) { MessageBox(NULL, text.c_str(), title, MB_ICONERROR); }
+inline void Error(std::string title, std::string text) { MessageBox(NULL, text.c_str(), title.c_str(), MB_ICONERROR); }
+inline void Warning(const char* title, const char* text) { MessageBox(NULL, text, title, MB_ICONWARNING); }
+inline void Warning(const char* title, std::string text) { MessageBox(NULL, text.c_str(), title, MB_ICONWARNING); }
+inline void Warning(std::string title, std::string text) { MessageBox(NULL, text.c_str(), title.c_str(), MB_ICONWARNING); }
+
+
 #endif

Release/shaders/main_shader.frag

@@ -0,0 +1,126 @@
+#include "FBO.h"
+
+CFBO::CFBO()
+{
+	FrameBuffer = NULL;
+	DepthBuffer = NULL;
+}
+
+bool CFBO::CreateDepthShadowBuffer()
+{
+	const char* LOG_TAG = "FBO::CreateDepthShadowBuffer";
+	glGenFramebuffers(1, &FrameBuffer);
+	
+	Texture.CreateEmpty(1024, 1024, 0);
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT16, 1024, 1024, 0, GL_DEPTH_COMPONENT16, GL_FLOAT, 0);
+	Texture.SetFiltering(TEXTURE_FILTER_MAG_NEAREST, TEXTURE_FILTER_MIN_NEAREST);
+
+	glFramebufferTexture(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, Texture.GetID(), 0);
+	glDrawBuffer(GL_NONE);
+
+	if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE)
+	{
+		Error(LOG_TAG, "glCheckFramebufferStatus failed");
+		return false;
+	}
+}
+
+bool CFBO::CreateWithTexture(int width, int height)
+{
+	const char* LOG_TAG = "FBO::CreateWithTexture";
+	if (FrameBuffer != 0)
+	{
+		Error(LOG_TAG, "Trying to create into an existing buffer");
+		return false;
+	}
+
+	glGenFramebuffers(1, &FrameBuffer);
+	glBindFramebuffer(GL_FRAMEBUFFER, FrameBuffer);
+
+	Texture.CreateEmpty(width, height, GL_RGB);
+	glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, Texture.GetID(), 0);
+
+	Width = width;
+	Height = height;
+
+	if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE)
+	{
+		Error(LOG_TAG, "glCheckFramebufferStatus failed");
+		return false;
+	}
+
+	return true;
+}
+
+bool CFBO::AddDepthBuffer()
+{
+	if (FrameBuffer == 0) return false;
+
+	glBindFramebuffer(GL_FRAMEBUFFER, FrameBuffer);
+
+	glGenRenderbuffers(1, &DepthBuffer);
+	glBindRenderbuffer(GL_RENDERBUFFER, DepthBuffer);
+	glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT24, Width, Height);
+
+	glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, DepthBuffer);
+	return glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE;
+}
+
+void CFBO::Bind(bool fullViewPort)
+{
+	glBindFramebuffer(GL_FRAMEBUFFER, FrameBuffer);
+	if (fullViewPort) glViewport(0, 0, 1024, 1024);
+}
+
+void CFBO::BindShadowMap()
+{
+	glBindFramebuffer(GL_FRAMEBUFFER, FrameBuffer);
+	glViewport(0, 0, 1024, 1024);
+}
+
+void CFBO::SetTextureFiltering(int mag, int min)
+{
+	Texture.SetFiltering(mag, min);
+	Texture.SetWrap(GL_CLAMP_TO_EDGE, GL_CLAMP_TO_EDGE);
+}
+
+void CFBO::BindTexture(int textureUnit, bool mipmaps)
+{
+	Texture.Bind(textureUnit);
+	if (mipmaps) glGenerateMipmap(GL_TEXTURE_2D);
+}
+
+void CFBO::Release()
+{
+	if (FrameBuffer)
+	{
+		glDeleteFramebuffers(1, &FrameBuffer);
+		FrameBuffer = 0;
+	}
+	if (DepthBuffer)
+	{
+		glDeleteRenderbuffers(1, &DepthBuffer);
+		DepthBuffer = 0;
+	}
+	Texture.Release();
+}
+
+glm::mat4 CFBO::GetProjectionMatrix(float a_fov, float a_near, float a_far)
+{
+	return glm::perspective(a_fov, float(Width) / float(Height), a_near, a_far);
+}
+
+glm::mat4 CFBO::GetOrthogonalMatrix()
+{
+	return glm::ortho(0.0f, float(Width), 0.0f, float(Height));
+}
+
+int CFBO::GetWidth()
+{
+	return Width;
+}
+
+int CFBO::GetHeight()
+{
+	return Height;
+}

astria.v12.suo

@@ -0,0 +1,38 @@
+#ifndef _FBO_H_
+#define _FBO_H_
+
+#include "Common.h"
+#include "Texture.h"
+
+class CFBO
+{
+public:
+	CFBO::CFBO();
+
+	bool Create();
+
+	void Bind(bool fullViewPort = true);
+	void BindShadowMap();
+
+	void SetTextureFiltering(int mag, int min);
+	void BindTexture(int textureUnit = 0, bool mipmaps = false);
+
+	void Release();
+
+	bool CreateDepthShadowBuffer();
+	bool CreateWithTexture(int width, int height);
+
+	bool AddDepthBuffer();
+
+	glm::mat4 GetProjectionMatrix(float a_fov, float a_near, float a_far);
+	glm::mat4 GetOrthogonalMatrix();
+	int GetWidth();
+	int GetHeight();
+private:
+	GLuint FrameBuffer;
+	GLuint DepthBuffer;
+	CTexture Texture;
+	int Width, Height;
+};
+
+#endif