Merge pull request #148 from rrbox/feat/events

rrbox · web-flow · commit ca1a53c914f7 · 2025-07-06T22:51:26.000+09:00
Feat/events
diff --git a/Sources/ECS/Event/CommandsEvent/CommandsEvent+Buffer.swift b/Sources/ECS/Event/CommandsEvent/CommandsEvent+Buffer.swift
@@ -6,21 +6,21 @@
 //
 
 extension AnyMap<EventStorage> {
-    mutating func setUpCommandsEventQueue<T: CommandsEventProtocol>(eventOfType: T.Type) {
-        push(CommandsEventQueue<T>())
+    func commandsEventReceiver<T: CommandsEventProtocol>(eventOfType type: T.Type) -> CommandsEventReceiver<T>? {
+        valueRef(ofType: CommandsEventReceiver<T>.self)?.body
     }
 
-    func commandsEventQueue<T: CommandsEventProtocol>(eventOfType: T.Type) -> CommandsEventQueue<T>? {
-        valueRef(ofType: CommandsEventQueue<T>.self)?.body
+    mutating func registerCommandsEventReceiver<T: CommandsEventProtocol>(eventType: T.Type) {
+        push(CommandsEventReceiver<T>())
     }
 
     func commandsEventWriter<T>(eventOfType type: T.Type) -> CommandsEventWriter<T>? {
         valueRef(ofType: CommandsEventWriter<T>.self)?.body
     }
 
     mutating func registerCommandsEventWriter<T: CommandsEventProtocol>(eventType: T.Type) {
-        let eventQueue = valueRef(ofType: CommandsEventQueue<T>.self)!.body
-        push(CommandsEventWriter<T>(eventQueue: eventQueue))
+        let receiver = valueRef(ofType: CommandsEventReceiver<T>.self)!.body
+        push(CommandsEventWriter<T>(receiver: receiver))
     }
 
     func commandsEventResponder<T: CommandsEventProtocol>(eventOfType type: T.Type) -> EventResponder<T>? {
diff --git a/Sources/ECS/Event/CommandsEvent/CommandsEventQueue.swift b/Sources/ECS/Event/CommandsEvent/CommandsEventQueue.swift
diff --git a/Sources/ECS/Event/CommandsEvent/CommandsEventReceiver.swift b/Sources/ECS/Event/CommandsEvent/CommandsEventReceiver.swift
@@ -0,0 +1,29 @@
+//
+//  CommandsEventReceiver.swift
+//  ECS_Swift
+//
+//  Created by rrbox on 2025/07/06.
+//
+
+final class CommandsEventReceiver<T: CommandsEventProtocol>: AnyEventReceiver, EventStorageElement {
+    var eventBuffer = [T]()
+
+    override func receive(worldStorage: WorldStorageRef) {
+        let events = eventBuffer
+        eventBuffer = []
+        guard !events.isEmpty else { return }
+        worldStorage.eventStorage.push(EventReader(events: events))
+        if let systems = worldStorage.eventStorage.commandsEventResponder(eventOfType: T.self)!.systems[.update] {
+            for system in systems {
+                system.execute(worldStorage)
+            }
+        }
+        for schedule in worldStorage.stateStorage.currentEventSchedulesWhichAssociatedStates() {
+            guard let systems = worldStorage.eventStorage.commandsEventResponder(eventOfType: T.self)!.systems[schedule] else { continue }
+            for system in systems {
+                system.execute(worldStorage)
+            }
+        }
+        worldStorage.eventStorage.pop(EventReader<T>.self)
+    }
+}
diff --git a/Sources/ECS/Event/CommandsEvent/CommandsEventWriter.swift b/Sources/ECS/Event/CommandsEvent/CommandsEventWriter.swift
@@ -6,14 +6,14 @@
 //
 
 final class CommandsEventWriter<T: CommandsEventProtocol>: SystemParameter, EventStorageElement {
-    unowned let eventQueue: CommandsEventQueue<T>
+    unowned let receiver: CommandsEventReceiver<T>
 
-    init(eventQueue: CommandsEventQueue<T>) {
-        self.eventQueue = eventQueue
+    init(receiver: CommandsEventReceiver<T>) {
+        self.receiver = receiver
     }
 
     public func send(value: T) {
-        self.eventQueue.eventQueue.append(value)
+        receiver.eventBuffer.append(value)
     }
 
     public static func register(to worldStorage: WorldStorageRef) {
diff --git a/Sources/ECS/Event/EventStreaming/AnyEventReceiver.swift b/Sources/ECS/Event/EventStreaming/AnyEventReceiver.swift
@@ -0,0 +1,10 @@
+//
+//  AnyEventReceiver.swift
+//  ECS_Swift
+//
+//  Created by rrbox on 2025/07/06.
+//
+
+class AnyEventReceiver {
+    func receive(worldStorage: WorldStorageRef) {}
+}
diff --git a/Sources/ECS/Event/EventStreaming/EventProtocol.swift b/Sources/ECS/Event/EventStreaming/EventProtocol.swift
@@ -0,0 +1,10 @@
+//
+//  EventProtocol.swift
+//  ECS_Swift
+//
+//  Created by rrbox on 2025/07/06.
+//
+
+public protocol EventProtocol {
+
+}
diff --git a/Sources/ECS/Event/EventStreaming/EventQueue.swift b/Sources/ECS/Event/EventStreaming/EventQueue.swift
diff --git a/Sources/ECS/Event/EventStreaming/EventReader.swift b/Sources/ECS/Event/EventStreaming/EventReader.swift
@@ -6,10 +6,10 @@
 //
 
 final public class EventReader<T>: SystemParameter, EventStorageElement {
-    public let value: T
+    public let events: [T]
 
-    init(value: T) {
-        self.value = value
+    init(events: [T]) {
+        self.events = events
     }
 
     public static func register(to worldStorage: WorldStorageRef) {
diff --git a/Sources/ECS/Event/EventStreaming/EventReceiver.swift b/Sources/ECS/Event/EventStreaming/EventReceiver.swift
@@ -1,43 +1,29 @@
 //
-//  Event.swift
-//  
+//  EventReceiver.swift
+//  ECS_Swift
 //
-//  Created by rrbox on 2023/08/14.
+//  Created by rrbox on 2025/07/06.
 //
 
-public protocol EventProtocol {
-
-}
-
-class AnyEvent {
-    func runEventReceiver(worldStorage: WorldStorageRef) {
-
-    }
-}
-
-final class Event<T: EventProtocol>: AnyEvent {
-    let value: T
-
-    init(value: T) {
-        self.value = value
-    }
-
-    override func runEventReceiver(worldStorage: WorldStorageRef) {
-        worldStorage.eventStorage.push(EventReader(value: self.value))
+final class EventReceiver<T: EventProtocol>: AnyEventReceiver, EventStorageElement {
+    var eventBuffer = [T]()
 
+    override func receive(worldStorage: WorldStorageRef) {
+        let events = eventBuffer
+        eventBuffer = []
+        guard !events.isEmpty else { return }
+        worldStorage.eventStorage.push(EventReader(events: events))
         if let systems = worldStorage.eventStorage.eventResponder(eventOfType: T.self)!.systems[.update] {
             for system in systems {
                 system.execute(worldStorage)
             }
         }
-
         for schedule in worldStorage.stateStorage.currentEventSchedulesWhichAssociatedStates() {
             guard let systems = worldStorage.eventStorage.eventResponder(eventOfType: T.self)!.systems[schedule] else { continue }
             for system in systems {
                 system.execute(worldStorage)
             }
         }
-
         worldStorage.eventStorage.pop(EventReader<T>.self)
     }
 }
diff --git a/Sources/ECS/Event/EventStreaming/EventReceivers.swift b/Sources/ECS/Event/EventStreaming/EventReceivers.swift
@@ -0,0 +1,10 @@
+//
+//  EventReceivers.swift
+//  ECS_Swift
+//
+//  Created by rrbox on 2025/07/06.
+//
+
+final class EventReceivers: EventStorageElement {
+    var eventReceivers = [AnyEventReceiver]()
+}
diff --git a/Sources/ECS/Event/EventStreaming/EventStorage.swift b/Sources/ECS/Event/EventStreaming/EventStorage.swift
@@ -29,21 +29,32 @@ extension AnyMap where Mode == EventStorage {
 // world buffer にプロパティをつけておく
 
 extension AnyMap<EventStorage> {
-    mutating func setUpEventQueue() {
-        push(EventQueue())
+    func eventReceivers() -> EventReceivers? {
+        valueRef(ofType: EventReceivers.self)?.body
     }
 
-    func eventQueue() -> EventQueue? {
-        valueRef(ofType: EventQueue.self)?.body
+    mutating func registerEventReceivers() {
+        push(EventReceivers())
+    }
+
+    func eventReceiver<T>(eventOfType type: T.Type) -> EventReceiver<T>? {
+        valueRef(ofType: EventReceiver<T>.self)?.body
+    }
+
+    mutating func registerEventReceiver<T: EventProtocol>(eventType: T.Type) {
+        let eventReceiver = EventReceiver<T>()
+        let eventReceivers = eventReceivers()
+        eventReceivers?.eventReceivers.append(eventReceiver)
+        push(eventReceiver)
     }
 
     func eventWriter<T>(eventOfType type: T.Type) -> EventWriter<T>? {
         valueRef(ofType: EventWriter<T>.self)?.body
     }
 
     mutating func registerEventWriter<T: EventProtocol>(eventType: T.Type) {
-        let eventQueue = valueRef(ofType: EventQueue.self)!.body
-        push(EventWriter<T>(eventQueue: eventQueue))
+        let receiver = valueRef(ofType: EventReceiver<T>.self)!.body
+        push(EventWriter<T>(receiver: receiver))
     }
 
     func eventResponder<T: EventProtocol>(eventOfType type: T.Type) -> EventResponder<T>? {
diff --git a/Sources/ECS/Event/EventStreaming/EventWriter.swift b/Sources/ECS/Event/EventStreaming/EventWriter.swift
@@ -7,14 +7,14 @@
 
 // Commands と基本的な仕組みは同じ.
 final public class EventWriter<T: EventProtocol>: SystemParameter, EventStorageElement {
-    unowned let eventQueue: EventQueue
+    unowned let receiver: EventReceiver<T>
 
-    init(eventQueue: EventQueue) {
-        self.eventQueue = eventQueue
+    init(receiver: EventReceiver<T>) {
+        self.receiver = receiver
     }
 
     public func send(value: T) {
-        self.eventQueue.eventQueue.append(Event<T>(value: value))
+        receiver.eventBuffer.append(value)
     }
 
     public static func register(to worldStorage: WorldStorageRef) {
diff --git a/Sources/ECS/Event/World+EventStreamer.swift b/Sources/ECS/Event/World+EventStreamer.swift
@@ -10,6 +10,7 @@ public extension World {
     ///
     /// `Event<T>` をイベントシステムで扱う前に, World に EventStreamer を追加する必要があります.
     @discardableResult func addEventStreamer<T: EventProtocol>(eventType: T.Type) -> World {
+        worldStorage.eventStorage.registerEventReceiver(eventType: T.self)
         worldStorage.eventStorage.registerEventWriter(eventType: T.self)
         worldStorage.eventStorage.registerEventResponder(eventType: T.self)
         return self
@@ -19,46 +20,24 @@ public extension World {
 extension World {
     func addCommandsEventStreamer<T: CommandsEventProtocol>(eventType: T.Type) {
         worldStorage.systemStorage.insertSchedule(.onCommandsEvent(ofType: T.self))
+        worldStorage.eventStorage.registerCommandsEventReceiver(eventType: T.self)
         worldStorage.eventStorage.registerCommandsEventWriter(eventType: T.self)
         worldStorage.eventStorage.resisterCommandsEventResponder(eventType: T.self)
     }
 }
 
 extension World {
     func applyEventQueue() {
-        let eventQueue = self.worldStorage.eventStorage.eventQueue()!
-        eventQueue.sendingEvents = eventQueue.eventQueue
-        eventQueue.eventQueue = []
-        for event in eventQueue.sendingEvents {
-            event.runEventReceiver(worldStorage: self.worldStorage)
+        let receivers = self.worldStorage.eventStorage.eventReceivers()!
+        for receiver in receivers.eventReceivers {
+            receiver.receive(worldStorage: worldStorage)
         }
-        eventQueue.sendingEvents = []
     }
 
     func applyCommandsEventQueue<T: CommandsEventProtocol>(eventOfType: T.Type) {
         let eventStorage = self.worldStorage.eventStorage
-        let eventQueue = eventStorage.commandsEventQueue(eventOfType: T.self)!
-        eventQueue.sendingEvents = eventQueue.eventQueue
-        eventQueue.eventQueue = []
-        for event in eventQueue.sendingEvents {
-            worldStorage.eventStorage.push(EventReader(value: event))
-
-            if let systems = eventStorage.commandsEventResponder(eventOfType: T.self)!.systems[.update] {
-                for system in systems {
-                    system.execute(self.worldStorage)
-                }
-            }
-
-            for schedule in self.worldStorage.stateStorage.currentEventSchedulesWhichAssociatedStates() {
-                guard let systems = eventStorage.commandsEventResponder(eventOfType: T.self)!.systems[schedule] else { continue }
-                for system in systems {
-                    system.execute(self.worldStorage)
-                }
-            }
-
-            worldStorage.eventStorage.pop(EventReader<T>.self)
-        }
-        eventQueue.sendingEvents = []
+        let receiver = eventStorage.commandsEventReceiver(eventOfType: T.self)!
+        receiver.receive(worldStorage: worldStorage)
     }
 }
 
diff --git a/Sources/ECS/Schedule/EventSchedule.swift b/Sources/ECS/Schedule/EventSchedule.swift
@@ -8,25 +8,8 @@
 /**
  システムが実行されるタイミングを指定します.
 
- Eccentials
+ - ``EventSchedule/update``
 
- - ``Schedule/startUp``
- - ``Schedule/update``
-
- State associated schedules
-
- - ``EventSchedule/didEnter(_:)``
- - ``EventSchedule/willExit(_:)``
- - ``EventSchedule/onUpdate(_:)``
- - ``EventSchedule/onInactiveUpdate(_:)``
- - ``EventSchedule/onStackUpdate(_:)``
- - ``EventSchedule/onPause(_:)``
- - ``EventSchedule/onResume(_:)``
-
- Entity spawn / despawn
-
- - ``Schedule/didSpawn``
- - ``Schedule/willDespawn``
  */
 public struct EventSchedule: Hashable {
     let typeId: ObjectIdentifier
diff --git a/Sources/ECS/Schedule/Schedule.swift b/Sources/ECS/Schedule/Schedule.swift
@@ -22,11 +22,7 @@
  - ``Schedule/onStackUpdate(_:)``
  - ``Schedule/onPause(_:)``
  - ``Schedule/onResume(_:)``
- 
- Entity spawn / despawn
- 
- - ``Schedule/didSpawn``
- - ``Schedule/willDespawn``
+
  */
 public struct Schedule: Hashable {
     let typeId: ObjectIdentifier
diff --git a/Sources/ECS/WorldMethods/World+Init.swift b/Sources/ECS/WorldMethods/World+Init.swift
@@ -36,9 +36,7 @@ public extension World {
         worldStorage.stateStorage.setUp()
 
         // world buffer に event queue を作成します.
-        worldStorage.eventStorage.setUpEventQueue()
-        worldStorage.eventStorage.setUpCommandsEventQueue(eventOfType: DidSpawnEvent.self)
-        worldStorage.eventStorage.setUpCommandsEventQueue(eventOfType: WillDespawnEvent.self)
+        worldStorage.eventStorage.registerEventReceivers()
 
         // world buffer に spawn/despawn event の streamer を登録します.
         addCommandsEventStreamer(eventType: DidSpawnEvent.self)
diff --git a/Sources/PlugIns/Graphic2D/Commands/EntityCommands+Graphic.swift b/Sources/PlugIns/Graphic2D/Commands/EntityCommands+Graphic.swift
diff --git a/Sources/PlugIns/Graphic2D/PlugInExport.swift b/Sources/PlugIns/Graphic2D/PlugInExport.swift
diff --git a/Tests/ecs-swiftTests/EventTests.swift b/Tests/ecs-swiftTests/EventTests.swift

Original file line number	Diff line number	Diff line change
`@@ -6,21 +6,21 @@`
`6`	`6`	`//`
`7`	`7`
`8`	`8`	`extension AnyMap<EventStorage> {`
`9`		`- mutating func setUpCommandsEventQueue<T: CommandsEventProtocol>(eventOfType: T.Type) {`
`10`		`- push(CommandsEventQueue<T>())`
	`9`	`+ func commandsEventReceiver<T: CommandsEventProtocol>(eventOfType type: T.Type) -> CommandsEventReceiver<T>? {`
	`10`	`+ valueRef(ofType: CommandsEventReceiver<T>.self)?.body`
`11`	`11`	`}`
`12`	`12`
`13`		`- func commandsEventQueue<T: CommandsEventProtocol>(eventOfType: T.Type) -> CommandsEventQueue<T>? {`
`14`		`- valueRef(ofType: CommandsEventQueue<T>.self)?.body`
	`13`	`+ mutating func registerCommandsEventReceiver<T: CommandsEventProtocol>(eventType: T.Type) {`
	`14`	`+ push(CommandsEventReceiver<T>())`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`func commandsEventWriter<T>(eventOfType type: T.Type) -> CommandsEventWriter<T>? {`
`18`	`18`	`valueRef(ofType: CommandsEventWriter<T>.self)?.body`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`mutating func registerCommandsEventWriter<T: CommandsEventProtocol>(eventType: T.Type) {`
`22`		`- let eventQueue = valueRef(ofType: CommandsEventQueue<T>.self)!.body`
`23`		`- push(CommandsEventWriter<T>(eventQueue: eventQueue))`
	`22`	`+ let receiver = valueRef(ofType: CommandsEventReceiver<T>.self)!.body`
	`23`	`+ push(CommandsEventWriter<T>(receiver: receiver))`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`func commandsEventResponder<T: CommandsEventProtocol>(eventOfType type: T.Type) -> EventResponder<T>? {`