From a99da7b94e275e7437c7802d509697cd313d1166 Mon Sep 17 00:00:00 2001 From: majestic Date: Wed, 10 Jun 2020 13:19:05 -0700 Subject: more original cheats - CSmokeTrails and CSmokeTrail classes added in new files - more cheats added --- src/render/Fluff.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/render/Fluff.cpp') diff --git a/src/render/Fluff.cpp b/src/render/Fluff.cpp index 1056d6ff..00267e30 100644 --- a/src/render/Fluff.cpp +++ b/src/render/Fluff.cpp @@ -13,6 +13,7 @@ #include "Stats.h" #include "maths.h" #include "Frontend.h" +#include "SmokeTrails.h" uint8 ScrollCharSet[59][5] = { { 0x00, 0x00, 0x00, 0x00, 0x00 }, // ' ' @@ -99,6 +100,8 @@ CMovingThing CMovingThings::aMovingThings[NUMMOVINGTHINGS]; void CMovingThings::Init() { + CSmokeTrails::Init(); + StartCloseList.m_pNext = &CMovingThings::EndCloseList; StartCloseList.m_pPrev = nil; EndCloseList.m_pNext = nil; @@ -189,6 +192,8 @@ void CMovingThings::Update() void CMovingThings::Render() { + CSmokeTrails::Update(); + int i; for (i = 0; i < 11; ++i) { @@ -205,6 +210,8 @@ void CMovingThings::Render() if (aDigitalClocks[i].IsVisible()) aDigitalClocks[i].Render(); } + + CSmokeTrails::Render(); } // ---------- CMovingThing ---------- -- cgit v1.2.3 From 287987b8fe46cf7e1d1258551e7a5f807e36bdd2 Mon Sep 17 00:00:00 2001 From: majestic Date: Wed, 10 Jun 2020 13:47:48 -0700 Subject: SmokeTrail(s) moved to Fluff, variables' names fixed, floats rounded --- src/render/Fluff.cpp | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 131 insertions(+), 1 deletion(-) (limited to 'src/render/Fluff.cpp') diff --git a/src/render/Fluff.cpp b/src/render/Fluff.cpp index 00267e30..582468e7 100644 --- a/src/render/Fluff.cpp +++ b/src/render/Fluff.cpp @@ -13,7 +13,20 @@ #include "Stats.h" #include "maths.h" #include "Frontend.h" -#include "SmokeTrails.h" +#include "CutsceneMgr.h" +#include "PlayerPed.h" +#include "Bones.h" +#include "World.h" + + +bool CSmokeTrails::CigOn = false; +CSmokeTrail CSmokeTrails::aSmoke[3]; + +extern RwImVertexIndex SmokeTrailIndices[32] = { 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, +9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16 }; + +float RandomSmoke[16] = { 10.0f, 5.0f, -1.0f, -9.0f, -7.0f, -1.0f, 0.0f, 3.0f, 6.0f, 7.0f, 4.0f, 2.0f, +5.0f, 7.0f }; uint8 ScrollCharSet[59][5] = { { 0x00, 0x00, 0x00, 0x00, 0x00 }, // ' ' @@ -873,3 +886,120 @@ void CDigitalClock::Render() CSprite::FlushSpriteBuffer(); } } + +void +CSmokeTrail::RegisterPoint(CVector regPosition, float opacity) { + bool bAddedNewPoint = false; + + if (m_time[0] && CTimer::GetTimeInMilliseconds() - m_time[0] > 150) { + bAddedNewPoint = true; + for (int32 i = 15; i > 0; i--) { + m_pos[i] = m_pos[i - 1]; + m_time[i] = m_time[i - 1]; + m_density[i] = m_density[i - 1]; + } + ++m_seed; + } + m_pos[0] = regPosition; + + if (bAddedNewPoint || !m_time[0]) { + m_time[0] = CTimer::GetTimeInMilliseconds(); + float density = 0.1f / (m_pos[1] - m_pos[2]).Magnitude(); + m_density[1] = opacity * Min(density, 1.0f); + } + m_density[0] = 0.0f; +} + +void +CSmokeTrail::Init(int num) { + for (int32 i = 0; i < 16; i++) + m_time[i] = 0; + m_seed = num * 2; +} + +void +CSmokeTrails::Init(void) { + for (int32 i = 0; i < 3; i++) + aSmoke[i].Init(i); +} + +void +CSmokeTrails::Render(void) { + for (int32 i = 0; i < 3; i++) + aSmoke[i].Render(); +} + +void +CSmokeTrail::Render(void) { + int numVerts = 0; + RwIm3DVertex TempVertexBuffer[16]; + + if (TheCamera.IsSphereVisible(m_pos[0], 10.0f)) { + for (int32 i = 0; i < 16; i++) { + int timeSinceSpawned = CTimer::GetTimeInMilliseconds() - m_time[i]; + + if (timeSinceSpawned > 2250) + m_time[i] = 0; + + if (m_time[i]) { + int alpha = (1.0f - timeSinceSpawned / 2250.0f) * 110.0f * m_density[i]; + float offset = timeSinceSpawned * CWeather::Wind * 0.0001f; + float posX = (m_pos[i].x + timeSinceSpawned * RandomSmoke[(i - m_seed) & 0xF] * 0.00001f) - offset; + float posY = (m_pos[i].y + timeSinceSpawned * RandomSmoke[(i - m_seed + 5) & 0xF] * 0.00001f) - offset; + float posZ = m_pos[i].z + timeSinceSpawned * 0.0004f; + RwIm3DVertexSetRGBA(&TempVertexBuffer[i], 200, 200, 200, alpha); + RwIm3DVertexSetPos(&TempVertexBuffer[i], posX, posY, posZ); + numVerts++; + } + } + } + + if (numVerts > 1) { + RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE); + RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA); + RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA); + RwRenderStateSet(rwRENDERSTATETEXTURERASTER, nil); + + if (RwIm3DTransform(TempVertexBuffer, numVerts, nil, rwIM3D_VERTEXXYZ | rwIM3D_VERTEXRGBA)) { + RwIm3DRenderIndexedPrimitive(rwPRIMTYPEPOLYLINE, SmokeTrailIndices, 2 * (numVerts - 1)); + RwIm3DEnd(); + } + } +} + +void +CSmokeTrails::Update(void) { + + if (!CSmokeTrails::CigOn || TheCamera.Using1stPersonWeaponMode() || !FindPlayerPed() || + FindPlayerVehicle() || CCutsceneMgr::IsRunning() || !FindPlayerPed()->GetClump()) + return; + + RwV3d startPos = { 0.026f, 0.15f, 0.02f }; + RwV3d endPos = { 0.026f, 0.05f, 0.02f }; + + RpHAnimHierarchy *hier = GetAnimHierarchyFromSkinClump(FindPlayerPed()->GetClump()); + int32 idx = RpHAnimIDGetIndex(hier, ConvertPedNode2BoneTag(PED_HEAD)); + RwMatrix *head = &RpHAnimHierarchyGetMatrixArray(hier)[idx]; + RwV3dTransformPoints(&startPos, &startPos, 1, head); + RwV3dTransformPoints(&endPos, &endPos, 1, head); + + aSmoke[0].RegisterPoint(startPos, 1.0f); + aSmoke[1].RegisterPoint(startPos, 0.75f); + aSmoke[2].RegisterPoint(startPos, 0.5f); + + RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE); + RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA); + RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA); + RwRenderStateSet(rwRENDERSTATETEXTURERASTER, nil); + + RwIm3DVertex TempVertexBuffer[2]; + RwIm3DVertexSetRGBA(&TempVertexBuffer[0], 255, 255, 255, 255); + RwIm3DVertexSetPos(&TempVertexBuffer[0], startPos.x, startPos.y, startPos.z); + RwIm3DVertexSetRGBA(&TempVertexBuffer[1], 255, 255, 255, 255); + RwIm3DVertexSetPos(&TempVertexBuffer[1], endPos.x, endPos.y, endPos.z); + + if (RwIm3DTransform(TempVertexBuffer, 2, nil, rwIM3D_VERTEXXYZ | rwIM3D_VERTEXRGBA)) { + RwIm3DRenderIndexedPrimitive(rwPRIMTYPEPOLYLINE, SmokeTrailIndices, 2); + RwIm3DEnd(); + } +} \ No newline at end of file -- cgit v1.2.3 From cf8fcada6e9989c7c5ea88a797b98914de815aec Mon Sep 17 00:00:00 2001 From: majestic Date: Wed, 10 Jun 2020 14:01:37 -0700 Subject: m_density renamed to m_opacity --- src/render/Fluff.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/render/Fluff.cpp') diff --git a/src/render/Fluff.cpp b/src/render/Fluff.cpp index 582468e7..9074ee66 100644 --- a/src/render/Fluff.cpp +++ b/src/render/Fluff.cpp @@ -896,7 +896,7 @@ CSmokeTrail::RegisterPoint(CVector regPosition, float opacity) { for (int32 i = 15; i > 0; i--) { m_pos[i] = m_pos[i - 1]; m_time[i] = m_time[i - 1]; - m_density[i] = m_density[i - 1]; + m_opacity[i] = m_opacity[i - 1]; } ++m_seed; } @@ -905,9 +905,9 @@ CSmokeTrail::RegisterPoint(CVector regPosition, float opacity) { if (bAddedNewPoint || !m_time[0]) { m_time[0] = CTimer::GetTimeInMilliseconds(); float density = 0.1f / (m_pos[1] - m_pos[2]).Magnitude(); - m_density[1] = opacity * Min(density, 1.0f); + m_opacity[1] = opacity * Min(density, 1.0f); } - m_density[0] = 0.0f; + m_opacity[0] = 0.0f; } void @@ -942,7 +942,7 @@ CSmokeTrail::Render(void) { m_time[i] = 0; if (m_time[i]) { - int alpha = (1.0f - timeSinceSpawned / 2250.0f) * 110.0f * m_density[i]; + int alpha = (1.0f - timeSinceSpawned / 2250.0f) * 110.0f * m_opacity[i]; float offset = timeSinceSpawned * CWeather::Wind * 0.0001f; float posX = (m_pos[i].x + timeSinceSpawned * RandomSmoke[(i - m_seed) & 0xF] * 0.00001f) - offset; float posY = (m_pos[i].y + timeSinceSpawned * RandomSmoke[(i - m_seed + 5) & 0xF] * 0.00001f) - offset; -- cgit v1.2.3 From 2cc8ecbb90b044fc10829d14dc7e21d46af826e1 Mon Sep 17 00:00:00 2001 From: majestic Date: Thu, 11 Jun 2020 01:36:45 -0700 Subject: removed extern from RwImVertexIndex SmokeTrailIndices and additional rotational variables for minigun --- src/render/Fluff.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/render/Fluff.cpp') diff --git a/src/render/Fluff.cpp b/src/render/Fluff.cpp index 9074ee66..9770eb0a 100644 --- a/src/render/Fluff.cpp +++ b/src/render/Fluff.cpp @@ -22,7 +22,7 @@ bool CSmokeTrails::CigOn = false; CSmokeTrail CSmokeTrails::aSmoke[3]; -extern RwImVertexIndex SmokeTrailIndices[32] = { 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, +RwImVertexIndex SmokeTrailIndices[32] = { 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16 }; float RandomSmoke[16] = { 10.0f, 5.0f, -1.0f, -9.0f, -7.0f, -1.0f, 0.0f, 3.0f, 6.0f, 7.0f, 4.0f, 2.0f, -- cgit v1.2.3