wgge 1.0.2 → 1.0.4

package/core/audio/AudioRenderer.js

@@ -40,18 +40,21 @@ export default class AudioRenderer extends RendererBase {
 			}
 		});
 
-		this.game.assets.getAsset(this.model.url.get(), (audio) => {
-			if (!this.audio) {
-				console.log('audio loaded after renderer was deactivated');
-				return;
+		this.game.assets.loadAsset(
+			this.model.url.get(),
+			(audio) => {
+				if (!this.audio) {
+					console.log('audio loaded after renderer was deactivated');
+					return;
+				}
+
+				this.audio.addEventListener('canplaythrough', () => {
+					this.updatePlaying();
+				});
+
+				this.audio.src = audio.src;
 			}
-
-			this.audio.addEventListener('canplaythrough', () => {
-				this.updatePlaying();
-			});
-
-			this.audio.src = audio.src;
-		});
+		);
 	}
 
 	deactivateInternal() {

package/core/renderer/canvas/ImageCanvasRenderer.js

@@ -49,11 +49,14 @@ export default class ImageCanvasRenderer extends CanvasRenderer {
 	reloadImage() {
 		this.image = null;
 		if (this.model.image.uri.isEmpty()) return;
-		this.game.assets.getAsset(this.model.image.uri.get(), (img) => {
-			this.image = img;
-			this.model.image.size.set(img.width, img.height);
-			this.renderImage();
-		});
+		this.game.assets.loadAsset(
+			this.model.image.uri.get(),
+			(img) => {
+				this.image = img;
+				this.model.image.size.set(img.width, img.height);
+				this.renderImage();
+			}
+		);
 	}
 
 }

package/core/renderer/dom/ImageDomRenderer.js

@@ -33,9 +33,12 @@ export default class ImageDomRenderer extends DomRenderer {
 			console.error('Invalid image URI', uri);
 			return;
 		}
-		this.game.assets.getAsset(uri, (img) => {
-			this.container = img.cloneNode(true);
-			this.dom.appendChild(this.container);
-		});
+		this.game.assets.loadAsset(
+			uri,
+			(img) => {
+				this.container = img.cloneNode(true);
+				this.dom.appendChild(this.container);
+			}
+		);
 	}
 }

package/game/GameController.js

@@ -1,6 +1,5 @@
 import * as localForage from "localforage";
 import ControllerBase from "../core/controller/ControllerBase";
