wgge 1.1.3 → 2.0.0

package/bin/build.cmd

@@ -0,0 +1 @@
+npm run build

package/core/renderer/dom/DomContainerRenderer.js

@@ -1,4 +1,5 @@
 import DomRenderer from "./DomRenderer";
+import DOMHelper from "../../helper/DOMHelper";
 
 export default class DomContainerRenderer extends DomRenderer {
 
@@ -17,12 +18,16 @@ export default class DomContainerRenderer extends DomRenderer {
 	}
 
 	activateInternal() {
-		this.container = this.addElement(this.tag, this.cls);
+		this.container = super.addElement(this.tag, this.cls);
 	}
 
 	deactivateInternal() {
-		this.removeElement(this.container);
+		super.removeElement(this.container);
 		this.container = null;
 	}
 
+	addElement(tag, css = null) {
+		return DOMHelper.createElement(this.container, tag, css);
+	}
+
 }

package/game/GameController.js

@@ -1,4 +1,3 @@
-import * as localForage from "localforage";
 import ControllerBase from "../core/controller/ControllerBase";
 import ControlsController from "./controls/ControlsController";
 
@@ -14,9 +13,6 @@ export default class GameController extends ControllerBase {
 
 		this.model = model;
 
-		this.isResourcesDirty = false;
-		this.resourcesTimeOut = null;
-
 		this.addChild(new ControlsController(this.game, this.model.controls));
 
 		this.addAutoEvent(
@@ -36,99 +32,6 @@ export default class GameController extends ControllerBase {
 			}
 		);
 
-		this.addAutoEvent(
-			this.model.resources,
-			'dirty',
-			() => this.isResourcesDirty = true
-		);
-
-		this.addAutoEvent(
-			this.model,
-			'save-ui',
-			() => {
-				this.saveGameToStorage().then(() => {
-					console.log('savegame saved');
-				});
-				this.saveResourcesToStorage().then(() => {
-					console.log('resources saved');
-				});
-			}
-		);
-
-	}
-
-	activateInternal() {
-		super.activateInternal();
-		this.loadResourcesFromStorage();
-	}
-
-	updateInternal(delta) {
-
-		// saving of resources during debugging
-		if (this.model.isInDebugMode.get()) {
-			this.resourcesTimeOut = (this.resourcesTimeOut === null) ? 3000 : this.resourcesTimeOut - delta;
-			if (this.isResourcesDirty && this.resourcesTimeOut <= 0) {
-				this.resourcesTimeOut = null;
-				this.isResourcesDirty = false;
-				this.saveResourcesToStorage().then(() => {
-					this.resourcesTimeOut = null;
-					console.log('resources saved');
-				});
-			}
-		}
-	}
-
-	async loadResourcesFromStorage() {
-		try {
-			const state = await localForage.getItem('wegge-resources');
-			if (state) {
-				this.model.resources.restoreState(state);
-			} else {
-				console.log('nothing in storage');
-			}
-		} catch (err) {
-			console.error(err);
-		}
-	}
-
-	async saveResourcesToStorage() {
-		const state = this.model.resources.getState();
-		try {
-			await localForage.setItem('wegge-resources', state);
-		} catch (err) {
-			console.error(err);
-		}
-	}
-
-	async loadGameFromStorage() {
-		try {
-			const state = await localForage.getItem('wegge-autosave');
-			if (state) {
-				const saveGame = this.saveGameFactory();
-				saveGame.restoreState(state);
-				this.model.saveGame.set(saveGame);
-				this.model.menu.set(null);
-			} else {
-				console.log('no saved game in storage');
-			}
-		} catch (err) {
-			console.error('Error when loading saved game.', err);
-		}
-	}
-
-	async saveGameToStorage() {
-		const saveGame = this.model.saveGame.get();
-		if (!saveGame) return;
-		const state = saveGame.getState();
-		try {
-			await localForage.setItem('wegge-autosave', state);
-		} catch (err) {
-			console.error(err);
-		}
-	}
-
-	hideMenu() {
-		this.model.menu.set(null);
 	}
 
 }

