6502/8bitworkshop
1
0
Fork 0
mirror of https://github.com/sehugg/8bitworkshop.git synced 2024-11-26 10:49:17 +00:00
Code Issues Projects Releases Wiki Activity

ecs: entity.lookup

Browse Source
This commit is contained in:
Steven Hugg 2022-02-03 16:44:43 -06:00
parent a66d060c08
commit 51f0f6ffea
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/common/ecs/ecs.ts
View File

@ -267,8 +267,8 @@ __BRK:
comment(s: string) { comment(s: string) {
return `\n;;; ${s}\n`; return `\n;;; ${s}\n`;
} }
absolute(ident: string) { absolute(ident: string, offset?: number) {
return ident; return this.addOffset(ident, offset || 0);
} }
addOffset(ident: string, offset: number) { addOffset(ident: string, offset: number) {
if (offset > 0) return `${ident}+${offset}`; if (offset > 0) return `${ident}+${offset}`;
@ -698,16 +698,26 @@ class ActionEval {
const qr = this.jr || this.qr; // TODO: why not both! const qr = this.jr || this.qr; // TODO: why not both!
var component: ComponentType; var component: ComponentType;
var qualified = false; var baseLookup = false;
let entities: Entity[];
// is qualified field? // is qualified field?
if (fieldName.indexOf(':') > 0) { if (fieldName.indexOf('.') > 0) {
let [entname, fname] = fieldName.split('.');
let ent = this.scope.getEntityByName(entname);
if (ent == null) throw new ECSError(`no entity named "${entname}" in this scope`, action);
component = this.em.singleComponentWithFieldName(this.qr.atypes, fname, action);
fieldName = fname;
entities = [ent];
} else if (fieldName.indexOf(':') > 0) {
let [cname, fname] = fieldName.split(':'); let [cname, fname] = fieldName.split(':');
component = this.em.getComponentByName(cname); component = this.em.getComponentByName(cname);
fieldName = fname;
qualified = true;
if (component == null) throw new ECSError(`no component named "${cname}"`, action) if (component == null) throw new ECSError(`no component named "${cname}"`, action)
entities = this.entities;
fieldName = fname;
baseLookup = true;
} else { } else {
component = this.em.singleComponentWithFieldName(qr.atypes, fieldName, action); component = this.em.singleComponentWithFieldName(qr.atypes, fieldName, action);
entities = this.entities;
} }
// find archetypes // find archetypes
let field = component.fields.find(f => f.name == fieldName); let field = component.fields.find(f => f.name == fieldName);
@ -716,7 +726,7 @@ class ActionEval {
// TODO: should be done somewhere else? // TODO: should be done somewhere else?
let constValues = new Set<DataValue>(); let constValues = new Set<DataValue>();
let isConst = false; let isConst = false;
for (let e of this.entities) { for (let e of entities) {
let constVal = e.consts[mksymbol(component, fieldName)]; let constVal = e.consts[mksymbol(component, fieldName)];
if (constVal !== undefined) isConst = true; if (constVal !== undefined) isConst = true;
constValues.add(constVal); // constVal === undefined is allowed constValues.add(constVal); // constVal === undefined is allowed
@ -739,10 +749,10 @@ class ActionEval {
if (!range) throw new ECSError(`couldn't find field for ${component.name}:${fieldName}, maybe no entities?`); // TODO if (!range) throw new ECSError(`couldn't find field for ${component.name}:${fieldName}, maybe no entities?`); // TODO
// TODO: dialect // TODO: dialect
let ident = this.dialect.fieldsymbol(component, field, bitofs); let ident = this.dialect.fieldsymbol(component, field, bitofs);
if (qualified) { if (baseLookup) {
return this.dialect.absolute(ident);
} else if (this.entities.length == 1) {
return this.dialect.absolute(ident); return this.dialect.absolute(ident);
} else if (entities.length == 1) {
return this.dialect.absolute(ident, entities[0].id - qr.entities[0].id);
} else { } else {
let eidofs = range.elo - qr.entities[0].id; // TODO let eidofs = range.elo - qr.entities[0].id; // TODO
// TODO: eidofs? // TODO: eidofs?
@ -830,6 +840,9 @@ export class EntityScope implements SourceLocated {
addAction(action: Action) { addAction(action: Action) {
this.events.push(action); this.events.push(action);
} }
getEntityByName(name: string) {
return this.entities.find(e => e.name == name);
}
*iterateEntityFields(entities: Entity[]) { *iterateEntityFields(entities: Entity[]) {
for (let i = 0; i < entities.length; i++) { for (let i = 0; i < entities.length; i++) {
let e = entities[i]; let e = entities[i];