Subversion Repositories gelsvn

Rev

Rev 367 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 367 Rev 373
Line 91... Line 91...
91 
            for (int j=0; j<samples; ++j)
 91 
            for (int j=0; j<samples; ++j)
92 
            {
 92 
            {
93 
                Vec3f Li, wi;
 93 
                Vec3f Li, wi;
94 
                if (lum->sample(r, hi, Li, wi))
 94 
                if (lum->sample(r, hi, Li, wi))
95 
                {
 95 
                {
96 
                    float cost = std::max(dot(hi.shading_normal, wi),0.f);
 96 
                    float cost = s_max(dot(hi.shading_normal, wi),0.f);
97 
                    L += Li * cost * bsdf_evaluate(hi, wi, wo);
 97 
                    L += Li * cost * bsdf_evaluate(hi, wi, wo);
98 
                }
 98 
                }
99 
 
 99 
 
100 
                Ld += L / float(samples);
 100 
                Ld += L / float(samples);
101 
            }
 101 
            }
Line 248... Line 248...
248 
void special(int key, int x, int y)
 248 
void special(int key, int x, int y)
249 
{
 249 
{
250 
    switch (key)
 250 
    switch (key)
251 
    {
 251 
    {
252 
    case GLUT_KEY_LEFT:
 252 
    case GLUT_KEY_LEFT:
253 
        dgamma = std::max(dgamma - 0.1f, 0.5f);
 253 
        dgamma = s_max(dgamma - 0.1f, 0.5f);
254 
        break;
 254 
        break;
255 
 
 255 
 
256 
    case GLUT_KEY_RIGHT:
 256 
    case GLUT_KEY_RIGHT:
257 
        dgamma = std::min(dgamma + 0.1f, 5.f);
 257 
        dgamma = s_min(dgamma + 0.1f, 5.f);
258 
        break;
 258 
        break;
259 
 
 259 
 
260 
    case GLUT_KEY_DOWN:
 260 
    case GLUT_KEY_DOWN:
261 
        dexposure = std::max(dexposure - 0.1f, -10.f);
 261 
        dexposure = s_max(dexposure - 0.1f, -10.f);
262 
        break;
 262 
        break;
263 
 
 263 
 
264 
    case GLUT_KEY_UP:
 264 
    case GLUT_KEY_UP:
265 
        dexposure = std::min(dexposure + 0.1f, 10.f);
 265 
        dexposure = s_min(dexposure + 0.1f, 10.f);
266 
        break;
 266 
        break;
267 
    }
 267 
    }
268 
 
 268 
 
269 
    printf("gamma: %.2f, exposure: %.2f\n", dgamma, dexposure);
 269 
    printf("gamma: %.2f, exposure: %.2f\n", dgamma, dexposure);
270 
    glutPostRedisplay();
 270 
    glutPostRedisplay();