MagicFlare refactors

src/graphics/particle/MagicFlare.cpp

@@ -41,7 +41,17 @@
 #include "graphics/data/TextureContainer.h"
 #include "math/RandomVector.h"
 
-struct MagicFlare {
+struct FLARETC {
+	TextureContainer* lumignon;
+	TextureContainer* lumignon2;
+	TextureContainer* plasm;
+	TextureContainer* shine[11];
+};
+
+static FLARETC g_magicFlareTextures;
+
+class MagicFlare {
+public:
 	unsigned char exist;
 	char type;
 	short flags;
@@ -56,105 +66,32 @@ struct MagicFlare {
 };
 
 static const size_t g_magicFlaresMax = 500;
-static MagicFlare g_magicFlares[g_magicFlaresMax];
 static long g_magicFlaresCount = 0;
+static short g_magicFlareCurrentColor = 0;
 
-struct FLARETC
-{
-	TextureContainer * lumignon;
-	TextureContainer * lumignon2;
-	TextureContainer * plasm;
-	TextureContainer * shine[11];
+class MagicFlareContainer {
+public:
+	MagicFlare& operator[](size_t element);
+	void removeFlare(MagicFlare& flare);
+	void addFlare(const Vec2f& pos, float sm, short typ, Entity* io, bool bookDraw);
+	long flaggedCount();
+	void removeFlareEntityPtr(const Entity* entity);
+	void init();
+	void removeAll();
+
+	short shinum = 1;
+private:
+	MagicFlare m_flares[g_magicFlaresMax];
 };
 
-static FLARETC g_magicFlareTextures;
-
-void MagicFlareLoadTextures() {
-
-	TextureContainer::TCFlags flags = TextureContainer::NoColorKey;
-
-	g_magicFlareTextures.lumignon = TextureContainer::LoadUI("graph/particles/lumignon", flags);
-	g_magicFlareTextures.lumignon2 = TextureContainer::LoadUI("graph/particles/lumignon2", flags);
-	g_magicFlareTextures.plasm = TextureContainer::LoadUI("graph/particles/plasm", flags);
-
-	std::ostringstream oss;
-	for(size_t i = 1; i < 10; i++) {
-		oss.str(std::string());
-		oss << "graph/particles/shine" << i;
-		g_magicFlareTextures.shine[i] = TextureContainer::LoadUI(oss.str(), flags);
-	}
-
-}
-
-static short shinum = 1;
-
-void MagicFlareReleaseEntity(const Entity * entity) {
-	for(size_t i = 0; i < g_magicFlaresMax; i++) {
-		if(g_magicFlares[i].exist && g_magicFlares[i].io == entity) {
-			g_magicFlares[i].io = nullptr;
-		}
-	}
-}
+static MagicFlareContainer g_magicFlares;
 
-long MagicFlareCountNonFlagged() {
-
-	if(!g_magicFlaresCount)
-		return 0;
+MagicFlare& MagicFlareContainer::operator[](size_t element) {
 
-	long count = 0;
-	for(size_t i = 0; i < g_magicFlaresMax; i++) {
-		if(g_magicFlares[i].exist && g_magicFlares[i].flags == 0) {
-			count++;
-		}
-	}
-
-	return count;
+	return m_flares[element];
 }
 
-void ARX_MAGICAL_FLARES_FirstInit() {
-	g_magicFlaresCount = 0;
-	for(size_t i = 0; i < g_magicFlaresMax; i++) {
-		g_magicFlares[i].exist = 0;
-	}
-}
-
-static void removeFlare(MagicFlare & flare) {
-
-	if(flare.io && ValidIOAddress(flare.io)) {
-		flare.io->flarecount--;
-	}
-
-	lightHandleDestroy(flare.dynlight);
-
-	flare.tolive = 0;
-	flare.exist = 0;
-	g_magicFlaresCount--;
-
-}
-
-void ARX_MAGICAL_FLARES_KillAll() {
-
-	for(size_t i = 0; i < g_magicFlaresMax; i++) {
-		MagicFlare & flare = g_magicFlares[i];
-		if(flare.exist) {
-			removeFlare(flare);
-		}
-	}
-
-	g_magicFlaresCount = 0;
-}
-
-static short g_magicFlareCurrentColor = 0;
-
-void MagicFlareChangeColor() {
-	g_magicFlareCurrentColor++;
-
-	if(g_magicFlareCurrentColor > 2)
-		g_magicFlareCurrentColor = 0;
-}
-
-void AddFlare(const Vec2f & pos, float sm, short typ, Entity * io, bool bookDraw) {
-
+void MagicFlareContainer::addFlare(const Vec2f& pos, float sm, short typ, Entity* io, bool bookDraw) {
 	size_t oldest = 0;
 	size_t i;
 	for(i = 0; i < g_magicFlaresMax; i++) {
@@ -166,16 +103,16 @@ void AddFlare(const Vec2f & pos, float sm, short typ, Entity * io, bool bookDraw
 		}
 	}
 	if(i >= g_magicFlaresMax) {
-		removeFlare(g_magicFlares[oldest]);
+		g_magicFlares.removeFlare(g_magicFlares[oldest]);
 		i = oldest;
 	}
 
-	MagicFlare & flare = g_magicFlares[i];
+	MagicFlare& flare = g_magicFlares[i];
 	flare.exist = 1;
 	g_magicFlaresCount++;
-	
+
 	flare.bDrawBitmap = bookDraw;
-	
+
 	flare.io = io;
 	if(io) {
 		flare.flags = 1;
@@ -202,21 +139,24 @@ void AddFlare(const Vec2f & pos, float sm, short typ, Entity * io, bool bookDraw
 	}
 
 	switch(g_magicFlareCurrentColor) {
-		case 0: {
+		case 0:
+		{
 			flare.rgb = Color3f(0.4f, 0.f, 0.4f) + Color3f(2.f / 3, 2.f / 3, 2.f / 3) * randomColor3f();
 			break;
 		}
-		case 1: {
+		case 1:
+		{
 			flare.rgb = Color3f(0.5f, 0.5f, 0.f) + Color3f(0.625f, 0.625f, 0.55f) * randomColor3f();
 			break;
 		}
-		case 2: {
+		case 2:
+		{
 			flare.rgb = Color3f(0.4f, 0.f, 0.f) + Color3f(2.f / 3, 0.55f, 0.55f) * randomColor3f();
 			break;
 		}
 		default: arx_unreachable();
 	}
-	
+
 	if(typ == -1) {
 		float zz = eeMousePressed1() ? 0.29f : ((sm > 0.5f) ? Random::getf() : 1.f);
 		if(zz < 0.2f) {
@@ -237,20 +177,20 @@ void AddFlare(const Vec2f & pos, float sm, short typ, Entity * io, bool bookDraw
 		flare.size = Random::getf(64.f, 102.f) * sm;
 		flare.tolive = Random::get(3400000us, 4400000us);
 	}
-	
-	flare.dynlight = { };
-	
+
+	flare.dynlight = {};
+
 	for(unsigned int kk = 0; kk < 3; kk++) {
-		
+
 		if(Random::getf() < 0.5f) {
 			continue;
 		}
-		
-		PARTICLE_DEF * pd = createParticle(true);
+
+		PARTICLE_DEF* pd = createParticle(true);
 		if(!pd) {
 			break;
 		}
-		
+
 		if(!bookDraw) {
 			pd->m_flags = FADE_IN_AND_OUT | ROTATING | DISSIPATING;
 			if(!io) {
@@ -259,7 +199,7 @@ void AddFlare(const Vec2f & pos, float sm, short typ, Entity * io, bool bookDraw
 		} else {
 			pd->m_flags = FADE_IN_AND_OUT | PARTICLE_2D;
 		}
-		
+
 		pd->ov = flare.p + arx::randomVec(-5.f, 5.f);
 		pd->move = Vec3f(0.f, 5.f, 0.f);
 		pd->sizeDelta = -2.f;
@@ -273,9 +213,113 @@ void AddFlare(const Vec2f & pos, float sm, short typ, Entity * io, bool bookDraw
 		}
 		pd->rgb = flare.rgb * (2.f / 3);
 		pd->m_rotation = 1.2f;
-
+
+	}
+}
+
+void MagicFlareContainer::removeFlare(MagicFlare& flare) {
+
+	if(flare.io && ValidIOAddress(flare.io)) {
+		flare.io->flarecount--;
+	}
+
+	lightHandleDestroy(flare.dynlight);
+
+	flare.tolive = 0;
+	flare.exist = 0;
+	g_magicFlaresCount--;
+
+}
+
+long MagicFlareContainer::flaggedCount() {
+	if(!g_magicFlaresCount)
+		return 0;
+
+	long count = 0;
+	for(size_t i = 0; i < g_magicFlaresMax; i++) {
+		if(g_magicFlares[i].exist && g_magicFlares[i].flags == 0) {
+			count++;
+		}
+	}
+
+	return count;
+}
+
+void MagicFlareContainer::removeFlareEntityPtr(const Entity* entity) {
+
+	for(size_t i = 0; i < g_magicFlaresMax; i++) {
+		if(g_magicFlares[i].exist && g_magicFlares[i].io == entity) {
+			g_magicFlares[i].io = nullptr;
+		}
+	}
+}
+
+void MagicFlareContainer::init() {
+	g_magicFlaresCount = 0;
+	for(size_t i = 0; i < g_magicFlaresMax; i++) {
+		g_magicFlares[i].exist = 0;
+	}
+}
+
+void MagicFlareContainer::removeAll() {
+
+	for(size_t i = 0; i < g_magicFlaresMax; i++) {
+		MagicFlare& flare = g_magicFlares[i];
+		if(flare.exist) {
+			g_magicFlares.removeFlare(flare);
+		}
 	}
+
+	g_magicFlaresCount = 0;
+}
+
+void MagicFlareLoadTextures() {
+
+	TextureContainer::TCFlags flags = TextureContainer::NoColorKey;
+
+	g_magicFlareTextures.lumignon = TextureContainer::LoadUI("graph/particles/lumignon", flags);
+	g_magicFlareTextures.lumignon2 = TextureContainer::LoadUI("graph/particles/lumignon2", flags);
+	g_magicFlareTextures.plasm = TextureContainer::LoadUI("graph/particles/plasm", flags);
+
+	std::ostringstream oss;
+	for(size_t i = 1; i < 10; i++) {
+		oss.str(std::string());
+		oss << "graph/particles/shine" << i;
+		g_magicFlareTextures.shine[i] = TextureContainer::LoadUI(oss.str(), flags);
+	}
+
+}
+
+void MagicFlareReleaseEntity(const Entity * entity) {
+
+	g_magicFlares.removeFlareEntityPtr(entity);
+}
+
+long MagicFlareCountNonFlagged() {
+
+	return g_magicFlares.flaggedCount();
+}
+
+void ARX_MAGICAL_FLARES_FirstInit() {
+
+	g_magicFlares.init();
+}
+
+void ARX_MAGICAL_FLARES_KillAll() {
+
+	g_magicFlares.removeAll();
+}
+
+void MagicFlareChangeColor() {
+	g_magicFlareCurrentColor++;
+
+	if(g_magicFlareCurrentColor > 2)
+		g_magicFlareCurrentColor = 0;
+}
+
+void AddFlare(const Vec2f & pos, float sm, short typ, Entity * io, bool bookDraw) {
 
+	g_magicFlares.addFlare(pos, sm, typ, io, bookDraw);
 }
 
 //! Helper for FlareLine
@@ -340,9 +384,9 @@ void ARX_MAGICAL_FLARES_Update() {
 	if(!g_magicFlaresCount)
 		return;
 
-	shinum++;
-	if(shinum >= 10) {
-		shinum = 1;
+	g_magicFlares.shinum++;
+	if(g_magicFlares.shinum >= 10) {
+		g_magicFlares.shinum = 1;
 	}
 
 	PlatformDuration diff = g_platformTime.lastFrameDuration();
@@ -361,7 +405,7 @@ void ARX_MAGICAL_FLARES_Update() {
 			case 2:  surf = g_magicFlareTextures.lumignon; break;
 			case 3:  surf = g_magicFlareTextures.lumignon2; break;
 			case 4:  surf = g_magicFlareTextures.plasm; break;
-			default: surf = g_magicFlareTextures.shine[shinum]; break;
+			default: surf = g_magicFlareTextures.shine[g_magicFlares.shinum]; break;
 		}
 
 		mat.setTexture(surf);
@@ -392,7 +436,7 @@ void ARX_MAGICAL_FLARES_Update() {
 			}
 
 			if(flare.tolive <= 0 || flare.pos.y < -64.f || size < 3.f) {
-				removeFlare(flare);
+				g_magicFlares.removeFlare(flare);
 				continue;
 			}