From 02597db21d25fedde53513967cd979d38acbceec Mon Sep 17 00:00:00 2001
From: rodri <rgl@antares-labs.eu>
Date: Wed, 7 Aug 2024 11:49:20 +0000
Subject: use the new readobjmodel function.

---
 mkfile  |  2 +-
 solar.c |  7 +------
 vis.c   | 12 ++++--------
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/mkfile b/mkfile
index 8cae9d6..2b6cf9c 100644
--- a/mkfile
+++ b/mkfile
@@ -14,8 +14,8 @@ OFILES=\
 HFILES=dat.h fns.h
 
 LIB=\
-	libobj/libobj.a$O\
 	libgraphics/libgraphics.a$O\
+	libobj/libobj.a$O\
 
 </sys/src/cmd/mkmany
 
diff --git a/solar.c b/solar.c
index 12893ed..4aefd7b 100644
--- a/solar.c
+++ b/solar.c
@@ -733,7 +733,6 @@ threadmain(int argc, char *argv[])
 	Channel *keyc;
 	Entity *subject;
 	Model *model;
-	OBJ *obj;
 	Point lblsiz;
 	int i, j;
 
@@ -750,11 +749,7 @@ threadmain(int argc, char *argv[])
 
 	confproc();
 
-	if((obj = objparse("mdl/planet.obj")) == nil)
-		sysfatal("objparse: %r");
-	model = newmodel();
-	loadobjmodel(model, obj);
-	objfree(obj);
+	model = readobjmodel("mdl/planet.obj");
 	/*
 	 * normalize the vertices so that we can scale
 	 * each planet based on its radius
diff --git a/vis.c b/vis.c
index 6afe468..a784f5e 100644
--- a/vis.c
+++ b/vis.c
@@ -872,7 +872,6 @@ threadmain(int argc, char *argv[])
 	Renderer *rctl;
 	Channel *keyc;
 	Entity *subject;
-	OBJ *obj;
 	char *texpath, *mdlpath, *s;
 	int i, fd, fbw, fbh, scale;
 
@@ -909,16 +908,11 @@ threadmain(int argc, char *argv[])
 	scene = newscene(nil);
 	while(argc--){
 		mdlpath = argv[argc];
-		model = newmodel();
+		model = readobjmodel(mdlpath);
 		subject = newentity(mdlpath, model);
 //		subject->p.x = argc*4;
 		scene->addent(scene, subject);
 
-		if((obj = objparse(mdlpath)) == nil)
-			sysfatal("objparse: %r");
-		loadobjmodel(model, obj);
-		objfree(obj);
-
 		if(argc == 0 && texpath != nil){
 			fd = open(texpath, OREAD);
 			if(fd < 0)
@@ -957,7 +951,9 @@ threadmain(int argc, char *argv[])
 			cams[i]->view->setscalefilter(cams[i]->view, UFScale2x);
 		else if(scale == 3)
 			cams[i]->view->setscalefilter(cams[i]->view, UFScale3x);
-fprint(2, "scalex %g scaley %g\n", cams[i]->view->bx.x, cams[i]->view->by.y);
+		cams[i]->view->p.x = (Dx(screenb->r) - cams[i]->view->getwidth(cams[i]->view))/2;
+		cams[i]->view->p.y = (Dy(screenb->r) - cams[i]->view->getheight(cams[i]->view))/2;
+fprint(2, "off %v scalex %g scaley %g\n", cams[i]->view->p, cams[i]->view->bx.x, cams[i]->view->by.y);
 	}
 	maincam = cams[3];
 	light.p = Pt3(0,100,100,1);
-- 
cgit v1.2.3