diff options
Diffstat (limited to 'example')
| -rw-r--r-- | example/fragmentshader.glsl | 19 | ||||
| -rwxr-xr-x | example/main | bin | 54184 -> 54360 bytes | |||
| -rw-r--r-- | example/main.cpp | 16 | ||||
| -rw-r--r-- | example/main.o | bin | 5152 -> 5904 bytes | |||
| -rw-r--r-- | example/textures/elevold.bmp | bin | 0 -> 4000138 bytes | |||
| -rw-r--r-- | example/textures/frederickelev.png | bin | 0 -> 19336 bytes | |||
| -rw-r--r-- | example/textures/frederickelev.xcf | bin | 0 -> 111015 bytes |
7 files changed, 24 insertions, 11 deletions
diff --git a/example/fragmentshader.glsl b/example/fragmentshader.glsl index 631ea69..fc7b4c8 100644 --- a/example/fragmentshader.glsl +++ b/example/fragmentshader.glsl @@ -2,6 +2,7 @@ out vec4 outpix; uniform vec3 campos; uniform vec3 lightpos; +uniform vec4 lightattrib; uniform sampler2D tex; uniform sampler2D elev; //varing blends them it is transformed to world space @@ -18,18 +19,30 @@ void main() float diffuse = dot(lightnormal, fragnormal.xyz); if (diffuse < 0.0) { diffuse = 0.0; + } else { } vec3 camnormal = normalize(campos - refpos); - lightnormal = -normalize((lightpos - refpos)); // this time it is an incoming vector + lightnormal = normalize((refpos - lightpos)); // this time it is an incoming vector vec3 refnormal = lightnormal - (2 * dot(lightnormal, fragnormal.xyz) * fragnormal.xyz); float reflect = dot(camnormal, refnormal); + if (reflect < 0.0) { + reflect = 0.0; + } else { + } diffuse = pow(diffuse, 2.0); reflect = pow(reflect, 2.0); - float light = (elevpix.b) * reflect + elevpix.a * diffuse; + float dist = abs(length(difpos - lightpos)) / lightattrib.a; + if (dist > 1.0) { + dist = 1.0; + } + dist = 1 - pow(dist, 4.0); + float lightr = (elevpix.b) * 1.0 * lightattrib.r * reflect + elevpix.a * 1.0 * dist * diffuse; + float lightg = (elevpix.b) * 1.0 * lightattrib.g * reflect + elevpix.a * 1.0 * dist * diffuse; + float lightb = (elevpix.b) * 1.0 * lightattrib.b * reflect + elevpix.a * 1.0 * dist * diffuse; vec4 texpix = texture(tex, fragtexcoord); //this should be the vertex in camera space without the w value //outpix = gl_FragCoord; - outpix = light * texpix; + outpix = vec4(lightr * texpix.r, lightg * texpix.g, lightb * texpix.b, texpix.a); //outpix = vec4(light * 1.0,light * 1.0,light * 1.0, 1.0); //outpix = vec4(fragpos.x ,fragpos.y ,fragpos.z, 0.5); //outpix = vec4(fragnormal.x, fragnormal.y, fragnormal.z, 0.5); diff --git a/example/main b/example/main Binary files differindex 248dc85..9f2411e 100755 --- a/example/main +++ b/example/main diff --git a/example/main.cpp b/example/main.cpp index a92ce4b..6b7975c 100644 --- a/example/main.cpp +++ b/example/main.cpp @@ -11,7 +11,7 @@ int main (int argc, char * argv[]) { //inits program initgfx(400,600, "rotating cube"); initglgfx(); - setlight(0,10,10); + setlight(2.0,10.0,3.0, 1.0, 0.5, 0.5, 15.0); setcam(0.0,0.0,1.0, 0.0,0.0,0.0, 0.0,1.0,0.0); //main loop, this is defined in main.h and global loop = 1; @@ -40,19 +40,19 @@ int main (int argc, char * argv[]) { } switch (rot) { case 0: - drawmodel(0.0f, 0.0f, -2.0f, dir, 0.0f, 0.0f, 1.0); - drawmodel(0.5f, 3.0f, -10.0f, dir, 0.0f, 0.0f, 1.0); + drawmodel(0.0f, 0.0f, -2.0f, dir, 0.0f, 0.0f, 1.0, 1.0, 1.0); + drawmodel(0.5f, 3.0f, -10.0f, dir, 0.0f, 0.0f, 1.0, 1.0, 1.0); break; case 1: - drawmodel(0.0f, 0.0f, -2.0f, 0.0f, dir, 0.0f, 1.0); - drawmodel(0.5f, 3.0f, -10.0f, 0.0f, dir, 0.0f, 1.0); + drawmodel(0.0f, 0.0f, -2.0f, 0.0f, dir, 0.0f, 1.0, 1.0, 1.0); + drawmodel(0.5f, 3.0f, -10.0f, 0.0f, dir, 0.0f, 1.0, 1.0, 1.0); break; case 2: - drawmodel(0.0f, 0.0f, -2.0f, 0.0f, 0.0f, dir, 1.0); - drawmodel(0.5f, 3.0f, -10.0f, 0.0f, 0.0f, dir, 1.0); + drawmodel(0.0f, 0.0f, -2.0f, 0.0f, 0.0f, dir, 1.0, 1.0, 1.0); + drawmodel(0.5f, 3.0f, -10.0f, 0.0f, 0.0f, dir, 1.0, 1.0, 1.0); break; } - drawmodel(0.0f, -2.0, -5.0,0.0,0.0,0.0,1.0 ); + drawmodel(0.0f, -2.0, -5.0,0.0,0.0,0.0,10.0, 1.0, 10.0 ); updategfx(); } quitgfx(); diff --git a/example/main.o b/example/main.o Binary files differindex 0a41d2f..c6267ba 100644 --- a/example/main.o +++ b/example/main.o diff --git a/example/textures/elevold.bmp b/example/textures/elevold.bmp Binary files differnew file mode 100644 index 0000000..cb9fec6 --- /dev/null +++ b/example/textures/elevold.bmp diff --git a/example/textures/frederickelev.png b/example/textures/frederickelev.png Binary files differnew file mode 100644 index 0000000..b3f13b5 --- /dev/null +++ b/example/textures/frederickelev.png diff --git a/example/textures/frederickelev.xcf b/example/textures/frederickelev.xcf Binary files differnew file mode 100644 index 0000000..8b7cd36 --- /dev/null +++ b/example/textures/frederickelev.xcf |
