Update flecs and modules

Author: SanderMertens

deps/flecs.c

@@ -4219,6 +4219,16 @@ void flecs_component_ids_set(
     int32_t index,
     ecs_entity_t id);
 
+/** Query iterator function for trivially cached queries.
+ * This operation can be called if an iterator matches the conditions for 
+ * trivial iteration:
+ * 
+ * @param it The query iterator.
+ * @return Whether the query has more results.
+ */
+FLECS_API
+bool flecs_query_trivial_cached_next(
+    ecs_iter_t *it);
 
 #ifdef FLECS_DEBUG
 /** Check if current thread has exclusive access to world.
@@ -12869,9 +12879,6 @@ typedef struct ecs_system_t {
     /** System query */
     ecs_query_t *query;
 
-    /** Entity associated with query */
-    ecs_entity_t query_entity;
-
     /** Tick source associated with system */
     ecs_entity_t tick_source;
 
@@ -12912,8 +12919,6 @@ typedef struct ecs_system_t {
     int64_t last_frame;
 
     /* Mixins */
-    ecs_world_t *world;
-    ecs_entity_t entity;
     flecs_poly_dtor_t dtor;      
 } ecs_system_t;
 
@@ -27545,6 +27550,16 @@ struct each_delegate : public delegate {
         self->invoke(iter);
     }
 
+    // Static function that can be used as callback for systems/triggers. 
+    // Different from run() in that it loops the iterator.
+    static void run_each(ecs_iter_t *iter) {
+        auto self = static_cast<const each_delegate*>(iter->run_ctx);
+        ecs_assert(self != nullptr, ECS_INTERNAL_ERROR, NULL);
+        while (iter->next(iter)) {
+            self->invoke(iter);
+        }
+    }
+
     // Create instance of delegate
     static each_delegate* make(const Func& func) {
         return FLECS_NEW(each_delegate)(func);
@@ -31916,6 +31931,17 @@ struct node_builder : IBuilder<Base, Components ...>
         return T(world_, &desc_);
     }
 
+    template <typename Func>
+    T run_each(Func&& func) {
+        using Delegate = typename _::each_delegate<
+            typename std::decay<Func>::type, Components...>;
+        auto ctx = FLECS_NEW(Delegate)(FLECS_FWD(func));
+        desc_.run = Delegate::run_each;
+        desc_.run_ctx = ctx;
+        desc_.run_ctx_free = _::free_obj<Delegate>;
+        return T(world_, &desc_);
+    }
+
 protected:
     flecs::world_t* world_v() override { return world_; }
     TDesc desc_;
@@ -32535,6 +32561,9 @@ struct system_builder final : _::system_builder_base<Components...> {
         ecs_add_id(world, this->desc_.entity, flecs::OnUpdate);
 #endif
     }
+
+    template <typename Func>
+    system each(Func&& func);
 };
 
 }
@@ -32719,6 +32748,14 @@ inline void system_init(flecs::world& world) {
 }
 
 } // namespace _
+
+template <typename ... Components>
+template <typename Func>
+inline system system_builder<Components...>::each(Func&& func) {
+    // Faster version of each() that iterates the query on the C++ side.
+    return this->run_each(FLECS_FWD(func));
+}
+
 } // namespace flecs
 
 #endif

deps/flecs.h

@@ -128,6 +128,7 @@ ECS_STRUCT(EcsAtmosphere, {
     float rayleigh_scale_height;
     float mie_scale_height;
     float mie_scatter_dir;
+    EcsRgb night_color;
 });
 
 FLECS_COMPONENTS_GRAPHICS_API

deps/flecs_components_graphics.h

@@ -35,5 +35,9 @@ void FlecsComponentsTransformImport(
     ecs_set_hooks(world, EcsTransform3, {
         .ctor = flecs_default_ctor
     });
+
+    ecs_add_pair(world, ecs_id(EcsPosition3), EcsWith, ecs_id(EcsTransform3));
+    ecs_add_pair(world, ecs_id(EcsRotation3), EcsWith, ecs_id(EcsTransform3));
+    ecs_add_pair(world, ecs_id(EcsScale3),    EcsWith, ecs_id(EcsTransform3));
 }
 

deps/flecs_components_transform.c

@@ -631,7 +631,7 @@ void LightControllerSyncIntensity(ecs_iter_t *it) {
 static
 void TimeOfDayUpdate(ecs_iter_t *it) {
     EcsTimeOfDay *tod = ecs_field(it, EcsTimeOfDay, 0);
-    tod->t += it->delta_time * tod->speed;
+    tod->t += it->delta_system_time * tod->speed;
 }
 
 static
@@ -742,5 +742,10 @@ void FlecsGameLightControllerImport(ecs_world_t *world) {
     ecs_add_pair(world, EcsSun, EcsWith, ecs_id(EcsDirectionalLight));
     ecs_add_pair(world, EcsSun, EcsWith, ecs_id(EcsRgb));
     ecs_add_pair(world, EcsSun, EcsWith, ecs_id(EcsLightIntensity));
+
+    ecs_system(world, {
+        .entity = ecs_id(TimeOfDayUpdate),
+        .interval = 1.0
+    });
 }
 

deps/flecs_game.c

@@ -29171,6 +29171,7 @@ typedef struct sokol_global_uniforms_t {
 
     vec3 sun_direction;
     vec3 sun_color;
+    vec3 night_color;
     vec3 sun_screen_pos;
     float sun_intensity;
 
@@ -30128,9 +30129,10 @@ void sokol_run_atmos_pass(
     glm_mat4_copy(state->uniforms.inv_mat_v, fs_u.inv_mat_vp);
     glm_vec3_copy(state->uniforms.eye_pos, fs_u.eye_pos);
     glm_vec3_copy(state->uniforms.sun_direction, fs_u.light_pos);
-    fs_u.night_color[0] = 0.001 / 8.0;
-    fs_u.night_color[1] = 0.008 / 8.0;
-    fs_u.night_color[2] = 0.016 / 8.0;
+    glm_vec3_copy((float*)&state->atmosphere->night_color, fs_u.night_color);
+    // fs_u.night_color[0] = 0.001 / 8.0;
+    // fs_u.night_color[1] = 0.008 / 8.0;
+    // fs_u.night_color[2] = 0.016 / 8.0;
     fs_u.aspect = state->uniforms.aspect;
     fs_u.offset = 0.05;
 

deps/flecs_systems_sokol.c

@@ -1,7 +1,6 @@
 #include "flecs_systems_transform.h"
 
 void EcsApplyTransform3(ecs_iter_t *it) {
-    // printf("---\n");
     while (ecs_query_next(it)) {
         EcsTransform3 *m = ecs_field(it, EcsTransform3, 0);
         EcsTransform3 *m_parent = ecs_field(it, EcsTransform3, 1);
@@ -10,9 +9,6 @@ void EcsApplyTransform3(ecs_iter_t *it) {
         EcsScale3 *s = ecs_field(it, EcsScale3, 4);
         int i;
 
-
-        // printf("%llu\n", it->priv_.iter.query.node);
-
         if (!m_parent) {
             if (ecs_field_is_self(it, 3)) {
                 for (i = 0; i < it->count; i ++) {

deps/flecs_systems_transform.c

@@ -41,5 +41,5 @@ void main() {
       mie_scatter_dir                 // Mie preferred scattering direction
   );
 
-  frag_color = max(vec4(atmos, 1.0), vec4(u_night_color, 1.0));
+  frag_color = vec4(atmos, 1.0) + vec4(u_night_color, 1.0);
 }