Fog of war

PaintWars/Project_II_Game/Motor2D/Barracks.cpp

@@ -34,6 +34,13 @@ Barracks::Barracks(iPoint tile, int damage, j1Module* listener, Entity* creator)
 	isEntityFromPlayer = true;
 
 	isSpawningAUnit = false;
+
+	uint visibilityRadius = 5;
+
+	fow_entity->frontier = App->fow->CreateSightQuad(visibilityRadius, fow_entity->position);
+	fow_entity->LOS = App->fow->FulfillSight(fow_entity->frontier);
+
+
 }
 
 Barracks::~Barracks() {}

PaintWars/Project_II_Game/Motor2D/Entity.cpp

@@ -21,6 +21,9 @@ Entity::Entity(iPoint tile, int damage, j1Module* listeners, Entity* creator) :
 	isOnTheMove = false;
 	isAlive = true;
 	spawningProgress = 0;
+
+	fow_entity = App->fow->CreateFOWEntity(currentTile, true);
+
 }
 
 Entity::~Entity() {

PaintWars/Project_II_Game/Motor2D/Entity.h

@@ -8,6 +8,7 @@
 
 #include "j1App.h"
 #include "j1Audio.h"
+#include "j1FogOfWar.h"
 
 class j1Module;
 
@@ -156,6 +157,11 @@ class Entity
 	bool isBuildingSomething;
 	bool isAlive;
 
+	//FOW
+	FOW_Entity* fow_entity = nullptr;
+	bool visible = true;
+	uint visibilityRadius;
+
 	Entity* spawnedBy;
 	Entity* builtBy;
 

PaintWars/Project_II_Game/Motor2D/GameScene.cpp

@@ -287,6 +287,9 @@ bool GameScene::Start()
 
 	App->player->cricketsRepeat.Start();
 
+	App->fow->SetVisibilityMap(App->map->data.width, App->map->data.height);
+
+
 	return ret;
 }
 

PaintWars/Project_II_Game/Motor2D/House.cpp

@@ -33,6 +33,12 @@ House::House(iPoint tile, int damage, j1Module* listener, Entity* creator) : Ent
 	App->player->housingSpace.maxCount += 5;
 
 	isEntityFromPlayer = true;
+
+	uint visibilityRadius = 5;
+
+	fow_entity->frontier = App->fow->CreateSightQuad(visibilityRadius, fow_entity->position);
+	fow_entity->LOS = App->fow->FulfillSight(fow_entity->frontier);
+
 }
 
 House::~House() {}

PaintWars/Project_II_Game/Motor2D/Motor2D.vcxproj

@@ -91,6 +91,7 @@
     <ClCompile Include="House.cpp" />
     <ClCompile Include="j1ButtonUI.cpp" />
     <ClCompile Include="j1Collision.cpp" />
+    <ClCompile Include="j1FogOfWar.cpp" />
     <ClCompile Include="j1UIElements.cpp" />
     <ClCompile Include="j1EntityManager.cpp" />
     <ClCompile Include="j1FontsUI.cpp" />
@@ -152,6 +153,7 @@
     <ClInclude Include="j1ButtonUI.h" />
     <ClInclude Include="j1Collision.h" />
     <ClInclude Include="j1EntityManager.h" />
+    <ClInclude Include="j1FogOfWar.h" />
     <ClInclude Include="j1FontsUI.h" />
     <ClInclude Include="j1UI_Manager.h" />
     <ClInclude Include="j1SpritesUI.h" />

PaintWars/Project_II_Game/Motor2D/Motor2D.vcxproj.filters

@@ -172,6 +172,9 @@
     <ClCompile Include="TeamLogoScene.cpp">
       <Filter>Motor  ========\Scenes</Filter>
     </ClCompile>
+    <ClCompile Include="j1FogOfWar.cpp">
+      <Filter>Motor  ========\Modules</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="j1Window.h">
@@ -369,6 +372,9 @@
     <ClInclude Include="TeamLogoScene.h">
       <Filter>Motor  ========\Scenes</Filter>
     </ClInclude>
+    <ClInclude Include="j1FogOfWar.h">
+      <Filter>Motor  ========\Modules</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Programacio 2 ===========">

PaintWars/Project_II_Game/Motor2D/PaintExtractor.cpp

@@ -36,6 +36,12 @@ PaintExtractor::PaintExtractor(iPoint tile, int damage, j1Module* listener, Enti
 		extractionRate *= 1.33f;
 
 	isEntityFromPlayer = true;
+
+	uint visibilityRadius = 6;
+
+	fow_entity->frontier = App->fow->CreateSightQuad(visibilityRadius, fow_entity->position);
+	fow_entity->LOS = App->fow->FulfillSight(fow_entity->frontier);
+
 }
 
 PaintExtractor::~PaintExtractor() {}

