faerbit/Saxum
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 2 Wiki Activity

Made flickering dependent of the wind power.

Browse Source
This commit is contained in:
Faerbit 2015-03-09 11:13:12 +01:00
parent 9609c50335
commit b313bd0645
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
data/shader/flame.gsh
View File

@ -4,6 +4,7 @@ uniform mat4 modelViewProjectionMatrix;
uniform float time; uniform float time;
uniform bool bottom; uniform bool bottom;
uniform bool left; uniform bool left;
uniform vec2 skew;
layout(points) in; layout(points) in;
layout(triangle_strip, max_vertices = 146) out; layout(triangle_strip, max_vertices = 146) out;
@ -18,18 +19,22 @@ const float cos_p2_1 = 2.0;
const float ex_p1_1 = -0.193; const float ex_p1_1 = -0.193;
const float ex_p2_1 = 2.9426; const float ex_p2_1 = 2.9426;
const float begin_1 = -0.8; const float begin_1 = -0.8;
const float end_1 = 1.5; const float end_1 = 2;
const float transition_point_2 = 0.600598; const float transition_point_2 = 0.549778;
const float cos_p1_2 = 0.3; const float cos_p1_2 = 0.5;
const float cos_p2_2 = 1.7; const float cos_p2_2 = 2.0;
const float ex_p1_2 = -0.19; const float ex_p1_2 = 0.677;
const float ex_p2_2 = 2.762; const float ex_p2_2 = 3.9314;
const float begin_2 = -0.8; const float begin_2 = -0.8;
const float end_2 = 2; const float end_2 = 1.3;
float flickerFunction() { float flickerFunction() {
return pow(sin(20.0*time + gl_in[0].gl_Position.x*gl_in[0].gl_Position.z), 2); float windPower = length(skew);
if (windPower < 0.8) {
windPower += 0.2;
}
return windPower * pow(sin((20.0/(windPower))*time + gl_in[0].gl_Position.x*gl_in[0].gl_Position.z), 2) + (1-windPower);
} }
float radiusFunction(float x) { float radiusFunction(float x) {

6
data/shader/phong.fsh
View File

@ -67,7 +67,11 @@ vec2 poissonDisk[16] = vec2[](
); );
float flickerFunction(int index) { float flickerFunction(int index) {
return 0.7*pow(sin(20.0*time + lightSources[index].x*lightSources[index].z), 2) + 0.3; float windPower = length(movement);
if (windPower < 0.8) {
windPower += 0.2;
}
return windPower * pow(sin((20.0/(windPower))*time + lightSources[index].x*lightSources[index].z), 2) + (1-windPower);
} }
vec4 fogColor(float dot) { vec4 fogColor(float dot) {