Allow obj model files to be included (gitignore).
This commit is contained in:
parent
37eff22e31
commit
1f17dd34ef
2
.gitignore
vendored
2
.gitignore
vendored
@ -75,7 +75,7 @@ StyleCopReport.xml
|
|||||||
*_h.h
|
*_h.h
|
||||||
*.ilk
|
*.ilk
|
||||||
*.meta
|
*.meta
|
||||||
*.obj
|
#*.obj
|
||||||
*.iobj
|
*.iobj
|
||||||
*.pch
|
*.pch
|
||||||
*.pdb
|
*.pdb
|
||||||
|
@ -1206,7 +1206,7 @@ void FaceBall::RenderWorld() {
|
|||||||
{t.uv[1].u,t.uv[1].v},
|
{t.uv[1].u,t.uv[1].v},
|
||||||
{t.uv[2].u,t.uv[2].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]});
|
}, { 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,{
|
DrawPolygonDecal(nullptr,{
|
||||||
{t.p[0].x, t.p[0].y},
|
{t.p[0].x, t.p[0].y},
|
||||||
{t.p[1].x, t.p[1].y},
|
{t.p[1].x, t.p[1].y},
|
||||||
@ -1215,7 +1215,7 @@ void FaceBall::RenderWorld() {
|
|||||||
{0,0},
|
{0,0},
|
||||||
{0,0},
|
{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);
|
SetDecalStructure(DecalStructure::FAN);
|
||||||
triRenderCount++;
|
triRenderCount++;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user