shithub: 3dee

Info  •  Files  •  Log  •  Branches

add multiple light source handling to the shaders.

--- a/med.c

+++ b/med.c

@@ -808,6 +808,7 @@

 	light.p = Pt3(0,100,100,1);

 	light.c = Pt3(1,1,1,1);

 	light.type = LightPoint;

+	scene->addlight(scene, &light);

 	tsampler = neartexsampler;

 	setupcompass(&compass, rectaddpt(Rect(0,0,100,100), subpt(screenb->r.max, Pt(100,100))), rctl);

--- a/shaders.inc

+++ b/shaders.inc

@@ -8,6 +8,7 @@

 	double spec;

 	Point3 pos, lightdir, lookdir;

 	Material m;

+	LightSource *l;

 	Color ambient, diffuse, specular, lightc;

 	sp->v->n = model2world(sp->su->entity, sp->v->n);

@@ -23,23 +24,27 @@

 		m.shininess = 1;

 	}

-	lightdir = normvec3(subpt3(light.p, pos));

-	lightc = getlightcolor(&light, lightdir);

+	lightc = getscenecolor(sp->su->camera->scene, pos, sp->v->n);

+	sp->v->c = Vec3(0,0,0);

-	ambient = mulpt3(lightc, Ka);

-	ambient = modulapt3(ambient, m.diffuse);

+	for(l = sp->su->camera->scene->lights.next; l != &sp->su->camera->scene->lights; l = l->next){

+		lightdir = normvec3(subpt3(l->p, pos));

-	Kd = max(0, dotvec3(sp->v->n, lightdir));

-	diffuse = mulpt3(lightc, Kd);

-	diffuse = modulapt3(diffuse, m.diffuse);

+		ambient = mulpt3(lightc, Ka);

+		ambient = modulapt3(ambient, m.diffuse);

-	lookdir = normvec3(subpt3(sp->su->camera->p, pos));

-	lightdir = qrotate(lightdir, sp->v->n, PI);

-	spec = pow(max(0, dotvec3(lookdir, lightdir)), m.shininess);

-	specular = mulpt3(lightc, spec*Ks);

-	specular = modulapt3(specular, m.specular);

+		Kd = max(0, dotvec3(sp->v->n, lightdir));

+		diffuse = mulpt3(lightc, Kd);

+		diffuse = modulapt3(diffuse, m.diffuse);

-	sp->v->c = addpt3(ambient, addpt3(diffuse, specular));

+		lookdir = normvec3(subpt3(sp->su->camera->p, pos));

+		lightdir = qrotate(lightdir, sp->v->n, PI); /* reflect */

+		spec = pow(max(0, dotvec3(lookdir, lightdir)), m.shininess);

+		specular = mulpt3(lightc, spec*Ks);

+		specular = modulapt3(specular, m.specular);

+

+		sp->v->c = addpt3(sp->v->c, addpt3(ambient, addpt3(diffuse, specular)));

+	}

 	sp->v->c.a = m.diffuse.a;

 	return world2clip(sp->su->camera, pos);

 }

@@ -100,6 +105,7 @@

 	Color ambient, diffuse, specular, lightc, c;

 	Point3 pos, n, lightdir, lookdir;

 	Material m;

+	LightSource *l;

 	RFrame3 TBN;

 	Vertexattr *va;

@@ -115,9 +121,6 @@

 	va = sp->getattr(sp, "shininess");

 	m.shininess = va != nil? va->n: 1;

-	lightdir = normvec3(subpt3(light.p, pos));

-	lightc = getlightcolor(&light, lightdir);

-

 	/* normal mapping */

 	va = sp->getattr(sp, "tangent");

 	if(va == nil)

@@ -140,28 +143,35 @@

 	else if(sp->v->mtl != nil && sp->v->mtl->diffusemap != nil && sp->v->uv.w != 0)

 		m.diffuse = sampletexture(sp->v->mtl->diffusemap, sp->v->uv, tsampler);

-	ambient = mulpt3(lightc, Ka);

-	ambient = modulapt3(ambient, m.diffuse);

-

-	Kd = max(0, dotvec3(n, lightdir));

-	diffuse = mulpt3(lightc, Kd);

-	diffuse = modulapt3(diffuse, m.diffuse);

-

 	if(sp->v->mtl != nil && sp->v->mtl->specularmap != nil && sp->v->uv.w != 0)

 		m.specular = sampletexture(sp->v->mtl->specularmap, sp->v->uv, tsampler);

-	lookdir = normvec3(subpt3(sp->su->camera->p, pos));

-	lightdir = qrotate(lightdir, n, PI);

-	spec = pow(max(0, dotvec3(lookdir, lightdir)), m.shininess);

-	specular = mulpt3(lightc, spec*Ks);

-	specular = modulapt3(specular, m.specular);

+	lightc = getscenecolor(sp->su->camera->scene, pos, n);

+	c = Vec3(0,0,0);

-	n.w = 1;

-	sp->toraster(sp, "normals", &n);

