Merge pull request #959 from Fire-Head/lcs

Lcs Particle

src/control/GameLogic.cpp

@@ -393,7 +393,7 @@ CGameLogic::RestorePlayerStuffDuringResurrection(CPlayerPed *pPlayerPed, CVector
 	CWorld::Add(pPlayerPed);
 	CHud::ResetWastedText();
 	CStreaming::StreamZoneModels(pos);
-	clearWaterDrop = true;
+	//clearWaterDrop = true;
 }
 
 void

src/core/main.cpp

@@ -76,7 +76,7 @@
 
 GlobalScene Scene;
 
-uint8 work_buff[55000];
+uint8 work_buff[102400];
 char gString[256];
 char gString2[512];
 wchar gUString[256];

src/core/main.h

@@ -7,7 +7,7 @@ struct GlobalScene
 };
 extern GlobalScene Scene;
 
-extern uint8 work_buff[55000];
+extern uint8 work_buff[102400];
 extern char gString[256];
 extern char gString2[512];
 extern wchar gUString[256];

src/modelinfo/VehicleModelInfo.cpp

@@ -1139,11 +1139,11 @@ CVehicleModelInfo::LoadEnvironmentMaps(void)
 	txdslot = CTxdStore::FindTxdSlot("particle");
 	CTxdStore::PushCurrentTxd();
 	CTxdStore::SetCurrentTxd(txdslot);
-	if(gpWhiteTexture == nil){
+	/*if(gpWhiteTexture == nil){
 		gpWhiteTexture = RwTextureRead("white", nil);
 		RwTextureGetName(gpWhiteTexture)[0] = '@';
 		RwTextureSetFilterMode(gpWhiteTexture, rwFILTERLINEAR);
-	}
+	}*/
 	CTxdStore::PopCurrentTxd();
 }
 

src/render/MBlur.cpp

@@ -591,6 +591,8 @@ CMBlur::AddRenderFx(RwCamera *cam, RwRect *rect, float z, FxType type)
 void
 CMBlur::OverlayRenderFx(RwCamera *cam, RwRaster *frontBuf)
 {
+	//TODO(LCS)
+#if 0
 	bool drawWaterDrops = false;
 	RwIm2DVertex verts[4];
 	int red = (0.75f*CTimeCycle::GetDirectionalRed() + CTimeCycle::GetAmbientRed())*0.55f * 255;
@@ -796,4 +798,5 @@ CMBlur::OverlayRenderFx(RwCamera *cam, RwRaster *frontBuf)
 	RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)FALSE);
 	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
 	pBufVertCount = 0;
+#endif
 }

src/render/Particle.h

@@ -18,11 +18,6 @@ public:
 	uint32    m_nTimeWhenWillBeDestroyed;
 	uint32    m_nTimeWhenColorWillBeChanged;
 	float     m_fZGround;
-	CVector   m_vecParticleMovementOffset;
-	int16     m_nCurrentZRotation;
-	uint16    m_nZRotationTimer;
-	float     m_fCurrentZRadius;
-	uint16    m_nZRadiusTimer;
 	uint8     m_nColorIntensity;
 	uint8     m_nAlpha;
 	float     m_fSize;
@@ -36,6 +31,14 @@ public:
 	RwRGBA    m_Color;
 	CParticle *m_pNext;
 
+	//CVector   m_vecParticleMovementOffset;
+	//int16     m_nCurrentZRotation;
+	//uint16    m_nZRotationTimer;
+	//float     m_fCurrentZRadius;
+	//uint16    m_nZRadiusTimer;
+	
+	int32     field_4C;
+
 	CParticle()
 	{
 		;
@@ -97,12 +100,9 @@ public:
 	static void HandleShootableBirdsStuff(CEntity *entity, CVector const&camPos);
 };
 
-extern bool clearWaterDrop;
-extern int32 numWaterDropOnScreen;
 extern RwRaster *gpCarSplashRaster[];
 extern RwRaster *gpHeatHazeRaster;
