@flashist/appframework 0.0.86 → 0.0.88

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@flashist/appframework",
3
- "version": "0.0.86",
3
+ "version": "0.0.88",
4
4
  "scripts": {
5
5
  "build": "gulp",
6
6
  "publish:patch": "npm version patch && npm run build && cd ./dist && npm publish",
@@ -6,9 +6,8 @@ export declare class BasePageView extends BaseAppView {
6
6
  protected sizeAreaColor: number;
7
7
  protected sizeAreaColorAlpha: number;
8
8
  protected contentCont: FContainer;
9
- protected reversedScaleContentScreenRect: Rectangle;
10
- protected reversedScaleContentLocalPosCached: Point;
11
- protected reversedScaleContentGlobalPosCached: Point;
9
+ protected reversedScaleContentContResizeSizeRect: Rectangle;
10
+ protected contentContLocalPosOfGlobalZero: Point;
12
11
  protected construction(...args: any[]): void;
13
12
  get sizeArea(): Rectangle;
14
13
  set sizeArea(value: Rectangle);
@@ -25,6 +25,8 @@ var BasePageView = /** @class */ (function (_super) {
25
25
  _this.sizeAreaColorAlpha = 0.5;
26
26
  return _this;
27
27
  }
28
+ // protected reversedScaleContentLocalPosCached: Point;
29
+ // protected reversedScaleContentGlobalPosCached: Point;
28
30
  BasePageView.prototype.construction = function () {
29
31
  var args = [];
30
32
  for (var _i = 0; _i < arguments.length; _i++) {
@@ -32,9 +34,10 @@ var BasePageView = /** @class */ (function (_super) {
32
34
  }
33
35
  _super.prototype.construction.call(this, args);
34
36
  // appState.app.config = getInstance(AppConfigModel);
35
- this.reversedScaleContentScreenRect = new Rectangle();
36
- this.reversedScaleContentLocalPosCached = new Point();
37
- this.reversedScaleContentGlobalPosCached = new Point();
37
+ this.reversedScaleContentContResizeSizeRect = new Rectangle();
38
+ this.contentContLocalPosOfGlobalZero = new Point();
39
+ // this.reversedScaleContentLocalPosCached = new Point();
40
+ // this.reversedScaleContentGlobalPosCached = new Point();
38
41
  this.contentCont = new FContainer();
39
42
  this.addChild(this.contentCont);
40
43
  this.contentCont.interactive = true;
@@ -83,18 +86,19 @@ var BasePageView = /** @class */ (function (_super) {
83
86
  this.contentCont.scale.set(tempScale);
84
87
  /*this.contentCont.x = this.sizeArea.x + Math.floor((this.resizeSize.x - this.contentCont.width) / 2);
85
88
  this.contentCont.y = this.sizeArea.y + Math.floor((this.resizeSize.y - this.contentCont.height) / 2);*/
86
- this.contentCont.x = Math.floor((this.resizeSize.x - (this.sizeArea.width * tempScale)) / 2);
87
- this.contentCont.x -= Math.floor(this.sizeArea.x * tempScale);
88
- this.contentCont.y = Math.floor((this.resizeSize.y - (this.sizeArea.height * tempScale)) / 2);
89
- this.contentCont.y -= Math.floor(this.sizeArea.y * tempScale);
90
- this.reversedScaleContentLocalPosCached.x = this.contentCont.x;
91
- this.reversedScaleContentLocalPosCached.y = this.contentCont.y;
92
- this.contentCont.toGlobal(this.reversedScaleContentLocalPosCached, this.reversedScaleContentGlobalPosCached);
89
+ // this.contentCont.x = Math.floor((this.resizeSize.x - (this.sizeArea.width * tempScale)) / 2);
90
+ // this.contentCont.x -= Math.floor(this.sizeArea.x * tempScale);
91
+ // this.contentCont.y = Math.floor((this.resizeSize.y - (this.sizeArea.height * tempScale)) / 2);
92
+ // this.contentCont.y -= Math.floor(this.sizeArea.y * tempScale);
93
+ // this.reversedScaleContentLocalPosCached.x = this.contentCont.x;
94
+ // this.reversedScaleContentLocalPosCached.y = this.contentCont.y;
95
+ // this.contentCont.toGlobal(this.reversedScaleContentLocalPosCached, this.reversedScaleContentGlobalPosCached);
93
96
  //
94
- this.reversedScaleContentScreenRect.x = this.reversedScaleContentGlobalPosCached.x;
95
- this.reversedScaleContentScreenRect.y = this.reversedScaleContentGlobalPosCached.y;
96
- this.reversedScaleContentScreenRect.width = Math.floor(this.resizeSize.x / this.contentCont.scale.x);
97
- this.reversedScaleContentScreenRect.height = Math.floor(this.resizeSize.y / this.contentCont.scale.y);
97
+ this.contentCont.toLocal({ x: 0, y: 0 }, null, this.contentContLocalPosOfGlobalZero);
98
+ this.reversedScaleContentContResizeSizeRect.x = this.contentContLocalPosOfGlobalZero.x;
99
+ this.reversedScaleContentContResizeSizeRect.y = this.contentContLocalPosOfGlobalZero.y;
100
+ this.reversedScaleContentContResizeSizeRect.width = Math.floor(this.resizeSize.x / this.contentCont.scale.x);
101
+ this.reversedScaleContentContResizeSizeRect.height = Math.floor(this.resizeSize.y / this.contentCont.scale.y);
98
102
  };
99
103
  return BasePageView;
100
104
  }(BaseAppView));
@@ -1 +1 @@
1
- {"version":3,"file":"BasePageView.js","sourceRoot":"","sources":["../../../src/pages/views/BasePageView.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"BasePageView.js","sourceRoot":"","sources":["../../../src/pages/views/BasePageView.ts"],"names":[],"mappings":"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"}