Commit: 91ae155d5b47b8a82b0e4bfe1b288689944079b5 - OfficeWork_cocos2d (hg)

Commit MetaInfo

• Revisão: 91ae155d5b47b8a82b0e4bfe1b288689944079b5 (tree)
• Hora: 2016-09-17 05:42:55
• Autor: sebastian_ <bugiu@head...>
• Commiter: sebastian_

Mensagem de Log

Loading level.

Mudança Sumário

• modified: Classes/EventProperties.h
• modified: Classes/EventRelation.cpp
• modified: Classes/EventRelation.h
• modified: Classes/GateControl.cpp
• modified: Classes/GateControl.h
• modified: proj.win32/OfficeWork.vcxproj
• modified: proj.win32/OfficeWork.vcxproj.filters
• add: Classes/BoilerExplosion.cpp
• add: Classes/BoilerExplosion.h
• add: Classes/GateChange.cpp
• add: Classes/GateChange.h
• add: Classes/KillBoss.cpp
• add: Classes/KillBoss.h

Diff

diff -r 77ad7fc84c32 -r 91ae155d5b47 Classes/BoilerExplosion.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Classes/BoilerExplosion.cpp	Fri Sep 16 23:42:55 2016 +0300
@@ -0,0 +1,5 @@
+#include "BoilerExplosion.h"
+
+void BoilerExplosionEvent::operator()()
+{
+}

diff -r 77ad7fc84c32 -r 91ae155d5b47 Classes/BoilerExplosion.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Classes/BoilerExplosion.h	Fri Sep 16 23:42:55 2016 +0300
@@ -0,0 +1,13 @@
+#ifndef _BOILER_EXPLOSION_H_
+#define _BOILER_EXPLOSION_H_
+
+#include "Event.h"
+
+class BoilerExplosionEvent : public GameEvent::Event
+{
+public:
+    void operator()() override;
+};
+
+#endif
+

