From 1f17dd34efa02aeebf4501d055f0ac5643b735ca Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Thu, 20 Apr 2023 18:29:28 -0700 Subject: [PATCH] Allow obj model files to be included (gitignore). --- .gitignore | 2 +- Faceball2030/main.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9491a2f..19171b2 100644 --- a/.gitignore +++ b/.gitignore @@ -75,7 +75,7 @@ StyleCopReport.xml *_h.h *.ilk *.meta -*.obj +#*.obj *.iobj *.pch *.pdb diff --git a/Faceball2030/main.cpp b/Faceball2030/main.cpp index 5c98765..879f12a 100644 --- a/Faceball2030/main.cpp +++ b/Faceball2030/main.cpp @@ -1206,7 +1206,7 @@ void FaceBall::RenderWorld() { {t.uv[1].u,t.uv[1].v}, {t.uv[2].u,t.uv[2].v}, }, { t.uv[0].w,t.uv[1].w,t.uv[2].w }, { t.p[0].z,t.p[1].z,t.p[2].z }, { t.col[0],t.col[1],t.col[2]}); - /*SetDecalMode(DecalMode::WIREFRAME); + SetDecalMode(DecalMode::WIREFRAME); DrawPolygonDecal(nullptr,{ {t.p[0].x, t.p[0].y}, {t.p[1].x, t.p[1].y}, @@ -1215,7 +1215,7 @@ void FaceBall::RenderWorld() { {0,0}, {0,0}, {0,0}, - }, { t.uv[0].w,t.uv[1].w,t.uv[2].w }, { t.p[0].z,t.p[1].z,t.p[2].z }, { BLACK,BLACK,BLACK });*/ + }, { t.uv[0].w,t.uv[1].w,t.uv[2].w }, { t.p[0].z,t.p[1].z,t.p[2].z }, { WHITE,WHITE,WHITE}); SetDecalStructure(DecalStructure::FAN); triRenderCount++; }