pederbs
/
TDT4230_final_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the first light color affect the emissive colors, and fix bilinear filtering in PNGImage

This commit is contained in:
Peder Bergebakken Sundt 2019-03-28 09:40:40 +01:00
parent 6c7e6de5a8
commit faa69754f8
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/shaders/simple.frag
View File

@ -130,7 +130,7 @@ vec3 phong(vec3 basecolor, vec3 nnormal) {
if (diffuse_i>0) diffuse_component += light[i].color * diffuse_i * attenuation; if (diffuse_i>0) diffuse_component += light[i].color * diffuse_i * attenuation;
} }
basecolor *= (emissive_color + diffuse_color *diffuse_component); basecolor *= (emissive_color*light[0].color + diffuse_color *diffuse_component);
if (isReflectionMapped) if (isReflectionMapped)
basecolor = reflection(basecolor, nnormal); basecolor = reflection(basecolor, nnormal);

18
src/utilities/imageLoader.cpp
View File

@ -34,21 +34,21 @@ vec4 PNGImage::get(int x, int y) {
float(pixels[x*4+y*width*4 + 3]) / 255); float(pixels[x*4+y*width*4 + 3]) / 255);
} }
vec4 PNGImage::at_nearest(double u, double v) { vec4 PNGImage::at_nearest(double u, double v) {
int x = int( u*(width -1) + 0.5); int x = int( u*(width) - 0.5);
int y = int(-v*(height-1) - 0.5); int y = int(-v*(height) + 0.5);
return get(x, y); return get(x, y);
} }
vec4 PNGImage::at_bilinear(double u, double v) { vec4 PNGImage::at_bilinear(double u, double v) {
double x = u*double(width-1); double x = u*double(width) - 0.5;
double y = -v*double(height-1); double y = -v*double(height) + 0.5;
int x1 = int(x + 0.0); int x1 = int(x + 0.0);
int x2 = int(x + 1.0);
int y1 = int(y + 0.0); int y1 = int(y + 0.0);
int x2 = int(x + 1.0);
int y2 = int(y + 1.0); int y2 = int(y + 1.0);
double x2x = x2 - x; double xx1 = x - x1;
double y2y = y2 - y; double yy1 = y - y1;
double yy1 = y - y1; double x2x = 1 - xx1;
double xx1 = x - x1; double y2y = 1 - yy1;
vec4 q11 = get(x1, y1); vec4 q11 = get(x1, y1);
vec4 q21 = get(x2, y1); vec4 q21 = get(x2, y1);
vec4 q12 = get(x1, y2); vec4 q12 = get(x1, y2);