cha0s/silphius
1
1
Fork 0
Code Issues 11 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: cha0s:6eac2986710e19ef022c625e342f355353940e8b
Branches Tags
cha0s:master
..
compare: cha0s:a872d9ae5f540cf1835b14f5cb988980cc00fd51
Branches Tags
cha0s:master

No commits in common. "6eac2986710e19ef022c625e342f355353940e8b" and "a872d9ae5f540cf1835b14f5cb988980cc00fd51" have entirely different histories.
6eac298671 ... a872d9ae5f

38 changed files with 212 additions and 637 deletions
Show Stats Expand all files Collapse all files

3
app/client/prediction.js
View File

@ -1,5 +1,4 @@
import {encode} from '@/net/packets/index.js';
import {withResolvers} from '@/util/promise.js';
let connected = false;
let socket;
@ -13,7 +12,7 @@ onmessage = async (event) => {
const url = new URL(`wss://${event.data.host}/ws`)
socket = new WebSocket(url.href);
socket.binaryType = 'arraybuffer';
const {promise, resolve} = withResolvers();
const {promise, resolve} = Promise.withResolvers();
socket.addEventListener('open', resolve);
socket.addEventListener('error', () => {
postMessage(encode({type: 'ConnectionStatus', payload: 'aborted'}));

3
app/client/remote.js
View File

@ -1,7 +1,6 @@
import Client from '@/net/client.js';
import {encode} from '@/net/packets/index.js';
import {CLIENT_PREDICTION} from '@/util/constants.js';
import {withResolvers} from '@/util/promise.js';
export default class RemoteClient extends Client {
constructor() {
@ -31,7 +30,7 @@ export default class RemoteClient extends Client {
const onMessage = (event) => {
this.accept(event.data);
}
const {promise, resolve} = withResolvers();
const {promise, resolve} = Promise.withResolvers();
this.socket.addEventListener('open', resolve);
this.socket.addEventListener('error', () => {
this.accept(encode({type: 'ConnectionStatus', payload: 'aborted'}));

46
app/ecs/components/behaving.js
View File

@ -1,46 +0,0 @@
import Component from '@/ecs/component.js';
export default class Behaving extends Component {
instanceFromSchema() {
return class BehavingInstance extends super.instanceFromSchema() {
$$routineInstances = {};
tick(elapsed) {
const routine = this.$$routineInstances[this.currentRoutine];
if (routine) {
routine.tick(elapsed);
}
}
};
}
async load(instance) {
// heavy handed...
if ('undefined' !== typeof window) {
return;
}
const promises = [];
for (const key in instance.routines) {
promises.push(
this.ecs.readScript(
instance.routines[key],
{
entity: this.ecs.get(instance.entity),
},
)
.then((script) => {
instance.$$routineInstances[key] = script;
}),
);
}
await Promise.all(promises);
}
static properties = {
currentRoutine: {defaultValue: 'initial', type: 'string'},
isBehaving: {defaultValue: 1, type: 'uint8'},
routines: {
type: 'map',
value: {
type: 'string',
},
},
};
}

2
app/ecs/components/interactive.js
View File

@ -8,7 +8,7 @@ export default class Interactive extends Component {
const script = this.interactScriptInstance.clone();
script.context.initiator = initiator;
const {Ticking} = ecs.get(this.entity);
Ticking.add(script.ticker());
Ticking.addTickingPromise(script.tickingPromise());
}
get interacting() {
return !!this.$$interacting;

2
app/ecs/components/plant.js
View File

@ -11,7 +11,7 @@ export default class Plant extends Component {
}
grow() {
const {Ticking} = ecs.get(this.entity);
Ticking.add(this.growScriptInstance.ticker());
Ticking.addTickingPromise(this.growScriptInstance.tickingPromise());
}
};
}

38
app/ecs/components/sprite.js
View File

@ -3,60 +3,24 @@ import Component from '@/ecs/component.js';
export default class Sprite extends Component {
instanceFromSchema() {
return class SpriteInstance extends super.instanceFromSchema() {
$$sourceJson = {};
get anchor() {
return {x: this.anchorX, y: this.anchorY};
}
get animation() {
return super.animation;
}
set animation(animation) {
super.animation = animation;
// eslint-disable-next-line no-self-assign
this.frame = this.frame;
}
get frame() {
return super.frame;
}
set frame(frame) {
super.frame = this.frames ? frame % this.frames : 0;
}
get frames() {
if (
!this.animation
|| !this.$$sourceJson.animations
|| !(this.animation in this.$$sourceJson.animations)
) {
return 0;
}
return this.$$sourceJson.animations[this.animation].length;
}
get scale() {
return {x: this.scaleX, y: this.scaleY};
}
toNet() {
// eslint-disable-next-line no-unused-vars
const {elapsed, ...rest} = super.toNet();
return rest;
}
};
}
async load(instance) {
instance.$$sourceJson = await this.ecs.readJson(instance.source);
}
markChange(entityId, key, value) {
if ('elapsed' === key) {
return;
}
super.markChange(entityId, key, value);
}
static properties = {
anchorX: {defaultValue: 0.5, type: 'float32'},
anchorY: {defaultValue: 0.5, type: 'float32'},
animation: {type: 'string'},
elapsed: {type: 'float32'},
frame: {type: 'uint16'},
isAnimating: {defaultValue: 1, type: 'uint8'},
frames: {type: 'uint16'},
scaleX: {defaultValue: 1, type: 'float32'},
scaleY: {defaultValue: 1, type: 'float32'},
source: {type: 'string'},

22
app/ecs/components/ticking.js
View File

@ -5,30 +5,30 @@ export default class Ticking extends Component {
return class TickingInstance extends super.instanceFromSchema() {
$$finished = [];
$$tickers = [];
$$tickingPromises = [];
add(ticker) {
this.$$tickers.push(ticker);
ticker.then(() => {
this.$$finished.push(ticker);
addTickingPromise(tickingPromise) {
this.$$tickingPromises.push(tickingPromise);
tickingPromise.then(() => {
this.$$finished.push(tickingPromise);
});
}
reset() {
this.$$finished = [];
this.$$tickers = [];
this.$$tickingPromises = [];
}
tick(elapsed) {
for (const ticker of this.$$finished) {
this.$$tickers.splice(
this.$$tickers.indexOf(ticker),
for (const tickingPromise of this.$$finished) {
this.$$tickingPromises.splice(
this.$$tickingPromises.indexOf(tickingPromise),
1,
);
}
this.$$finished = [];
for (const ticker of this.$$tickers) {
ticker.tick(elapsed);
for (const tickingPromise of this.$$tickingPromises) {
tickingPromise.tick(elapsed);
}
}

2
app/ecs/components/wielder.js
View File

@ -20,7 +20,7 @@ export default class Wielder extends Component {
script.context.ecs = ecs;
script.context.item = activeItem;
script.context.wielder = entity;
Ticking.add(script.ticker());
Ticking.addTickingPromise(script.tickingPromise());
}
}
}

7
app/ecs/ecs.js
View File

@ -1,7 +1,6 @@
import {Encoder, Decoder} from '@msgpack/msgpack';
import {LRUCache} from 'lru-cache';
import {withResolvers} from '@/util/promise.js';
import Script from '@/util/script.js';
import EntityFactory from './entity-factory.js';
@ -327,7 +326,11 @@ export default class Ecs {
async readJson(uri) {
const key = ['$$json', uri].join(':');
if (!cache.has(key)) {
const {promise, resolve, reject} = withResolvers();
let promise, resolve, reject;
promise = new Promise((res, rej) => {
resolve = res;
reject = rej;
});
cache.set(key, promise);
this.readAsset(uri)
.then((chars) => {

12
app/ecs/ecs.test.js
View File

@ -170,16 +170,10 @@ test('ticks systems', async () => {
.to.deep.equal(JSON.stringify({y: 128 + 30}));
});
test('schedules entities to be deleted when ticking systems', async () => {
test('schedules entities to be deleted when ticking systems', () => {
const ecs = new Ecs({
Components: {Empty},
Systems: {
Despawn: class extends System {
static queries() {
return {
default: ['Empty'],
};
}
tick() {
this.ecs.destroy(1);
expect(ecs.get(1))
@ -189,10 +183,8 @@ test('schedules entities to be deleted when ticking systems', async () => {
},
});
ecs.system('Despawn').active = true;
await ecs.create({Empty: {}});
ecs.create();
ecs.tick(1);
expect(Array.from(ecs.system('Despawn').select('default')))
.to.have.lengthOf(0);
expect(ecs.get(1))
.to.be.undefined;
});

4
app/ecs/query.js
View File

@ -24,8 +24,8 @@ export default class Query {
}
deindex(entityIds) {
for (const entityId of entityIds) {
this.$$index.delete(entityId);
for (let i = 0; i < entityIds.length; ++i) {
this.$$index.delete(entityIds[i]);
}
}

17
app/ecs/systems/behave.js
View File

@ -1,17 +0,0 @@
import {System} from '@/ecs/index.js';
export default class Behave extends System {
static queries() {
return {
default: ['Behaving'],
};
}
tick(elapsed) {
for (const {Behaving} of this.select('default')) {
Behaving.tick(elapsed);
}
}
}

8
app/ecs/systems/colliders.js
View File

@ -69,14 +69,14 @@ export default class Colliders extends System {
const script = entity.Collider.collisionStartScriptInstance.clone();
script.context.intersections = intersections;
script.context.other = other;
entity.Ticking.add(script.ticker());
entity.Ticking.addTickingPromise(script.tickingPromise());
}
if (other.Collider.collisionStartScriptInstance) {
const script = other.Collider.collisionStartScriptInstance.clone();
script.context.intersections = intersections
.map(([l, r]) => [r, l]);
script.context.other = entity;
other.Ticking.add(script.ticker());
other.Ticking.addTickingPromise(script.tickingPromise());
}
}
for (const i in intersections) {
@ -127,12 +127,12 @@ export default class Colliders extends System {
if (entity.Collider.collisionEndScriptInstance) {
const script = entity.Collider.collisionEndScriptInstance.clone();
script.context.other = other;
entity.Ticking.add(script.ticker());
entity.Ticking.addTickingPromise(script.tickingPromise());
}
if (other.Collider.collisionEndScriptInstance) {
const script = other.Collider.collisionEndScriptInstance.clone();
script.context.other = entity;
other.Ticking.add(script.ticker());
other.Ticking.addTickingPromise(script.tickingPromise());
}
}
}

6
app/ecs/systems/run-animations.js
View File

@ -1,6 +1,6 @@
import {System} from '@/ecs/index.js';
export default class RunAnimations extends System {
export default class ControlMovement extends System {
static queries() {
return {
@ -10,13 +10,13 @@ export default class RunAnimations extends System {
tick(elapsed) {
for (const {Sprite} of this.select('default')) {
if (0 === Sprite.speed || !Sprite.isAnimating) {
if (0 === Sprite.speed) {
continue;
}
Sprite.elapsed += elapsed / Sprite.speed;
while (Sprite.elapsed > 1) {
Sprite.elapsed -= 1;
Sprite.frame += 1;
Sprite.frame = (Sprite.frame + 1) % Sprite.frames;
}
}
}

7
app/react/components/client-ecs.js
View File

@ -1,7 +1,6 @@
import {LRUCache} from 'lru-cache';
import Ecs from '@/ecs/ecs.js';
import {withResolvers} from '@/util/promise.js';
const cache = new LRUCache({
max: 128,
@ -10,7 +9,11 @@ const cache = new LRUCache({
export default class ClientEcs extends Ecs {
async readAsset(uri) {
if (!cache.has(uri)) {
const {promise, resolve, reject} = withResolvers();
let promise, resolve, reject;
promise = new Promise((res, rej) => {
resolve = res;
reject = rej;
});
cache.set(uri, promise);
fetch(new URL(uri, window.location.origin))
.then(async (response) => {

6
app/react/components/devtools.jsx
View File

@ -16,12 +16,12 @@ export default function Devtools({
}) {
const [ecs] = useEcs();
const [mainEntity] = useMainEntity();
const [mainEntityJson, setMainEntityJson] = useState('');
const [mainEntityJson, setMainEntityJson] = useState({});
useEcsTick(() => {
if (!ecs || !mainEntity) {
return;
}
setMainEntityJson(JSON.stringify(ecs.get(mainEntity), null, 2));
setMainEntityJson(ecs.get(mainEntity).toJSON());
}, [ecs, mainEntity]);
return (
<div className={styles.devtools}>
@ -46,7 +46,7 @@ export default function Devtools({
</label>
</div>
</form>
<pre><code><small>{mainEntityJson}</small></code></pre>
<pre><code><small>{JSON.stringify(mainEntityJson, null, 2)}</small></code></pre>
</div>
</TabPanel>
<TabPanel>

2
app/react/components/pixi/entity.jsx
View File

@ -5,7 +5,7 @@ import {useDebug} from '@/react/context/debug.js';
import {useMainEntity} from '@/react/context/main-entity.js';
import Emitter from './emitter.jsx';
// import Light from './light.jsx';
import Light from './light.jsx';
import Sprite from './sprite.jsx';
function Aabb({color, width = 0.5, x0, y0, x1, y1, ...rest}) {

27
app/react/components/pixi/lights.js
View File

@ -1,5 +1,4 @@
import {Group, Layer} from '@pixi/layers';
import * as Lights from '@pixi/lights';
class LightLayer extends Layer {
$$diffuseTexture;
@ -43,16 +42,22 @@ class DeferredLighting {
export const deferredLighting = new DeferredLighting();
export class AmbientLight extends Lights.AmbientLight {
constructor(...args) {
super(...args);
this.parentGroup = deferredLighting.lightGroup;
let AmbientLight, PointLight;
if ('undefined' !== typeof window) {
const Lights = await import('@pixi/lights');
AmbientLight = class AmbientLight extends Lights.AmbientLight {
constructor(...args) {
super(...args);
this.parentGroup = deferredLighting.lightGroup;
}
}
PointLight = class PointLight extends Lights.PointLight {
constructor(...args) {
super(...args);
this.parentGroup = deferredLighting.lightGroup;
}
}
}
export class PointLight extends Lights.PointLight {
constructor(...args) {
super(...args);
this.parentGroup = deferredLighting.lightGroup;
}
}
export {AmbientLight, PointLight};

1
app/server/create/ecs.js
View File

@ -4,7 +4,6 @@ import Systems from '@/ecs/systems/index.js';
export default function createEcs(Ecs) {
const ecs = new Ecs({Components, Systems});
const defaultSystems = [
'Behave',
'PassTime',
'Attract',
'ResetForces',

35
app/server/create/homestead.js
View File

@ -94,40 +94,5 @@ export default async function createHomestead(id) {
Ticking: {},
VisibleAabb: {},
});
const kitty = {
Behaving: {
routines: {
initial: '/assets/kitty/initial.js',
},
},
Collider: {
bodies: [
{
points: [
{x: -4, y: -4},
{x: 3, y: -4},
{x: 3, y: 3},
{x: -4, y: 3},
],
},
],
},
Controlled: {},
Direction: {direction: 2},
Forces: {},
Position: {x: 250, y: 250},
Speed: {speed: 20},
Sprite: {
anchorX: 0.5,
anchorY: 0.7,
source: '/assets/kitty/kitty.json',
speed: 0.115,
},
Ticking: {},
VisibleAabb: {},
};
for (let i = 0; i < 10; ++i) {
entities.push(kitty);
}
return entities;
}

11
app/server/create/player.js
View File

@ -5,10 +5,10 @@ export default async function createPlayer(id) {
bodies: [
{
points: [
{x: -4, y: -4},
{x: 3, y: -4},
{x: 3, y: 3},
{x: -4, y: 3},
{x: -8, y: -8},
{x: 7, y: -8},
{x: 7, y: 7},
{x: -8, y: 7},
],
},
],
@ -49,9 +49,10 @@ export default async function createPlayer(id) {
Sound: {},
Sprite: {
anchorX: 0.5,
anchorY: 0.9,
anchorY: 0.8,
animation: 'moving:down',
frame: 0,
frames: 8,
source: '/assets/dude/dude.json',
speed: 0.115,
},

12
app/server/engine.js
View File

@ -7,7 +7,6 @@ import {
RESOLUTION,
TPS,
} from '@/util/constants.js';
import {withResolvers} from '@/util/promise.js';
import createEcs from './create/ecs.js';
import createForest from './create/forest.js';
@ -49,7 +48,11 @@ export default class Engine {
}
async readAsset(uri) {
if (!cache.has(uri)) {
const {promise, resolve, reject} = withResolvers();
let promise, resolve, reject;
promise = new Promise((res, rej) => {
resolve = res;
reject = rej;
});
cache.set(uri, promise);
server.readAsset(uri)
.then(resolve)
@ -85,7 +88,7 @@ export default class Engine {
...updates,
};
// remove from old ECS
this.destroyImmediately(entity.id);
this.destroy(entity.id);
// load if necessary
if (!engine.ecses[path]) {
await engine.loadEcs(path);
@ -227,7 +230,7 @@ export default class Engine {
const {entity, id} = connectedPlayer;
const ecs = this.ecses[entity.Ecs.path];
await this.savePlayer(id, entity);
ecs.destroyImmediately(entity.id);
ecs.destroy(entity.id);
this.connectedPlayers.delete(connection);
this.incomingActions.delete(connection);
}
@ -319,6 +322,7 @@ export default class Engine {
stop() {
clearTimeout(this.handle);
this.handle = undefined;
this.tick(0);
}
tick(elapsed) {

8
app/server/pixi-context.js
View File

@ -1,8 +0,0 @@
import {settings} from '@pixi/core';
settings.ADAPTER = {
...settings.ADAPTER,
createCanvas: () => ({
getContext: () => undefined,
}),
};

48
app/server/worker.js
View File

@ -2,7 +2,6 @@ import {del, get, set} from 'idb-keyval';
import {encode} from '@/net/packets/index.js';
import Server from '@/net/server.js';
import {withResolvers} from '@/util/promise.js';
import createEcs from './create/ecs.js';
import './create/forest.js';
@ -63,32 +62,41 @@ onmessage = async (event) => {
})();
if (import.meta.hot) {
const before = withResolvers();
const promises = [before.promise];
const createResolver = () => {
let r;
const promise = new Promise((resolve) => {
r = resolve;
});
promise.resolve = r;
return promise;
};
const beforeResolver = createResolver();
const resolvers = [beforeResolver];
import.meta.hot.on('vite:beforeUpdate', async () => {
engine.stop();
await engine.disconnectPlayer(0);
await engine.saveEcses();
before.resolve();
beforeResolver.resolve();
});
import.meta.hot.accept('./engine.js');
import.meta.hot.accept('./create/player.js', async ({default: createPlayer}) => {
const {promise, resolve} = withResolvers();
promises.push(promise);
await before.promise;
const oldPlayer = await engine.loadPlayer(0);
const player = await createPlayer(0);
const resolver = createResolver();
resolvers.push(resolver);
await beforeResolver;
const oldPlayer = await engine.server.readJson('players/0');
const buffer = await createPlayer(0);
const player = JSON.parse((new TextDecoder()).decode(buffer));
// Less jarring
player.Ecs = oldPlayer.Ecs;
player.Direction = oldPlayer.Direction;
player.Position = oldPlayer.Position;
await engine.savePlayer(0, player);
resolve();
await engine.server.writeData('players/0', (new TextEncoder()).encode(JSON.stringify(player)));
resolver.resolve();
});
import.meta.hot.accept('./create/forest.js', async ({default: createForest}) => {
const {promise, resolve} = withResolvers();
promises.push(promise);
await before.promise;
const resolver = createResolver();
resolvers.push(resolver);
await beforeResolver;
delete engine.ecses['forests/0'];
await engine.server.removeData('forests/0');
const forest = createEcs(engine.Ecs);
@ -96,12 +104,12 @@ if (import.meta.hot) {
await forest.create(entity);
}
await engine.saveEcs('forests/0', forest);
resolve();
resolver.resolve();
});
import.meta.hot.accept('./create/homestead.js', async ({default: createHomestead}) => {
const {promise, resolve} = withResolvers();
promises.push(promise);
await before.promise;
const resolver = createResolver();
resolvers.push(resolver);
await beforeResolver;
delete engine.ecses['homesteads/0'];
await engine.server.removeData('homesteads/0');
const homestead = createEcs(engine.Ecs);
@ -109,10 +117,10 @@ if (import.meta.hot) {
await homestead.create(entity);
}
await engine.saveEcs('homesteads/0', homestead);
resolve();
resolver.resolve();
});
import.meta.hot.on('vite:afterUpdate', async () => {
await Promise.all(promises);
await Promise.all(resolvers);
postMessage(encode({type: 'ConnectionStatus', payload: 'aborted'}));
close();
});

4
app/util/constants.js
View File

@ -1,6 +1,6 @@
export const CHUNK_SIZE = 32;
export const CLIENT_LATENCY = 100;
export const CLIENT_LATENCY = 0;
export const CLIENT_PREDICTION = true;
@ -11,6 +11,6 @@ export const RESOLUTION = {
y: 450,
};
export const SERVER_LATENCY = 100;
export const SERVER_LATENCY = 0;
export const TPS = 60;

4
app/util/delta.js
View File

@ -1,4 +1,4 @@
import {Ticker} from '@/util/promise.js';
import TickingPromise from '@/util/ticking-promise.js';
export default function delta(object, properties) {
const deltas = {};
@ -12,7 +12,7 @@ export default function delta(object, properties) {
deltas[key] = delta;
}
let stop;
const promise = new Ticker(
const promise = new TickingPromise(
(resolve) => {
stop = resolve;
},

8
app/util/lfo.js
View File

@ -1,4 +1,4 @@
import {Ticker, withResolvers} from '@/util/promise.js';
import TickingPromise from '@/util/ticking-promise.js';
const Modulators = {
flat: () => 0.5,
@ -35,7 +35,9 @@ export default function lfo(object, properties) {
}
}
oscillator.low = oscillator.median - oscillator.magnitude / 2;
({promise: oscillator.promise, resolve: oscillator.stop} = withResolvers());
oscillator.promise = new Promise((resolve) => {
oscillator.stop = resolve;
});
oscillator.promise.then(() => {
delete oscillators[key];
});
@ -43,7 +45,7 @@ export default function lfo(object, properties) {
oscillators[key] = oscillator;
}
let stop;
const promise = new Ticker(
const promise = new TickingPromise(
(resolve) => {
stop = resolve;
Promise.all(promises).then(resolve);

14
app/util/math.js
View File

@ -121,13 +121,6 @@ export function createRandom(seed = 0) {
return alea(seed);
}
export const directionToVector = [
{x: 0, y: -1},
{x: 1, y: 0},
{x: 0, y: 1},
{x: -1, y: 0},
];
export function distance({x: lx, y: ly}, {x: rx, y: ry}) {
const xd = lx - rx;
const yd = ly - ry;
@ -253,6 +246,13 @@ export function isCollinear({x: ax, y: ay}, {x: bx, y: by}, {x: cx, y: cy}) {
return (ay - by) * (ax - cx) === (ay - cy) * (ax - bx);
}
export const directionToVector = [
{x: 0, y: -1},
{x: 1, y: 0},
{x: 0, y: 1},
{x: -1, y: 0},
];
export function ortho(points, k = {x: 1, y: 1}) {
if (points.length < 4) {
throw new TypeError('Math.ortho(): points.length < 4');

32
app/util/script.js
View File

@ -2,10 +2,10 @@ import {parse as acornParse} from 'acorn';
import {LRUCache} from 'lru-cache';
import Sandbox from '@/astride/sandbox.js';
import TickingPromise from '@/util/ticking-promise.js';
import delta from '@/util/delta.js';
import lfo from '@/util/lfo.js';
import * as MathUtil from '@/util/math.js';
import * as PromiseUtil from '@/util/promise.js';
import transition from '@/util/transition.js';
function parse(code, options = {}) {
@ -43,7 +43,7 @@ export default class Script {
delta,
lfo,
Math: MathUtil,
Promise: PromiseUtil,
Promise,
transition,
wait: (seconds) => (
new Promise((resolve) => {
@ -95,7 +95,7 @@ export default class Script {
tick(elapsed, resolve, reject) {
if (this.promise) {
if (this.promise instanceof PromiseUtil.Ticker) {
if (this.promise instanceof TickingPromise) {
this.promise.tick(elapsed);
}
return;
@ -106,12 +106,10 @@ export default class Script {
if (async) {
this.promise = value;
value
.catch(reject ? reject : () => {})
.catch(reject)
.then(() => {
if (done) {
if (resolve) {
resolve();
}
resolve();
}
})
.finally(() => {
@ -120,16 +118,14 @@ export default class Script {
break;
}
if (done) {
if (resolve) {
resolve();
}
resolve();
break;
}
}
}
ticker() {
return new PromiseUtil.Ticker(
tickingPromise() {
return new TickingPromise(
() => {},
(elapsed, resolve, reject) => {
this.tick(elapsed, resolve, reject);
@ -137,18 +133,18 @@ export default class Script {
);
}
static ticker(code, context = {}) {
let ticker;
return new PromiseUtil.Ticker(
static tickingPromise(code, context = {}) {
let tickingPromise;
return new TickingPromise(
(resolve) => {
this.fromCode(code, context)
.then((script) => {
ticker = script.ticker();
resolve(ticker);
tickingPromise = script.tickingPromise();
resolve(tickingPromise);
})
},
(elapsed) => {
ticker?.tick?.(elapsed);
tickingPromise?.tick?.(elapsed);
},
);
}

33
app/util/promise.js → app/util/ticking-promise.js
View File

@ -1,19 +1,4 @@
export const all = Promise.all.bind(Promise);
export const allSettled = Promise.allSettled.bind(Promise);
export const any = Promise.any.bind(Promise);
export const race = Promise.race.bind(Promise);
export const reject = Promise.reject.bind(Promise);
export const resolve = Promise.resolve.bind(Promise);
export function withResolvers() {
let resolve, reject, promise = new Promise((res, rej) => {
resolve = res;
reject = rej;
});
return {promise, reject, resolve};
}
export class Ticker extends Promise {
export default class TickingPromise extends Promise {
constructor(executor, ticker) {
let _reject;
@ -31,22 +16,22 @@ export class Ticker extends Promise {
}
static all(promises) {
const tickers = [];
const tickingPromises = [];
for (let i = 0; i < promises.length; i++) {
const promise = promises[i];
if (promise instanceof Ticker) {
tickers.push(promise);
if (promise instanceof TickingPromise) {
tickingPromises.push(promise);
// After resolution, stop ticking the promise.
promise.then(() => {
tickers.splice(tickers.indexOf(promise), 1);
tickingPromises.splice(tickingPromises.indexOf(promise), 1);
});
}
}
/* v8 ignore next 3 */
if (0 === tickers.length) {
if (0 === tickingPromises.length) {
return super.all(promises);
}
return new Ticker(
return new TickingPromise(
(resolve, reject) => {
super.all(promises)
.then(resolve)
@ -54,8 +39,8 @@ export class Ticker extends Promise {
.catch(reject);
},
(elapsed) => {
for (let i = 0; i < tickers.length; i++) {
tickers[i].tick(elapsed);
for (let i = 0; i < tickingPromises.length; i++) {
tickingPromises[i].tick(elapsed);
}
},
);

16
app/util/promise.test.js → app/util/ticking-promise.test.js
View File

@ -1,17 +1,17 @@
import {expect, test} from 'vitest';
import {Ticker} from './promise.js';
import TickingPromise from './ticking-promise.js';
test('runs executor', async () => {
expect(
await new Ticker((resolve) => {
await new TickingPromise((resolve) => {
resolve(32);
}),
)
.to.equal(32);
expect(
async () => {
await new Ticker((resolve, reject) => {
await new TickingPromise((resolve, reject) => {
reject(new Error(''));
})
}
@ -22,7 +22,7 @@ test('runs executor', async () => {
test('ticks and resolves', async () => {
let done = false;
let e = 0;
const tp = new Ticker(undefined, (elapsed, resolve) => {
const tp = new TickingPromise(undefined, (elapsed, resolve) => {
e += elapsed;
if (1 === e) {
done = true;
@ -49,7 +49,7 @@ test('ticks and resolves', async () => {
test('ticks and rejects', async () => {
let caught = false;
const tp = new Ticker(undefined, (elapsed, resolve, reject) => {
const tp = new TickingPromise(undefined, (elapsed, resolve, reject) => {
reject(new Error());
});
tp.catch(() => {
@ -66,21 +66,21 @@ test('ticks and rejects', async () => {
test('handles all', async () => {
let done = 0;
let e1 = 0, e2 = 0;
const tp1 = new Ticker(undefined, (elapsed, resolve) => {
const tp1 = new TickingPromise(undefined, (elapsed, resolve) => {
e1 += elapsed;
if (1 === e1) {
done += 1;
resolve(16);
}
});
const tp2 = new Ticker(undefined, (elapsed, resolve) => {
const tp2 = new TickingPromise(undefined, (elapsed, resolve) => {
e2 += elapsed;
if (2 === e2) {
done += 1;
resolve(32);
}
});
const tpa = Ticker.all([
const tpa = TickingPromise.all([
Promise.resolve(8),
tp1,
tp2,

4
app/util/transition.js
View File

@ -1,4 +1,4 @@
import {Ticker} from '@/util/promise.js';
import TickingPromise from '@/util/ticking-promise.js';
/* eslint-disable */
const Easing = {
@ -152,7 +152,7 @@ export default function transition(object, properties) {
transitions[key] = transition;
}
let stop;
const promise = new Ticker(
const promise = new TickingPromise(
(resolve) => {
stop = resolve;
},

16
public/assets/kitty/initial.js
View File

@ -1,16 +0,0 @@
entity.Direction.direction = Math.floor(Math.random() * 4);
const map = {0: 'moveUp', 1: 'moveRight', 2: 'moveDown', 3: 'moveLeft'};
entity.Controlled[map[entity.Direction.direction]] = 1;
await wait(0.25 + Math.random() * 2.25);
entity.Controlled[map[entity.Direction.direction]] = 0;
entity.Sprite.isAnimating = 0;
await wait(1 + Math.random() * 3);
entity.Direction.direction = Math.floor(Math.random() * 4);
await wait(0.5 + Math.random() * 2.5);
entity.Sprite.isAnimating = 1;

263
public/assets/kitty/kitty.json
View File

@ -1,263 +0,0 @@
{
"animations": {
"idle:up": [
"kitty/0"
],
"idle:right": [
"kitty/3"
],
"idle:down": [
"kitty/6"
],
"idle:left": [
"kitty/9"
],
"moving:up": [
"kitty/0",
"kitty/1",
"kitty/2"
],
"moving:right": [
"kitty/3",
"kitty/4",
"kitty/5"
],
"moving:down": [
"kitty/6",
"kitty/7",
"kitty/8"
],
"moving:left": [
"kitty/9",
"kitty/10",
"kitty/11"
]
},
"frames": {
"kitty/0": {
"frame": {
"x": 0,
"y": 0,
"w": 16,
"h": 16
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 16,
"h": 16
},
"sourceSize": {
"w": 16,
"h": 16
}
},
"kitty/1": {
"frame": {
"x": 16,
"y": 0,
"w": 16,
"h": 16
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 16,
"h": 16
},
"sourceSize": {
"w": 16,
"h": 16
}
},
"kitty/2": {
"frame": {
"x": 32,
"y": 0,
"w": 16,
"h": 16
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 16,
"h": 16
},
"sourceSize": {
"w": 16,
"h": 16
}
},
"kitty/3": {
"frame": {
"x": 0,
"y": 16,
"w": 16,
"h": 16
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 16,
"h": 16
},
"sourceSize": {
"w": 16,
"h": 16
}
},
"kitty/4": {
"frame": {
"x": 16,
"y": 16,
"w": 16,
"h": 16
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 16,
"h": 16
},
"sourceSize": {
"w": 16,
"h": 16
}
},
"kitty/5": {
"frame": {
"x": 32,
"y": 16,
"w": 16,
"h": 16
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 16,
"h": 16
},
"sourceSize": {
"w": 16,
"h": 16
}
},
"kitty/6": {
"frame": {
"x": 0,
"y": 32,
"w": 16,
"h": 16
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 16,
"h": 16
},
"sourceSize": {
"w": 16,
"h": 16
}
},
"kitty/7": {
"frame": {
"x": 16,
"y": 32,
"w": 16,
"h": 16
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 16,
"h": 16
},
"sourceSize": {
"w": 16,
"h": 16
}
},
"kitty/8": {
"frame": {
"x": 32,
"y": 32,
"w": 16,
"h": 16
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 16,
"h": 16
},
"sourceSize": {
"w": 16,
"h": 16
}
},
"kitty/9": {
"frame": {
"x": 0,
"y": 48,
"w": 16,
"h": 16
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 16,
"h": 16
},
"sourceSize": {
"w": 16,
"h": 16
}
},
"kitty/10": {
"frame": {
"x": 16,
"y": 48,
"w": 16,
"h": 16
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 16,
"h": 16
},
"sourceSize": {
"w": 16,
"h": 16
}
},
"kitty/11": {
"frame": {
"x": 32,
"y": 48,
"w": 16,
"h": 16
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 16,
"h": 16
},
"sourceSize": {
"w": 16,
"h": 16
}
}
},
"meta": {
"format": "RGBA8888",
"image": "./kitty.png",
"scale": 1,
"size": {
"w": 48,
"h": 64
}
}
}

BIN
public/assets/kitty/kitty.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 884 B

116
public/assets/tomato-plant/interact.js
View File

@ -48,61 +48,71 @@ for (let i = 0; i < 10; ++i) {
},
)
tomato.Ticking.add(
Promise.Ticker.all([
d.promise,
lfo(
d.deltas.y,
{
delta: {
count: 1,
frequency: 0.5,
magnitude: 64,
median: 0,
offset: -0.5,
},
const l = lfo(
d.deltas.y,
{
delta: {
count: 1,
frequency: 0.5,
magnitude: 64,
median: 0,
offset: -0.5,
},
},
)
const ls = lfo(
tomato.Sprite,
{
scaleX: {
count: 1,
frequency: 0.5,
magnitude: 0.333,
median: 0.333,
elapsed: 0.25,
offset: -0.5,
},
scaleY: {
count: 1,
frequency: 0.5,
magnitude: 0.333,
median: 0.333,
elapsed: 0.25,
offset: -0.5,
},
},
)
tomato.Ticking.addTickingPromise(
d.promise,
);
tomato.Ticking.addTickingPromise(
l.promise,
);
tomato.Ticking.addTickingPromise(
ls.promise,
);
tomato.Ticking.addTickingPromise(
delta(
tomato.Position,
{
x: {
duration: 0.5,
delta: (12 * x) + Math.random() * 8,
},
).promise,
lfo(
tomato.Sprite,
{
scaleX: {
count: 1,
frequency: 0.5,
magnitude: 0.333,
median: 0.333,
elapsed: 0.25,
offset: -0.5,
},
scaleY: {
count: 1,
frequency: 0.5,
magnitude: 0.333,
median: 0.333,
elapsed: 0.25,
offset: -0.5,
},
},
).promise,
);
tomato.Ticking.addTickingPromise(
delta(
tomato.Position,
{
y: {
duration: 0.5,
delta: (12 * y) + Math.random() * 8,
},
).promise,
delta(
tomato.Position,
{
x: {
duration: 0.5,
delta: (12 * x) + Math.random() * 8,
},
},
).promise,
delta(
tomato.Position,
{
y: {
duration: 0.5,
delta: (12 * y) + Math.random() * 8,
},
},
).promise,
]),
},
).promise,
);
}

2
server.js
View File

@ -44,8 +44,6 @@ let websocketBuilt = false;
const remixHandler = createRequestHandler({
build: async () => {
// patch pixi server context
import('./app/server/pixi-context.js');
const ssr = await (
viteDevServer
? viteDevServer.ssrLoadModule('virtual:remix/server-build')

8
vite.config.js
View File

@ -25,11 +25,6 @@ else {
}
export default defineConfig({
esbuild: {
supported: {
'top-level-await': true,
},
},
plugins,
resolve: {
alias: [
@ -46,7 +41,4 @@ export default defineConfig({
cert: readFileSync(`${cacheDirectory}/localhost.pem`),
},
},
worker: {
format: 'es',
},
});