Merge branch 'master' into dev

gpaluk · web-flow · commit a3ea1020f69f · 2021-04-18T01:33:48.000+01:00
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Nano TypeScript
 
 
-[![CircleCI](https://circleci.com/gh/PluginIO/nano-typescript.svg?style=svg)](https://circleci.com/gh/PluginIO/nano-typescript)
+[![CircleCI](https://circleci.com/gh/pluginio/nano-typescript.svg?style=svg)](https://circleci.com/gh/pluginio/nano-typescript)
 
 ## About
 
@@ -65,7 +65,7 @@ To run a development build, we simply run the following instruction in the **ter
 
 `npm run dev`
 
-You can now navigate to `http:/127.0.0.1:3000` in your browser. All being well you should see a sample of the **Nano** engine running in your browser. You can make changes to the source code and your changes will be reflected automatically upon saving.
+You can now navigate to `http://127.0.0.1:3000` in your browser. All being well you should see a sample of the **Nano** engine running in your browser. You can make changes to the source code and your changes will be reflected automatically upon saving.
 
 ### Release Build
 
@@ -88,4 +88,4 @@ Also included is a suite of unit tests. Unit tests allow for the automation of t
 `npm run test`
 
 ## Many Thanks
-**Thank you** for checking out **Nano TypeScript**. We are super excited to see the amazing HTML5 games and apps that you build and we hope to showcase them here. Please let us know about your projects.
+**Thank you** for checking out **Nano TypeScript**. We are super excited to see the amazing HTML5 games and apps that you build and we hope to showcase them here. Please let us know about your projects. :)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nano-typescript",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "Super fast and lightweight 2D graphics library for TypeScript",
   "scripts": {
     "dev": "webpack serve --config webpack.dev.js --host 0.0.0.0 --port 3000 --content-base dev --inline --hot --mode development",
@@ -22,6 +22,9 @@
   ],
   "author": "Gary Paluk",
   "license": "MIT",
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org"
+  },
   "bugs": {
     "url": "https://github.com/pluginio/nano-typescript/issues"
   },
@@ -56,4 +59,4 @@
     "remove-strict-webpack-plugin": "^0.1.2",
     "uglify-js": "^3.5.13"
   }
-}
+}
diff --git a/src/Demo/View/GameScene.ts b/src/Demo/View/GameScene.ts
@@ -1,19 +1,19 @@
-import {Scene} from 'App/Scene'
-import {Assets} from 'Demo/Assets'
-import {TileSet} from 'Display/Tiles/TileSet'
-import {TileAnimation} from 'Display/Tiles/TileAnimation'
-import {TileMap} from 'Display/Tiles/TileMap'
-import {Sprite} from 'Display/Sprite'
-import {BlendMode} from 'Display/BlendMode'
-import {AnchorType} from 'Display/AnchorType'
-import {Color} from 'Display/Color'
-import {MovieClip} from 'Display/MovieClip'
-import {Tweener} from 'Animation/Tweener'
-import {EaseType} from 'Animation/EaseType'
-import {AudioMixer} from 'Audio/AudioMixer'
+import { Scene } from 'App/Scene'
+import { Assets } from 'Demo/Assets'
+import { TileSet } from 'Display/Tiles/TileSet'
+import { TileAnimation } from 'Display/Tiles/TileAnimation'
+import { TileMap } from 'Display/Tiles/TileMap'
+import { Sprite } from 'Display/Sprite'
+import { BlendMode } from 'Display/BlendMode'
+import { AnchorType } from 'Display/AnchorType'
+import { Color } from 'Display/Color'
+import { MovieClip } from 'Display/MovieClip'
+import { Tweener } from 'Animation/Tweener'
+import { EaseType } from 'Animation/EaseType'
+import { AudioMixer } from 'Audio/AudioMixer'
 
 export class GameScene extends Scene {
-    protected onAssetsError(e: Event): void {}
+    protected onAssetsError(e: Event): void { }
 
     public init(): void {
         this.assets.add(Assets.BUNNY_PATH)
@@ -50,7 +50,7 @@ export class GameScene extends Scene {
         let bunny: Sprite = this.assets.getSprite(Assets.BUNNY_PATH)
         bunny.blendMode = BlendMode.SOURCE_OVER
         bunny.anchorType = AnchorType.CENTER
-        bunny.scale = 2
+        bunny.scale = 0.5
         bunny.smoothing = false
         bunny.graphics.fillStyle = '#FF0000'
         bunny.graphics.fillRect(0, 0, 10, 10)
diff --git a/src/Demo/View/SplashScene.ts b/src/Demo/View/SplashScene.ts
@@ -1,11 +1,11 @@
-import {Scene} from 'App/Scene'
-import {Assets} from 'Demo/Assets'
-import {EventType} from 'Events/EventType'
-import {Button} from 'GUI/Button'
-import {AudioMixer} from 'Audio/AudioMixer'
-import {Sprite} from 'Display/Sprite'
-import {Color} from 'Display/Color'
-import {GameScene} from './GameScene'
+import { Scene } from 'App/Scene'
+import { Assets } from 'Demo/Assets'
+import { EventType } from 'Events/EventType'
+import { Button } from 'GUI/Button'
+import { AudioMixer } from 'Audio/AudioMixer'
+import { Sprite } from 'Display/Sprite'
+import { Color } from 'Display/Color'
+import { GameScene } from './GameScene'
 
 export class SplashScene extends Scene {
     public init(): void {
diff --git a/src/Display/Container.ts b/src/Display/Container.ts
@@ -1,4 +1,4 @@
-import {Spatial} from './Spatial'
+import { Spatial } from './Spatial'
 
 export class Container extends Spatial {
     protected _children: Spatial[]
@@ -32,6 +32,7 @@ export class Container extends Spatial {
         let index = this._children.lastIndexOf(spatial)
         if (index != -1) {
             spatial.parent = null
+            spatial.dispose()
             this._children.splice(index, 1)
         }
     }
diff --git a/src/Display/Sprite.ts b/src/Display/Sprite.ts
@@ -1,13 +1,13 @@
-import {BlendMode} from './BlendMode'
-import {Point} from 'Geom/Point'
-import {Container} from './Container'
-import {Matrix} from 'Geom/Matrix'
-import {Stage} from './Stage'
-import {Color} from './Color'
-import {AnchorType} from './AnchorType'
-import {Texture} from './Texture'
-import {Bound} from './Bound'
-import {Rectangle} from 'Geom/Rectangle'
+import { BlendMode } from './BlendMode'
+import { Point } from 'Geom/Point'
+import { Container } from './Container'
+import { Matrix } from 'Geom/Matrix'
+import { Stage } from './Stage'
+import { Color } from './Color'
+import { AnchorType } from './AnchorType'
+import { Texture } from './Texture'
+import { Bound } from './Bound'
+import { Rectangle } from 'Geom/Rectangle'
 
 export class Sprite extends Container {
     public alpha: number = 1
@@ -56,9 +56,9 @@ export class Sprite extends Container {
             this.texture = texture
         } else {
             let img: HTMLImageElement = document.createElement('img')
-            img.width = 300
-            img.height = 200
-            this._texture = new Texture(img)
+            img.width = 10
+            img.height = 10
+            this.texture = new Texture(img)
         }
 
         this._mask = document.createElement('img')
@@ -81,12 +81,23 @@ export class Sprite extends Container {
     public set texture(value: Texture) {
         //TODO [GJP] Tidy all this up
         this._texture = value
-        this._targetCanvas.width = value.width
-        this.canvas.width = value.width
-        this._targetCanvas.height = value.height
-        this.canvas.height = value.height
-        this._width = value.width
-        this._height = value.height
+
+        this.resizeWidth(value.width)
+        this.resizeHeight(value.height)
+    }
+
+    private resizeWidth(width: number): void {
+        this._targetCanvas.width = width
+        this.canvas.width = width
+        this._width = width
+
+        this._isDirty = true
+    }
+
+    private resizeHeight(height: number): void {
+        this._targetCanvas.height = height
+        this.canvas.height = height
+        this._height = height
 
         this._isDirty = true
     }
@@ -223,6 +234,7 @@ export class Sprite extends Container {
     }
 
     public set width(value: number) {
+        this.resizeWidth(value)
         this.scaleX = value / this._targetCanvas.width
     }
 
@@ -231,6 +243,7 @@ export class Sprite extends Container {
     }
 
     public set height(value: number) {
+        this.resizeHeight(value)
         this.scaleY = value / this._targetCanvas.height
     }
 
diff --git a/src/Loaders/AssetLoader.ts b/src/Loaders/AssetLoader.ts
@@ -1,9 +1,9 @@
-import {EventDispatcher} from 'Events/EventDispatcher'
-import {EventType} from 'Events/EventType'
-import {Texture} from 'Display/Texture'
-import {Sprite} from 'Display/Sprite'
-import {TileSet} from 'Display/Tiles/TileSet'
-import {AudioClip} from 'Audio/AudioClip'
+import { EventDispatcher } from 'Events/EventDispatcher'
+import { EventType } from 'Events/EventType'
+import { Texture } from 'Display/Texture'
+import { Sprite } from 'Display/Sprite'
+import { TileSet } from 'Display/Tiles/TileSet'
+import { AudioClip } from 'Audio/AudioClip'
 
 export class AssetLoader extends EventDispatcher {
     public constructor() {
@@ -111,11 +111,14 @@ export class AssetLoader extends EventDispatcher {
                 mimeType = this.getFileExtension(path)
             }
 
+            console.log("Asset loaded: " + path)
+            console.log("MIME: " + mimeType)
+
             switch (mimeType) {
                 case 'png':
                 case 'image/png':
                     let png = document.createElement('img')
-                    png.src = path
+                    png.src = 'data:image/png;base64,' + btoa(String.fromCharCode.apply(null, data));
                     png.crossOrigin = 'anonymous'
                     png.height =
                         (data[20] << 24) |
@@ -128,12 +131,15 @@ export class AssetLoader extends EventDispatcher {
                         (data[18] << 8) |
                         data[19]
                     this._imageMap.set(path, png)
+
+                    console.log("width: " + png.width + ", height: " + png.height)
+                    console.log("MIME: " + mimeType)
                     break
                 case 'jpg':
                 case 'jpeg':
                 case 'image/jpeg':
                     let jpg = document.createElement('img')
-                    jpg.src = path
+                    jpg.src = 'data:image/png;base64,' + btoa(String.fromCharCode.apply(null, data));
                     jpg.crossOrigin = 'anonymous'
 
                     let offset: number = 0

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import {Spatial} from './Spatial'`
	`1`	`+import { Spatial } from './Spatial'`
`2`	`2`
`3`	`3`	`export class Container extends Spatial {`
`4`	`4`	`protected _children: Spatial[]`
`@@ -32,6 +32,7 @@ export class Container extends Spatial {`
`32`	`32`	`let index = this._children.lastIndexOf(spatial)`
`33`	`33`	`if (index != -1) {`
`34`	`34`	`spatial.parent = null`
	`35`	`+ spatial.dispose()`
`35`	`36`	`this._children.splice(index, 1)`
`36`	`37`	`}`
`37`	`38`	`}`