wgge 1.0.3 → 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/assets/AssetCache.js

@@ -158,11 +158,11 @@ export default class AssetCache extends NodeWithEvents {
 	}
 
 	loadImage(url, onLoaded) {
-		this.getAsset(url, onLoaded);
+		this.loadAsset(url, onLoaded);
 	}
 
 	loadAudio(materialId, onLoaded) {
-		this.getAsset(`mat/${materialId}`, onLoaded);
+		this.loadAsset(`mat/${materialId}`, onLoaded);
 	}
 
 	resetMaterial(materialId) {
@@ -171,11 +171,11 @@ export default class AssetCache extends NodeWithEvents {
 
 	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.3",
+	"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/game/save/editor/SaveGameEditorRenderer.js

@@ -1,17 +0,0 @@
-import DomRenderer from "../../../core/renderer/dom/DomRenderer";
-
-export default class SaveGameEditorRenderer extends DomRenderer {
-
-	/**
-	 * @type SaveGameModel
-	 */
-	model;
-
-	constructor(game, model, dom) {
-		super(game, model, dom);
-
-		this.model = model;
-
-	}
-
-}

package/style/basic/editor.less

@@ -1,290 +0,0 @@
-.instant-editor {
-	display: block;
-	position: static;
-	padding: 1px;
-	margin: 1px;
-
-	input[type=text],
-	textarea {
-		display: block;
-		width: 100%;
-		margin: auto;
-	}
-}
-
-.table-lookup {
-	background-color: black;
-	color: gray;
-
-	.buttons {
-		input {
-			margin: 2px !important;
-		}
-
-		button {
-			background-color: gray !important;
-			color: black !important;
-			font-weight: normal !important;
-			box-shadow: none !important;
-			border-radius: 2px !important;
-			padding: 2px !important;
-			margin: 2px !important;
-		}
-	}
-
-	.scroll {
-		overflow-y: auto;
-		overflow-x: hidden;
-		max-height: 400px;
-	}
-
-	.row {
-		display: flex !important;
-	}
-
-	tr.active {
-		color: white;
-	}
-}
-
-.force-foreground {
-	position: fixed;
-	z-index: 9999999;
-	top: 20%;
-	left: 40%;
-}
-
-.editor-section {
-	background-color: black;
-	color: gray;
-
-	button {
-		background-color: gray !important;
-		color: black !important;
-		font-weight: normal !important;
-		box-shadow: none !important;
-		border-radius: 2px !important;
-		padding: 2px !important;
-		margin: 2px !important;
-	}
-}
-
-.editor-layer {
-	font-family: monospace;
-	position: absolute;
-	top: 0;
-	left: 0;
-	max-height: 100%;
-	overflow: hidden;
-	cursor: default;
-
-	.editor {
-		background-color: transparent;
-		font-size: 10pt;
-		position: fixed;
-
-		.bg {
-			background-color: black;
-			color: gray;
-		}
-
-		ul.menu {
-			padding: 0;
-			margin: 0;
-
-			a:hover {
-				color: lightblue;
-				cursor: pointer;
-			}
-
-			.active {
-				color: white;
-			}
-
-			li {
-				padding: 4px;
-				list-style: none;
-			}
-		}
-
-		.buttons {
-			display: flex;
-			flex-direction: row;
-			justify-content: space-between;
-
-			& > div {
-				display: flex;
-				flex-direction: row;
-				justify-content: start;
-			}
-
-			input {
-				margin: @m-1;
-			}
-		}
-
-		button {
-			background-color: gray;
-			color: black;
-			border: 0;
-			border-radius: 5px;
-			cursor: pointer;
-			margin: @m-1;
-
-			&.active {
-				background-color: black;
-				color: white;
-				border: 1px white solid;
-				cursor: default;
-			}
-
-			&:hover {
-				background-color: lightblue;
-			}
-
-			&.special {
-				background-color: @light-brown;
-				color: @dark-brown;
-			}
-
-			&.red {
-				background-color: red;
-			}
-
-			&.blue {
-				background-color: lightblue;
-			}
-		}
-
-		.dock {
-			width: 100%;
-			display: flex;
-			flex-direction: row;
-			align-items: flex-start;
-			justify-content: space-between;
-		}
-
-		.table,
-		form,
-		.item-def {
-			border: 1px gray solid;
-			border-radius: 5px;
-			margin: 10px;
-			padding: 10px;
-		}
-
-		.grab-icon {
-			cursor: move;
-			opacity: 0.5;
-
-			&::after {
-				content: "■";
-			}
-		}
-
-		.table .scroll,
-		form .scroll {
-			display: block;
-			overflow-y: auto;
-			overflow-x: hidden;
-		}
-
-		.table .scroll {
-			max-height: 200px;
-			max-width: 700px;
-			overflow-x: auto;
-		}
-
-		form .scroll {
-			max-height: 563px;
-		}
-
-		table {
-			margin-right: 20px;
-		}
-
-		table td {
-			border-left: 1px gray solid;
-			white-space: nowrap;
-			max-height: 1em;
-			overflow: hidden;
-			text-overflow: ellipsis;
-		}
-
-		table td:last-of-type {
-			border-right: 1px gray solid;
-		}
-
-		table tr:hover > td {
-			color: lightblue;
-			cursor: pointer;
-		}
-
-		table tr.active > td {
-			color: white;
-		}
-
-		form .fields .row {
-			display: grid;
-			grid-template-columns: 1fr 4fr;
-			gap: 10px;
-			margin-bottom: @m-1;
-		}
-
-		form .fields .row .field {
-			display: flex;
-			align-content: stretch;
-			flex-direction: column;
-		}
-
-		form .fields .row .field.with-lookup {
-			flex-direction: row;
-			align-items: center;
-		}
-
-		form .fields .row .field.with-lookup .lookup-button {
-			margin: 0;
-		}
-
-		form .fields .row input {
-			display: block;
-			width: auto;
-			margin-right: 10px;
-		}
-
-		form .fields .row input[type=checkbox] {
-			align-self: start;
-		}
-
-		form .fields .row .vector {
-			flex-direction: row;
-		}
-
-		form .fields .row .vector input {
-			width: 100px;
-		}
-
-		.battle-menu {
-			position: fixed;
-			right: 20px;
-			top: 20px;
-			padding: @m-2;
-
-			input[type=text] {
-				width: 50px;
-			}
-
-			input[type=radio] {
-				margin: 0;
-				padding: @m-1;
-				display: inline-block;
-			}
-
-			label {
-				padding: @m-1;
-				display: inline-block;
-			}
-		}
-
-	}
-}