Commit: 3eb1fe4e1a7b229743957930d2cf4daf86c75be1 - OfficeWork_cocos2d (hg)

Commit MetaInfo

• Revisão: 3eb1fe4e1a7b229743957930d2cf4daf86c75be1 (tree)
• Hora: 2016-10-03 05:46:03
• Autor: sebastian_ <bugiu@head...>
• Commiter: sebastian_

Mensagem de Log

Got rid of event relation.

Mudança Sumário

• modified: Classes/GateControl.cpp
• modified: Classes/GateControl.h
• modified: compile_howto.txt
• modified: proj.win32/OfficeWork.vcxproj
• modified: proj.win32/OfficeWork.vcxproj.filters
• delete: Classes/EventRelation.cpp
• delete: Classes/EventRelation.h

Diff

diff -r dcc9e8c61081 -r 3eb1fe4e1a7b Classes/EventRelation.cpp
--- a/Classes/EventRelation.cpp	Sat Oct 01 22:28:17 2016 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-#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 dcc9e8c61081 -r 3eb1fe4e1a7b Classes/EventRelation.h
--- a/Classes/EventRelation.h	Sat Oct 01 22:28:17 2016 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-#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 dcc9e8c61081 -r 3eb1fe4e1a7b Classes/GateControl.cpp
--- a/Classes/GateControl.cpp	Sat Oct 01 22:28:17 2016 +0300
+++ b/Classes/GateControl.cpp	Sun Oct 02 23:46:03 2016 +0300
@@ -1,11 +1,11 @@
 #include "GateControl.h"
 
-GateControlEvent::GateControlEvent(artemis::World& world_, std::unique_ptr<EventRelation> eventRelation_) 
-    : Event(world_), eventRelation(std::move(eventRelation_))
+GateControlEvent::GateControlEvent(artemis::World& world_) 
+    : Event(world_)
 {
 }
 
 void GateControlEvent::operator()()
 {
-    eventRelation->affectEntities();
+
 }

diff -r dcc9e8c61081 -r 3eb1fe4e1a7b Classes/GateControl.h
--- a/Classes/GateControl.h	Sat Oct 01 22:28:17 2016 +0300
+++ b/Classes/GateControl.h	Sun Oct 02 23:46:03 2016 +0300
@@ -1,15 +1,13 @@
 #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(artemis::World& world_, std::unique_ptr<EventRelation> eventRelation);
+    explicit GateControlEvent(artemis::World& world_);
 
     void operator()() override;
 

diff -r dcc9e8c61081 -r 3eb1fe4e1a7b compile_howto.txt
--- a/compile_howto.txt	Sat Oct 01 22:28:17 2016 +0300
+++ b/compile_howto.txt	Sun Oct 02 23:46:03 2016 +0300
@@ -1,2 +1,5 @@
 Compile for android. If want to compile for x86 add --app-abi x86
-cocos compile -p android --android-studio
\ No newline at end of file
+cocos compile -p android --android-studio
+
+Deploy in bin
+cocos deploy -p win32 -m release
\ No newline at end of file

diff -r dcc9e8c61081 -r 3eb1fe4e1a7b proj.win32/OfficeWork.vcxproj
--- a/proj.win32/OfficeWork.vcxproj	Sat Oct 01 22:28:17 2016 +0300
+++ b/proj.win32/OfficeWork.vcxproj	Sun Oct 02 23:46:03 2016 +0300
@@ -166,7 +166,6 @@
     <ClCompile Include="..\Classes\CreditsMenuScene.cpp" />
     <ClCompile Include="..\Classes\EndCondition.cpp" />
     <ClCompile Include="..\Classes\EventList.cpp" />
-    <ClCompile Include="..\Classes\EventRelation.cpp" />
     <ClCompile Include="..\Classes\EventUpdateSystem.cpp" />
     <ClCompile Include="..\Classes\GameCompletedScene.cpp" />
     <ClCompile Include="..\Classes\GameOverScene.cpp" />
@@ -235,7 +234,6 @@
     <ClInclude Include="..\Classes\Event.h" />
     <ClInclude Include="..\Classes\EventList.h" />
     <ClInclude Include="..\Classes\EventProperties.h" />
-    <ClInclude Include="..\Classes\EventRelation.h" />
     <ClInclude Include="..\Classes\EventUpdateSystem.h" />
     <ClInclude Include="..\Classes\GameCompletedScene.h" />
     <ClInclude Include="..\Classes\GameOverScene.h" />

diff -r dcc9e8c61081 -r 3eb1fe4e1a7b proj.win32/OfficeWork.vcxproj.filters
--- a/proj.win32/OfficeWork.vcxproj.filters	Sat Oct 01 22:28:17 2016 +0300
+++ b/proj.win32/OfficeWork.vcxproj.filters	Sun Oct 02 23:46:03 2016 +0300
@@ -156,9 +156,6 @@
     <ClCompile Include="..\Classes\CollisionDetectionSystem.cpp">
       <Filter>src\systems</Filter>
     </ClCompile>
-    <ClCompile Include="..\Classes\EventRelation.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="..\Classes\GateChange.cpp">
       <Filter>src\events</Filter>
     </ClCompile>
@@ -377,9 +374,6 @@
     <ClInclude Include="..\Classes\CollisionDetectionSystem.h">
       <Filter>src\systems</Filter>
     </ClInclude>
-    <ClInclude Include="..\Classes\EventRelation.h">
-      <Filter>src</Filter>
-    </ClInclude>
     <ClInclude Include="..\Classes\GateChange.h">
       <Filter>src\events</Filter>
     </ClInclude>