From 2e8926d6fa97353328d88bbca0903857461161c7 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Mon, 6 May 2024 14:17:20 -0700 Subject: [PATCH] module: rename query -> queryDeprecated Signed-off-by: Stephen Gutekanst --- examples/custom-renderer/App.zig | 4 ++-- examples/custom-renderer/Renderer.zig | 2 +- examples/glyphs/App.zig | 2 +- examples/piano/App.zig | 2 +- examples/play-opus/App.zig | 2 +- examples/sprite/App.zig | 2 +- examples/text/App.zig | 4 ++-- src/Audio.zig | 2 +- src/Core.zig | 4 ++-- src/gfx/Sprite.zig | 4 ++-- src/gfx/SpritePipeline.zig | 8 ++++---- src/gfx/Text.zig | 4 ++-- src/gfx/TextPipeline.zig | 8 ++++---- src/module/entities.zig | 12 ++++++------ src/module/main.zig | 2 +- src/module/query.zig | 4 ++-- 16 files changed, 33 insertions(+), 33 deletions(-) diff --git a/examples/custom-renderer/App.zig b/examples/custom-renderer/App.zig index bc254e41..d186ff63 100644 --- a/examples/custom-renderer/App.zig +++ b/examples/custom-renderer/App.zig @@ -155,7 +155,7 @@ fn tick( // Query all the entities that have the .follower tag indicating they should follow the player. // TODO(important): better querying API - var archetypes_iter = core.entities.query(.{ .all = &.{ + var archetypes_iter = core.entities.queryDeprecated(.{ .all = &.{ .{ .app = &.{.follower} }, } }); while (archetypes_iter.next()) |archetype| { @@ -169,7 +169,7 @@ fn tick( const close_dist = 1.0 / 15.0; var avoidance = Vec3.splat(0); var avoidance_div: f32 = 1.0; - var archetypes_iter_2 = core.entities.query(.{ .all = &.{ + var archetypes_iter_2 = core.entities.queryDeprecated(.{ .all = &.{ .{ .app = &.{.follower} }, } }); while (archetypes_iter_2.next()) |archetype_2| { diff --git a/examples/custom-renderer/Renderer.zig b/examples/custom-renderer/Renderer.zig index 3c159be2..61d371d2 100644 --- a/examples/custom-renderer/Renderer.zig +++ b/examples/custom-renderer/Renderer.zig @@ -138,7 +138,7 @@ fn renderFrame( defer encoder.release(); // Update uniform buffer - var archetypes_iter = core.entities.query(.{ .all = &.{ + var archetypes_iter = core.entities.queryDeprecated(.{ .all = &.{ .{ .renderer = &.{ .position, .scale } }, } }); var num_entities: usize = 0; diff --git a/examples/glyphs/App.zig b/examples/glyphs/App.zig index d81117e7..d26da1c8 100644 --- a/examples/glyphs/App.zig +++ b/examples/glyphs/App.zig @@ -163,7 +163,7 @@ fn tick( const delta_time = game.state().timer.lap(); // Animate entities - var archetypes_iter = core.entities.query(.{ .all = &.{ + var archetypes_iter = core.entities.queryDeprecated(.{ .all = &.{ .{ .mach_gfx_sprite = &.{.transform} }, } }); while (archetypes_iter.next()) |archetype| { diff --git a/examples/piano/App.zig b/examples/piano/App.zig index 13570a58..4bbba0fb 100644 --- a/examples/piano/App.zig +++ b/examples/piano/App.zig @@ -69,7 +69,7 @@ fn audioStateChange( app: *Mod, ) !void { // Find audio entities that are no longer playing - var archetypes_iter = audio.entities.query(.{ .all = &.{ + var archetypes_iter = audio.entities.queryDeprecated(.{ .all = &.{ .{ .mach_audio = &.{.playing} }, } }); while (archetypes_iter.next()) |archetype| { diff --git a/examples/play-opus/App.zig b/examples/play-opus/App.zig index e2543e8d..aeea62a4 100644 --- a/examples/play-opus/App.zig +++ b/examples/play-opus/App.zig @@ -79,7 +79,7 @@ fn audioStateChange( app: *Mod, ) !void { // Find audio entities that are no longer playing - var archetypes_iter = audio.entities.query(.{ .all = &.{.{ .mach_audio = &.{.playing} }} }); + var archetypes_iter = audio.entities.queryDeprecated(.{ .all = &.{.{ .mach_audio = &.{.playing} }} }); while (archetypes_iter.next()) |archetype| { for ( archetype.slice(.entity, .id), diff --git a/examples/sprite/App.zig b/examples/sprite/App.zig index 7499531b..80fb5d86 100644 --- a/examples/sprite/App.zig +++ b/examples/sprite/App.zig @@ -156,7 +156,7 @@ fn tick( const delta_time = game.state().timer.lap(); // Rotate entities - var archetypes_iter = core.entities.query(.{ .all = &.{ + var archetypes_iter = core.entities.queryDeprecated(.{ .all = &.{ .{ .mach_gfx_sprite = &.{.transform} }, } }); while (archetypes_iter.next()) |archetype| { diff --git a/examples/text/App.zig b/examples/text/App.zig index e091eafa..bff42967 100644 --- a/examples/text/App.zig +++ b/examples/text/App.zig @@ -199,7 +199,7 @@ fn tick( const delta_time = game.state().timer.lap(); // Rotate entities - var archetypes_iter = core.entities.query(.{ .all = &.{ + var archetypes_iter = core.entities.queryDeprecated(.{ .all = &.{ .{ .mach_gfx_text = &.{.transform} }, } }); while (archetypes_iter.next()) |archetype| { @@ -283,7 +283,7 @@ fn endFrame(game: *Mod, text: *gfx.Text.Mod, core: *mach.Core.Mod) !void { // Gather some text rendering stats var num_texts: u32 = 0; var num_glyphs: usize = 0; - var archetypes_iter = text.entities.query(.{ .all = &.{ + var archetypes_iter = text.entities.queryDeprecated(.{ .all = &.{ .{ .mach_gfx_text = &.{ .built, } }, diff --git a/src/Audio.zig b/src/Audio.zig index b07ac3da..7b70a6f1 100644 --- a/src/Audio.zig +++ b/src/Audio.zig @@ -134,7 +134,7 @@ fn audioTick(audio: *Mod) !void { @memset(mixing_buffer.items, 0); var did_state_change = false; - var archetypes_iter = audio.entities.query(.{ .all = &.{ + var archetypes_iter = audio.entities.queryDeprecated(.{ .all = &.{ .{ .mach_audio = &.{ .samples, .channels, .playing, .index } }, } }); while (archetypes_iter.next()) |archetype| { diff --git a/src/Core.zig b/src/Core.zig index 4b3bc6d1..c4740c68 100644 --- a/src/Core.zig +++ b/src/Core.zig @@ -132,7 +132,7 @@ fn init(core: *Mod) !void { } fn update(core: *Mod) !void { - var archetypes_iter = core.entities.query(.{ .all = &.{ + var archetypes_iter = core.entities.queryDeprecated(.{ .all = &.{ .{ .mach_core = &.{ .title, } }, @@ -173,7 +173,7 @@ fn deinit(core: *Mod) void { core.state().queue.release(); mach.core.deinit(); - var archetypes_iter = core.entities.query(.{ .all = &.{ + var archetypes_iter = core.entities.queryDeprecated(.{ .all = &.{ .{ .mach_core = &.{ .title, } }, diff --git a/src/gfx/Sprite.zig b/src/gfx/Sprite.zig index 74d7199c..f7e70c78 100644 --- a/src/gfx/Sprite.zig +++ b/src/gfx/Sprite.zig @@ -43,7 +43,7 @@ pub const events = .{ }; fn update(core: *mach.Core.Mod, sprite: *Mod, sprite_pipeline: *gfx.SpritePipeline.Mod) !void { - var archetypes_iter = sprite_pipeline.entities.query(.{ .all = &.{ + var archetypes_iter = sprite_pipeline.entities.queryDeprecated(.{ .all = &.{ .{ .mach_gfx_sprite_pipeline = &.{ .built, } }, @@ -69,7 +69,7 @@ fn updatePipeline( const encoder = device.createCommandEncoder(&.{ .label = label }); defer encoder.release(); - var archetypes_iter = sprite.entities.query(.{ .all = &.{ + var archetypes_iter = sprite.entities.queryDeprecated(.{ .all = &.{ .{ .mach_gfx_sprite = &.{ .uv_transform, .transform, diff --git a/src/gfx/SpritePipeline.zig b/src/gfx/SpritePipeline.zig index 9c1edd53..9f3545f3 100644 --- a/src/gfx/SpritePipeline.zig +++ b/src/gfx/SpritePipeline.zig @@ -124,7 +124,7 @@ fn init(sprite_pipeline: *Mod) void { } fn deinit(sprite_pipeline: *Mod) void { - var archetypes_iter = sprite_pipeline.entities.query(.{ .all = &.{ + var archetypes_iter = sprite_pipeline.entities.queryDeprecated(.{ .all = &.{ .{ .mach_gfx_sprite_pipeline = &.{ .built, } }, @@ -138,7 +138,7 @@ fn update(core: *mach.Core.Mod, sprite_pipeline: *Mod) !void { // Destroy all sprite render pipelines. We will rebuild them all. deinit(sprite_pipeline); - var archetypes_iter = sprite_pipeline.entities.query(.{ .all = &.{ + var archetypes_iter = sprite_pipeline.entities.queryDeprecated(.{ .all = &.{ .{ .mach_gfx_sprite_pipeline = &.{ .texture, } }, @@ -324,7 +324,7 @@ fn preRender(sprite_pipeline: *Mod, core: *mach.Core.Mod) void { const encoder = core.state().device.createCommandEncoder(&.{ .label = label }); defer encoder.release(); - var archetypes_iter = sprite_pipeline.entities.query(.{ .all = &.{ + var archetypes_iter = sprite_pipeline.entities.queryDeprecated(.{ .all = &.{ .{ .mach_gfx_sprite_pipeline = &.{ .built, } }, @@ -367,7 +367,7 @@ fn render(sprite_pipeline: *Mod) !void { sprite_pipeline.state().render_pass = null; // TODO(sprite): need a way to specify order of rendering with multiple pipelines - var archetypes_iter = sprite_pipeline.entities.query(.{ .all = &.{ + var archetypes_iter = sprite_pipeline.entities.queryDeprecated(.{ .all = &.{ .{ .mach_gfx_sprite_pipeline = &.{ .built, } }, diff --git a/src/gfx/Text.zig b/src/gfx/Text.zig index 8700cd98..77ddfbb9 100644 --- a/src/gfx/Text.zig +++ b/src/gfx/Text.zig @@ -59,7 +59,7 @@ const BuiltText = struct { }; fn update(core: *mach.Core.Mod, text: *Mod, text_pipeline: *gfx.TextPipeline.Mod) !void { - var archetypes_iter = text_pipeline.entities.query(.{ .all = &.{ + var archetypes_iter = text_pipeline.entities.queryDeprecated(.{ .all = &.{ .{ .mach_gfx_text_pipeline = &.{ .built, } }, @@ -97,7 +97,7 @@ fn updatePipeline( var texture_update = false; var num_texts: u32 = 0; var removes = try std.ArrayListUnmanaged(mach.EntityID).initCapacity(allocator, 8); - var archetypes_iter = text.entities.query(.{ .all = &.{ + var archetypes_iter = text.entities.queryDeprecated(.{ .all = &.{ .{ .mach_gfx_text = &.{ .transform, .text, diff --git a/src/gfx/TextPipeline.zig b/src/gfx/TextPipeline.zig index 78a10736..7aeadaa7 100644 --- a/src/gfx/TextPipeline.zig +++ b/src/gfx/TextPipeline.zig @@ -145,7 +145,7 @@ pub const BuiltPipeline = struct { }; fn deinit(text_pipeline: *Mod) void { - var archetypes_iter = text_pipeline.entities.query(.{ .all = &.{ + var archetypes_iter = text_pipeline.entities.queryDeprecated(.{ .all = &.{ .{ .mach_gfx_text_pipeline = &.{ .built, } }, @@ -163,7 +163,7 @@ fn update(core: *mach.Core.Mod, text_pipeline: *Mod) !void { // Destroy all text render pipelines. We will rebuild them all. deinit(text_pipeline); - var archetypes_iter = text_pipeline.entities.query(.{ .all = &.{ + var archetypes_iter = text_pipeline.entities.queryDeprecated(.{ .all = &.{ .{ .mach_gfx_text_pipeline = &.{ .is_pipeline, } }, @@ -353,7 +353,7 @@ fn preRender(text_pipeline: *Mod, core: *mach.Core.Mod) void { const encoder = core.state().device.createCommandEncoder(&.{ .label = label }); defer encoder.release(); - var archetypes_iter = text_pipeline.entities.query(.{ .all = &.{ + var archetypes_iter = text_pipeline.entities.queryDeprecated(.{ .all = &.{ .{ .mach_gfx_text_pipeline = &.{ .built, } }, @@ -396,7 +396,7 @@ fn render(text_pipeline: *Mod) !void { text_pipeline.state().render_pass = null; // TODO(text): need a way to specify order of rendering with multiple pipelines - var archetypes_iter = text_pipeline.entities.query(.{ .all = &.{ + var archetypes_iter = text_pipeline.entities.queryDeprecated(.{ .all = &.{ .{ .mach_gfx_text_pipeline = &.{ .built, } }, diff --git a/src/module/entities.zig b/src/module/entities.zig index 7a38a8a5..dae66500 100644 --- a/src/module/entities.zig +++ b/src/module/entities.zig @@ -114,7 +114,7 @@ pub fn Entities(comptime modules: anytype) type { }; /// A complex query for entities matching a given criteria - pub const Query = query_mod.Query(modules); + pub const QueryDeprecated = query_mod.QueryDeprecated(modules); pub const QueryTag = query_mod.QueryTag; pub fn init(allocator: Allocator) !Self { @@ -628,9 +628,9 @@ pub fn Entities(comptime modules: anytype) type { } // Queries for archetypes matching the given query. - pub fn query( + pub fn queryDeprecated( entities: *Self, - q: Query, + q: QueryDeprecated, ) ArchetypeIterator(modules) { return ArchetypeIterator(modules).init(entities, q); } @@ -721,12 +721,12 @@ pub fn ArchetypeIterator(comptime modules: anytype) type { const EntitiesT = Entities(modules); return struct { entities: *EntitiesT, - query: EntitiesT.Query, + query: EntitiesT.QueryDeprecated, index: usize, const Self = @This(); - pub fn init(entities: *EntitiesT, query: EntitiesT.Query) Self { + pub fn init(entities: *EntitiesT, query: EntitiesT.QueryDeprecated) Self { return Self{ .entities = entities, .query = query, @@ -921,7 +921,7 @@ test "example" { //------------------------------------------------------------------------- // Query for archetypes that have all of the given components - var iter = world.query(.{ .all = &.{ + var iter = world.queryDeprecated(.{ .all = &.{ .{ .game = &.{.rotation} }, } }); while (iter.next()) |archetype| { diff --git a/src/module/main.zig b/src/module/main.zig index 98df29c8..f3293f8c 100644 --- a/src/module/main.zig +++ b/src/module/main.zig @@ -96,7 +96,7 @@ test "entities DB" { //------------------------------------------------------------------------- // Querying - var iter = world.entities.query(.{ .all = &.{ + var iter = world.entities.queryDeprecated(.{ .all = &.{ .{ .physics = &.{.id} }, } }); diff --git a/src/module/query.zig b/src/module/query.zig index 077e1a74..fc952321 100644 --- a/src/module/query.zig +++ b/src/module/query.zig @@ -10,7 +10,7 @@ pub const QueryTag = enum { }; /// A complex query for entities matching a given criteria -pub fn Query(comptime modules: anytype) type { +pub fn QueryDeprecated(comptime modules: anytype) type { const component_types_by_name = ComponentTypesByName(modules){}; return union(QueryTag) { // TODO: cleanup comptime @@ -102,7 +102,7 @@ test "query" { }, }); - const Q = Query(modules); + const Q = QueryDeprecated(modules); // Namespace type lets us select a single namespace. try testing.expectEqual(@as(Q.Namespace, .game), .game);