diff options
author | aap <aap@papnet.eu> | 2020-05-06 09:23:31 +0200 |
---|---|---|
committer | aap <aap@papnet.eu> | 2020-05-06 09:23:31 +0200 |
commit | ed021431e92ee84140828f5866a70d07eb1628aa (patch) | |
tree | 79d60a213f240ad76a3f507ba43a69782e796f29 | |
parent | implemented most of timecycle and mblur (diff) | |
download | re3-ed021431e92ee84140828f5866a70d07eb1628aa.tar re3-ed021431e92ee84140828f5866a70d07eb1628aa.tar.gz re3-ed021431e92ee84140828f5866a70d07eb1628aa.tar.bz2 re3-ed021431e92ee84140828f5866a70d07eb1628aa.tar.lz re3-ed021431e92ee84140828f5866a70d07eb1628aa.tar.xz re3-ed021431e92ee84140828f5866a70d07eb1628aa.tar.zst re3-ed021431e92ee84140828f5866a70d07eb1628aa.zip |
m--------- | librw | 0 | ||||
-rw-r--r-- | src/fakerw/fake.cpp | 3 | ||||
-rw-r--r-- | src/fakerw/rwcore.h | 10 |
3 files changed, 6 insertions, 7 deletions
diff --git a/librw b/librw -Subproject b3ad490d1be3c1f41b416d3ceeaff3453bd2d28 +Subproject 40eae78e793f234e332aff08265c41683faeb7f diff --git a/src/fakerw/fake.cpp b/src/fakerw/fake.cpp index 76d7865c..e569dea9 100644 --- a/src/fakerw/fake.cpp +++ b/src/fakerw/fake.cpp @@ -429,8 +429,7 @@ void RwIm3DVertexSetU(RwIm3DVertex *vert, RwReal u) { vert->setU(u); } void RwIm3DVertexSetV(RwIm3DVertex *vert, RwReal v) { vert->setV(v); } void RwIm3DVertexSetRGBA(RwIm3DVertex *vert, RwUInt8 r, RwUInt8 g, RwUInt8 b, RwUInt8 a) { vert->setColor(r, g, b, a); } -// WARNING: ignoring flags -void *RwIm3DTransform(RwIm3DVertex *pVerts, RwUInt32 numVerts, RwMatrix *ltm, RwUInt32 flags) { im3d::Transform(pVerts, numVerts, ltm); return pVerts; } +void *RwIm3DTransform(RwIm3DVertex *pVerts, RwUInt32 numVerts, RwMatrix *ltm, RwUInt32 flags) { im3d::Transform(pVerts, numVerts, ltm, flags); return pVerts; } RwBool RwIm3DEnd(void) { im3d::End(); return true; } RwBool RwIm3DRenderLine(RwInt32 vert1, RwInt32 vert2) { RwImVertexIndex indices[2]; diff --git a/src/fakerw/rwcore.h b/src/fakerw/rwcore.h index 22e29737..31bc5541 100644 --- a/src/fakerw/rwcore.h +++ b/src/fakerw/rwcore.h @@ -20,11 +20,11 @@ typedef RwUInt16 RwImVertexIndex; enum RwIm3DTransformFlags { - rwIM3D_VERTEXUV = 1, - rwIM3D_ALLOPAQUE = 2, - rwIM3D_NOCLIP = 4, - rwIM3D_VERTEXXYZ = 8, - rwIM3D_VERTEXRGBA = 16, + rwIM3D_VERTEXUV = rw::im3d::VERTEXUV, + rwIM3D_ALLOPAQUE = rw::im3d::ALLOPAQUE, + rwIM3D_NOCLIP = rw::im3d::NOCLIP, + rwIM3D_VERTEXXYZ = rw::im3d::VERTEXXYZ, + rwIM3D_VERTEXRGBA = rw::im3d::VERTEXRGBA, }; void RwIm2DVertexSetCameraX(RwIm2DVertex *vert, RwReal camx); |