updated librw

This commit is contained in:
aap 2020-05-06 09:23:31 +02:00
parent 31f9bb566b
commit ed021431e9
3 changed files with 7 additions and 8 deletions

2
librw

@ -1 +1 @@
Subproject commit b3ad490d1be3c1f41b416d3ceeaff3453bd2d28d Subproject commit 40eae78e793f234e332aff08265c41683faeb7f7

View file

@ -429,8 +429,7 @@ void RwIm3DVertexSetU(RwIm3DVertex *vert, RwReal u) { vert->setU(u); }
void RwIm3DVertexSetV(RwIm3DVertex *vert, RwReal v) { vert->setV(v); } 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); } 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, flags); return pVerts; }
void *RwIm3DTransform(RwIm3DVertex *pVerts, RwUInt32 numVerts, RwMatrix *ltm, RwUInt32 flags) { im3d::Transform(pVerts, numVerts, ltm); return pVerts; }
RwBool RwIm3DEnd(void) { im3d::End(); return true; } RwBool RwIm3DEnd(void) { im3d::End(); return true; }
RwBool RwIm3DRenderLine(RwInt32 vert1, RwInt32 vert2) { RwBool RwIm3DRenderLine(RwInt32 vert1, RwInt32 vert2) {
RwImVertexIndex indices[2]; RwImVertexIndex indices[2];

View file

@ -20,11 +20,11 @@ typedef RwUInt16 RwImVertexIndex;
enum RwIm3DTransformFlags enum RwIm3DTransformFlags
{ {
rwIM3D_VERTEXUV = 1, rwIM3D_VERTEXUV = rw::im3d::VERTEXUV,
rwIM3D_ALLOPAQUE = 2, rwIM3D_ALLOPAQUE = rw::im3d::ALLOPAQUE,
rwIM3D_NOCLIP = 4, rwIM3D_NOCLIP = rw::im3d::NOCLIP,
rwIM3D_VERTEXXYZ = 8, rwIM3D_VERTEXXYZ = rw::im3d::VERTEXXYZ,
rwIM3D_VERTEXRGBA = 16, rwIM3D_VERTEXRGBA = rw::im3d::VERTEXRGBA,
}; };
void RwIm2DVertexSetCameraX(RwIm2DVertex *vert, RwReal camx); void RwIm2DVertexSetCameraX(RwIm2DVertex *vert, RwReal camx);