diff --git a/src/base.cpp b/src/base.cpp index f7776ad7..3c3ca08c 100644 --- a/src/base.cpp +++ b/src/base.cpp @@ -587,6 +587,7 @@ Matrix::makeRotation(Matrix *dst, const V3d *axis, float32 angle) dst->pos.y = 0.0; dst->pos.z = 0.0; dst->flags = TYPEORTHONORMAL; + dst->pad1 = dst->pad2 = dst->pad3 = 0; } /* q must be normalized */ @@ -616,6 +617,7 @@ Matrix::makeRotation(Matrix *dst, const Quat &q) dst->pos.y = 0.0; dst->pos.z = 0.0; dst->flags = TYPEORTHONORMAL; + dst->pad1 = dst->pad2 = dst->pad3 = 0; } float32 diff --git a/src/ps2/rwps2.h b/src/ps2/rwps2.h index f749e724..d2945e90 100644 --- a/src/ps2/rwps2.h +++ b/src/ps2/rwps2.h @@ -15,8 +15,8 @@ extern Device renderdevice; struct Im2DVertex { float32 x, y, z, w; - uint32 r, g, b, a; float32 u, v, q, PAD; + uint32 r, g, b, a; void setScreenX(float32 x) { this->x = x; } void setScreenY(float32 y) { this->y = y; } @@ -121,6 +121,7 @@ struct PipeAttribute uint32 attrib; }; +extern bool adcHack; // use MASK write to initialize ADC field in vertex cluster extern PipeAttribute attribXYZ; extern PipeAttribute attribXYZW; extern PipeAttribute attribUV;