Skip to content

A fast 2D and 3D game engine — TypeScript SDK, C++/WebAssembly core, visual editor. Ship one project to web, desktop, WeChat MiniGames, playable ads, and native Android / iOS.

fix: correct Query() call syntax and texture type in all examples

esengine9b5ae4616f65
diff --git a/examples/audio-demo/src/systems/sfx.ts b/examples/audio-demo/src/systems/sfx.ts
index 8ea83e415..882acefca 100644
--- a/examples/audio-demo/src/systems/sfx.ts
+++ b/examples/audio-demo/src/systems/sfx.ts
@@ -13,7 +13,7 @@ const SFX_URLS = [
let triggerIndex = 0;
export const sfxTriggerSystem = defineSystem(
- [Query([Mut(SFXTrigger)]), Res(Time), Res(Input)],
+ [Query(Mut(SFXTrigger)), Res(Time), Res(Input)],
(query, time, input) => {
triggerIndex = 0;
for (const [_entity, trigger] of query) {
diff --git a/examples/audio-demo/src/systems/visualizer.ts b/examples/audio-demo/src/systems/visualizer.ts
index c587e3b95..5aec3ed60 100644
--- a/examples/audio-demo/src/systems/visualizer.ts
+++ b/examples/audio-demo/src/systems/visualizer.ts
@@ -6,7 +6,7 @@ import { Visualizer } from '../components';
let barIndex = 0;
export const visualizerSystem = defineSystem(
- [Query([Mut(UIRect), Visualizer]), Res(Time)],
+ [Query(Mut(UIRect), Visualizer), Res(Time)],
(query, time) => {
barIndex = 0;
for (const [_entity, rect] of query) {
diff --git a/examples/collision-layers/src/systems/spawn.ts b/examples/collision-layers/src/systems/spawn.ts
index b105675be..d4ba700d6 100644
--- a/examples/collision-layers/src/systems/spawn.ts
+++ b/examples/collision-layers/src/systems/spawn.ts
@@ -22,7 +22,7 @@ const LAYERS = [
let bodyCount = 0;
export const spawnSystem = defineSystem(
- [Query([Mut(SpawnTimer)]), Res(Time), Commands()],
+ [Query(Mut(SpawnTimer)), Res(Time), Commands()],
(query, time, cmds) => {
for (const [_entity, timer] of query) {
timer.timer += time.delta;
diff --git a/examples/ecs-basics/src/systems/bounce.ts b/examples/ecs-basics/src/systems/bounce.ts
index 43b486bb3..21c0cf4c2 100644
--- a/examples/ecs-basics/src/systems/bounce.ts
+++ b/examples/ecs-basics/src/systems/bounce.ts
@@ -7,7 +7,7 @@ const HALF_WIDTH = 400;
const HALF_HEIGHT = 300;
export const bounceSystem = defineSystem(
- [Query([Transform, Mut(Mover), Bouncer])],
+ [Query(Transform, Mut(Mover), Bouncer)],
(query) => {
for (const [_entity, transform, mover] of query) {
if (transform.position.x > HALF_WIDTH || transform.position.x < -HALF_WIDTH) {
diff --git a/examples/ecs-basics/src/systems/lifetime.ts b/examples/ecs-basics/src/systems/lifetime.ts
index e2ddc26b1..4656e9ba7 100644
--- a/examples/ecs-basics/src/systems/lifetime.ts
+++ b/examples/ecs-basics/src/systems/lifetime.ts
@@ -4,7 +4,7 @@ import {
import { Lifetime } from '../components';
export const lifetimeSystem = defineSystem(
- [Query([Mut(Lifetime), Mut(Sprite)]), Res(Time), Commands()],
+ [Query(Mut(Lifetime), Mut(Sprite)), Res(Time), Commands()],
(query, time, cmds) => {
for (const [entity, lifetime, sprite] of query) {
lifetime.remaining -= time.delta;
diff --git a/examples/ecs-basics/src/systems/move.ts b/examples/ecs-basics/src/systems/move.ts
index a73f53797..61fce6e98 100644
--- a/examples/ecs-basics/src/systems/move.ts
+++ b/examples/ecs-basics/src/systems/move.ts
@@ -4,7 +4,7 @@ import {
import { Mover } from '../components';
export const moveSystem = defineSystem(
- [Query([Mut(Transform), Mover]), Res(Time)],
+ [Query(Mut(Transform), Mover), Res(Time)],
(query, time) => {
for (const [_entity, transform, mover] of query) {
transform.position.x += mover.directionX * mover.speed * time.delta;
diff --git a/examples/ecs-basics/src/systems/spawner.ts b/examples/ecs-basics/src/systems/spawner.ts
index 1650d4436..bfef6e9bf 100644
--- a/examples/ecs-basics/src/systems/spawner.ts
+++ b/examples/ecs-basics/src/systems/spawner.ts
@@ -8,7 +8,7 @@ const MAX_ENTITIES = 60;
let entityCount = 0;
export const spawnerSystem = defineSystem(
- [Query([Mut(Spawner), Transform]), Res(Time), Commands()],
+ [Query(Mut(Spawner), Transform), Res(Time), Commands()],
(query, time, cmds) => {
for (const [_entity, spawner, transform] of query) {
spawner.timer += time.delta;
diff --git a/examples/event-system/src/systems/animate.ts b/examples/event-system/src/systems/animate.ts
index 01a0b6cbe..70e06f5c5 100644
--- a/examples/event-system/src/systems/animate.ts
+++ b/examples/event-system/src/systems/animate.ts
@@ -5,7 +5,7 @@ import {
import { Collectible } from '../components';
export const animateSystem = defineSystem(
- [Query([Mut(Transform), Mut(Sprite), Collectible]), Res(Time)],
+ [Query(Mut(Transform), Mut(Sprite), Collectible), Res(Time)],
(query, time) => {
for (const [_entity, transform, sprite, collectible] of query) {
const scale = 1 + 0.2 * Math.sin(time.elapsed * collectible.pulseSpeed);
diff --git a/examples/event-system/src/systems/collect.ts b/examples/event-system/src/systems/collect.ts
index 6c1062e13..4f201928d 100644
--- a/examples/event-system/src/systems/collect.ts
+++ b/examples/event-system/src/systems/collect.ts
@@ -8,7 +8,7 @@ import { CollectEventDef } from '../events';
const COLLECT_LIFETIME = 5;
export const collectSystem = defineSystem(
- [Query([Transform, Sprite, Collectible]), Res(Time), Commands(), EventWriter(CollectEventDef)],
+ [Query(Transform, Sprite, Collectible), Res(Time), Commands(), EventWriter(CollectEventDef)],
(query, time, cmds, writer) => {
for (const [entity, _transform, sprite, collectible] of query) {
const age = COLLECT_LIFETIME - (sprite.color.a > 0.1 ? COLLECT_LIFETIME : 0);
diff --git a/examples/hello-world/src/systems/animate.ts b/examples/hello-world/src/systems/animate.ts
index 6390f20ff..cd1b39421 100644
--- a/examples/hello-world/src/systems/animate.ts
+++ b/examples/hello-world/src/systems/animate.ts
@@ -5,7 +5,7 @@ import {
import { Rotator } from '../components';
export const rotateSystem = defineSystem(
- [Query([Mut(Transform), Rotator]), Res(Time)],
+ [Query(Mut(Transform), Rotator), Res(Time)],
(query, time) => {
for (const [_entity, transform, rotator] of query) {
const angle = rotator.speed * time.elapsed * (Math.PI / 180);
@@ -21,7 +21,7 @@ export const rotateSystem = defineSystem(
);
export const colorPulseSystem = defineSystem(
- [Query([Mut(Sprite), Rotator]), Res(Time)],
+ [Query(Mut(Sprite), Rotator), Res(Time)],
(query, time) => {
for (const [_entity, sprite, rotator] of query) {
const pulse = 0.7 + 0.3 * Math.sin(time.elapsed * rotator.bobSpeed * 1.5);
diff --git a/examples/input-demo/src/systems/keyboard.ts b/examples/input-demo/src/systems/keyboard.ts
index 3494c1820..4dae6604c 100644
--- a/examples/input-demo/src/systems/keyboard.ts
+++ b/examples/input-demo/src/systems/keyboard.ts
@@ -4,7 +4,7 @@ import {
import { PlayerControl } from '../components';
export const keyboardMoveSystem = defineSystem(
- [Query([Mut(Transform), PlayerControl]), Res(Input), Res(Time)],
+ [Query(Mut(Transform), PlayerControl), Res(Input), Res(Time)],
(query, input, time) => {
for (const [_entity, transform, player] of query) {
let dx = 0;
diff --git a/examples/input-demo/src/systems/mouse.ts b/examples/input-demo/src/systems/mouse.ts
index 2a1d3f8f7..159ce69df 100644
--- a/examples/input-demo/src/systems/mouse.ts
+++ b/examples/input-demo/src/systems/mouse.ts
@@ -7,7 +7,7 @@ import { MouseFollower, Trail } from '../components';
const FOLLOW_SPEED = 8;
export const mouseFollowSystem = defineSystem(
- [Query([Mut(Transform), MouseFollower]), Res(Input)],
+ [Query(Mut(Transform), MouseFollower), Res(Input)],
(query, input) => {
const mouse = input.getMousePosition();
const worldX = mouse.x;
diff --git a/examples/input-demo/src/systems/trail.ts b/examples/input-demo/src/systems/trail.ts
index 810bc8b12..727918291 100644
--- a/examples/input-demo/src/systems/trail.ts
+++ b/examples/input-demo/src/systems/trail.ts
@@ -5,7 +5,7 @@ import {
import { Trail } from '../components';
export const trailSystem = defineSystem(
- [Query([Mut(Transform), Mut(Sprite), Mut(Trail)]), Res(Time), Commands()],
+ [Query(Mut(Transform), Mut(Sprite), Mut(Trail)), Res(Time), Commands()],
(query, time, cmds) => {
for (const [entity, transform, sprite, trail] of query) {
trail.lifetime -= time.delta;
diff --git a/examples/physics-playground/src/systems/spawn.ts b/examples/physics-playground/src/systems/spawn.ts
index 3da4de1e1..c4605bbba 100644
--- a/examples/physics-playground/src/systems/spawn.ts
+++ b/examples/physics-playground/src/systems/spawn.ts
@@ -1,6 +1,7 @@
import {
defineSystem, Query, Mut, Res, Time, Commands,
Transform, Sprite, RigidBody, BoxCollider, CircleCollider, BodyType,
+ INVALID_TEXTURE,
} from 'esengine';
import { SpawnTimer } from '../components';
@@ -11,7 +12,7 @@ const PPU = 100;
let bodyCount = 0;
export const spawnSystem = defineSystem(
- [Query([Mut(SpawnTimer)]), Res(Time), Commands()],
+ [Query(Mut(SpawnTimer)), Res(Time), Commands()],
(query, time, cmds) => {
for (const [_entity, timer] of query) {
timer.timer += time.delta;
@@ -30,7 +31,7 @@ export const spawnSystem = defineSystem(
.insert(Sprite, {
size: { x: radius * 2, y: radius * 2 },
color: { r: rgb.r, g: rgb.g, b: rgb.b, a: 1 },
- texture: '0477f2e4-d640-4a8e-b696-36f52b7583df',
+ texture: INVALID_TEXTURE,
})
.insert(RigidBody, {
bodyType: BodyType.Dynamic,
@@ -48,7 +49,7 @@ export const spawnSystem = defineSystem(
.insert(Sprite, {
size: { x: w, y: h },
color: { r: rgb.r, g: rgb.g, b: rgb.b, a: 1 },
- texture: '88be0710-ab45-4377-ac76-166aecfbd56f',
+ texture: INVALID_TEXTURE,
})
.insert(RigidBody, {
bodyType: BodyType.Dynamic,
diff --git a/examples/platformer/src/systems/coin.ts b/examples/platformer/src/systems/coin.ts
index 5eb5bff1b..98ba0f802 100644
--- a/examples/platformer/src/systems/coin.ts
+++ b/examples/platformer/src/systems/coin.ts
@@ -9,9 +9,9 @@ const BOB_AMOUNT = 6;
export const coinSystem = defineSystem(
[
- Query([Mut(Transform), Mut(Coin)]),
- Query([Transform, Player]),
- Query([Mut(ScoreDisplay)]),
+ Query(Mut(Transform), Mut(Coin)),
+ Query(Transform, Player),
+ Query(Mut(ScoreDisplay)),
Res(Time),
Commands(),
],
diff --git a/examples/platformer/src/systems/player.ts b/examples/platformer/src/systems/player.ts
index 2a5e13302..2a58bd9a0 100644
--- a/examples/platformer/src/systems/player.ts
+++ b/examples/platformer/src/systems/player.ts
@@ -8,7 +8,7 @@ const PLAYER_HALF_W = 16;
const PLAYER_HALF_H = 24;
export const playerSystem = defineSystem(
- [Query([Mut(Transform), Mut(Player)]), Query([Transform, Platform]), Res(Time), Res(Input)],
+ [Query(Mut(Transform), Mut(Player)), Query(Transform, Platform), Res(Time), Res(Input)],
(players, platforms, time, input) => {
for (const [_entity, transform, player] of players) {
let moveX = 0;
diff --git a/examples/postprocess-effects/src/systems/animate.ts b/examples/postprocess-effects/src/systems/animate.ts
index 390b8c607..a79d7d739 100644
--- a/examples/postprocess-effects/src/systems/animate.ts
+++ b/examples/postprocess-effects/src/systems/animate.ts
@@ -4,7 +4,7 @@ import {
import { Orbit } from '../components';
export const animateSystem = defineSystem(
- [Query([Mut(Transform), Mut(Orbit)]), Res(Time)],
+ [Query(Mut(Transform), Mut(Orbit)), Res(Time)],
(query, time) => {
for (const [_entity, transform, orbit] of query) {
orbit.angle += orbit.speed * time.delta;
diff --git a/examples/sprite-animation/src/systems/switch.ts b/examples/sprite-animation/src/systems/switch.ts
index 708fd2770..423f2b95a 100644
--- a/examples/sprite-animation/src/systems/switch.ts
+++ b/examples/sprite-animation/src/systems/switch.ts
@@ -4,7 +4,7 @@ import {
import { AnimSwitcher } from '../components';
export const switchSystem = defineSystem(
- [Query([Mut(SpriteAnimator), Mut(AnimSwitcher)]), Res(Time)],
+ [Query(Mut(SpriteAnimator), Mut(AnimSwitcher)), Res(Time)],
(query, time) => {
for (const [_entity, animator, switcher] of query) {
switcher.switchTimer -= time.delta;
diff --git a/examples/sprite-rendering/src/systems/animate.ts b/examples/sprite-rendering/src/systems/animate.ts
index 98afc6b36..84d9781a9 100644
--- a/examples/sprite-rendering/src/systems/animate.ts
+++ b/examples/sprite-rendering/src/systems/animate.ts
@@ -5,7 +5,7 @@ import {
import { Wave, Orbit, FlipDemo } from '../components';
export const waveSystem = defineSystem(
- [Query([Mut(Transform), Wave]), Res(Time)],
+ [Query(Mut(Transform), Wave), Res(Time)],
(query, time) => {
for (const [_entity, transform, wave] of query) {
transform.position.x += Math.sin(time.elapsed * wave.frequency + wave.phase) * wave.amplitude * time.delta;
@@ -15,7 +15,7 @@ export const waveSystem = defineSystem(
);
export const orbitSystem = defineSystem(
- [Query([Mut(Transform), Mut(Orbit)]), Res(Time)],
+ [Query(Mut(Transform), Mut(Orbit)), Res(Time)],
(query, time) => {
for (const [_entity, transform, orbit] of query) {
orbit.angle += orbit.speed * time.delta;
@@ -27,7 +27,7 @@ export const orbitSystem = defineSystem(
);
export const flipSystem = defineSystem(
- [Query([Mut(Transform), FlipDemo]), Res(Time)],
+ [Query(Mut(Transform), FlipDemo), Res(Time)],
(query, time) => {
for (const [_entity, transform] of query) {
const bounce = Math.sin(time.elapsed * 2) * 5;
diff --git a/examples/tween-animation/src/systems/setup.ts b/examples/tween-animation/src/systems/setup.ts
index 67dff16f8..9a194886b 100644
--- a/examples/tween-animation/src/systems/setup.ts
+++ b/examples/tween-animation/src/systems/setup.ts
@@ -18,7 +18,7 @@ const X_TO = 250;
const DURATION = 2;
export const setupSystem = defineSystem(
- [Query([Transform, EasingDemo]), Query([Transform, ScaleDemo]), Query([Transform, RotationDemo]), Query([Transform, ColorDemo])],
+ [Query(Transform, EasingDemo), Query(Transform, ScaleDemo), Query(Transform, RotationDemo), Query(Transform, ColorDemo)],
(easings, scales, rotations, colors) => {
for (const [entity, _t, demo] of easings) {
Tween.to(entity, TweenTarget.PositionX, X_FROM, X_TO, DURATION, {
diff --git a/examples/ui-controls/src/systems/animate.ts b/examples/ui-controls/src/systems/animate.ts
index d0c1a150c..8fe5e8824 100644
--- a/examples/ui-controls/src/systems/animate.ts
+++ b/examples/ui-controls/src/systems/animate.ts
@@ -4,7 +4,7 @@ import {
import { ProgressAnimator } from '../components';
export const progressAnimateSystem = defineSystem(
- [Query([Mut(ProgressBar), Mut(ProgressAnimator)]), Res(Time)],
+ [Query(Mut(ProgressBar), Mut(ProgressAnimator)), Res(Time)],
(query, time) => {
for (const [_entity, bar, animator] of query) {
bar.value += animator.speed * animator.direction * time.delta;