diff -r 77ad7fc84c32 -r 91ae155d5b47 Classes/EventProperties.h
--- a/Classes/EventProperties.h	Fri Sep 16 20:08:09 2016 +0300
+++ b/Classes/EventProperties.h	Fri Sep 16 23:42:55 2016 +0300
@@ -7,17 +7,22 @@
 class EventProperties : public artemis::Component
 {
 private:
-    std::unique_ptr<GameEvent::Event> event;
+    std::shared_ptr<GameEvent::Event> event;
     int scoreIncrease;
     bool eventDone;
 
 public:
-    EventProperties()
+    EventProperties(std::unique_ptr<GameEvent::Event> event_) : event(std::move(event_))
     {
         
     }
 
 
+    std::shared_ptr<GameEvent::Event> getEvent() const
+    {
+        return event;
+    }
+
     int getScoreIncrease() const
     {
         return scoreIncrease;

diff -r 77ad7fc84c32 -r 91ae155d5b47 Classes/EventRelation.cpp
--- a/Classes/EventRelation.cpp	Fri Sep 16 20:08:09 2016 +0300
+++ b/Classes/EventRelation.cpp	Fri Sep 16 23:42:55 2016 +0300
@@ -1,1 +1,20 @@
-#include "EventRelation.h"
\ No newline at end of file
+#include "EventRelation.h"
+
+EventRelation::EventRelation(artemis::Entity& controller_, artemis::World& world) : controller(controller_)
+{
+    eventPropertiesMapper.init(world);
+}
+
+void EventRelation::addAffectedEntity(artemis::Entity& entity)
+{
+    affectedEntities.push_back(entity);
+}
+
+void EventRelation::affectEntities()
+{
+    for (auto& entity : affectedEntities)
+    {
+        auto eventProperties = eventPropertiesMapper.get(entity);
+        (*eventProperties->getEvent())();        
+    }
+}

diff -r 77ad7fc84c32 -r 91ae155d5b47 Classes/EventRelation.h
--- a/Classes/EventRelation.h	Fri Sep 16 20:08:09 2016 +0300
+++ b/Classes/EventRelation.h	Fri Sep 16 23:42:55 2016 +0300
@@ -1,9 +1,26 @@
 #ifndef _EVENT_RELATION_H_
 #define _EVENT_RELATION_H_
+#include <vector>
+#include "EventProperties.h"
+#include "artemis/src/Artemis/ComponentMapper.h"
+
+namespace artemis{
+    class Entity;
+}
 
 class EventRelation
 {
-    
+private:
+    artemis::Entity& controller;
+    std::vector<std::reference_wrapper<artemis::Entity>> affectedEntities;
+    artemis::ComponentMapper<EventProperties> eventPropertiesMapper;
+
+public:
+    EventRelation(artemis::Entity& controller_, artemis::World& world);
+
+    void addAffectedEntity(artemis::Entity& entity);
+
+    void affectEntities();
 };
 
 #endif

diff -r 77ad7fc84c32 -r 91ae155d5b47 Classes/GateChange.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Classes/GateChange.cpp	Fri Sep 16 23:42:55 2016 +0300
@@ -0,0 +1,5 @@
+#include "GateChange.h"
+
+void GateChangeEvent::operator()()
+{
+}

diff -r 77ad7fc84c32 -r 91ae155d5b47 Classes/GateChange.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Classes/GateChange.h	Fri Sep 16 23:42:55 2016 +0300
@@ -0,0 +1,12 @@
+#ifndef _GATE_CHANGE_H_
+#define _GATE_CHANGE_H_
+#include "Event.h"
+
+class GateChangeEvent : public GameEvent::Event
+{
+public:
+    void operator()() override;
+};
+
+#endif
+

diff -r 77ad7fc84c32 -r 91ae155d5b47 Classes/GateControl.cpp
--- a/Classes/GateControl.cpp	Fri Sep 16 20:08:09 2016 +0300
+++ b/Classes/GateControl.cpp	Fri Sep 16 23:42:55 2016 +0300
@@ -1,5 +1,10 @@
 #include "GateControl.h"
 
+GateControlEvent::GateControlEvent(std::unique_ptr<EventRelation> eventRelation_) : eventRelation(std::move(eventRelation_))
+{
+}
+
 void GateControlEvent::operator()()
 {
+    eventRelation->affectEntities();
 }

diff -r 77ad7fc84c32 -r 91ae155d5b47 Classes/GateControl.h
--- a/Classes/GateControl.h	Fri Sep 16 20:08:09 2016 +0300
+++ b/Classes/GateControl.h	Fri Sep 16 23:42:55 2016 +0300
@@ -1,11 +1,18 @@
 #ifndef _GATE_CONTROL_H_
 #define _GATE_CONTROL_H_
 #include "Event.h"
+#include "EventRelation.h"
+#include <memory>
 
 class GateControlEvent : public GameEvent::Event
 {
+private:
+    std::unique_ptr<EventRelation> eventRelation;
 public:
+    explicit GateControlEvent(std::unique_ptr<EventRelation> eventRelation);
+
     void operator()() override;
+
 };
 
 #endif

diff -r 77ad7fc84c32 -r 91ae155d5b47 Classes/KillBoss.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Classes/KillBoss.cpp	Fri Sep 16 23:42:55 2016 +0300
@@ -0,0 +1,5 @@
+#include "KillBoss.h"
+
+void KillBossEvent::operator()()
+{
+}

diff -r 77ad7fc84c32 -r 91ae155d5b47 Classes/KillBoss.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Classes/KillBoss.h	Fri Sep 16 23:42:55 2016 +0300
@@ -0,0 +1,13 @@
+#ifndef _KILL_BOSS_H_
+#define _KILL_BOSS_H_
+
+#include "Event.h"
+
+class KillBossEvent : public GameEvent::Event
+{
+public:
+    void operator()() override;
+};
+
+#endif
+

diff -r 77ad7fc84c32 -r 91ae155d5b47 proj.win32/OfficeWork.vcxproj
--- a/proj.win32/OfficeWork.vcxproj	Fri Sep 16 20:08:09 2016 +0300
+++ b/proj.win32/OfficeWork.vcxproj	Fri Sep 16 23:42:55 2016 +0300
@@ -160,14 +160,17 @@
     <ClCompile Include="..\Classes\artemis\src\TagManager.cpp" />
     <ClCompile Include="..\Classes\artemis\src\VoidEntitySystem.cpp" />
     <ClCompile Include="..\Classes\artemis\src\World.cpp" />
+    <ClCompile Include="..\Classes\BoilerExplosion.cpp" />
     <ClCompile Include="..\Classes\CollisionDetectionSystem.cpp" />
     <ClCompile Include="..\Classes\ControlPanel.cpp" />
     <ClCompile Include="..\Classes\CreditsMenuScene.cpp" />
     <ClCompile Include="..\Classes\EventRelation.cpp" />
+    <ClCompile Include="..\Classes\GateChange.cpp" />
     <ClCompile Include="..\Classes\GateControl.cpp" />
     <ClCompile Include="..\Classes\HighScoreScene.cpp" />
     <ClCompile Include="..\Classes\GameScene.cpp" />
     <ClCompile Include="..\Classes\InGameMenuScene.cpp" />
+    <ClCompile Include="..\Classes\KillBoss.cpp" />
     <ClCompile Include="..\Classes\Level.cpp" />
     <ClCompile Include="..\Classes\LevelUpdateSystem.cpp" />
     <ClCompile Include="..\Classes\MainMenuScene.cpp" />
@@ -210,6 +213,7 @@
     <ClInclude Include="..\Classes\artemis\src\Artemis\TypeInfoComparator.h" />
     <ClInclude Include="..\Classes\artemis\src\Artemis\VoidEntitySystem.h" />
     <ClInclude Include="..\Classes\artemis\src\Artemis\World.h" />
+    <ClInclude Include="..\Classes\BoilerExplosion.h" />
     <ClInclude Include="..\Classes\CollisionDetectionSystem.h" />
     <ClInclude Include="..\Classes\ControlPanel.h" />
     <ClInclude Include="..\Classes\CreditsMenuScene.h" />
@@ -219,9 +223,11 @@
     <ClInclude Include="..\Classes\EventRelation.h" />
     <ClInclude Include="..\Classes\GameResources.h" />
     <ClInclude Include="..\Classes\GameScene.h" />
+    <ClInclude Include="..\Classes\GateChange.h" />
     <ClInclude Include="..\Classes\GateControl.h" />
     <ClInclude Include="..\Classes\HighScoreScene.h" />
     <ClInclude Include="..\Classes\InGameMenuScene.h" />
+    <ClInclude Include="..\Classes\KillBoss.h" />
     <ClInclude Include="..\Classes\Level.h" />
     <ClInclude Include="..\Classes\LevelProperties.h" />
     <ClInclude Include="..\Classes\LevelUpdateSystem.h" />

diff -r 77ad7fc84c32 -r 91ae155d5b47 proj.win32/OfficeWork.vcxproj.filters
--- a/proj.win32/OfficeWork.vcxproj.filters	Fri Sep 16 20:08:09 2016 +0300
+++ b/proj.win32/OfficeWork.vcxproj.filters	Fri Sep 16 23:42:55 2016 +0300
@@ -159,6 +159,15 @@
     <ClCompile Include="..\Classes\EventRelation.cpp">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\Classes\GateChange.cpp">
+      <Filter>src\events</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Classes\BoilerExplosion.cpp">
+      <Filter>src\events</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Classes\KillBoss.cpp">
+      <Filter>src\events</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="main.h">
@@ -335,6 +344,15 @@
     <ClInclude Include="..\Classes\EventRelation.h">
       <Filter>src</Filter>
     </ClInclude>
+    <ClInclude Include="..\Classes\GateChange.h">
+      <Filter>src\events</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Classes\BoilerExplosion.h">
+      <Filter>src\events</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Classes\KillBoss.h">
+      <Filter>src\events</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="game.rc">