2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-10 03:47:42 +00:00

initial DEAFBABE support

This commit is contained in:
Jack Andersen
2015-09-11 21:13:40 -10:00
parent 40c39ee83b
commit 73862a937f
15 changed files with 565 additions and 50 deletions

View File

@@ -58,12 +58,14 @@ void InitGeomBlenderContext(HECL::BlenderConnection::PyOutStream& os,
" face = od_entry['bm'].faces.new(verts)\n"
" else: # Probably a double-sided surface\n"
" face = face.copy()\n"
" face.normal_flip()\n"
" for i in range(3):\n"
" face.verts[i].co = verts[i].co\n"
" ret_mesh = od_entry['bm']\n"
"\n"
" elif face is not None: # Same material, probably double-sided\n"
" face = face.copy()\n"
" face.normal_flip()\n"
" for i in range(3):\n"
" face.verts[i].co = verts[i].co\n"
"\n"
" else: \n"
" face = bm.faces.new(verts)\n"

View File

@@ -686,11 +686,9 @@ atUint32 ReadGeomSectionsToBlender(HECL::BlenderConnection::PyOutStream& os,
if (v+3 >= vertCount)
break;
bool peek = (v >= vertCount - 3);
/* Advance 3 Prim Verts */
for (int pv=0 ; pv<3 ; ++pv)
primVerts[pv] = dl.readVert(peek);
primVerts[pv] = dl.readVert();
}
}
else if (ptype == GX::TRIANGLEFAN)
@@ -728,10 +726,12 @@ atUint32 ReadGeomSectionsToBlender(HECL::BlenderConnection::PyOutStream& os,
}
}
bool peek = (v >= vertCount - 3);
/* Break if done */
if (v+3 >= vertCount)
break;
/* Advance one prim vert */
primVerts[(c+2)%3] = dl.readVert(peek);
primVerts[(c+2)%3] = dl.readVert();
++c;
}
}

View File

@@ -1,6 +1,5 @@
make_dnalist(liblist
CMDL
DeafBabe)
CMDL)
add_library(DNACommon
DNACommon.hpp DNACommon.cpp
${liblist}
@@ -11,6 +10,5 @@ add_library(DNACommon
TXTR.hpp TXTR.cpp
ANCS.hpp
ANIM.hpp ANIM.cpp
DeafBabe.cpp
Tweaks/ITweakPlayer.hpp
Tweaks/ITweakPlayerControl.hpp)

View File

@@ -1,31 +0,0 @@
#ifndef _DNACOMMON_DEAFBABE_HPP_
#define _DNACOMMON_DEAFBABE_HPP_
#include "DNACommon.hpp"
namespace Retro
{
namespace DNACommon
{
struct DeafBabe : BigDNA
{
Delete expl;
std::vector<atUint64> materials;
std::vector<atUint8> vertMats;
std::vector<atUint8> edgeMats;
std::vector<atUint8> polyMats;
std::vector<std::pair<atUint16, atUint16>> edgeVertConnections;
std::vector<std::pair<atUint16, atUint16>> triangleEdgeConnections;
void read(Athena::io::IStreamReader& reader)
{
}
void write(Athena::io::IStreamWriter& writer) const
{
}
};
}
}
#endif // _DNACOMMON_DEAFBABE_HPP_