unify timeline, world. shadeless schematics.
This commit is contained in:
201
world.js
201
world.js
@@ -7,9 +7,25 @@ export class Block {
|
||||
}
|
||||
|
||||
export class World {
|
||||
constructor() {
|
||||
constructor(script = '') {
|
||||
this.blocks = new Map();
|
||||
this.listeners = new Set();
|
||||
|
||||
// Timeline State
|
||||
this.events = [];
|
||||
this.labels = new Map();
|
||||
|
||||
this.currentIndex = 0;
|
||||
this.currentTime = -Infinity;
|
||||
|
||||
this.initialState = new Map();
|
||||
this.initialIndex = 0;
|
||||
|
||||
this.eventCount = 0;
|
||||
|
||||
if (script) {
|
||||
this.#compile(script);
|
||||
}
|
||||
}
|
||||
|
||||
subscribe(callback) {
|
||||
@@ -23,12 +39,14 @@ export class World {
|
||||
|
||||
set(id, x, y, z, state = {}) {
|
||||
const key = `${x},${y},${z}`;
|
||||
this.blocks.set(key, new Block(id, [x, y, z], state));
|
||||
this.notify();
|
||||
}
|
||||
const isAir = id === 'air' || id === 'minecraft:air';
|
||||
|
||||
del(x, y, z) {
|
||||
if (this.blocks.delete(`${x},${y},${z}`)) {
|
||||
if (isAir) {
|
||||
if (this.blocks.delete(key)) {
|
||||
this.notify();
|
||||
}
|
||||
} else {
|
||||
this.blocks.set(key, new Block(id, [x, y, z], state));
|
||||
this.notify();
|
||||
}
|
||||
}
|
||||
@@ -36,4 +54,175 @@ export class World {
|
||||
get(x, y, z) {
|
||||
return this.blocks.get(`${x},${y},${z}`);
|
||||
}
|
||||
|
||||
#compile(script) {
|
||||
let currentTime = -1;
|
||||
let subTick = 0;
|
||||
let capturedInitialState = false;
|
||||
|
||||
const shadowWorld = new Map();
|
||||
|
||||
const captureInitial = () => {
|
||||
if (capturedInitialState) return;
|
||||
for (const [k, v] of shadowWorld.entries()) {
|
||||
this.initialState.set(k, {id: v.id, pos: [...v.pos], state: {...v.state}});
|
||||
}
|
||||
this.initialIndex = this.events.length;
|
||||
capturedInitialState = true;
|
||||
};
|
||||
|
||||
const lines = script.split('\n').map(l => l.trim()).filter(l => l && !l.startsWith('#'));
|
||||
|
||||
for (const line of lines) {
|
||||
const tokens = line.split(/\s+/);
|
||||
const cmd = tokens[0];
|
||||
|
||||
if (cmd === 't') {
|
||||
const newTime = parseFloat(tokens[1]);
|
||||
|
||||
// If we are crossing the tick 0 threshold, lock in the initial state
|
||||
if (newTime >= 0 && !capturedInitialState) captureInitial();
|
||||
|
||||
currentTime = newTime;
|
||||
subTick = 0;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (cmd === 'l') {
|
||||
this.labels.set(tokens[1], currentTime);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (cmd === 'p') {
|
||||
const x = parseFloat(tokens[1]);
|
||||
const y = parseFloat(tokens[2]);
|
||||
const z = parseFloat(tokens[3]);
|
||||
const key = `${x},${y},${z}`;
|
||||
|
||||
let id = null;
|
||||
const newState = {};
|
||||
|
||||
for (let i = 4; i < tokens.length; i++) {
|
||||
const token = tokens[i];
|
||||
if (token.includes('=')) {
|
||||
const [k, v] = token.split('=');
|
||||
newState[k] = v;
|
||||
} else {
|
||||
id = token;
|
||||
}
|
||||
}
|
||||
|
||||
const prevBlock = shadowWorld.get(key);
|
||||
const prev = prevBlock ? {id: prevBlock.id, state: {...prevBlock.state}} : null;
|
||||
|
||||
const isAir = id === 'air' || id === 'minecraft:air';
|
||||
|
||||
if (isAir) {
|
||||
shadowWorld.delete(key);
|
||||
} else if (id) {
|
||||
shadowWorld.set(key, {id, pos: [x, y, z], state: newState});
|
||||
} else if (prevBlock) {
|
||||
Object.assign(prevBlock.state, newState);
|
||||
} else {
|
||||
console.warn(`Timeline warning: Attempted to update state of non-existent block at ${key}`);
|
||||
continue;
|
||||
}
|
||||
|
||||
const nextBlock = shadowWorld.get(key);
|
||||
const next = nextBlock ? {id: nextBlock.id, state: {...nextBlock.state}} : null;
|
||||
|
||||
this.events.push({
|
||||
time: currentTime,
|
||||
subTick: subTick++,
|
||||
x, y, z,
|
||||
prev,
|
||||
next
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// Fallback catch if the script ends entirely before tick 0
|
||||
if (!capturedInitialState) captureInitial();
|
||||
|
||||
this.eventCount = this.events.length - this.initialIndex;
|
||||
|
||||
this.reset();
|
||||
}
|
||||
|
||||
#apply(data, x, y, z) {
|
||||
const key = `${x},${y},${z}`;
|
||||
if (data) {
|
||||
this.blocks.set(key, new Block(data.id, [x, y, z], {...data.state}));
|
||||
} else {
|
||||
this.blocks.delete(key);
|
||||
}
|
||||
}
|
||||
|
||||
seek(target) {
|
||||
let targetTime = target;
|
||||
|
||||
if (typeof target === 'string') {
|
||||
targetTime = this.labels.get(target);
|
||||
if (targetTime === undefined) throw new Error(`Label not found: ${target}`);
|
||||
}
|
||||
|
||||
// Scrub Forward
|
||||
while (this.currentIndex < this.events.length && this.events[this.currentIndex].time <= targetTime) {
|
||||
const ev = this.events[this.currentIndex];
|
||||
this.#apply(ev.next, ev.x, ev.y, ev.z);
|
||||
this.currentIndex++;
|
||||
}
|
||||
|
||||
// Scrub Backward
|
||||
while (this.currentIndex > 0 && this.events[this.currentIndex - 1].time > targetTime) {
|
||||
this.currentIndex--;
|
||||
const ev = this.events[this.currentIndex];
|
||||
this.#apply(ev.prev, ev.x, ev.y, ev.z);
|
||||
}
|
||||
|
||||
this.currentTime = targetTime;
|
||||
this.notify(); // Dispatch a single batched update to the Engine
|
||||
}
|
||||
|
||||
seekIndex(targetIndex) {
|
||||
targetIndex = targetIndex + this.initialIndex;
|
||||
|
||||
while (this.currentIndex < this.events.length && this.currentIndex < targetIndex) {
|
||||
const ev = this.events[this.currentIndex];
|
||||
this.#apply(ev.next, ev.x, ev.y, ev.z);
|
||||
this.currentIndex++;
|
||||
}
|
||||
|
||||
while (this.currentIndex > 0 && this.currentIndex > targetIndex) {
|
||||
this.currentIndex--;
|
||||
const ev = this.events[this.currentIndex];
|
||||
this.#apply(ev.prev, ev.x, ev.y, ev.z);
|
||||
}
|
||||
|
||||
if (this.currentIndex < this.events.length) {
|
||||
this.currentTime = this.events[this.currentIndex].time;
|
||||
} else if (this.events.length > 0) {
|
||||
this.currentTime = this.events[this.events.length - 1].time;
|
||||
}
|
||||
|
||||
this.notify();
|
||||
}
|
||||
|
||||
reset() {
|
||||
this.blocks.clear();
|
||||
|
||||
for (const [key, block] of this.initialState.entries()) {
|
||||
this.blocks.set(key, new Block(block.id, [...block.pos], {...block.state}));
|
||||
}
|
||||
|
||||
this.currentIndex = this.initialIndex;
|
||||
|
||||
if (this.initialIndex > 0 && this.events.length > 0) {
|
||||
this.currentTime = this.events[this.initialIndex - 1].time;
|
||||
} else {
|
||||
this.currentTime = -Infinity;
|
||||
}
|
||||
|
||||
this.notify();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user