ref: 2cc077e56d3d86bfa9283ccde8f130224ee5a734
parent: f9d1c08b05ccfe9e7a87811a14220a35cda48e1f
author: rodri <rgl@antares-labs.eu>
date: Mon Jun 30 11:09:16 EDT 2025
move everything related to the Model to its own trans unit
--- a/mkfile
+++ b/mkfile
@@ -8,6 +8,7 @@
clip.$O\
xform.$O\
scene.$O\
+ model.$O\
vertex.$O\
texture.$O\
alloc.$O\
--- /dev/null
+++ b/model.c
@@ -1,0 +1,199 @@
+#include <u.h>
+#include <libc.h>
+#include <thread.h>
+#include <draw.h>
+#include <memdraw.h>
+#include <geometry.h>
+#include "graphics.h"
+#include "internal.h"
+
+Vertex
+mkvert(void)
+{+ return (Vertex){NaI, NaI, NaI, NaI};+}
+
+Primitive
+mkprim(int type)
+{+ Primitive prim;
+
+ prim.type = type;
+ prim.v[0] = prim.v[1] = prim.v[2] = NaI;
+ prim.tangent = NaI;
+ prim.mtl = nil;
+ return prim;
+}
+
+Material *
+newmaterial(char *name)
+{+ Material *mtl;
+
+ if(name == nil){+ werrstr("needs a name");+ return nil;
+ }
+
+ mtl = _emalloc(sizeof *mtl);
+ memset(mtl, 0, sizeof *mtl);
+ mtl->name = _estrdup(name);
+ mtl->ambient = Pt3(1,1,1,1);
+ mtl->diffuse = Pt3(1,1,1,1);
+ mtl->specular = Pt3(1,1,1,1);
+ return mtl;
+}
+
+void
+delmaterial(Material *mtl)
+{+ freetexture(mtl->diffusemap);
+ freetexture(mtl->specularmap);
+ freetexture(mtl->normalmap);
+ free(mtl->name);
+}
+
+static usize
+model_addposition(Model *m, Point3 p)
+{+ return itemarrayadd(m->positions, &p, 0);
+}
+
+static usize
+model_addnormal(Model *m, Point3 n)
+{+ return itemarrayadd(m->normals, &n, 0);
+}
+
+static usize
+model_addtexcoord(Model *m, Point2 t)
+{+ return itemarrayadd(m->texcoords, &t, 0);
+}
+
+static usize
+model_addcolor(Model *m, Color c)
+{+ return itemarrayadd(m->colors, &c, 0);
+}
+
+static usize
+model_addtangent(Model *m, Point3 T)
+{+ return itemarrayadd(m->tangents, &T, 0);
+}
+
+static usize
+model_addvert(Model *m, Vertex v)
+{+ return itemarrayadd(m->verts, &v, 0);
+}
+
+static usize
+model_addprim(Model *m, Primitive P)
+{+ return itemarrayadd(m->prims, &P, 0);
+}
+
+static int
+model_addmaterial(Model *m, Material mtl)
+{+ m->materials = _erealloc(m->materials, ++m->nmaterials*sizeof(*m->materials));
+ m->materials[m->nmaterials-1] = mtl;
+ return m->nmaterials-1;
+}
+
+static Material *
+model_getmaterial(Model *m, char *name)
+{+ Material *mtl;
+
+ for(mtl = m->materials; mtl < m->materials+m->nmaterials; mtl++)
+ if(strcmp(mtl->name, name) == 0)
+ return mtl;
+ return nil;
+}
+
+Model *
+newmodel(void)
+{+ Model *m;
+
+ m = _emalloc(sizeof *m);
+ memset(m, 0, sizeof *m);
+ m->positions = mkitemarray(sizeof(Point3));
+ m->normals = mkitemarray(sizeof(Point3));
+ m->texcoords = mkitemarray(sizeof(Point2));
+ m->colors = mkitemarray(sizeof(Color));
+ m->tangents = mkitemarray(sizeof(Point3));
+ m->verts = mkitemarray(sizeof(Vertex));
+ m->prims = mkitemarray(sizeof(Primitive));
+ m->addposition = model_addposition;
+ m->addnormal = model_addnormal;
+ m->addtexcoord = model_addtexcoord;
+ m->addcolor = model_addcolor;
+ m->addtangent = model_addtangent;
+ m->addvert = model_addvert;
+ m->addprim = model_addprim;
+ m->addmaterial = model_addmaterial;
+ m->getmaterial = model_getmaterial;
+ return m;
+}
+
+Model *
+dupmodel(Model *m)
+{+ Model *nm;
+ Primitive *prim, *nprim;
+ int i;
+
+ if(m == nil)
+ return nil;
+
+ nm = newmodel();
+ if(m->nmaterials > 0){+ nm->nmaterials = m->nmaterials;
+ nm->materials = _emalloc(nm->nmaterials*sizeof(*nm->materials));
+ for(i = 0; i < m->nmaterials; i++){+ nm->materials[i] = m->materials[i];
+ nm->materials[i].diffusemap = duptexture(m->materials[i].diffusemap);
+ nm->materials[i].specularmap = duptexture(m->materials[i].specularmap);
+ nm->materials[i].normalmap = duptexture(m->materials[i].normalmap);
+ nm->materials[i].name = _estrdup(m->materials[i].name);
+ }
+ }
+ nm->positions = dupitemarray(m->positions);
+ nm->normals = dupitemarray(m->normals);
+ nm->texcoords = dupitemarray(m->texcoords);
+ nm->colors = dupitemarray(m->colors);
+ nm->tangents = dupitemarray(m->tangents);
+ nm->verts = dupitemarray(m->verts);
+ nm->prims = dupitemarray(m->prims);
+ for(i = 0; i < m->prims->nitems && nm->nmaterials > 0; i++){+ prim = itemarrayget(m->prims, i);
+ if(prim->mtl != nil){+ nprim = itemarrayget(nm->prims, i);
+ nprim->mtl = &nm->materials[prim->mtl - m->materials];
+ }
+ }
+ return nm;
+}
+
+void
+delmodel(Model *m)
+{+ if(m == nil)
+ return;
+
+ while(m->nmaterials--)
+ delmaterial(&m->materials[m->nmaterials]);
+ free(m->materials);
+ rmitemarray(m->positions);
+ rmitemarray(m->normals);
+ rmitemarray(m->texcoords);
+ rmitemarray(m->colors);
+ rmitemarray(m->tangents);
+ rmitemarray(m->verts);
+ rmitemarray(m->prims);
+ free(m);
+}
--- a/scene.c
+++ b/scene.c
@@ -7,197 +7,6 @@
#include "graphics.h"
#include "internal.h"
-Vertex
-mkvert(void)
-{- return (Vertex){NaI, NaI, NaI, NaI};-}
-
-Primitive
-mkprim(int type)
-{- Primitive prim;
-
- prim.type = type;
- prim.v[0] = prim.v[1] = prim.v[2] = NaI;
- prim.tangent = NaI;
- prim.mtl = nil;
- return prim;
-}
-
-Material *
-newmaterial(char *name)
-{- Material *mtl;
-
- if(name == nil){- werrstr("needs a name");- return nil;
- }
-
- mtl = _emalloc(sizeof *mtl);
- memset(mtl, 0, sizeof *mtl);
- mtl->name = _estrdup(name);
- mtl->ambient = Pt3(1,1,1,1);
- mtl->diffuse = Pt3(1,1,1,1);
- mtl->specular = Pt3(1,1,1,1);
- return mtl;
-}
-
-void
-delmaterial(Material *mtl)
-{- freetexture(mtl->diffusemap);
- freetexture(mtl->specularmap);
- freetexture(mtl->normalmap);
- free(mtl->name);
-}
-
-static usize
-model_addposition(Model *m, Point3 p)
-{- return itemarrayadd(m->positions, &p, 0);
-}
-
-static usize
-model_addnormal(Model *m, Point3 n)
-{- return itemarrayadd(m->normals, &n, 0);
-}
-
-static usize
-model_addtexcoord(Model *m, Point2 t)
-{- return itemarrayadd(m->texcoords, &t, 0);
-}
-
-static usize
-model_addcolor(Model *m, Color c)
-{- return itemarrayadd(m->colors, &c, 0);
-}
-
-static usize
-model_addtangent(Model *m, Point3 T)
-{- return itemarrayadd(m->tangents, &T, 0);
-}
-
-static usize
-model_addvert(Model *m, Vertex v)
-{- return itemarrayadd(m->verts, &v, 0);
-}
-
-static usize
-model_addprim(Model *m, Primitive P)
-{- return itemarrayadd(m->prims, &P, 0);
-}
-
-static int
-model_addmaterial(Model *m, Material mtl)
-{- m->materials = _erealloc(m->materials, ++m->nmaterials*sizeof(*m->materials));
- m->materials[m->nmaterials-1] = mtl;
- return m->nmaterials-1;
-}
-
-static Material *
-model_getmaterial(Model *m, char *name)
-{- Material *mtl;
-
- for(mtl = m->materials; mtl < m->materials+m->nmaterials; mtl++)
- if(strcmp(mtl->name, name) == 0)
- return mtl;
- return nil;
-}
-
-Model *
-newmodel(void)
-{- Model *m;
-
- m = _emalloc(sizeof *m);
- memset(m, 0, sizeof *m);
- m->positions = mkitemarray(sizeof(Point3));
- m->normals = mkitemarray(sizeof(Point3));
- m->texcoords = mkitemarray(sizeof(Point2));
- m->colors = mkitemarray(sizeof(Color));
- m->tangents = mkitemarray(sizeof(Point3));
- m->verts = mkitemarray(sizeof(Vertex));
- m->prims = mkitemarray(sizeof(Primitive));
- m->addposition = model_addposition;
- m->addnormal = model_addnormal;
- m->addtexcoord = model_addtexcoord;
- m->addcolor = model_addcolor;
- m->addtangent = model_addtangent;
- m->addvert = model_addvert;
- m->addprim = model_addprim;
- m->addmaterial = model_addmaterial;
- m->getmaterial = model_getmaterial;
- return m;
-}
-
-Model *
-dupmodel(Model *m)
-{- Model *nm;
- Primitive *prim, *nprim;
- int i;
-
- if(m == nil)
- return nil;
-
- nm = newmodel();
- if(m->nmaterials > 0){- nm->nmaterials = m->nmaterials;
- nm->materials = _emalloc(nm->nmaterials*sizeof(*nm->materials));
- for(i = 0; i < m->nmaterials; i++){- nm->materials[i] = m->materials[i];
- nm->materials[i].diffusemap = duptexture(m->materials[i].diffusemap);
- nm->materials[i].specularmap = duptexture(m->materials[i].specularmap);
- nm->materials[i].normalmap = duptexture(m->materials[i].normalmap);
- nm->materials[i].name = _estrdup(m->materials[i].name);
- }
- }
- nm->positions = dupitemarray(m->positions);
- nm->normals = dupitemarray(m->normals);
- nm->texcoords = dupitemarray(m->texcoords);
- nm->colors = dupitemarray(m->colors);
- nm->tangents = dupitemarray(m->tangents);
- nm->verts = dupitemarray(m->verts);
- nm->prims = dupitemarray(m->prims);
- for(i = 0; i < m->prims->nitems && nm->nmaterials > 0; i++){- prim = itemarrayget(m->prims, i);
- if(prim->mtl != nil){- nprim = itemarrayget(nm->prims, i);
- nprim->mtl = &nm->materials[prim->mtl - m->materials];
- }
- }
- return nm;
-}
-
-void
-delmodel(Model *m)
-{- if(m == nil)
- return;
-
- while(m->nmaterials--)
- delmaterial(&m->materials[m->nmaterials]);
- free(m->materials);
- rmitemarray(m->positions);
- rmitemarray(m->normals);
- rmitemarray(m->texcoords);
- rmitemarray(m->colors);
- rmitemarray(m->tangents);
- rmitemarray(m->verts);
- rmitemarray(m->prims);
- free(m);
-}
-
static LightSource *
newlight(int t, Point3 p, Point3 d, Color c, double coff, double θu, double θp)
{--
⑨