Changeset 1105Tweet

Timestamp:

Dec 5, 2011, 9:24:04 AM (11 years ago)

Author:

sam

Message:

core: start working on the Emcee class.

Location:

trunk

Files:

• src/Makefile.am (modified) (1 diff)
• src/application/application.cpp (modified) (2 diffs)
• src/core.h (modified) (1 diff)
• src/emcee.cpp (added)
• src/emcee.h (added)
• src/entity.cpp (modified) (1 diff)
• src/entity.h (modified) (1 diff)
• src/thread/threadbase.h (modified) (1 diff)
• test/debug/sandbox.cpp (modified) (1 diff)

trunk/src/Makefile.am

@@ -12 +12 @@
     worldentity.cpp worldentity.h gradient.cpp gradient.h half.cpp half.h \
     platform.cpp platform.h sprite.cpp sprite.h trig.cpp trig.h \
-    real.cpp real.h \
+    real.cpp real.h emcee.cpp emcee.h \
     \
     lol/unit.h \

trunk/src/application/application.cpp

@@ -60 +60 @@
 Application::Application(char const *name, ivec2 resolution, float framerate)
 {
+    Emcee::Setup();
     data = new ApplicationData(name, resolution, framerate);
 }
@@ -76 +77 @@
 {
     delete data;
+    Emcee::Shutdown();
 }
 

trunk/src/core.h

@@ -104 +104 @@
 
 // Managers
+#include "emcee.h"
 #include "ticker.h"
 #include "forge.h"

trunk/src/entity.cpp

@@ -69 +69 @@
 }
 
+void Entity::SetState(uint32_t state)
+{
+    Emcee::SetState(this, state);
+}
+
+void Entity::SetStateWhenMatch(uint32_t state,
+                               Entity *other_entity, uint32_t other_state)
+{
+    Emcee::SetStateWhenMatch(this, state, other_entity, other_state);
+}
+
 } /* namespace lol */
 

trunk/src/entity.h

@@ -78 +78 @@
 #endif
 
+    // Emcee begin
+private:
+    void SetState(uint32_t newstate);
+    void SetStateWhenMatch(uint32_t newstate,
+                           Entity *other_entity, uint32_t other_state);
+    virtual uint32_t OnStateChanged(uint32_t newstate)
+    {
+        return m_state = newstate;
+    }
+
+    uint32_t m_state;
+    // Emcee end
+
 private:
     Entity *gamenext, *drawnext, *autonext;

trunk/src/thread/threadbase.h

@@ -18 +18 @@
 
 #if defined __linux__ || defined __native_client__
-#   include <cstring>
 #   include <pthread.h>
 #elif defined _WIN32

trunk/test/debug/sandbox.cpp

@@ -19 +19 @@
 #include "core.h"
 
+class Moo
+{
+    Moo() {}
+
+    virtual int SetState(int state) { return state; }
+};
+
 using namespace std;
 using namespace lol;