DamageIndicator is now disabled for Friendly fire

include/Engine/Rendering/TextPass.h

@@ -23,7 +23,6 @@ public:
 
 private:
     void renderText(std::string text, Font* font, TextJob::AlignmentEnum alignment, glm::vec4 color, glm::mat4 modelMatrix, glm::mat4 projectionMatrix, glm::mat4 viewMatrix);
-	std::string parseColors(std::string text, std::map<int, glm::vec4>& colorChanges, glm::vec4 originalColor);
 
     Font* font;
     GLuint VAO, VBO;

include/Game/Systems/AmmoPickupSystem.h

@@ -40,17 +40,5 @@ private:
     };
     std::vector<EntityAtMaxValuePickupStruct> m_PickupAtMaximum;
     void DoPickup(EntityWrapper &player, EntityWrapper &trigger);
-    //class
-    enum class PlayerClass {
-        Assault,
-        Defender,
-        Sniper,
-        None
-    };
-    //helper methods
-    bool DoesPlayerHaveMaxAmmo(EntityWrapper &player);
-    PlayerClass DetermineClass(EntityWrapper &player);
-    void SetPlayerAmmo(EntityWrapper &player, int ammoGain);
-    int GetPlayerMaxAmmo(EntityWrapper &player);
 };
 #endif

include/Game/Systems/DamageIndicatorSystem.h

@@ -15,6 +15,7 @@
 
 #include "Rendering/Util/CommonFunctions.h"
 //#define INDICATOR_TEST
+#include "Core/ConfigFile.h"
 
 class DamageIndicatorSystem : public ImpureSystem
 {
@@ -40,6 +41,8 @@ private:
     std::vector<DamageIndicatorStruct> updateDamageIndicatorVector;
     float CalculateAngle(EntityWrapper player, glm::vec3 enemyPos);
 
+    bool m_NetworkEnabled;
+
     //for tests
 #ifdef INDICATOR_TEST
     glm::vec3 DamageIndicatorTest(EntityWrapper player);

src/Engine/Rendering/TextPass.cpp

@@ -7,23 +7,23 @@ TextPass::TextPass()
 
 void TextPass::Initialize()
 {
-	glGenVertexArrays(1, &VAO);
-	glGenBuffers(1, &VBO);
-	glBindVertexArray(VAO);
-	glBindBuffer(GL_ARRAY_BUFFER, VBO);
-	glBufferData(GL_ARRAY_BUFFER, sizeof(GLfloat) * 6 * 4, NULL, GL_DYNAMIC_DRAW);
-	glEnableVertexAttribArray(0);
-	glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, 4 * sizeof(GLfloat), 0);
-	glBindBuffer(GL_ARRAY_BUFFER, 0);
-	glBindVertexArray(0);
+    glGenVertexArrays(1, &VAO);
+    glGenBuffers(1, &VBO);
+    glBindVertexArray(VAO);
+    glBindBuffer(GL_ARRAY_BUFFER, VBO);
+    glBufferData(GL_ARRAY_BUFFER, sizeof(GLfloat) * 6 * 4, NULL, GL_DYNAMIC_DRAW);
+    glEnableVertexAttribArray(0);
+    glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, 4 * sizeof(GLfloat), 0);
+    glBindBuffer(GL_ARRAY_BUFFER, 0);
+    glBindVertexArray(0);
 
-	m_TextProgram = ResourceManager::Load<ShaderProgram>("#TextProgram");
-	m_TextProgram->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/Text.vert.glsl")));
-	m_TextProgram->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/Text.frag.glsl")));
-	m_TextProgram->Compile();
-	m_TextProgram->BindFragDataLocation(0, "sceneColor");
-	m_TextProgram->BindFragDataLocation(1, "bloomColor");
-	m_TextProgram->Link();
+    m_TextProgram = ResourceManager::Load<ShaderProgram>("#TextProgram");
+    m_TextProgram->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/Text.vert.glsl")));
+    m_TextProgram->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/Text.frag.glsl")));
+    m_TextProgram->Compile();
+    m_TextProgram->BindFragDataLocation(0, "sceneColor");
+    m_TextProgram->BindFragDataLocation(1, "bloomColor");
+    m_TextProgram->Link();
 }
 
 void TextPass::Update()
