Преглед изворни кода

process: remove init, we have constructors already

skypjack пре 9 месеци
родитељ
комит
45e9c12b29
2 измењених фајлова са 11 додато и 33 уклоњено
  1. 4 16
      src/entt/process/process.hpp
  2. 7 17
      test/entt/process/process.cpp

+ 4 - 16
src/entt/process/process.hpp

@@ -26,15 +26,6 @@ namespace entt {
  *   update.
  *
  * * @code{.cpp}
- *   void init() override;
- *   @endcode
- *
- *   It's invoked when the process joins the running queue of a scheduler. This
- *   happens as soon as it's attached to the scheduler if the process is a top
- *   level one, otherwise when it replaces its parent if the process is a
- *   continuation.
- *
- * * @code{.cpp}
  *   void succeeded() override;
  *   @endcode
  *
@@ -67,7 +58,7 @@ namespace entt {
 template<typename Delta>
 class process {
     enum class state : std::uint8_t {
-        uninitialized = 0,
+        idle = 0,
         running,
         paused,
         succeeded,
@@ -81,7 +72,6 @@ class process {
         abort(true);
     }
 
-    virtual void init() {}
     virtual void succeeded() {}
     virtual void failed() {}
     virtual void aborted() {}
@@ -201,11 +191,9 @@ public:
      */
     void tick(const Delta delta, void *data = nullptr) {
         switch(current) {
-        case state::uninitialized:
-            init();
-            current = state::running;
-            break;
+        case state::idle:
         case state::running:
+            current = state::running;
             update(delta, data);
             break;
         default:
@@ -234,7 +222,7 @@ public:
     }
 
 private:
-    state current{state::uninitialized};
+    state current{state::idle};
 };
 
 /**

+ 7 - 17
test/entt/process/process.cpp

@@ -4,11 +4,7 @@
 #include "../../common/empty.h"
 
 template<typename Delta>
-class fake_process: public entt::process<Delta> {
-    void init() override {
-        init_invoked = true;
-    }
-
+class test_process: public entt::process<Delta> {
     void succeeded() override {
         succeeded_invoked = true;
     }
@@ -30,7 +26,6 @@ class fake_process: public entt::process<Delta> {
     }
 
 public:
-    bool init_invoked{};
     bool update_invoked{};
     bool succeeded_invoked{};
     bool failed_invoked{};
@@ -38,7 +33,7 @@ public:
 };
 
 TEST(Process, Basics) {
-    fake_process<int> process{};
+    test_process<int> process{};
 
     ASSERT_FALSE(process.alive());
     ASSERT_FALSE(process.finished());
@@ -93,7 +88,7 @@ TEST(Process, Basics) {
 }
 
 TEST(Process, Succeeded) {
-    fake_process<test::empty> process{};
+    test_process<test::empty> process{};
 
     process.tick({});
     process.tick({});
@@ -105,7 +100,6 @@ TEST(Process, Succeeded) {
     ASSERT_FALSE(process.paused());
     ASSERT_FALSE(process.rejected());
 
-    ASSERT_TRUE(process.init_invoked);
     ASSERT_TRUE(process.update_invoked);
     ASSERT_TRUE(process.succeeded_invoked);
     ASSERT_FALSE(process.failed_invoked);
@@ -113,7 +107,7 @@ TEST(Process, Succeeded) {
 }
 
 TEST(Process, Fail) {
-    fake_process<int> process{};
+    test_process<int> process{};
 
     process.tick(0);
     process.tick(0);
@@ -125,7 +119,6 @@ TEST(Process, Fail) {
     ASSERT_FALSE(process.paused());
     ASSERT_TRUE(process.rejected());
 
-    ASSERT_TRUE(process.init_invoked);
     ASSERT_TRUE(process.update_invoked);
     ASSERT_FALSE(process.succeeded_invoked);
     ASSERT_TRUE(process.failed_invoked);
@@ -133,7 +126,7 @@ TEST(Process, Fail) {
 }
 
 TEST(Process, Data) {
-    fake_process<test::empty> process{};
+    test_process<test::empty> process{};
     int value = 0;
 
     process.tick({});
@@ -147,7 +140,6 @@ TEST(Process, Data) {
     ASSERT_FALSE(process.rejected());
 
     ASSERT_EQ(value, 1);
-    ASSERT_TRUE(process.init_invoked);
     ASSERT_TRUE(process.update_invoked);
     ASSERT_TRUE(process.succeeded_invoked);
     ASSERT_FALSE(process.failed_invoked);
@@ -155,7 +147,7 @@ TEST(Process, Data) {
 }
 
 TEST(Process, AbortNextTick) {
-    fake_process<int> process{};
+    test_process<int> process{};
 
     process.tick(0);
     process.abort();
@@ -166,7 +158,6 @@ TEST(Process, AbortNextTick) {
     ASSERT_FALSE(process.paused());
     ASSERT_TRUE(process.rejected());
 
-    ASSERT_TRUE(process.init_invoked);
     ASSERT_FALSE(process.update_invoked);
     ASSERT_FALSE(process.succeeded_invoked);
     ASSERT_FALSE(process.failed_invoked);
@@ -174,7 +165,7 @@ TEST(Process, AbortNextTick) {
 }
 
 TEST(Process, AbortImmediately) {
-    fake_process<test::empty> process{};
+    test_process<test::empty> process{};
 
     process.tick({});
     process.abort(true);
@@ -184,7 +175,6 @@ TEST(Process, AbortImmediately) {
     ASSERT_FALSE(process.paused());
     ASSERT_TRUE(process.rejected());
 
-    ASSERT_TRUE(process.init_invoked);
     ASSERT_FALSE(process.update_invoked);
     ASSERT_FALSE(process.succeeded_invoked);
     ASSERT_FALSE(process.failed_invoked);