diff options
author | rodri <rgl@antares-labs.eu> | 2024-09-26 20:56:08 +0000 |
---|---|---|
committer | rodri <rgl@antares-labs.eu> | 2024-09-26 20:56:08 +0000 |
commit | 6b01863dcb76ba8ef49d5ab0790f546d7c8645f7 (patch) | |
tree | 3ad45ba80832bf331f8c4ab3fc90216c9cfdac13 /solar.c | |
parent | 11b9c1697a3fd518c8b133544f0abbdb915a2491 (diff) | |
download | 3dee-6b01863dcb76ba8ef49d5ab0790f546d7c8645f7.tar.gz 3dee-6b01863dcb76ba8ef49d5ab0790f546d7c8645f7.tar.bz2 3dee-6b01863dcb76ba8ef49d5ab0790f546d7c8645f7.zip |
new tool: obj. and changes to use the new model(6) format.
with this change some models were also completely turned
from obj into model(6) ones: 9fs, cirno, and diablo3.
Diffstat (limited to 'solar.c')
-rw-r--r-- | solar.c | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -7,7 +7,6 @@ #include <mouse.h> #include <keyboard.h> #include <geometry.h> -#include "libobj/obj.h" #include "libgraphics/graphics.h" #include "fns.h" @@ -864,7 +863,7 @@ threadmain(int argc, char *argv[]) Entity *subject; Model *model; Point lblsiz; - int i, j; + int fd, i, j; tmfmtinstall(); GEOMfmtinstall(); @@ -879,7 +878,13 @@ threadmain(int argc, char *argv[]) confproc(); - model = readobjmodel("mdl/planet.obj"); + fd = open("mdl/planet.mdl", OREAD); + if(fd < 0) + sysfatal("open: %r"); + model = readmodel(fd); + if(model == nil) + sysfatal("readmodel: %r"); + close(fd); /* * normalize the vertices so that we can scale * each planet based on its radius |