AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-07-03 23:55:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AxioDL/PathShagged

Browse Source
This commit is contained in:
Jack Andersen 2015-11-14 13:43:17 -10:00
commit 5f5ce04391
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
*.user

6
DataSpec/DNACommon/MAPA.hpp
View File

@ -108,7 +108,7 @@ bool ReadMAPAToBlender(HECL::BlenderConnection& conn,
if (GX::Primitive(prim.type) == GX::TRIANGLESTRIP) if (GX::Primitive(prim.type) == GX::TRIANGLESTRIP)
{ {
atUint8 flip = 0; atUint8 flip = 0;
for (int v=0 ; v<prim.indexCount-2 ; ++v) for (size_t v=0 ; v<prim.indexCount-2 ; ++v)
{ {
if (flip) if (flip)
{ {
@ -138,7 +138,7 @@ bool ReadMAPAToBlender(HECL::BlenderConnection& conn,
} }
else if (GX::Primitive(prim.type) == GX::TRIANGLES) else if (GX::Primitive(prim.type) == GX::TRIANGLES)
{ {
for (int v=0 ; v<prim.indexCount ; v+=3) for (size_t v=0 ; v<prim.indexCount ; v+=3)
{ {
os.format("add_triangle(bm, (%u,%u,%u))\n", os.format("add_triangle(bm, (%u,%u,%u))\n",
primVerts[0], primVerts[0],
@ -159,7 +159,7 @@ bool ReadMAPAToBlender(HECL::BlenderConnection& conn,
for (const typename MAPA::Surface::Border& border : surf.borders) for (const typename MAPA::Surface::Border& border : surf.borders)
{ {
auto iit = border.indices.cbegin(); auto iit = border.indices.cbegin();
for (int i=0 ; i<border.indexCount-1 ; ++i) for (size_t i=0 ; i<border.indexCount-1 ; ++i)
{ {
os.format("add_border(bm, (%u,%u))\n", os.format("add_border(bm, (%u,%u))\n",
*iit, *(iit+1)); *iit, *(iit+1));