summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFire-Head <Fire-Head@users.noreply.github.com>2020-03-28 16:24:21 +0100
committerFire-Head <Fire-Head@users.noreply.github.com>2020-03-28 16:24:21 +0100
commita81233429d42753003de65eaab6d5f927d0651bc (patch)
tree4b941f4faf998e4adc6e9fe79fa87d347c5edb90
parentWaterCannon done, resource ico (diff)
downloadre3-a81233429d42753003de65eaab6d5f927d0651bc.tar
re3-a81233429d42753003de65eaab6d5f927d0651bc.tar.gz
re3-a81233429d42753003de65eaab6d5f927d0651bc.tar.bz2
re3-a81233429d42753003de65eaab6d5f927d0651bc.tar.lz
re3-a81233429d42753003de65eaab6d5f927d0651bc.tar.xz
re3-a81233429d42753003de65eaab6d5f927d0651bc.tar.zst
re3-a81233429d42753003de65eaab6d5f927d0651bc.zip
-rw-r--r--src/render/WaterCannon.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/render/WaterCannon.cpp b/src/render/WaterCannon.cpp
index 23c2293c..e848fb43 100644
--- a/src/render/WaterCannon.cpp
+++ b/src/render/WaterCannon.cpp
@@ -29,17 +29,17 @@ void CWaterCannon::Init(void)
for ( int32 i = 0; i < NUM_SEGMENTPOINTS; i++ )
m_abUsed[i] = false;
- WaterCannonVertices[0].u = 0.0f;
- WaterCannonVertices[0].v = 0.0f;
+ RwIm3DVertexSetU(&WaterCannonVertices[0], 0.0f);
+ RwIm3DVertexSetV(&WaterCannonVertices[0], 0.0f);
- WaterCannonVertices[1].u = 1.0f;
- WaterCannonVertices[1].v = 0.0f;
+ RwIm3DVertexSetU(&WaterCannonVertices[1], 1.0f);
+ RwIm3DVertexSetV(&WaterCannonVertices[1], 0.0f);
- WaterCannonVertices[2].u = 0.0f;
- WaterCannonVertices[2].v = 0.0f;
+ RwIm3DVertexSetU(&WaterCannonVertices[2], 0.0f);
+ RwIm3DVertexSetV(&WaterCannonVertices[2], 0.0f);
- WaterCannonVertices[3].u = 1.0f;
- WaterCannonVertices[3].v = 0.0f;
+ RwIm3DVertexSetU(&WaterCannonVertices[3], 1.0f);
+ RwIm3DVertexSetV(&WaterCannonVertices[3], 0.0f);
WaterCannonIndexList[0] = 0;
WaterCannonIndexList[1] = 1;
@@ -118,11 +118,11 @@ void CWaterCannon::Render(void)
RwRenderStateSet(rwRENDERSTATETEXTURERASTER, (void *)gpWaterRaster);
float v = float(CGeneral::GetRandomNumber() & 255) / 256;
-
- WaterCannonVertices[0].v = v;
- WaterCannonVertices[1].v = v;
- WaterCannonVertices[2].v = v;
- WaterCannonVertices[3].v = v;
+
+ RwIm3DVertexSetV(&WaterCannonVertices[0], v);
+ RwIm3DVertexSetV(&WaterCannonVertices[1], v);
+ RwIm3DVertexSetV(&WaterCannonVertices[2], v);
+ RwIm3DVertexSetV(&WaterCannonVertices[3], v);
int16 pointA = m_nCur % -NUM_SEGMENTPOINTS;