@awayfl/awayfl-player 0.2.39 → 0.2.41

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAC,WAAW,EAAC,MAAM,cAAc,CAAC;AACzC,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AACvC,OAAO,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAC,QAAQ,IAAI,YAAY,EAAC,MAAM,cAAc,CAAC;AACtD,OAAO,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAC,WAAW,EAAC,MAAM,cAAc,CAAC;AACzC,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AACvC,OAAO,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAC,QAAQ,IAAI,YAAY,EAAC,MAAM,cAAc,CAAC;AACtD,OAAO,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC"}

package/dist/index.js

@@ -1,4 +1,5 @@
-console.debug("AwayFL-Player - 0.2.39");
+import { BitmapImage2D, ImageUtils } from "@awayjs/stage";
+console.debug("AwayFL-Player - 0.2.41");
 export { AVMPlayer } from "./lib/AVMPlayer";
 export { AVM1Player } from "./lib/AVM1Player";
 export { AVM2Player } from "./lib/AVM2Player";
@@ -7,3 +8,4 @@ export { EventBase } from "@awayjs/core";
 export { StageManager } from "@awayjs/stage";
 export { Settings as AVM2Settings } from "@awayfl/avm2";
 export { PlayerGlobal } from "@awayfl/playerglobal";
+ImageUtils.registerDefaults(function () { return new BitmapImage2D(1, 1, true, 0x0); }, null, null, null);

package/index.ts

@@ -1,4 +1,6 @@
-console.debug("AwayFL-Player - 0.2.39");
+import { BitmapImage2D, ImageUtils } from "@awayjs/stage";
+
+console.debug("AwayFL-Player - 0.2.41");
 
 export {AVMPlayer} from "./lib/AVMPlayer";
 export {AVM1Player} from "./lib/AVM1Player";
@@ -7,4 +9,11 @@ export {LoaderEvent} from "@awayjs/core";
 export {EventBase} from "@awayjs/core";
 export {StageManager} from "@awayjs/stage";
 export {Settings as AVM2Settings} from "@awayfl/avm2";
-export {PlayerGlobal} from "@awayfl/playerglobal";
+export {PlayerGlobal} from "@awayfl/playerglobal";
+
+ImageUtils.registerDefaults(
+	() => new BitmapImage2D(1, 1, true, 0x0),
+	null,
+	null,
+	null,
+);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@awayfl/awayfl-player",
-	"version": "0.2.39",
+	"version": "0.2.41",
 	"description": "Flash Player emulator for executing SWF files (published for FP versions 6 and up) in javascript",
 	"main": "bundle/awayfl-player.umd.js",
 	"module": "dist/index.js",

package/scripts/updateAwayDev_mac.sh

@@ -3,16 +3,22 @@ set -euo pipefail
 cd $(dirname "$0")
 
 function updateIfNeeded () {
+    BRANCH=`git rev-parse --abbrev-ref HEAD`
+
     set +e
-    UP_TO_DATE=`git pull origin $1 2>/dev/null | grep "Already up to date" | wc -l`
+    UP_TO_DATE=`git pull origin $1 2>/dev/null | grep "Already up to date"`
     set -e
-    if [[ "$UP_TO_DATE" == 0 ]]; then
+    if [ -z "$UP_TO_DATE" ]; then
         npm run tsc:build
+    else
+        echo Already up to date 
     fi
 }
 
 echo  Pulls all updates into the "@awayjs" and "@awayfl" directories, and runs tsc:build
 read -n 1 -s -r -p "Press any key to continue"
+echo
+echo
 cd ..
 cd ..
 

package/template/game_template.html

@@ -44,7 +44,6 @@
 			background-repeat: no-repeat;
 			background-image: url("INSERT_SPLASHSCREEN");
 			visibility: visible;
-			transition: all 0.5s;
 			z-index: 10;
 		}
 
@@ -57,6 +56,12 @@
 			height: 100%;
 			transition: all 0.5s;
 		}
+		#loading__image {
+			position: absolute;
+			background-size: contain;
+			background-position: center;
+			background-repeat: no-repeat;
+		}
 	</style>
 </head>
 
@@ -65,6 +70,7 @@
 		<div id="progress__root">
 			<div id="progress__line"></div>
 		</div>
+		<div id="loading__image"></div>
 	</div>
 
 	<script>

package/template/loader.js

@@ -303,7 +303,9 @@ var Loader = (function () {
 	let fillLine = undefined;
 	let __config = undefined;
 	let __splash = undefined;
+	let __loading = undefined;
 	let __pr__root = undefined;
+	let __pr__line = undefined;
 	let handleResize = undefined;
 
 	window["setStageDimensions"]=function(x, y, w, h){
@@ -345,20 +347,26 @@ var Loader = (function () {
 			// rereport			
 			completeEvent(f);
 
-			if (__config.start) {
+			const st_conf = __config.start;
+			if (st_conf) {
 
 				//	start image exists. 
 				//	hide progressbar, show startimage and wait for user-input to start the game
-
-				Object.assign(__pr__root.style, {
-					visibility: "hidden",
-					opacity: 0,
+				Object.assign(__pr__line.style, {
+					height: "100%",
+					width: "100%",
 				});
-				Object.assign(__splash.style, {
-					backgroundImage: `url(${__config.start})`,
+				Object.assign(__loading.style, {
+					backgroundImage: `url(${st_conf.image})`,
+					left: `${100 * st_conf.rect[0]}%`,
+					top: `${100 * st_conf.rect[1]}%`,
+					width: `${100 * st_conf.rect[2]}%`,
+					height: `${100 * st_conf.rect[3]}%`,
+					cursor: "pointer",
 				});				
-				let onCLick = (e) => {
-					window.removeEventListener("click", onCLick);
+				let onClick = (e) => {
+					__loading.removeEventListener("click", onClick);
+					__loading.removeEventListener("touchend", onClick);
 					Object.assign(__splash.style, {
 						visibility: "hidden",
 						opacity: 0,
@@ -371,7 +379,8 @@ var Loader = (function () {
 						handleResize=null;
 					}, 500)
 				};
-				window.addEventListener("click", onCLick);
+				__loading.addEventListener("click", onClick);
+				__loading.addEventListener('touchend', onClick);
 			}
 			else {
 				// 	no start image. 
@@ -428,11 +437,14 @@ var Loader = (function () {
 		__config = config;
 
 		const splash = document.querySelector("#splash__image");
+		const loading = document.querySelector("#loading__image");
 		const pr__root = document.querySelector("#progress__root");
 		const pr__line = document.querySelector("#progress__line");
 
 		__splash = splash;
+		__loading = loading;
 		__pr__root = pr__root;
+		__pr__line = pr__line;
 
 		const pr_conf = config.progress;
 		pr_conf.rect = pr_conf.rect || [0, 0.9, 1, 0.2];
@@ -442,6 +454,18 @@ var Loader = (function () {
 			visibility: "visible",
 		});
 
+		const ldg_conf = config.loading;
+
+		if (ldg_conf) {
+			Object.assign(loading.style, {
+				backgroundImage: `url(${ldg_conf.image})`,
+				left: `${100 * ldg_conf.rect[0]}%`,
+				top: `${100 * ldg_conf.rect[1]}%`,
+				width: `${100 * ldg_conf.rect[2]}%`,
+				height: `${100 * ldg_conf.rect[3]}%`,
+			});
+		}
+
 		Object.assign(pr__root.style, {
 			background: pr_conf.back,
 			left: `${100 * pr_conf.rect[0]}%`,