+	for(l = sp->su->camera->scene->lights.next; l != &sp->su->camera->scene->lights; l = l->next){

+		lightdir = normvec3(subpt3(l->p, pos));

-	c = addpt3(ambient, addpt3(diffuse, specular));

+		ambient = mulpt3(lightc, Ka);

+		ambient = modulapt3(ambient, m.diffuse);

+

+		Kd = max(0, dotvec3(n, lightdir));

+		diffuse = mulpt3(lightc, Kd);

+		diffuse = modulapt3(diffuse, m.diffuse);

+

+		lookdir = normvec3(subpt3(sp->su->camera->p, pos));

+		lightdir = qrotate(lightdir, n, PI); /* reflect */

+		spec = pow(max(0, dotvec3(lookdir, lightdir)), m.shininess);

+		specular = mulpt3(lightc, spec*Ks);

+		specular = modulapt3(specular, m.specular);

+

+		c = addpt3(c, addpt3(ambient, addpt3(diffuse, specular)));

+	}

 	c.a = m.diffuse.a;

+	n.w = 1;

+	sp->toraster(sp, "normals", &n);

+

 	specular.a = 1;

 	sp->toraster(sp, "specular", &specular);

@@ -178,6 +188,7 @@

 	Color ambient, diffuse, specular, lightc, c;

 	Point3 pos, n, lightdir, lookdir;

 	Material m;

+	LightSource *l;

 	RFrame3 TBN;

 	Vertexattr *va;

@@ -193,9 +204,6 @@

 	va = sp->getattr(sp, "shininess");

 	m.shininess = va != nil? va->n: 1;

-	lightdir = normvec3(subpt3(light.p, pos));

-	lightc = getlightcolor(&light, lightdir);

-

 	/* normal mapping */

 	va = sp->getattr(sp, "tangent");

 	if(va == nil)

@@ -218,28 +226,35 @@

 	else if(sp->v->mtl != nil && sp->v->mtl->diffusemap != nil && sp->v->uv.w != 0)

 		m.diffuse = sampletexture(sp->v->mtl->diffusemap, sp->v->uv, tsampler);

-	ambient = mulpt3(lightc, Ka);

-	ambient = modulapt3(ambient, m.diffuse);

-

-	Kd = max(0, dotvec3(n, lightdir));

-	diffuse = mulpt3(lightc, Kd);

-	diffuse = modulapt3(diffuse, m.diffuse);

-

 	if(sp->v->mtl != nil && sp->v->mtl->specularmap != nil && sp->v->uv.w != 0)

 		m.specular = sampletexture(sp->v->mtl->specularmap, sp->v->uv, tsampler);

-	lookdir = normvec3(subpt3(sp->su->camera->p, pos));

-	lightdir = normvec3(addpt3(lookdir, lightdir));	/* half vector */

-	spec = pow(max(0, dotvec3(n, lightdir)), m.shininess);

-	specular = mulpt3(lightc, spec*Ks);

-	specular = modulapt3(specular, m.specular);

+	lightc = getscenecolor(sp->su->camera->scene, pos, n);

+	c = Vec3(0,0,0);

-	n.w = 1;

-	sp->toraster(sp, "normals", &n);

+	for(l = sp->su->camera->scene->lights.next; l != &sp->su->camera->scene->lights; l = l->next){

+		lightdir = normvec3(subpt3(l->p, pos));

-	c = addpt3(ambient, addpt3(diffuse, specular));

+		ambient = mulpt3(lightc, Ka);

+		ambient = modulapt3(ambient, m.diffuse);

+

+		Kd = max(0, dotvec3(n, lightdir));

+		diffuse = mulpt3(lightc, Kd);

+		diffuse = modulapt3(diffuse, m.diffuse);

+

+		lookdir = normvec3(subpt3(sp->su->camera->p, pos));

+		lightdir = normvec3(addpt3(lookdir, lightdir));	/* half vector */

+		spec = pow(max(0, dotvec3(lookdir, lightdir)), m.shininess);

+		specular = mulpt3(lightc, spec*Ks);

+		specular = modulapt3(specular, m.specular);

+

+		c = addpt3(c, addpt3(ambient, addpt3(diffuse, specular)));

+	}

 	c.a = m.diffuse.a;

+	n.w = 1;

+	sp->toraster(sp, "normals", &n);

+

 	specular.a = 1;

 	sp->toraster(sp, "specular", &specular);

