Changeset 547 for trunk

Timestamp:

02/10/17 00:48:00 (8 years ago)

Author:

epyon

Message:

• support for recursive message dispatch

Location:

trunk/nv/ecs

Files:

• ecs.hh (modified) (6 diffs)
• message_queue.hh (modified) (3 diffs)

trunk/nv/ecs/ecs.hh

@@ -167 +167 @@
                                 ecs& m_ecs;
                         };
+
+                        template< typename System >
+                        void register_system( string_view name, System* c )
+                        {
+                                register_handler< System >( name, (System*)( c ) );
+                                register_ecs_update< System >( (System*)( c ) );
+                        }
+
 
                         template < typename Component, typename Handler >
@@ -253 +261 @@
                         }
 
+                        template < typename F >
+                        void recursive_call( handle_type h, F&& f )
+                        {
+                                f( h );
+                                for ( auto c : children( h ) )
+                                        recursive_call( c, f );
+                        }
+
                         void remove( handle_type h )
                         {
@@ -321 +337 @@
                         }
 
-                protected:
+//              protected:
 
                         template < typename System, typename Components, template <class...> class List, typename... Messages >
@@ -334 +350 @@
                         typename enable_if< has_component_message< System, Components, Message >::value, void >::type
                         register_component_message( System* s )
+                        {
+                                component_interface* ci = get_interface<Components>();
+                                register_callback( Message::message_id, [=] ( const message& msg )
+                                {
+                                        const Message& m = message_cast<Message>( msg );
+                                        if ( msg.recursive )
+                                        {
+                                                this->recursive_call( m.entity, [=] ( handle_type h )
+                                                {
+                                                        if ( void* c = ci->get_raw( h ) )
+                                                                s->on( m, *( (Components*)( c ) ) );
+                                                } );
+                                        }
+                                        else
+                                                if ( void* c = ci->get_raw( m.entity ) )
+                                                        s->on( m, *( (Components*)( c ) ) );
+                                } );
+                        }
+
+                        template < typename System, typename Components, typename Message >
+                        typename enable_if< has_ecs_component_message< this_type, System, Components, Message >::value, void >::type
+                        register_ecs_component_message( System* s )
                         {
                                 component_interface* ci = get_interface<Components>();
@@ -339 +377 @@
                                 {
                                         const Message& m = message_cast<Message>( msg );
-                                        if ( void* c = ci->get_raw( m.entity ) )
-                                                s->on( m, *((Components*)(c)) );
-                                } );
-
-                        }
-
-                        template < typename System, typename Components, typename Message >
-                        typename enable_if< has_ecs_component_message< this_type, System, Components, Message >::value, void >::type
-                        register_ecs_component_message( System* s )
-                        {
-                                component_interface* ci = get_interface<Components>();
-                                register_callback( Message::message_id, [=] ( const message& msg )
-                                {
-                                        const Message& m = message_cast<Message>( msg );
+                                        if ( msg.recursive )
+                                        {
+                                                this->recursive_call( m.entity, [=] ( handle_type h )
+                                                {
+                                                        if ( void* c = ci->get_raw( h ) )
+                                                                s->on( m, *this, *( (Components*)( c ) ) );
+                                                } );
+                                        }
+                                        else
                                         if ( void* c = ci->get_raw( m.entity ) )
                                                 s->on( m, *this, *((Components*)(c)) );
@@ -434 +467 @@
                                 m_update_handlers.push_back( handler );
                         }
+
+                protected:
 
                         handle_tree_manager< handle_type >          m_handles;

trunk/nv/ecs/message_queue.hh

@@ -84 +84 @@
                         {
                                 message_type type;
+                                uint32       recursive;
                                 time_type    time;
-                                uint8        payload[128 - sizeof( message_type ) - sizeof( time_type ) ];
+                                uint8        payload[128 - sizeof( message_type ) - sizeof( time_type ) - sizeof( uint32 ) ];
                         };
 
@@ -126 +127 @@
                         bool dispatch( Args&&... args )
                         {
-                                message m{ Payload::message_id, time_type( 0 ) };
+                                message m{ Payload::message_id, 0, time_type( 0 ) };
+                                new( &m.payload ) Payload{ nv::forward<Args>( args )... };
+                                return dispatch( m );
+                        }
+
+                        template < typename Payload, typename ...Args >
+                        bool dispatch_recursive( Args&&... args )
+                        {
+                                message m{ Payload::message_id, 1, time_type( 0 ) };
                                 new( &m.payload ) Payload{ nv::forward<Args>( args )... };
                                 return dispatch( m );
@@ -140 +149 @@
                         bool queue( time_type delay, Args&&... args )
                         {
-                                message m{ Payload::message_id, m_time + delay };
+                                message m{ Payload::message_id, 0, m_time + delay };
+                                new( &m.payload ) Payload{ nv::forward<Args>( args )... };
+                                return queue( m );
+                        }
+
+                        template < typename Payload, typename ...Args >
+                        bool queue_recursive( time_type delay, Args&&... args )
+                        {
+                                message m{ Payload::message_id, 1, m_time + delay };
                                 new( &m.payload ) Payload{ nv::forward<Args>( args )... };
                                 return queue( m );