@@ -33,180 +33,81 @@ void TextPass::Update()
 
 void TextPass::Draw(RenderScene& scene, FrameBuffer& frameBuffer)
 {
-	GLERROR("Derp1");
-	TextPassState* state = new TextPassState(frameBuffer.GetHandle());
-	for (auto &job : scene.Jobs.Text) {
-		auto textJob = std::dynamic_pointer_cast<TextJob>(job);
-		if (textJob) {
+    GLERROR("Derp1");
+    TextPassState* state = new TextPassState(frameBuffer.GetHandle());
+    for (auto &job : scene.Jobs.Text) {
+        auto textJob = std::dynamic_pointer_cast<TextJob>(job);
+        if (textJob) {
 
-			renderText(textJob->Content, textJob->Resource, textJob->Alignment, textJob->Color, textJob->Matrix, scene.Camera->ProjectionMatrix(), scene.Camera->ViewMatrix());
-		}
-	}
-	GLERROR("Derp2");
-	delete state;
-}
-
-std::string TextPass::parseColors(std::string text, std::map<int, glm::vec4>& colorChanges, glm::vec4 originalColor)
-{
-	std::string parsedString = text;
-	glm::vec4 newColor = originalColor;
-	bool colorChange = false;
-
-	for (std::string::const_iterator c = parsedString.begin(); c != parsedString.end(); c++) {
-		if (*c == char(92)) { // Backlash
-			if ((c + 1) != parsedString.end()) {
-				if (*(c + 1) == char('C')) { // C for Color 
-					if ((c + 7) != parsedString.end()) {
-						bool hasCorrectFormat = true;
-
-						for (std::string::const_iterator colorC = c + 2; colorC != c + 8; colorC++) {
-							if (*colorC < '0' || *colorC > 'F') {
-								hasCorrectFormat = false;
-								break;
-							}
-						}
-
-						if (hasCorrectFormat == true) {
-							colorChange = true;
-
-							std::array<int, 3> hexToInt = {
-								std::stoi(std::string(c + 2, c + 4), 0, 16),
-								std::stoi(std::string(c + 4, c + 6), 0, 16),
-								std::stoi(std::string(c + 6, c + 8), 0, 16)
-							};
-
-							newColor = glm::vec4(
-								float(hexToInt[0]) / 255.f,
-								float(hexToInt[1]) / 255.f,
-								float(hexToInt[2]) / 255.f,
-								newColor.a);
-
-							parsedString.erase(c, (c + 8));
-						}
-					}
-				}
-
-				if (*(c + 1) == char('A')) { // A for Alpha
-					if ((c + 3) != parsedString.end()) {
-						bool hasCorrectFormat = true;
-
-						for (std::string::const_iterator colorC = c + 2; colorC != c + 4; colorC++) {
-							if (*colorC < '0' || *colorC > 'F') {
-								hasCorrectFormat = false;
-								break;
-							}
-						}
-
-						if (hasCorrectFormat == true) {
-							colorChange = true;
-
-							int hexToInt = std::stoi(std::string(c + 2, c + 4), 0, 16);
-
-							newColor = glm::vec4(
-								newColor.r,
-								newColor.g,
-								newColor.b,
-								float(hexToInt) / 255.f);
-
-							parsedString.erase(c, (c + 4));
-						}
-					}
-				}
-
-				if ((*(c + 1) >= '1' && *(c + 1) <= '9') || *(c + 1) == 'B' || *(c + 1) == 'E' || *(c + 1) == 'F') { // Icons
-					if (*(c + 1) >= '1' && *(c + 1) <= '9') {
-						parsedString.replace(c, (c + 2), 1, (*(c + 1) - 48));
-					}
-					else {
-						parsedString.replace(c, (c + 2), 1, (*(c + 1) - 55));
-					}
-				}
-
-				if (colorChange) {
-					colorChanges[c - parsedString.begin()] = newColor;
-				}
-			}
-		}
-	}
-
-
-
-	return parsedString;
+            renderText(textJob->Content, textJob->Resource, textJob->Alignment, textJob->Color, textJob->Matrix, scene.Camera->ProjectionMatrix(), scene.Camera->ViewMatrix());
+        }
+    }
+    GLERROR("Derp2");
+    delete state;
 }
 
 void TextPass::renderText(std::string text, Font* font, TextJob::AlignmentEnum alignment, glm::vec4 color, glm::mat4 modelMatrix, glm::mat4 projectionMatrix, glm::mat4 viewMatrix)
 {
-	GLfloat penX = 0;
-	GLfloat penY = 0;
-	GLfloat scale = 1.0 / font->FontSize;
+    GLfloat penX = 0;
+    GLfloat penY = 0;
+    GLfloat scale = 1.0/font->FontSize;
 
-	GLfloat stringWidth = 0.f;
+    GLfloat stringWidth = 0.f;
 
-	std::map<int, glm::vec4> colorChanges;
-	std::string parsedText = parseColors(text, colorChanges, color);
+    for (std::string::const_iterator c = text.begin(); c != text.end(); c++) {
+        Font::Character ch = font->m_Characters[*c];
+        stringWidth += (ch.Advance >> 6) * scale;
+    }
 
-	for (std::string::const_iterator c = parsedText.begin(); c != parsedText.end(); c++) {
-		Font::Character ch = font->m_Characters[*c];
-		stringWidth += (ch.Advance >> 6) * scale;
-	}
+    if(alignment == TextJob::AlignmentEnum::Center) {
+        penX = -stringWidth/2.f;
+    } else if (alignment == TextJob::AlignmentEnum::Right) {
+        penX = -stringWidth;
+    } else {
+        penX = 0;
+    }	
+    
+    
 
-	if (alignment == TextJob::AlignmentEnum::Center) {
-		penX = -stringWidth / 2.f;
-	}
-	else if (alignment == TextJob::AlignmentEnum::Right) {
-		penX = -stringWidth;
-	}
-	else {
-		penX = 0;
-	}
+    m_TextProgram->Bind();
+    glUniform4fv(glGetUniformLocation(m_TextProgram->GetHandle(), "textColor"), 1, glm::value_ptr(color));
+    glUniformMatrix4fv(glGetUniformLocation(m_TextProgram->GetHandle(), "M"), 1, GL_FALSE, glm::value_ptr(modelMatrix));
+    glUniformMatrix4fv(glGetUniformLocation(m_TextProgram->GetHandle(), "V"), 1, GL_FALSE, glm::value_ptr(viewMatrix));
+    glUniformMatrix4fv(glGetUniformLocation(m_TextProgram->GetHandle(), "P"), 1, GL_FALSE, glm::value_ptr(projectionMatrix));
+    glActiveTexture(GL_TEXTURE0);
+    glBindVertexArray(VAO);
 
 
+    for (std::string::const_iterator c = text.begin(); c != text.end(); c++) {
+        Font::Character ch = font->m_Characters[*c];
 
-	m_TextProgram->Bind();
-	glUniform4fv(glGetUniformLocation(m_TextProgram->GetHandle(), "textColor"), 1, glm::value_ptr(color));
-	glUniformMatrix4fv(glGetUniformLocation(m_TextProgram->GetHandle(), "M"), 1, GL_FALSE, glm::value_ptr(modelMatrix));
-	glUniformMatrix4fv(glGetUniformLocation(m_TextProgram->GetHandle(), "V"), 1, GL_FALSE, glm::value_ptr(viewMatrix));
-	glUniformMatrix4fv(glGetUniformLocation(m_TextProgram->GetHandle(), "P"), 1, GL_FALSE, glm::value_ptr(projectionMatrix));
-	glActiveTexture(GL_TEXTURE0);
-	glBindVertexArray(VAO);
+        GLfloat xpos = penX + ch.Bearing.x * scale;
+        GLfloat ypos = penY - (ch.Size.y - ch.Bearing.y) * scale;
 
+        GLfloat w = ch.Size.x * scale;
+        GLfloat h = ch.Size.y * scale;
 
-	for (std::string::const_iterator c = parsedText.begin(); c != parsedText.end(); c++) {
+        GLfloat vertices[6][4] = {
+            { xpos, ypos + h, 0.0, 0.0 },
+            { xpos, ypos, 0.0, 1.0 },
+            { xpos + w, ypos, 1.0, 1.0 },
 
-		auto it = colorChanges.find(c - parsedText.begin());
-		if (it != colorChanges.end()) {
-			glUniform4fv(glGetUniformLocation(m_TextProgram->GetHandle(), "textColor"), 1, glm::value_ptr(it->second));
-		}
+            { xpos, ypos + h, 0.0, 0.0 },
+            { xpos + w, ypos, 1.0, 1.0 },
+            { xpos + w, ypos + h, 1.0, 0.0 }
+        };
 
-		Font::Character ch = font->m_Characters[*c];
+        glBindTexture(GL_TEXTURE_2D, ch.TextureID);
 
-		GLfloat xpos = penX + ch.Bearing.x * scale;
-		GLfloat ypos = penY - (ch.Size.y - ch.Bearing.y) * scale;
+        glBindBuffer(GL_ARRAY_BUFFER, VBO);
+        glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(vertices), vertices);
+        glBindBuffer(GL_ARRAY_BUFFER, 0);
+        glDrawArrays(GL_TRIANGLES, 0, 6);
+        penX += (ch.Advance >> 6) * scale; // Bitshift by 6 to get value in pixels (2^6 = 64)
+    }
+    glBindVertexArray(0);
+    glBindTexture(GL_TEXTURE_2D, 0);
 
-		GLfloat w = ch.Size.x * scale;
-		GLfloat h = ch.Size.y * scale;
-
-		GLfloat vertices[6][4] = {
-			{ xpos, ypos + h, 0.0, 0.0 },
-			{ xpos, ypos, 0.0, 1.0 },
-			{ xpos + w, ypos, 1.0, 1.0 },
-
-			{ xpos, ypos + h, 0.0, 0.0 },
-			{ xpos + w, ypos, 1.0, 1.0 },
-			{ xpos + w, ypos + h, 1.0, 0.0 }
-		};
-
-		glBindTexture(GL_TEXTURE_2D, ch.TextureID);
-
-		glBindBuffer(GL_ARRAY_BUFFER, VBO);
-		glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(vertices), vertices);
-		glBindBuffer(GL_ARRAY_BUFFER, 0);
-		glDrawArrays(GL_TRIANGLES, 0, 6);
-		penX += (ch.Advance >> 6) * scale; // Bitshift by 6 to get value in pixels (2^6 = 64)
-	}
-	glBindVertexArray(0);
-	glBindTexture(GL_TEXTURE_2D, 0);
-
-	GLERROR("Text rendering Error");
+    GLERROR("Text rendering Error");
 }
 