package/game/GameModel.js

@@ -1,11 +1,9 @@
 import ObjectModel from "../core/model/ObjectModel";
 import Vector2 from "../core/model/vector/Vector2";
 import ControlsModel from "./controls/ControlsModel";
-import ResourcesModel from "./resources/ResourcesModel";
-import NullableNode from "../core/model/value/NullableNode";
 import BoolValue from "../core/model/value/BoolValue";
 import GlobalAudioModel from "../core/audio/global/GlobalAudioModel";
-import AssetCache from "./resources/assets/AssetCache";
+import AssetCache from "./assets/AssetCache";
 
 export default class GameModel extends ObjectModel {
 
@@ -14,26 +12,11 @@ export default class GameModel extends ObjectModel {
 	 */
 	isInDebugMode;
 
-	/**
-	 * @type NullableNode<MenuModel>
-	 */
-	menu;
-
 	/**
 	 * @type Vector2
 	 */
 	viewBoxSize;
 
-	/**
-	 * @type NullableNode<SaveGameModel>
-	 */
-	saveGame;
-
-	/**
-	 * @type ResourcesModel
-	 */
-	resources;
-
 	/**
 	 * @type AssetCache
 	 */
@@ -53,11 +36,7 @@ export default class GameModel extends ObjectModel {
 		super(false);
 
 		this.isInDebugMode = this.addProperty('isInDebugMode', new BoolValue(debugModeEnabled));
-		this.menu = this.addProperty('menu', new NullableNode());
-
 		this.viewBoxSize = this.addProperty('viewBoxSize', new Vector2());
-		this.saveGame = this.addProperty('saveGame', new NullableNode());
-		this.resources = this.addProperty('resources', new ResourcesModel());
 		this.assets = new AssetCache(this.resources);
 		this.audio = this.addProperty('audio', new GlobalAudioModel());
 		this.controls = this.addProperty('controls', new ControlsModel());

package/game/{resources/assets → assets}/AssetCache.js

@@ -1,9 +1,9 @@
-import Dictionary from "../../../core/Dictionary";
-import Collection from "../../../core/Collection";
+import Dictionary from "../../core/Dictionary";
+import Collection from "../../core/Collection";
 import ImageLoader from "./loader/ImageLoader";
 import AudioLoader from "./loader/AudioLoader";
-import NodeWithEvents from "../../../core/model/event/NodeWithEvents";
-import StringHelper from "../../../core/helper/StringHelper";
+import NodeWithEvents from "../../core/model/event/NodeWithEvents";
+import StringHelper from "../../core/helper/StringHelper";
 
 const ASSET_TYPE_LOADERS = {
 	'aud': AudioLoader,

package/game/{resources/assets → assets}/loader/AssetLoader.js

@@ -1,4 +1,4 @@
-import NodeWithEvents from "../../../../core/model/event/NodeWithEvents";
+import NodeWithEvents from "../../../core/model/event/NodeWithEvents";
 
 /**
  * Loads a single raw resource.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wgge",
-	"version": "1.1.3",
+	"version": "2.0.0",
 	"description": "Web GL Game Engine",
 	"main": "index.js",
 	"devDependencies": {
@@ -26,6 +26,6 @@
 	},
 	"author": "Karel Zavadil",
 	"dependencies": {
-		"localforage": "^1.10.0"
+
 	}
 }

package/game/resources/ResourcesModel.js

@@ -1,23 +0,0 @@
-import ObjectModel from "../../core/model/ObjectModel";
-
-export default class ResourcesModel extends ObjectModel {
-
-	/**
-	 * @type ModelNodeTable
-	 */
-	images;
-
-	/**
-	 * @type ModelNodeTable
-	 */
-	sounds;
-
-	constructor() {
-		super();
-
-		//this.images = this.addProperty('images', new ModelNodeTable((id) => new ImageModel(id)));
-		//this.sounds = this.addProperty('sounds', new ModelNodeTable((id) => new Model3dModel(id)));
-
-	}
-
-}