Tony Wasserka : d3dx8: Implement the C++ stuff of the D3DXVECTOR4 structure .
Alexandre Julliard
julliard at winehq.org
Mon Nov 12 06:27:35 CST 2007
Module: wine
Branch: master
Commit: dca53f1890a8fccb7f39d65587fd7fdb3779034c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=dca53f1890a8fccb7f39d65587fd7fdb3779034c
Author: Tony Wasserka <tony.wasserka at freenet.de>
Date: Fri Nov 9 19:22:47 2007 +0100
d3dx8: Implement the C++ stuff of the D3DXVECTOR4 structure.
---
include/d3dx8math.h | 26 +++++++++++
include/d3dx8math.inl | 112 +++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 138 insertions(+), 0 deletions(-)
diff --git a/include/d3dx8math.h b/include/d3dx8math.h
index 383c80c..fa7eee6 100644
--- a/include/d3dx8math.h
+++ b/include/d3dx8math.h
@@ -96,6 +96,32 @@ typedef struct _D3DVECTOR D3DXVECTOR3, *LPD3DXVECTOR3;
typedef struct D3DXVECTOR4
{
+#ifdef __cplusplus
+ D3DXVECTOR4();
+ D3DXVECTOR4(CONST FLOAT *pf);
+ D3DXVECTOR4(FLOAT fx, FLOAT fy, FLOAT fz, FLOAT fw);
+
+ operator FLOAT* ();
+ operator CONST FLOAT* () const;
+
+ D3DXVECTOR4& operator += (CONST D3DXVECTOR4&);
+ D3DXVECTOR4& operator -= (CONST D3DXVECTOR4&);
+ D3DXVECTOR4& operator *= (FLOAT);
+ D3DXVECTOR4& operator /= (FLOAT);
+
+ D3DXVECTOR4 operator + () const;
+ D3DXVECTOR4 operator - () const;
+
+ D3DXVECTOR4 operator + (CONST D3DXVECTOR4&) const;
+ D3DXVECTOR4 operator - (CONST D3DXVECTOR4&) const;
+ D3DXVECTOR4 operator * (FLOAT) const;
+ D3DXVECTOR4 operator / (FLOAT) const;
+
+ friend D3DXVECTOR4 operator * (FLOAT, CONST D3DXVECTOR4&);
+
+ BOOL operator == (CONST D3DXVECTOR4&) const;
+ BOOL operator != (CONST D3DXVECTOR4&) const;
+#endif /* __cplusplus */
FLOAT x, y, z, w;
} D3DXVECTOR4, *LPD3DXVECTOR4;
diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl
index a2fd130..c034eba 100644
--- a/include/d3dx8math.inl
+++ b/include/d3dx8math.inl
@@ -236,6 +236,118 @@ inline BOOL D3DXVECTOR3::operator != (CONST D3DXVECTOR3& v) const
return x != v.x || y != v.y || z != v.z;
}
+inline D3DXVECTOR4::D3DXVECTOR4()
+{
+}
+
+inline D3DXVECTOR4::D3DXVECTOR4(CONST FLOAT *pf)
+{
+ if(!pf) return;
+ x = pf[0];
+ y = pf[1];
+ z = pf[2];
+ w = pf[3];
+}
+
+inline D3DXVECTOR4::D3DXVECTOR4(FLOAT fx, FLOAT fy, FLOAT fz, FLOAT fw)
+{
+ x = fx;
+ y = fy;
+ z = fz;
+ w = fw;
+}
+
+inline D3DXVECTOR4::operator FLOAT* ()
+{
+ return (FLOAT*)&x;
+}
+
+inline D3DXVECTOR4::operator CONST FLOAT* () const
+{
+ return (CONST FLOAT*)&x;
+}
+
+inline D3DXVECTOR4& D3DXVECTOR4::operator += (CONST D3DXVECTOR4& v)
+{
+ x += v.x;
+ y += v.y;
+ z += v.z;
+ w += v.w;
+ return *this;
+}
+
+inline D3DXVECTOR4& D3DXVECTOR4::operator -= (CONST D3DXVECTOR4& v)
+{
+ x -= v.x;
+ y -= v.y;
+ z -= v.z;
+ w -= v.w;
+ return *this;
+}
+
+inline D3DXVECTOR4& D3DXVECTOR4::operator *= (FLOAT f)
+{
+ x *= f;
+ y *= f;
+ z *= f;
+ w *= f;
+ return *this;
+}
+
+inline D3DXVECTOR4& D3DXVECTOR4::operator /= (FLOAT f)
+{
+ x /= f;
+ y /= f;
+ z /= f;
+ w /= f;
+ return *this;
+}
+
+inline D3DXVECTOR4 D3DXVECTOR4::operator + () const
+{
+ return *this;
+}
+
+inline D3DXVECTOR4 D3DXVECTOR4::operator - () const
+{
+ return D3DXVECTOR4(-x, -y, -z, -w);
+}
+
+inline D3DXVECTOR4 D3DXVECTOR4::operator + (CONST D3DXVECTOR4& v) const
+{
+ return D3DXVECTOR4(x + v.x, y + v.y, z + v.z, w + v.w);
+}
+
+inline D3DXVECTOR4 D3DXVECTOR4::operator - (CONST D3DXVECTOR4& v) const
+{
+ return D3DXVECTOR4(x - v.x, y - v.y, z - v.z, w - v.w);
+}
+
+inline D3DXVECTOR4 D3DXVECTOR4::operator * (FLOAT f) const
+{
+ return D3DXVECTOR4(x * f, y * f, z * f, w * f);
+}
+
+inline D3DXVECTOR4 D3DXVECTOR4::operator / (FLOAT f) const
+{
+ return D3DXVECTOR4(x / f, y / f, z / f, w / f);
+}
+
+inline D3DXVECTOR4 operator * (FLOAT f, CONST D3DXVECTOR4& v)
+{
+ return D3DXVECTOR4(f * v.x, f * v.y, f * v.z, f * v.w);
+}
+
+inline BOOL D3DXVECTOR4::operator == (CONST D3DXVECTOR4& v) const
+{
+ return x == v.x && y == v.y && z == v.z && w == v.w;
+}
+
+inline BOOL D3DXVECTOR4::operator != (CONST D3DXVECTOR4& v) const
+{
+ return x != v.x || y != v.y || z != v.z || w != v.w;
+}
+
#endif /* __cplusplus */
/*_______________D3DXCOLOR_____________________*/
More information about the wine-cvs
mailing list