-extern RwRaster *gpDotRaster;
 extern RwRaster *gpRainDripRaster[];
 extern RwRaster *gpRainDripDarkRaster[];
 
-VALIDATE_SIZE(CParticle, 0x58);
+VALIDATE_SIZE(CParticle, 0x50);

src/render/ParticleMgr.cpp

@@ -4,17 +4,29 @@
 #include "FileMgr.h"
 #include "ParticleMgr.h"
 
+// --LCS: File done
+
 cParticleSystemMgr mod_ParticleSystemManager;
 
 const char *ParticleFilename = "PARTICLE.CFG";
 
 cParticleSystemMgr::cParticleSystemMgr()
 {
-	memset(this, 0, sizeof(*this));
+#ifdef FIX_BUGS
+	m_aParticles = nil;
+#endif
+}
+
+cParticleSystemMgr::~cParticleSystemMgr()
+{
+#ifdef FIX_BUGS
+	delete [] m_aParticles;
+#endif
 }
 
 void cParticleSystemMgr::Initialise()
 {
+	if ( gMakeResources )
 		LoadParticleData();
 	
 	for ( int32 i = 0; i < MAX_PARTICLES; i++ )
@@ -23,20 +35,30 @@ void cParticleSystemMgr::Initialise()
 
 void cParticleSystemMgr::LoadParticleData()
 {
-	CFileMgr::SetDir("DATA");
+#ifdef FIX_BUGS
-	CFileMgr::LoadFile(ParticleFilename, work_buff, ARRAY_SIZE(work_buff), "r");
+	delete [] m_aParticles;
+#endif
+	m_aParticles = new tParticleSystemData[MAX_PARTICLES];
+	
+	memset(m_aParticles, 0, sizeof(tParticleSystemData)*MAX_PARTICLES);
+	
+	CFileMgr::SetDir("Data");
+	ssize_t len = CFileMgr::LoadFile(ParticleFilename, work_buff, ARRAY_SIZE(work_buff), "r");
 	CFileMgr::SetDir("");
 	
+	ASSERT(!(len <= 0));
+	
 	tParticleSystemData *entry = nil;
 	int32 type = PARTICLE_FIRST;
 	
+	char *buffEnd = (char *)&work_buff[len];
 	char *lineStart = (char *)work_buff;
 	char *lineEnd = lineStart + 1;
 	
 	char line[500];
 	char delims[4];
 
-	while ( true )
+	while ( lineStart < buffEnd )
 	{
 		ASSERT(lineStart != nil);
 		ASSERT(lineEnd != nil);

src/render/ParticleMgr.h

@@ -124,15 +124,18 @@ class cParticleSystemMgr
 	};
 
 public:
-	tParticleSystemData m_aParticles[MAX_PARTICLES];
+	tParticleSystemData *m_aParticles;//[MAX_PARTICLES];
 
 	cParticleSystemMgr();
+#ifdef FIX_BUGS
+	~cParticleSystemMgr();
+#endif
 
 	void Initialise();
 	void LoadParticleData();
 	void RangeCheck(tParticleSystemData *pData) { }
 };
 
-VALIDATE_SIZE(cParticleSystemMgr, 0x2FFC);
+VALIDATE_SIZE(cParticleSystemMgr, 0x4);
 
 extern cParticleSystemMgr mod_ParticleSystemManager;

src/render/ParticleType.h

@@ -42,8 +42,6 @@ enum tParticleType
 	PARTICLE_RAIN_SPLASH_BIGGROW,
 	PARTICLE_RAIN_SPLASHUP,
 	PARTICLE_WATERSPRAY,
-	PARTICLE_WATERDROP,
-	PARTICLE_BLOODDROP,
 	PARTICLE_EXPLOSION_MEDIUM,
 	PARTICLE_EXPLOSION_LARGE,
 	PARTICLE_EXPLOSION_MFAST,
@@ -83,10 +81,11 @@ enum tParticleType
 	PARTICLE_SHIP_SIDE,
 	PARTICLE_BEASTIE,
 	PARTICLE_RAINDROP_2D,
-	PARTICLE_HEATHAZE,
+	PARTICLE_FERRY_CHIM_SMOKE,
-	PARTICLE_HEATHAZE_IN_DIST,
+	PARTICLE_MULTIPLAYER_HIT,
+	PARTICLE_HYDRANT_STEAM,
 	
 	MAX_PARTICLES,
 	PARTICLE_FIRST = PARTICLE_SPARK,
-	PARTICLE_LAST = PARTICLE_HEATHAZE_IN_DIST
+	PARTICLE_LAST = PARTICLE_HYDRANT_STEAM
 };