@@ -250,12 +265,16 @@

 toonvshader(Shaderparams *sp)

 {

 	Point3 pos, lightdir;

+	LightSource *l;

 	double intens;

 	sp->v->n = model2world(sp->su->entity, sp->v->n);

 	pos = model2world(sp->su->entity, sp->v->p);

-	lightdir = normvec3(subpt3(light.p, pos));

-	intens = max(0, dotvec3(sp->v->n, lightdir));

+	intens = 0;

+	for(l = sp->su->camera->scene->lights.next; l != &sp->su->camera->scene->lights; l = l->next){

+		lightdir = normvec3(subpt3(l->p, pos));

+		intens += max(0, dotvec3(sp->v->n, lightdir));

+	}

 	sp->setattr(sp, "intensity", VANumber, &intens);

 	if(sp->v->mtl != nil)

 		sp->v->c = sp->v->mtl->diffuse;

@@ -336,6 +355,31 @@

 	bc = barycoords(t, Pt2(sp->p.x,sp->p.y,1));

 	if(bc.x < 0 || bc.y < 0 || bc.z < 0)

+		return Vec3(0,0,0);

+

+	/* wireframe version */

+	enum { THICKNESS = 8 };

+	Point2 p01, p12, p20;

+	double d01, d12, d20, d;

+	Point2 p, v, r;

+

+	p01 = subpt2(t.p1, t.p0);

+	p12 = subpt2(t.p2, t.p1);

+	p20 = subpt2(t.p0, t.p2);

+

+	p = Pt2(sp->p.x, sp->p.y, 1);

+	r = subpt2(t.p0, p);

+	v = Vec2(p01.y, -p01.x);

+	d01 = fabs(dotvec2(v, r));

+	r = subpt2(t.p1, p);

+	v = Vec2(p12.y, -p12.x);

+	d12 = fabs(dotvec2(v, r));

+	r = subpt2(t.p2, p);

+	v = Vec2(p20.y, -p20.x);

+	d20 = fabs(dotvec2(v, r));

+

+	d = min(d01, min(d12, d20));

+	if(d > THICKNESS)

 		return Vec3(0,0,0);

 	return Pt3(bc.x, bc.y, bc.z, 1);

--- a/vis.c

+++ b/vis.c

@@ -67,25 +67,25 @@

 	2,0,-4,1,

 	0,0,0,1,

 	0,1,0,0,

-	0, 0.01, 100, ORTHOGRAPHIC,

+	0, 0.01, 1000, ORTHOGRAPHIC,

 	-2,0,-4,1,

 	0,0,0,1,

 	0,1,0,0,

-	120*DEG, 0.01, 100, PERSPECTIVE,

+	120*DEG, 0.01, 1000, PERSPECTIVE,

 	-2,0,4,1,

 	0,0,0,1,

 	0,1,0,0,

-	0, 0.01, 100, ORTHOGRAPHIC,

+	0, 0.01, 1000, ORTHOGRAPHIC,

 	2,0,4,1,

 	0,0,0,1,

 	0,1,0,0,

-	80*DEG, 0.01, 100, PERSPECTIVE

+	80*DEG, 0.01, 1000, PERSPECTIVE

 };

 Point3 center = {0,0,0,1};

-LightSource light;		/* global point light */

+LightSource lights[2];

 static int showskybox;

 static int doprof;

@@ -334,15 +334,15 @@

 	lockdisplay(display);

 	switch(menuhit(2, mctl, &menu, _screen)){

 	case MOVELIGHT:

-		snprint(buf, sizeof buf, "%g %g %g", light.p.x, light.p.y, light.p.z);

+		snprint(buf, sizeof buf, "%g %g %g", lights[0].p.x, lights[0].p.y, lights[0].p.z);

 		if(enter("light pos", buf, sizeof buf, mctl, kctl, nil) <= 0)

 			break;

 		nf = tokenize(buf, f, 3);

 		if(nf != 3)

 			break;

-		light.p.x = strtod(f[0], nil);

-		light.p.y = strtod(f[1], nil);

-		light.p.z = strtod(f[2], nil);

+		lights[0].p.x = strtod(f[0], nil);

+		lights[0].p.y = strtod(f[1], nil);

+		lights[0].p.z = strtod(f[2], nil);

 		break;

 	case TSNEAREST:

 		tsampler = neartexsampler;

@@ -617,7 +617,7 @@

 	if(doprof)

 		fprint(fd, "profile\n");

-//	fprint(fd, "pri 15\n");

+//	fprint(fd, "fixedpri 15");

 //	fprint(fd, "wired 0\n");

 //	setfcr(getfcr() & ~FPINVAL);

@@ -737,13 +737,19 @@

 		placecamera(cams[i], scene, camcfgs[i].p, camcfgs[i].lookat, camcfgs[i].up);

 	}

 	maincam = cams[3];

-	light.p = Pt3(0,100,100,1);

-//	light.dir = Vec3(0,-1,0);

-	light.c = Pt3(1,1,1,1);

-	light.type = LightPoint;

-//	light.type = LightSpot;

-//	light.θu = 30*DEG;

-//	light.θp = 5*DEG;

+	lights[0].p = Pt3(0,100,100,1);

+	lights[0].c = Pt3(0,1,0,1);

+	lights[0].type = LightPoint;

+	lights[1].p = Pt3(0,100,-100,1);

+	lights[1].c = Pt3(1,0,0,1);

+	lights[1].type = LightPoint;

+	/* to test spotlights */

+//	lights[0].dir = Vec3(0,-1,0);

+//	lights[0].type = LightSpot;

+//	lights[0].θu = 30*DEG;

+//	lights[0].θp = 5*DEG;

+	scene->addlight(scene, &lights[0]);

+	scene->addlight(scene, &lights[1]);

 	tsampler = neartexsampler;

 	kctl = emalloc(sizeof *kctl);