From 37ec57a83f71008d3d6898599007c672b3a00b75 Mon Sep 17 00:00:00 2001 From: Carlos Sanchez Date: Fri, 2 Aug 2024 16:15:10 -0400 Subject: [PATCH] Diablo default --- renderer1/main.go | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/renderer1/main.go b/renderer1/main.go index 70d17af..4a2f56f 100644 --- a/renderer1/main.go +++ b/renderer1/main.go @@ -7,6 +7,7 @@ import ( "log" "math" "os" + "path/filepath" "renderer1/hrend" "runtime/pprof" // For performance profiling (unnecessary) "time" @@ -17,18 +18,18 @@ import ( ) const ( - Width = 640 - Height = 480 - NearClip = 0.1 - FarClip = 100 - FOV = 90.0 - ZOffset = 1.5 - Movement = 1.0 - Rotation = 0.25 - LookLock = math.Pi / 32 - Fps = 60 - ObjectFile = "../head.obj" - TextureFile = "../head.jpg" + Width = 640 + Height = 480 + NearClip = 0.01 + FarClip = 100 + FOV = 90.0 + ZOffset = 1.5 + Movement = 1.0 + Rotation = 0.25 + LookLock = math.Pi / 32 + Fps = 60 + //ObjectFile = "../head.obj" + //TextureFile = "../head.jpg" ) func must(err error) { @@ -38,15 +39,17 @@ func must(err error) { } func loadDefault() (*hrend.ObjModel, hrend.Framebuffer) { - log.Printf("Loading obj %s, texture %s", ObjectFile, TextureFile) + ofile := filepath.Join("../", *model+".obj") + tfile := filepath.Join("../", *model+".jpg") + log.Printf("Loading obj %s, texture %s", ofile, tfile) - of, err := os.Open(ObjectFile) + of, err := os.Open(ofile) must(err) defer of.Close() o, err := hrend.ParseObj(of) must(err) - jf, err := os.Open(TextureFile) + jf, err := os.Open(tfile) must(err) defer jf.Close() timg, _, err := image.Decode(jf) @@ -58,6 +61,7 @@ func loadDefault() (*hrend.ObjModel, hrend.Framebuffer) { // However flag works... idk var cpuprofile = flag.String("cpuprofile", "", "write cpu profile to file") +var model = flag.String("model", "diablo", "Which model to use (single name)") // var dozbuf = flag.Bool("zbuffer", false, "Write zbuffer instead of image") // var p6file = flag.String("p6file", "", "Output binary ppm to given file instead")