src/render/Shadows.cpp

@@ -76,14 +76,14 @@ CShadows::Init(void)
 	gpShadowBikeTex       = RwTextureRead("shad_bike",    nil);
 	gpShadowBaronTex      = RwTextureRead("shad_rcbaron", nil);
 	gpShadowExplosionTex  = RwTextureRead("shad_exp",     nil);
-	gpShadowHeadLightsTex = RwTextureRead("headlight",    nil);
+	gpShadowHeadLightsTex = RwTextureRead("headlight_single",    nil);
 	gpOutline1Tex         = RwTextureRead("outline_64",   nil);
 	gpOutline2Tex         = RwTextureRead("outline2_64",  nil);
 	gpOutline3Tex         = RwTextureRead("outline3_64",  nil);
 	gpBloodPoolTex        = RwTextureRead("bloodpool_64", nil);
-	gpReflectionTex       = RwTextureRead("reflection01", nil);
+	//gpReflectionTex       = RwTextureRead("reflection01", nil);
 	gpWalkDontTex         = RwTextureRead("walk_dont",    nil);
-	gpCrackedGlassTex     = RwTextureRead("wincrack_32",  nil);
+	//gpCrackedGlassTex     = RwTextureRead("wincrack_32",  nil);
 	gpPostShadowTex       = RwTextureRead("lamp_shad_64", nil);
 
 	CTxdStore::PopCurrentTxd();
@@ -99,9 +99,9 @@ CShadows::Init(void)
 	ASSERT(gpOutline2Tex != nil);
 	ASSERT(gpOutline3Tex != nil);
 	ASSERT(gpBloodPoolTex != nil);
-	ASSERT(gpReflectionTex != nil);
+	//ASSERT(gpReflectionTex != nil);
 	ASSERT(gpWalkDontTex != nil);
-	ASSERT(gpCrackedGlassTex != nil);
+	//ASSERT(gpCrackedGlassTex != nil);
 	ASSERT(gpPostShadowTex != nil);
 
 
@@ -178,9 +178,9 @@ CShadows::Shutdown(void)
 	ASSERT(gpOutline2Tex != nil);
 	ASSERT(gpOutline3Tex != nil);
 	ASSERT(gpBloodPoolTex != nil);
-	ASSERT(gpReflectionTex != nil);
+	//ASSERT(gpReflectionTex != nil);
 	ASSERT(gpWalkDontTex != nil);
-	ASSERT(gpCrackedGlassTex != nil);
+	//ASSERT(gpCrackedGlassTex != nil);
 	ASSERT(gpPostShadowTex != nil);
 
 	RwTextureDestroy(gpShadowCarTex);
@@ -194,9 +194,9 @@ CShadows::Shutdown(void)
 	RwTextureDestroy(gpOutline2Tex);
 	RwTextureDestroy(gpOutline3Tex);
 	RwTextureDestroy(gpBloodPoolTex);
-	RwTextureDestroy(gpReflectionTex);
+	//RwTextureDestroy(gpReflectionTex);
 	RwTextureDestroy(gpWalkDontTex);
-	RwTextureDestroy(gpCrackedGlassTex);
+	//RwTextureDestroy(gpCrackedGlassTex);
 	RwTextureDestroy(gpPostShadowTex);
 }
 

