Reset game.Resized when changing worlds

piesku · Jan 13, 2020 · fbab40e · fbab40e
1 parent c7a751d
commit fbab40e
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 4 deletions.
diff --git a/src/components/com_camera.ts b/src/components/com_camera.ts
@@ -6,7 +6,6 @@ import {Get, Has} from "./com_index.js";
 export interface Camera {
     EntityId: Entity;
     Radius: number;
-    New: boolean;
     Projection: Mat4;
     Unproject: Mat4;
     View: Mat4;
@@ -19,7 +18,6 @@ export function camera_ortho(Radius: number) {
         game[Get.Camera][EntityId] = <Camera>{
             EntityId,
             Radius,
-            New: true,
             Projection: create(),
             Unproject: create(),
             View: create(),

diff --git a/src/systems/sys_camera.ts b/src/systems/sys_camera.ts
@@ -26,8 +26,7 @@ function update(game: Game, entity: Entity) {
     let camera = game[Get.Camera][entity];
     game.Camera = camera;
 
-    if (camera.New || game.Resized) {
-        camera.New = false;
+    if (game.Resized) {
         let aspect = game.Canvas3.width / game.Canvas3.height;
         if (aspect > 1) {
             // Landscape orientation: radius = top.

diff --git a/src/worlds/wor_desert.ts b/src/worlds/wor_desert.ts
@@ -30,6 +30,7 @@ export function world_desert(game: Game) {
     let entrance_length = 6;
 
     game.Camera = undefined;
+    game.Resized = true;
     game.World = [];
     game.Grid = [];
 

diff --git a/src/worlds/wor_mine.ts b/src/worlds/wor_mine.ts
@@ -24,6 +24,7 @@ export function world_mine(game: Game) {
     set_seed(game.BountySeed);
 
     game.Camera = undefined;
+    game.Resized = true;
     game.World = [];
     game.Grid = [];
 

diff --git a/src/worlds/wor_store.ts b/src/worlds/wor_store.ts
@@ -8,6 +8,7 @@ import {set_seed} from "../math/random.js";
 export function world_store(game: Game) {
     set_seed(game.PlayerSeed);
     game.Camera = undefined;
+    game.Resized = true;
     game.World = [];
     game.GL.clearColor(0.9, 0.7, 0.3, 1);
 

diff --git a/src/worlds/wor_town.ts b/src/worlds/wor_town.ts
@@ -44,6 +44,7 @@ export function world_town(game: Game, is_intro?: boolean, bounty_collected?: nu
     ];
 
     game.Camera = undefined;
+    game.Resized = true;
     game.World = [];
     game.Grid = [];
 

diff --git a/src/worlds/wor_wanted.ts b/src/worlds/wor_wanted.ts
@@ -8,6 +8,7 @@ import {set_seed} from "../math/random.js";
 export function world_wanted(game: Game) {
     set_seed(game.BountySeed);
     game.Camera = undefined;
+    game.Resized = true;
     game.World = [];
     game.GL.clearColor(0.9, 0.7, 0.3, 1);