shithub: libgraphics

--- a/camera.c

+++ b/camera.c

@@ -248,7 +248,8 @@

 	job->fb = fbctl->getbb(fbctl);

 	job->camera = _emalloc(sizeof *c);

 	*job->camera = *c;

-	job->scene = dupscene(c->scene);	/* take a snapshot */

+	job->scene = dupscene(c->scene);	/* take a snapshot */

+	job->camera->scene = job->scene;

 	job->shaders = s;

 	job->donec = chancreate(sizeof(void*), 0);

@@ -270,6 +271,7 @@

 		job->camera->fov = 90*DEG;

 		reloadcamera(job->camera);

 		job->scene = dupscene(skyboxscene);

+		job->camera->scene = job->scene;

 		job->shaders = &skyboxshader;

 		sendp(c->rctl->jobq, job);

 		recvp(job->donec);

--- a/graphics.h

+++ b/graphics.h

@@ -423,6 +423,11 @@

 Model *newmodel(void);

 Model *dupmodel(Model*);

 void delmodel(Model*);

+LightSource *newpointlight(Point3, Color);

+LightSource *newdireclight(Point3, Point3, Color);

+LightSource *newspotlight(Point3, Point3, Color, double, double);

+LightSource *duplight(LightSource*);

+void dellight(LightSource*);

 Entity *newentity(char*, Model*);

 Entity *dupentity(Entity*);

 void delentity(Entity*);

@@ -477,3 +482,5 @@

 uvlong nanosec(void);

 extern Rectangle UR;	/* unit rectangle */

+extern Point2 ZP2;

+extern Point3 ZP3;

--- a/marshal.c

+++ b/marshal.c

@@ -876,7 +876,7 @@

 		P.nv = p->type+1;

 		for(i = 0; i < P.nv; i++){

 			v.p = itemarrayadd(pa, &p->v[i].p, dedup);

-			v.n = eqpt3(p->v[i].n, Vec3(0,0,0))?

+			v.n = eqpt3(p->v[i].n, ZP3)?

 				NaI: itemarrayadd(na, &p->v[i].n, dedup);

 			v.t = p->v[i].uv.w != 1?

 				NaI: itemarrayadd(ta, &p->v[i].uv, dedup);

@@ -884,7 +884,7 @@

 				NaI: itemarrayadd(ca, &p->v[i].c, dedup);

 			P.v[i] = itemarrayadd(va, &v, dedup);

-		P.T = eqpt3(p->tangent, Vec3(0,0,0))?

+		P.T = eqpt3(p->tangent, ZP3)?

 			NaI: itemarrayadd(Ta, &p->tangent, dedup);

 		P.mtlname = p->mtl != nil? p->mtl->name: nil;

--- a/scene.c

+++ b/scene.c

@@ -123,6 +123,59 @@

 	free(m);

+static LightSource *

+newlight(int t, Point3 p, Point3 d, Color c, double coff, double θu, double θp)

+{

+	LightSource *l;

+	l = _emalloc(sizeof *l);

+	l->type = t;

+	l->p = p;

+	l->dir = d;

+	l->c = c;

+	l->cutoff = coff;

+	l->θu = θu;

+	l->θp = θp;

+	l->prev = l->next = nil;

+	return l;

+}

+LightSource *

+newpointlight(Point3 p, Color c)

+{

+	return newlight(LightPoint, p, ZP3, c, 1000, 0, 0);

+}

+LightSource *

+newdireclight(Point3 p, Point3 dir, Color c)

+{

+	return newlight(LightDirectional, p, dir, c, 1000, 0, 0);

+}

+LightSource *

+newspotlight(Point3 p, Point3 dir, Color c, double θu, double θp)

+{

+	return newlight(LightSpot, p, dir, c, 1000, θu, θp);

+}

+LightSource *

+duplight(LightSource *l)

+{

+	LightSource *nl;

+	nl = _emalloc(sizeof *nl);

+	memset(nl, 0, sizeof *nl);

+	*nl = *l;

+	nl->prev = nl->next = nil;

+	return nl;

+}

+void

+dellight(LightSource *l)

+{

+	free(l);

+}

 Entity *

 newentity(char *name, Model *m)

@@ -231,14 +284,16 @@

 	Scene *ns;

 	Entity *e;

+	LightSource *l;

 	if(s == nil)

 		return nil;

 	ns = newscene(s->name);

-	if(s->nents > 0)

-		for(e = s->ents.next; e != &s->ents; e = e->next)

-			ns->addent(ns, dupentity(e));

+	for(e = s->ents.next; e != &s->ents; e = e->next)

+		ns->addent(ns, dupentity(e));

+	for(l = s->lights.next; l != &s->lights; l = l->next)

+		ns->addlight(ns, duplight(l));

 	ns->skybox = dupcubemap(s->skybox);

 	return ns;

--- a/shadeop.c

+++ b/shadeop.c

@@ -91,7 +91,7 @@

 	LightSource *l;

 	Color c;

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

+	c = ZP3;

 	for(l = s->lights.next; l != &s->lights; l = l->next)

 		c = addpt3(c, getlightcolor(l, p, n));

 	return c;

--- a/util.c

+++ b/util.c

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

 #include "internal.h"

 Rectangle UR = {0,0,1,1};

+Point2 ZP2;

+Point3 ZP3;

 Point

 minpt(Point a, Point b)