src/render/Sprite.cpp

@@ -10,6 +10,19 @@ float CSprite::m_f2DFarScreenZ;
 float CSprite::m_fRecipNearClipPlane;
 int32 CSprite::m_bFlushSpriteBufferSwitchZTest;
 
+float CalcScreenZ(float z)
+{
+	// LCS TODO: check 
+
+	if ( z == 0.0f )
+		return CSprite::GetNearScreenZ();
+					   
+	return (z - CDraw::GetNearClipZ())
+		* (CSprite::GetFarScreenZ() - CSprite::GetNearScreenZ()) * CDraw::GetFarClipZ()
+		/ ( (CDraw::GetFarClipZ() - CDraw::GetNearClipZ()) * z )
+		+ CSprite::GetNearScreenZ();
+}
+
 float 
 CSprite::CalcHorizonCoors(void)
 {

src/render/Sprite.h

@@ -29,3 +29,5 @@ public:
 	static void RenderBufferedOneXLUSprite2D_Rotate_Dimension(float x, float y, float w, float h, const RwRGBA &colour, int16 intens, float rotation, uint8 alpha);
 
 };
+
+extern float CalcScreenZ(float z);

src/render/Weather.cpp

@@ -330,6 +330,7 @@ void CWeather::Update(void)
 
 void CWeather::AddHeatHaze()
 {
+	/*
 	if(TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_TOPDOWN ||
 	   TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_TOP_DOWN_PED)
 		return;
@@ -341,6 +342,7 @@ void CWeather::AddHeatHaze()
 		pos.y = CGeneral::GetRandomNumberInRange(SCREEN_HEIGHT*0.4f, SCREEN_HEIGHT*0.9f);
 	pos.z = 100.0f;
 	CParticle::AddParticle(PARTICLE_HEATHAZE_IN_DIST, pos, CVector(0.0f, 0.0f, 0.0f));
+	*/
 }
 
 void CWeather::AddBeastie()

src/vehicles/Automobile.cpp

@@ -2037,6 +2037,7 @@ CAutomobile::PreRender(void)
 						if(DotProduct(GetForward(), camDist) > 0.0f ||
 						   TheCamera.GetLookDirection() == LOOKING_LEFT ||
 						   TheCamera.GetLookDirection() == LOOKING_RIGHT){
+							/*
 							CParticle::AddParticle(PARTICLE_HEATHAZE, pos1, CVector(0.0f, 0.0f, 0.0f));
 							if(pHandling->Flags & HANDLING_DBL_EXHAUST)
 								CParticle::AddParticle(PARTICLE_HEATHAZE, pos2, CVector(0.0f, 0.0f, 0.0f));
@@ -2044,6 +2045,7 @@ CAutomobile::PreRender(void)
 							CParticle::AddParticle(PARTICLE_HEATHAZE, pos1, CVector(0.0f, 0.0f, 0.0f));
 							if(pHandling->Flags & HANDLING_DBL_EXHAUST)
 								CParticle::AddParticle(PARTICLE_HEATHAZE, pos2, CVector(0.0f, 0.0f, 0.0f));
+							*/
 						}
 					}
 

src/vehicles/Bike.cpp

@@ -1724,7 +1724,7 @@ CBike::PreRender(void)
 						   TheCamera.GetLookDirection() == LOOKING_RIGHT)
 							pos1 -= 0.2f*GetForward();
 
-						CParticle::AddParticle(PARTICLE_HEATHAZE, pos1, CVector(0.0f, 0.0f, 0.0f));
+						//CParticle::AddParticle(PARTICLE_HEATHAZE, pos1, CVector(0.0f, 0.0f, 0.0f));
 					}
 				}
 			}

src/vehicles/Boat.cpp

@@ -682,6 +682,7 @@ CBoat::ProcessControl(void)
 		}
 
 		// Spray waterdrops on screen