PaintWars/Project_II_Game/Motor2D/Painter.cpp

@@ -46,6 +46,13 @@ Painter::Painter(iPoint tile, int damage, j1Module* listener, Entity* creator) :
 		extractionRate *= 1.33f;
 
 	isBuildingSomething = false;
+
+	visibilityRadius = 2;
+
+	fow_entity->frontier = App->fow->CreateSightQuad(visibilityRadius, fow_entity->position);
+	fow_entity->LOS = App->fow->FulfillSight(fow_entity->frontier);
+
+
 }
 
 Painter::~Painter() {}

PaintWars/Project_II_Game/Motor2D/TownHall.cpp

@@ -34,6 +34,12 @@ TownHall::TownHall(iPoint tile, int damage, j1Module* listener, Entity* creator)
 	isEntityFromPlayer = true;
 
 	isSpawningAUnit = false;
+
+	visibilityRadius = 8;
+
+	fow_entity->frontier = App->fow->CreateSightQuad(visibilityRadius, fow_entity->position);
+	fow_entity->LOS = App->fow->FulfillSight(fow_entity->frontier);
+
 }
 
 TownHall::~TownHall() {}

PaintWars/Project_II_Game/Motor2D/Warrior.cpp

@@ -47,6 +47,13 @@ Warrior::Warrior(iPoint tile, int damage, j1Module* listener, Entity* creator) :
 	attackCooldown = attackSpeed;
 
 	isEntityFromPlayer = true;
+
+	uint visibilityRadius = 2;
+
+	fow_entity->frontier = App->fow->CreateSightQuad(visibilityRadius, fow_entity->position);
+	fow_entity->LOS = App->fow->FulfillSight(fow_entity->frontier);
+
+
 }
 
 Warrior::~Warrior() {}

PaintWars/Project_II_Game/Motor2D/WoodProducer.cpp

@@ -34,9 +34,13 @@ WoodProducer::WoodProducer(iPoint tile, int damage, j1Module* listener, Entity*
 
 	constructionTime = 10.0f;
 
-
+	uint visibilityRadius = 6;
 
 	isEntityFromPlayer = true;
+
+	fow_entity->frontier = App->fow->CreateSightQuad(visibilityRadius, fow_entity->position);
+	fow_entity->LOS = App->fow->FulfillSight(fow_entity->frontier);
+
 }
 
 WoodProducer::~WoodProducer() {}

PaintWars/Project_II_Game/Motor2D/j1App.cpp

@@ -23,6 +23,7 @@
 #include "j1SceneManager.h"
 #include "j1QuestManager.h"
 #include "j1Window.h"
+#include "j1FogOfWar.h"
 
 // Constructor
 j1App::j1App(int argc, char* args[]) : argc(argc), args(args)
@@ -42,6 +43,7 @@ j1App::j1App(int argc, char* args[]) : argc(argc), args(args)
 	player = new j1Player();
 	transition_manager = new TransitionManager();
 	quest_manager = new j1QuestManager();
+	fow = new j1FogOfWar();
 
 
 	// Ordered for awake / Start / Update
@@ -61,6 +63,7 @@ j1App::j1App(int argc, char* args[]) : argc(argc), args(args)
 	AddModule(player);
 	AddModule(transition_manager);
 	AddModule(quest_manager);
+	AddModule(fow);
 
 	// render last to swap buffer
 	AddModule(render);

PaintWars/Project_II_Game/Motor2D/j1App.h

@@ -25,6 +25,7 @@ class j1Player;
 class TransitionManager;
 class SceneManager;
 class j1QuestManager;
+class j1FogOfWar;
 
 class j1App 
 {
@@ -107,6 +108,7 @@ class j1App
 	j1FontsUI*			fonts = NULL;
 	TransitionManager*  transition_manager = NULL;
 	j1QuestManager*		quest_manager = NULL;
+	j1FogOfWar*		    fow = NULL;
 
 
 private:

PaintWars/Project_II_Game/Motor2D/j1EntityManager.cpp

@@ -582,6 +582,27 @@ bool j1EntityManager::Update(float dt) {
 
 
 
+
+
+	// Fog of war update (for active entities)
+
+	list<Entity*>::iterator entitiesFoW = activeEntities.begin();
+	while (entitiesFoW != activeEntities.end()) {
+
+		(*entitiesFoW)->fow_entity->is_visible = (*entitiesFoW)->visible;
+
+		if ((*entitiesFoW)->isEntityFromPlayer) {
+			(*entitiesFoW)->fow_entity->SetPos((*entitiesFoW)->currentTile);
+		}
+
+		entitiesFoW++;
+
+	}
+
+
+
+
+
 	//if (App->PAUSE_ACTIVE == true) {
 
 		// Draw all active entities