diff options
| author | Elijah Thomas <42302100+elijah-thomas774@users.noreply.github.com> | 2024-10-16 15:36:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-16 15:36:02 -0400 |
| commit | 26af4db82da23364961ebb440efba88846240731 (patch) | |
| tree | 9cfe6a427cfe59c13c64928ccef6ba3c5ccfec21 /src/m/m3d/m_bmdl.cpp | |
| parent | 4543ec129ec02649b24ae0e20d8325a5f066c9b1 (diff) | |
update from dtk-template - clangd :) (#66)
* update from dtk-template and start work towards using clangd
* include <a> -> "a"
* Update build.yml
* remove/add non-trivial class in union warning
Diffstat (limited to 'src/m/m3d/m_bmdl.cpp')
| -rw-r--r-- | src/m/m3d/m_bmdl.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/m/m3d/m_bmdl.cpp b/src/m/m3d/m_bmdl.cpp index c565fb5b..9b51d8f6 100644 --- a/src/m/m3d/m_bmdl.cpp +++ b/src/m/m3d/m_bmdl.cpp @@ -1,6 +1,8 @@ -#include <m/m3d/m3d.h> -#include <m/m3d/m_bmdl.h> -#include <nw4r/g3d/g3d_scnmdl.h> +#include "m/m3d/m_bmdl.h" + +#include "m/m3d/m3d.h" +#include "nw4r/g3d/g3d_scnmdl.h" + namespace m3d { @@ -21,8 +23,9 @@ int bmdl_c::getNodeID(const char *name) const { } bool bmdl_c::getNodeWorldMtx(u32 p1, nw4r::math::MTX34 *out) const { - return nw4r::g3d::G3dObj::DynamicCast<nw4r::g3d::ScnMdlSimple>(mpScnLeaf)->GetScnMtxPos(out, - nw4r::g3d::ScnObj::MTX_TYPE_WORLD, p1); + return nw4r::g3d::G3dObj::DynamicCast<nw4r::g3d::ScnMdlSimple>(mpScnLeaf)->GetScnMtxPos( + out, nw4r::g3d::ScnObj::MTX_TYPE_WORLD, p1 + ); } bool bmdl_c::getNodeWorldMtxMultVecZero(u32 p1, nw4r::math::VEC3 &out) const { @@ -157,8 +160,9 @@ void bmdl_c::setTevKColorAll(GXTevKColorID tevKId, GXColor color, bool bMarkDirt } } -void bmdl_c::setBlendModeAll(GXBlendMode blendMode, GXBlendFactor srcFactor, GXBlendFactor dstFactor, GXLogicOp op, - bool bMarkDirty) { +void bmdl_c::setBlendModeAll( + GXBlendMode blendMode, GXBlendFactor srcFactor, GXBlendFactor dstFactor, GXLogicOp op, bool bMarkDirty +) { nw4r::g3d::ResMdl resMdl = getResMdl(); nw4r::g3d::ScnMdl *mdl = nw4r::g3d::G3dObj::DynamicCast<nw4r::g3d::ScnMdl>(mpScnLeaf); if (mdl) { |