+		/*
 		if(TheCamera.GetLookingForwardFirstPerson() && FindPlayerVehicle() && FindPlayerVehicle()->IsBoat() &&
 		   m_nDeltaVolumeUnderWater > 0 && numWaterDropOnScreen < 20){
 			CVector dropPos;
@@ -712,7 +713,7 @@ CBoat::ProcessControl(void)
 			if(CParticle::AddParticle(PARTICLE_WATERDROP, dropPos, dropDir, nil,
 					CGeneral::GetRandomNumberInRange(0.1f, 0.15f), dropColor, 0, 0, frm))
 				numWaterDropOnScreen++;
-		}
+		}*/
 
 		if(m_fPrevVolumeUnderWater == 0.0f && m_fVolumeUnderWater > 0.0f && GetModelIndex() == MI_SKIMMER){
 			CVector splashDir(0.0f, 0.0f, 0.25f*speed);

src/weapons/Weapon.cpp

@@ -645,9 +645,9 @@ CWeapon::FireMelee(CEntity *shooter, CVector &fireSource)
 									CVector dropDir(CGeneral::GetRandomNumberInRange(-0.15f, 0.15f), CGeneral::GetRandomNumberInRange(0.1f, 0.35f), 0.f);
 									CVector dropPos(CGeneral::GetRandomNumberInRange(SCREEN_STRETCH_X(50.0f), SCREEN_STRETCH_FROM_RIGHT(50.0f)),
 										CGeneral::GetRandomNumberInRange(SCREEN_STRETCH_Y(50.0f), SCREEN_STRETCH_FROM_BOTTOM(50.0f)), 1.f);
-									CParticle::AddParticle(PARTICLE_BLOODDROP, dropPos, dropDir, nil, CGeneral::GetRandomNumberInRange(0.1f, 0.15f),
+									/*CParticle::AddParticle(PARTICLE_BLOODDROP, dropPos, dropDir, nil, CGeneral::GetRandomNumberInRange(0.1f, 0.15f),
 										CRGBA(0, 0, 0, 0), 0, 0, CGeneral::GetRandomNumber() & 1, 0);
-
+									*/
 								}
 								if (info->m_AnimToPlay == ASSOCGRP_KNIFE)
 								{
@@ -737,7 +737,7 @@ CWeapon::FireMelee(CEntity *shooter, CVector &fireSource)
 		{
 			nearCar->VehicleDamage(info->m_nDamage * (0.00075f * nearCar->pHandling->fMass), gaTempSphereColPoints[0].pieceB);
 
-			CParticle::AddParticle(PARTICLE_HEATHAZE, gaTempSphereColPoints[0].point, CVector(0.0f, 0.0f, 0.0f), 0, 0.0f, 0, 0, 0, 0);
+			//CParticle::AddParticle(PARTICLE_HEATHAZE, gaTempSphereColPoints[0].point, CVector(0.0f, 0.0f, 0.0f), 0, 0.0f, 0, 0, 0, 0);
 		}
 		else
 		{
@@ -814,7 +814,7 @@ CWeapon::FireMelee(CEntity *shooter, CVector &fireSource)
 				CParticle::AddParticle(PARTICLE_SPARK, gaTempSphereColPoints[0].point, 0.1f * gaTempSphereColPoints[0].normal, 0, 0.0f, 0, 0, 0, 0);
 			}
 
-			CParticle::AddParticle(PARTICLE_HEATHAZE, gaTempSphereColPoints[0].point, CVector(0.0f, 0.0f, 0.0f), 0, 0.0f, 0, 0, 0, 0);
+			//CParticle::AddParticle(PARTICLE_HEATHAZE, gaTempSphereColPoints[0].point, CVector(0.0f, 0.0f, 0.0f), 0, 0.0f, 0, 0, 0, 0);
 			
 			if (!damageEntityRegistered)
 			{

vendor/librw

@@ -1 +1 @@
-Subproject commit 78d540fce0ca090b07377cee40d73eadfb7a699d
+Subproject commit 61b288a9fe72ae4073c0ac5fd2a5815ed510c8c8