BTH/squidout
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

temporary particles for demo. trails for bricks, and on brick hit.

Browse Source
This commit is contained in:
Stiffly
2015-10-08 21:41:01 +02:00
parent 706e720ae8
commit 2545cef90f
9 changed files with 64 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Core/Renderer.cpp
+1 -1
View File
@@ -440,7 +440,7 @@ void dd::Renderer::DrawScene(RenderQueue &objects, ShaderProgram &program)
glUniformMatrix4fv(glGetUniformLocation(shaderProgramHandle, "MVP"), 1, GL_FALSE, glm::value_ptr(MVP));
glUniformMatrix4fv(glGetUniformLocation(shaderProgramHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelMatrix));
glUniformMatrix4fv(glGetUniformLocation(shaderProgramHandle, "V"), 1, GL_FALSE, glm::value_ptr(viewMatrix));
glUniform4fv(glGetUniformLocation(shaderProgramHandle, "Color"), 1, glm::value_ptr(modelJob->Color));
glUniform4fv(glGetUniformLocation(shaderProgramHandle, "Color"), 1, glm::value_ptr(spriteJob->Color));
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, spriteJob->DiffuseTexture);
src/game/Core/Shaders/Forward/Fragment.glsl
+2 -1
View File
@@ -30,6 +30,7 @@ uniform vec3 LightPosition;
uniform float LightRadius;
uniform vec3 LightSpecular;
uniform vec3 LightDiffuse;
uniform vec4 Color;
in VertexData
{
@@ -86,5 +87,5 @@ void main()
vec4 La = vec4(0.3, 0.3, 0.3, 1.0);
vec4 light = phong(Input.Position, normalize(normal), specularTexel.rgb, specularTexel.a);
//frag_Diffuse = light;
frag_Diffuse = diffuseTexel;
frag_Diffuse = diffuseTexel * Color;
}