-import EditorController from "../editor/EditorController";
 import ControlsController from "./controls/ControlsController";
 
 export default class GameController extends ControllerBase {
@@ -19,7 +18,6 @@ export default class GameController extends ControllerBase {
 		this.resourcesTimeOut = null;
 
 		this.addChild(new ControlsController(this.game, this.model.controls));
-		this.addChild(new EditorController(this.game, this.model.editor));
 
 		this.addAutoEvent(
 			window,

package/game/GameModel.js

@@ -2,7 +2,6 @@ import ObjectModel from "../core/model/ObjectModel";
 import Vector2 from "../core/model/vector/Vector2";
 import ControlsModel from "./controls/ControlsModel";
 import ResourcesModel from "./resources/ResourcesModel";
-import EditorModel from "../editor/EditorModel";
 import NullableNode from "../core/model/value/NullableNode";
 import BoolValue from "../core/model/value/BoolValue";
 import GlobalAudioModel from "../core/audio/global/GlobalAudioModel";
@@ -15,11 +14,6 @@ export default class GameModel extends ObjectModel {
 	 */
 	isInDebugMode;
 
-	/**
-	 * @type EditorModel
-	 */
-	editor;
-
 	/**
 	 * @type NullableNode<MenuModel>
 	 */
@@ -59,7 +53,6 @@ export default class GameModel extends ObjectModel {
 		super(false);
 
 		this.isInDebugMode = this.addProperty('isInDebugMode', new BoolValue(debugModeEnabled));
-		this.editor = this.addProperty('editor', new EditorModel());
 		this.menu = this.addProperty('menu', new NullableNode());
 
 		this.viewBoxSize = this.addProperty('viewBoxSize', new Vector2());

package/game/GameRenderer.js

@@ -1,8 +1,6 @@
 import DomRenderer from "../core/renderer/dom/DomRenderer";
-import EditorRenderer from "../editor/EditorRenderer";
 import NullableNodeRenderer from "../core/renderer/generic/NullableNodeRenderer";
 import GlobalAudioRenderer from "../core/audio/global/GlobalAudioRenderer";
-import ConditionalNodeRenderer from "../core/renderer/generic/ConditionalNodeRenderer";
 import DOMHelper from "../core/helper/DOMHelper";
 import MainMenuRenderer from "./menu/MainMenuRenderer";
 
@@ -35,15 +33,6 @@ export default class GameRenderer extends DomRenderer {
 			)
 		);
 
-		this.addChild(
-			new ConditionalNodeRenderer(
-				this.game,
-				this.model.isInDebugMode,
-				() => this.model.isInDebugMode.get(),
-				() => new EditorRenderer(this.game, this.model.editor, this.editorLayer)
-			)
-		);
-
 		this.addAutoEvents(
 			this.model.assets,
 			['session-finished-loaders-changed', 'session-total-loaders-changed'],
@@ -68,7 +57,6 @@ export default class GameRenderer extends DomRenderer {
 		this.saveGameLayer = DOMHelper.createElement(this.container, 'div', 'savegame-layer container container-host');
 		this.loadingLayer = DOMHelper.createElement(this.container, 'div', 'loading-layer');
 		this.menuLayer = DOMHelper.createElement(this.container, 'div', 'menu-layer');
-		this.editorLayer = DOMHelper.createElement(this.container, 'div', 'editor-layer');
 
 		this.model.assets.preload(this.model.getResourcesForPreload());
 	}
@@ -79,7 +67,6 @@ export default class GameRenderer extends DomRenderer {
 		this.saveGameLayer = null;
 		this.loadingLayer = null;
 		this.menuLayer = null;
-		this.editorLayer = null;
 	}
 
 	updateLoading() {

package/game/resources/ResourcesModel.js

@@ -1,25 +1,22 @@
-import ModelNodeTable from "../../core/model/collection/table/ModelNodeTable";
-import MaterialModel from "./material/MaterialModel";
 import ObjectModel from "../../core/model/ObjectModel";
-import Model3dModel from "./3d/3DModel";
 
 export default class ResourcesModel extends ObjectModel {
 
 	/**
 	 * @type ModelNodeTable
 	 */
-	materials;
+	images;
 
 	/**
-	 * @type ModelNodeTable<Model3dModel>
+	 * @type ModelNodeTable
 	 */
-	models3d;
+	sounds;
 
 	constructor() {
 		super();
 
-		this.materials = this.addProperty('materials', new ModelNodeTable((id) => new MaterialModel(id)));
-		this.models3d = this.addProperty('models3d', new ModelNodeTable((id) => new Model3dModel(id)));
+		//this.images = this.addProperty('images', new ModelNodeTable((id) => new ImageModel(id)));
+		//this.sounds = this.addProperty('sounds', new ModelNodeTable((id) => new Model3dModel(id)));
 
 	}
 

package/game/resources/assets/AssetCache.js

@@ -1,23 +1,13 @@
 import Dictionary from "../../../core/Dictionary";
 import Collection from "../../../core/Collection";
 import ImageLoader from "./loader/ImageLoader";
-import GlbLoader from "./loader/GlbLoader";
 import AudioLoader from "./loader/AudioLoader";
-import MaterialLoader from "./loader/MaterialLoader";
-import Model3dLoader from "./loader/Model3dLoader";
-import SpriteLoader from "./loader/SpriteLoader";
 import NodeWithEvents from "../../../core/model/event/NodeWithEvents";
 import StringHelper from "../../../core/helper/StringHelper";
-import Model3dAnimationLoader from "./loader/Model3dAnimationLoader";
 
 const ASSET_TYPE_LOADERS = {
 	'aud': AudioLoader,
-	'img': ImageLoader,
-	'glb': GlbLoader,
-	'mat': MaterialLoader,
-	'm3d': Model3dLoader,
-	'm3a': Model3dAnimationLoader,
-	'spr': SpriteLoader
+	'img': ImageLoader
 }
 
 /**
@@ -133,7 +123,7 @@ export default class AssetCache extends NodeWithEvents {
 		this.loaders.remove(loader);
 	}
 
-	getAsset(uri, onLoaded = null, onError = null) {
+	loadAsset(uri, onLoaded = null, onError = null) {
 		if (typeof uri !== 'string') {
 			console.log('uri is not a string', uri);
 			return;
@@ -167,37 +157,25 @@ export default class AssetCache extends NodeWithEvents {
 		}
 	}
 
-	loadAsset(uri, onLoaded) {
-		this.getAsset(uri, onLoaded);
-	}
-	
 	loadImage(url, onLoaded) {
-		this.getAsset(url, onLoaded);
+		this.loadAsset(url, onLoaded);
 	}
 
-	loadMaterial(materialId, onLoaded) {
-		this.getAsset(`mat/${materialId}`, onLoaded);
+	loadAudio(materialId, onLoaded) {
+		this.loadAsset(`mat/${materialId}`, onLoaded);
 	}
 
 	resetMaterial(materialId) {
 		this.resetCache(`mat/${materialId}`);
 	}
 
-	loadModel3d(modelId, onLoaded) {
-		this.getAsset(`m3d/${modelId}`, onLoaded);
-	}
-
-	loadSprite(spriteId, onLoaded) {
-		this.getAsset(`spr/${spriteId}`, onLoaded);
-	}
-
 	preload(resources) {
 		console.log('Preloading:', resources);
-		resources.forEach((r) => this.getAsset(r));
+		resources.forEach((r) => this.loadAsset(r));
 	}
 
 	load(resources) {
 		console.log('Loading:', resources);
-		resources.forEach((r) => this.getAsset(r, () => undefined));
+		resources.forEach((r) => this.loadAsset(r, () => undefined));
 	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wgge",
-	"version": "1.0.2",
+	"version": "1.0.4",
 	"description": "Web GL Game Engine",
 	"main": "index.js",
 	"devDependencies": {

package/style/style.less

@@ -1,3 +1,2 @@
 @import "basic/utilities.less";
-@import "basic/editor.less";
 @import "basic/game.less";

package/editor/EditorController.js

@@ -1,134 +0,0 @@
-import ControllerBase from "../core/controller/ControllerBase";
-import HttpHelper from "../core/helper/HttpHelper";
-
-export default class EditorController extends ControllerBase {
-
-	/**
-	 * @type DemoEditorModel
-	 */
-	model;
-
-	constructor(game, model) {
-		super(game, model);
-
-		this.model = model;
-
-		this.addAutoEvent(
-			this.model,
-			'table-selected',
-			(table) => this.runOnUpdate(() => this.model.activeTable.set(table))
-		);
-
-		this.addAutoEvent(
-			this.model,
-			'table-closed',
-			() => this.runOnUpdate(() => this.model.activeTable.set(null))
-		);
-
-		this.addAutoEvent(
-			this.model,
-			'node-saved',
-			(param) => this.runOnUpdate(() => this.saveNode(param))
-		);
-
-		this.addAutoEvent(
-			this.model,
-			'form-closed',
-			() => this.runOnUpdate(() => this.model.activeForm.set(null))
-		);
-
-		this.addAutoEvent(
-			this.model,
-			'node-delete',
-			(param) => this.runOnUpdate(() => this.deleteNode(param))
-		);
-
-		this.addAutoEvent(
-			this.model,
-			'node-clone',
-			(param) => this.runOnUpdate(() => this.cloneNode(param))
-		);
-
-		this.addAutoEvent(
-			this.model,
-			'download-resources',
-			(param) => this.runOnUpdate(() => this.downloadResources(param))
-		);
-
-		this.addAutoEvent(
-			this.model,
-			'save-resources',
-			() => this.saveResources()
-		);
-
-		this.addAutoEvent(
-			this.model,
-			'switch-options',
-			() => this.runOnUpdate(() => this.model.isVisible.invert())
-		);
-
-	}
-
-	activateInternal() {
-		this.game.audio.paused.set(true);
-	}
-
-	deactivateInternal() {
-		this.game.audio.paused.set(false);
-	}
-
-	/**
-	 *
-	 * * @param {Object} param
-	 *  * @param {ObjectModel} param.node
-	 *  * @param {FormData} param.data
-	 */
-	saveNode(param) {
-		const node = param.node;
-		const data = param.data;
-
-		node.properties.forEach((name, value) => {
-			if (data.has(name)) {
-				if (value && value.value !== undefined && typeof value.set === 'function') {
-					value.set(data.get(name));
-				} else {
-					console.log(data.get(name), name);
-				}
-			} else if (data.has(`${name}[]`)) {
-				if (typeof value === 'object' && typeof value.setFromArray === 'function') {
-					const arr = data.getAll(`${name}[]`);
-					value.setFromArray(arr);
-				}
-			} else if (value && typeof value.value === 'boolean' && typeof value.set === 'function') {
-				value.set(false);
-			}
-		});
-	}
-
-	deleteNode(param) {
-		const node = param.node;
-		const table = param.table;
-		const result = table.remove(node);
-		if (table.selectedNode.equalsTo(node)) {
-			table.selectedNode.set(null);
-		}
-		console.log('removed node', result);
-	}
-
-	cloneNode(param) {
-		const node = param.node;
-		const table = param.table;
-		const result = table.addClone(node);
-		table.selectedNode.set(result);
-		console.log('cloned node', result);
-	}
-
-	downloadResources() {
-		const data = JSON.stringify(this.game.resources.getState());
-		HttpHelper.fakeDownload('resources.json', data);
-	}
-
-	async saveResources() {
-		await HttpHelper.post('http://localhost:88/save-resources', this.game.resources.getState());
-	}
-}

package/editor/EditorModel.js

@@ -1,38 +0,0 @@
-import ObjectModel from "../core/model/ObjectModel";
-import NullableNode from "../core/model/value/NullableNode";
-import BoolValue from "../core/model/value/BoolValue";
-
-export default class EditorModel extends ObjectModel {
-
-	/**
-	 * @type BoolValue
-	 */
-	isVisible;
-
-	/**
-	 * @type NullableNode
-	 */
-	activeTable;
-
-	/**
-	 * @type NullableNode
-	 */
-	activeForm;
-
-	/**
-	 * @type NullableNode<MaterialModel>
-	 */
-	activeMaterial;
-
-	constructor() {
-		super();
-
-		this.activeTable = this.addProperty('activeTable', new NullableNode());
-		this.activeForm = this.addProperty('activeForm', new NullableNode());
-		this.activeMaterial = this.addProperty('activeMaterial', new NullableNode());
-
-		this.isVisible = this.addProperty('isVisible', new BoolValue(true));
-
-	}
-
-}

package/editor/EditorRenderer.js

@@ -1,116 +0,0 @@
-import DomRenderer from "../core/renderer/dom/DomRenderer";
-import TableRenderer from "./table/TableRenderer";
-import NullableNodeRenderer from "../core/renderer/generic/NullableNodeRenderer";
-import NodeFormRenderer from "./form/NodeFormRenderer";
-import DOMHelper from "../core/helper/DOMHelper";
-
-export default class EditorRenderer extends DomRenderer {
-
-	/**
-	 * @type EditorModel
-	 */
-	model;
-
-	constructor(game, model, dom) {
-		super(game, model, dom);
-
-		this.model = model;
-
-		this.container = null;
-
-		this.tableRenderer = new NullableNodeRenderer(this.game, this.model.activeTable, (model) => new TableRenderer(this.game, model, this.table));
-		this.addChild(this.tableRenderer);
-
-		this.formRenderer = new NullableNodeRenderer(this.game, this.model.activeForm, (model) => new NodeFormRenderer(this.game, model, this.form));
-		this.addChild(this.formRenderer);
-
-		this.addAutoEvent(
-			this.model.activeTable,
-			'change',
-			() => this.updateTables()
-		);
-
-		this.addAutoEvent(
-			this.model.isVisible,
-			'change',
-			() => {
-				if (this.model.isVisible.get()) {
-					DOMHelper.removeClass(this.dock, 'hidden');
-					DOMHelper.removeClass(this.buttonsLeft, 'hidden');
-					DOMHelper.removeClass(this.buttonsRight, 'hidden');
-				} else {
-					DOMHelper.addClass(this.dock, 'hidden');
-					DOMHelper.addClass(this.buttonsLeft, 'hidden');
-					DOMHelper.addClass(this.buttonsRight, 'hidden');
-				}
-			},
-			true
-		);
-
-		this.stopEventPropagationHandler = (e) => e.stopPropagation();
-	}
-
-	activateInternal() {
-		this.container = this.addElement('div', 'editor');
-		this.nav = DOMHelper.createElement(this.container, 'nav', 'bg row');
-
-		const buttons = DOMHelper.createElement(this.nav, 'div', 'buttons row');
-		this.switch = DOMHelper.createElement(buttons, 'input');
-		this.switch.setAttribute('type', 'checkbox');
-		this.switch.setAttribute('name', 'switch');
-		this.switch.setAttribute('checked', this.model.isVisible.get());
-		this.switch.addEventListener('change', () => this.model.triggerEvent('switch-options'));
-
-		this.buttonsLeft = DOMHelper.createElement(buttons, 'div');
-
-		DOMHelper.createElement(
-			this.buttonsLeft,
-			'button',
-			'special',
-			'Save Resources',
-			() => this.model.triggerEvent('save-resources')
-		);
-
-		this.buttonsRight = DOMHelper.createElement(this.nav, 'div');
-
-		this.dock = DOMHelper.createElement(this.container, 'div', 'dock bg');
-		this.tables = DOMHelper.createElement(this.dock, 'div', 'table-selection bg');
-		this.table = DOMHelper.createElement(this.dock, 'div', 'active-table');
-		this.form = DOMHelper.createElement(this.dock, 'div', 'active-form');
-		this.item = DOMHelper.createElement(this.dock, 'div', 'active-item');
-
-		const events = ['click', 'mousemove', 'mousedown', 'mouseup', 'wheel'];
-		const elements = [this.nav, this.tables, this.table, this.form, this.item];
-		for (const eli in elements) {
-			for (const evi in events) {
-				this.addAutoEvent(elements[eli], events[evi], this.stopEventPropagationHandler);
-			}
-		}
-
-		this.updateTables();
-	}
-
-	deactivateInternal() {
-		this.removeElement(this.container);
-	}
-
-	updateTables() {
-		DOMHelper.emptyElement(this.tables);
-		const wrapper = DOMHelper.createElement(this.tables, 'div', 'inner');
-		this.addMenuSection(wrapper, this.game.resources, 'Resources');
-	}
-
-	addMenuSection(wrapper, node, name) {
-		DOMHelper.createElement(wrapper, 'h3', null, name);
-		const menu = DOMHelper.createElement(wrapper, 'ul', 'menu');
-		node.properties.forEach(
-			(name, property) => {
-				const isActive = this.model.activeTable.equalsTo(property);
-				const item = DOMHelper.createElement(menu, 'li', isActive ? 'active' : '');
-				const link = DOMHelper.createElement(item, 'a', null, name);
-				link.addEventListener('click', () => this.model.triggerEvent('table-selected', property));
-			}
-		);
-	}
-
-}