src/Game/Systems/AmmoPickupSystem.cpp

@@ -37,7 +37,8 @@ void AmmoPickupSystem::Update(double dt)
 
                 //erase the current element (somePickup)
                 it = m_ETriggerTouchVector.erase(it);
-            } else {
+            }
+            else { 
                 it++;
             }
         }
@@ -47,7 +48,7 @@ void AmmoPickupSystem::Update(double dt)
                 m_PickupAtMaximum.erase(it);
                 break;
             }
-            if (!DoesPlayerHaveMaxAmmo(it->player)) {
+            if ((int)it->player["AssaultWeapon"]["Ammo"] < (int)it->player["AssaultWeapon"]["MaxAmmo"]) {
                 DoPickup(it->player, it->trigger);
                 m_PickupAtMaximum.erase(it);
                 break;
@@ -55,58 +56,6 @@ void AmmoPickupSystem::Update(double dt)
         }
     }
 }
-bool AmmoPickupSystem::DoesPlayerHaveMaxAmmo(EntityWrapper &player) {
-    PlayerClass playerClass = DetermineClass(player);
-    if (playerClass == PlayerClass::Defender) {
-        return !((int)player["DefenderWeapon"]["Ammo"] < (int)player["DefenderWeapon"]["MaxAmmo"]);
-    } else if (playerClass == PlayerClass::Sniper) {
-        return !((int)player["SniperWeapon"]["Ammo"] < (int)player["SniperWeapon"]["MaxAmmo"]);
-    } else if (playerClass == PlayerClass::Assault) {
-        return !((int)player["AssaultWeapon"]["Ammo"] < (int)player["AssaultWeapon"]["MaxAmmo"]);
-    } else {
-        return false;
-    }
-}
-void AmmoPickupSystem::SetPlayerAmmo(EntityWrapper &player, int ammoGain) {
-    int maxWeaponAmmo = GetPlayerMaxAmmo(player);
-
-    PlayerClass playerClass = DetermineClass(player);
-    if (playerClass == PlayerClass::Defender) {
-        (int&)player["DefenderWeapon"]["Ammo"] = std::min((int)player["DefenderWeapon"]["Ammo"] + ammoGain, maxWeaponAmmo);
-    } else if (playerClass == PlayerClass::Sniper) {
-        (int&)player["SniperWeapon"]["Ammo"] = std::min((int)player["SniperWeapon"]["Ammo"] + ammoGain, maxWeaponAmmo);
-    } else if (playerClass == PlayerClass::Assault) {
-        (int&)player["AssaultWeapon"]["Ammo"] = std::min((int)player["AssaultWeapon"]["Ammo"] + ammoGain, maxWeaponAmmo);
-    } else {
-        //unknown class - ignore
-    }
-}
-int AmmoPickupSystem::GetPlayerMaxAmmo(EntityWrapper &player) {
-    PlayerClass playerClass = DetermineClass(player);
-    if (playerClass == PlayerClass::Defender) {
-        return (int)player["DefenderWeapon"]["MaxAmmo"];
-    } else if (playerClass == PlayerClass::Sniper) {
-        return (int)player["SniperWeapon"]["MaxAmmo"];
-    } else if (playerClass == PlayerClass::Assault) {
-        return (int)player["AssaultWeapon"]["MaxAmmo"];
-    } else {
-        return -1;
-    }
-}
-AmmoPickupSystem::PlayerClass AmmoPickupSystem::DetermineClass(EntityWrapper &player)
-{
-    //determine the class based on what component the inflictor-player has
-    if (m_World->HasComponent(player.ID, "DashAbility")) {
-        return PlayerClass::Assault;
-    }
-    if (m_World->HasComponent(player.ID, "ShieldAbility")) {
-        return PlayerClass::Defender;
-    }
-    if (m_World->HasComponent(player.ID, "SprintAbility")) {
-        return PlayerClass::Sniper;
-    }
-    return PlayerClass::None;
-}
 
 bool AmmoPickupSystem::OnTriggerTouch(Events::TriggerTouch& e)
 {
@@ -114,7 +63,7 @@ bool AmmoPickupSystem::OnTriggerTouch(Events::TriggerTouch& e)
         return false;
     }
     //TODO: add other weapontypes
