Tweaked: query_sort_cond makes use of SortComponentCond

include/gaia/ecs/query_common.h

@@ -213,7 +213,7 @@ namespace gaia {
 
 				// Smaller ids second.
 				if (lhs.id != rhs.id)
-					return lhs.id < rhs.id;
+					return SortComponentCond()(lhs.id, rhs.id);
 
 				// Sources go last. Note, sources are never a pair.
 				// We want to do it this way because it would be expensive to build cache for
@@ -223,7 +223,7 @@ namespace gaia {
 				//       E.g. depending on the number of archetypes we'd have to traverse
 				//       it might be beneficial to do a different ordering which is impossible
 				//       to do at this point.
-				return lhs.src.id() < rhs.src.id();
+				return SortComponentCond()(lhs.src, rhs.src);
 			}
 		};
 

include/gaia/ecs/vm.h

@@ -516,7 +516,7 @@ namespace gaia {
 				inline void match_archetype_one(MatchingCtx& ctx) {
 					EntityLookupKey entityKey(ctx.ent);
 
-					// For ANY we need at least one archetypes to match.
+					// For ANY we need at least one archetype to match.
 					// However, because any of them can match, we need to check them all.
 					// Iterating all of them is caller's responsibility.
 					const auto* pArchetypes = fetch_archetypes_for_select(*ctx.pEntityToArchetypeMap, entityKey);
@@ -529,7 +529,7 @@ namespace gaia {
 				inline void match_archetype_one_as(MatchingCtx& ctx) {
 					const auto& allArchetypes = *ctx.pAllArchetypes;
 
-					// For ANY we need at least one archetypes to match.
+					// For ANY we need at least one archetype to match.
 					// However, because any of them can match, we need to check them all.
 					// Iterating all of them is caller's responsibility.
 
@@ -565,7 +565,7 @@ namespace gaia {
 
 				inline void match_archetype_no_2(MatchingCtx& ctx) {
 					// We had some matches already (with ALL or ANY). We need to remove those
-					// that match with the NO list. Remove them back-to-front.
+					// that match with the NO list.
 					for (uint32_t i = 0; i < ctx.pMatchesArr->size();) {
 						auto* pArchetype = (*ctx.pMatchesArr)[i];
 						if (match_res<OpNo>(*pArchetype, ctx.idsToMatch)) {
@@ -579,7 +579,7 @@ namespace gaia {
 
 				inline void match_archetype_no_as_2(MatchingCtx& ctx) {
 					// We had some matches already (with ALL or ANY). We need to remove those
-					// that match with the NO list. Remove them back-to-front.
+					// that match with the NO list.
 					for (uint32_t i = 0; i < ctx.pMatchesArr->size();) {
 						auto* pArchetype = (*ctx.pMatchesArr)[i];
 						if (match_res_as<OpNo>(*ctx.pWorld, *pArchetype, ctx.idsToMatch)) {

single_include/gaia.h

@@ -21583,7 +21583,7 @@ namespace gaia {
 
 				// Smaller ids second.
 				if (lhs.id != rhs.id)
-					return lhs.id < rhs.id;
+					return SortComponentCond()(lhs.id, rhs.id);
 
 				// Sources go last. Note, sources are never a pair.
 				// We want to do it this way because it would be expensive to build cache for
@@ -21593,7 +21593,7 @@ namespace gaia {
 				//       E.g. depending on the number of archetypes we'd have to traverse
 				//       it might be beneficial to do a different ordering which is impossible
 				//       to do at this point.
-				return lhs.src.id() < rhs.src.id();
+				return SortComponentCond()(lhs.src, rhs.src);
 			}
 		};
 
@@ -22571,7 +22571,7 @@ namespace gaia {
 				inline void match_archetype_one(MatchingCtx& ctx) {
 					EntityLookupKey entityKey(ctx.ent);
 
-					// For ANY we need at least one archetypes to match.
+					// For ANY we need at least one archetype to match.
 					// However, because any of them can match, we need to check them all.
 					// Iterating all of them is caller's responsibility.
 					const auto* pArchetypes = fetch_archetypes_for_select(*ctx.pEntityToArchetypeMap, entityKey);
@@ -22584,7 +22584,7 @@ namespace gaia {
 				inline void match_archetype_one_as(MatchingCtx& ctx) {
 					const auto& allArchetypes = *ctx.pAllArchetypes;
 
-					// For ANY we need at least one archetypes to match.
+					// For ANY we need at least one archetype to match.
 					// However, because any of them can match, we need to check them all.
 					// Iterating all of them is caller's responsibility.
 
@@ -22620,7 +22620,7 @@ namespace gaia {
 
 				inline void match_archetype_no_2(MatchingCtx& ctx) {
 					// We had some matches already (with ALL or ANY). We need to remove those
-					// that match with the NO list. Remove them back-to-front.
+					// that match with the NO list.
 					for (uint32_t i = 0; i < ctx.pMatchesArr->size();) {
 						auto* pArchetype = (*ctx.pMatchesArr)[i];
 						if (match_res<OpNo>(*pArchetype, ctx.idsToMatch)) {
@@ -22634,7 +22634,7 @@ namespace gaia {
 
 				inline void match_archetype_no_as_2(MatchingCtx& ctx) {
 					// We had some matches already (with ALL or ANY). We need to remove those
-					// that match with the NO list. Remove them back-to-front.
+					// that match with the NO list.
 					for (uint32_t i = 0; i < ctx.pMatchesArr->size();) {
 						auto* pArchetype = (*ctx.pMatchesArr)[i];
 						if (match_res_as<OpNo>(*ctx.pWorld, *pArchetype, ctx.idsToMatch)) {