-    if (DetermineClass(e.Entity) == PlayerClass::None) {
+    if (!e.Entity.HasComponent("AssaultWeapon")) {
         return false;
     }
     if (!e.Trigger.HasComponent("AmmoPickup")) {
@@ -122,7 +71,7 @@ bool AmmoPickupSystem::OnTriggerTouch(Events::TriggerTouch& e)
     }
 
     //if at maxammo, save the trigger-touch to a vector since standing inside it will not re-trigger the trigger
-    if (DoesPlayerHaveMaxAmmo(e.Entity)) {
+    if ((int)e.Entity["AssaultWeapon"]["Ammo"] >= (int)e.Entity["AssaultWeapon"]["MaxAmmo"]) {
         m_PickupAtMaximum.push_back({ e.Entity, e.Trigger });
         return false;
     }
@@ -136,16 +85,19 @@ bool AmmoPickupSystem::OnAmmoPickup(Events::AmmoPickup & e)
         return false;
     }
     //TODO: add other weapontypes
-    if (DetermineClass(e.Player) == PlayerClass::None) {
+    if (!e.Player.HasComponent("AssaultWeapon")) {
         return false;
     }
+    int maxWeaponAmmo = (int)e.Player["AssaultWeapon"]["MaxAmmo"];
+    int& currentAmmo = (int)e.Player["AssaultWeapon"]["Ammo"];
     //cant pick up ammopacks if you are already at MaxAmmo
-    if (DoesPlayerHaveMaxAmmo(e.Player)) {
+    if (currentAmmo >= maxWeaponAmmo) {
         return false;
     }
-    SetPlayerAmmo(e.Player, e.AmmoGain);
 
-    return true;
+    currentAmmo = std::min(currentAmmo + e.AmmoGain, maxWeaponAmmo);
+
+    return false;
 }
 
 bool AmmoPickupSystem::OnTriggerLeave(Events::TriggerLeave& e) {
@@ -167,7 +119,7 @@ void AmmoPickupSystem::DoPickup(EntityWrapper &player, EntityWrapper &trigger) {
     if (!trigger.Valid()) {
         return;
     }
-    int maxWeaponAmmo = GetPlayerMaxAmmo(player);
+    int maxWeaponAmmo = (int)player["AssaultWeapon"]["MaxAmmo"];
     int ammoGiven = 0.01*(double)trigger["AmmoPickup"]["AmmoGain"] * maxWeaponAmmo;
 
     Events::AmmoPickup ePlayerAmmoPickup;

src/Game/Systems/DamageIndicatorSystem.cpp

@@ -10,10 +10,11 @@ DamageIndicatorSystem::DamageIndicatorSystem(SystemParams params)
     //load texture to cache
     auto texture = CommonFunctions::LoadTexture("Textures/DamageIndicator.png", false);
     auto entityFile = ResourceManager::Load<EntityXMLFile>("Schema/Entities/DamageIndicator.xml");
+    m_NetworkEnabled = ResourceManager::Load<ConfigFile>("Config.ini")->Get("Networking.StartNetwork", false);
 }
 
 void DamageIndicatorSystem::Update(double dt) {
-    if (!IsServer && LocalPlayer.Valid()) {
+    if ((!IsServer || !m_NetworkEnabled) && LocalPlayer.Valid()) {
         for (auto& iter = updateDamageIndicatorVector.begin(); iter != updateDamageIndicatorVector.end(); iter++) {
             if (!iter->spriteEntity.Valid()) {
                 updateDamageIndicatorVector.erase(iter);
@@ -40,10 +41,15 @@ bool DamageIndicatorSystem::OnPlayerDamage(Events::PlayerDamage& e)
         return false;
     }
 
+    //friendly fire - return
+    if (e.Damage < 0.1f) {
+        return false;
+    }
+
     glm::vec3 inflictorPos = e.Inflictor["Transform"]["Position"];
     //if testing
 #ifdef INDICATOR_TEST
-        inflictorPos = DamageIndicatorTest(e.Victim);
+    inflictorPos = DamageIndicatorTest(e.Victim);
 #endif
 
     float angleBetweenVectors = CalculateAngle(e.Victim, inflictorPos);
@@ -55,7 +61,7 @@ bool DamageIndicatorSystem::OnPlayerDamage(Events::PlayerDamage& e)
     //simply set the rotation z-wise to the angleBetweenVectors
     sprite["Transform"]["Orientation"] = glm::vec3(0, 0, angleBetweenVectors);
 
-    if (!IsServer) {
+    if (!IsServer || !m_NetworkEnabled) {
         updateDamageIndicatorVector.emplace_back(sprite, inflictorPos);
     }
 
@@ -122,7 +128,7 @@ glm::vec3 DamageIndicatorSystem::DamageIndicatorTest(EntityWrapper player) {
     }
     m_TestVar++;
 
-     auto inflictorPos = glm::vec3(currentPos.x + testVar*6.0f, currentPos.y, currentPos.z + testVar2*6.0f);
+    auto inflictorPos = glm::vec3(currentPos.x + testVar*6.0f, currentPos.y, currentPos.z + testVar2*6.0f);
 
     //load the explosioneffect XML
     auto deathEffect = ResourceManager::Load<EntityXMLFile>("Schema/Entities/PlayerDeathExplosionWithCamera.xml");