ambersz/procgen-skill-tree - Change NIYF4R7SECNOBIZNKAR627Q5BW7ANIFCKKKPHOM2OZIBVEGYWWZQC

remove shim

Created by Bowei Liu on December 24, 2020

NIYF4R7SECNOBIZNKAR627Q5BW7ANIFCKKKPHOM2OZIBVEGYWWZQC

Dependencies

In channels

main

Change contents

Replacement in frontend/src/components/PixiComponent.tsx at line 16 [6.97253]

B:BD[4.496] → [5.60:124]

∅:D[5.124] → [7.853:944]

B:BD[7.853] → [7.853:944]

const initialApplication = new Lazy(() => new BaseApplication({
  originalWindowWidth: window.innerWidth,
  originalWindowHeight: window.innerHeight,
}));

[4.496]

[7.944]

const initialApplication = new Lazy(() => new BaseApplication());

Replacement in frontend/src/components/PixiComponent.tsx at line 57 [6.97253]

B:BD[8.946] → [8.946:1116]

        setApplication(new BaseApplication({
          originalWindowWidth: window.innerWidth,
          originalWindowHeight: window.innerHeight,
        }, {}, true));

[8.946]

[8.1116]

        setApplication(new BaseApplication());

Insertion in frontend/src/components/PixiWrapperComponent.tsx at line 41 [11.1555]

[9.702]

[10.420]

    args: {
      fireBatch, 
      isSecondConstructorCall: false,
    },
    updaters: gameStateUpdaters,

Deletion in frontend/src/components/PixiWrapperComponent.tsx at line 48 [11.1555]
B:BD[10.464] → [10.464:487]
B:BD[10.487] → [12.1272:1286]
```
    gameStateUpdaters,
    fireBatch
```
Replacement in frontend/src/pixi/BaseApplication.ts at line 5 [14.158]
B:BD[13.1555] → [3.0:49]
```
import { RootComponent } from "./RootComponent";
```
[13.1555]
[15.537]
```
import { RootComponent } from "./components/RootComponent";
```

Replacement in frontend/src/pixi/BaseApplication.ts at line 8 [14.158]

B:BD[14.1043] → [12.1795:1825]

∅:D[12.1825] → [14.1043:1129]

B:BD[14.1043] → [14.1043:1129]

B:BD[14.1187] → [14.1187:1280]

B:BD[14.1313] → [14.1313:1316]

B:BD[14.1381] → [14.1381:1382]

B:BD[14.1382] → [12.1826:1889]

B:BD[12.1889] → [15.608:679]

// temp for backcompatibility
export type Config = {
  originalWindowWidth: number;
  originalWindowHeight: number;
};
const defaultConfig: Config = {
  originalWindowWidth: 800,
  originalWindowHeight: 800,
};
export type BaseApplicationProps = {
  args?: Partial<Config>,
  gameStateUpdaters: UpdaterGeneratorType2<GameState>, // aka updaters

[14.1043]

[12.1959]

type Props = {
  args: {
    fireBatch: () => void,
    isSecondConstructorCall: boolean
  },
  updaters: UpdaterGeneratorType2<GameState>, // aka updaters

Deletion in frontend/src/pixi/BaseApplication.ts at line 15 [14.158]
B:BD[12.2008] → [12.2008:2092]
```
  // // needed to avoid double-updates
  // prevGameState: DeepReadonly<GameState>,
```
Deletion in frontend/src/pixi/BaseApplication.ts at line 16 [14.158]
B:BD[12.2130] → [12.2130:2155]
```
  fireBatch: () => void,
```
Replacement in frontend/src/pixi/BaseApplication.ts at line 18 [14.158]
B:BD[14.1887] → [16.659:696]
```
export type BaseApplicationState = {
```
[10.1282]
[16.696]
```
type State = {
```
Insertion in frontend/src/pixi/BaseApplication.ts at line 22 [14.158]
[16.718]
[14.1922]

Insertion in frontend/src/pixi/BaseApplication.ts at line 25 [14.158]

[14.1923]

[16.719]

function appSizeFromWindowSize(window?: DeepReadonly<Vector2>): Vector2 {
  return new Vector2({
    x: Math.min(1280, window?.x || Infinity - 8),
    y: Math.min(720, window?.y || Infinity - 8),
  });
}

Deletion in frontend/src/pixi/BaseApplication.ts at line 33 [14.158]
B:BD[16.750] → [12.2185:2224]
```
  public config!: Config; // temp shim
```
Replacement in frontend/src/pixi/BaseApplication.ts at line 35 [14.158]
∅:D[10.1493] → [16.784:816]
B:BD[16.784] → [16.784:816]
B:BD[16.816] → [12.2225:2257]
```
  state!: BaseApplicationState;
  props!: BaseApplicationProps;
```
[10.1431]
[14.1983]
```
  state!: State;
  props!: Props;
```
Replacement in frontend/src/pixi/BaseApplication.ts at line 38 [14.158]
B:BD[14.1984] → [3.50:83]
∅:D[3.83] → [5.463:485]
B:BD[5.463] → [5.463:485]
```
  RootComponent!: RootComponent;
  isMounted: boolean;
```
[14.1984]
[8.2995]
```
  RootComponent: RootComponent | undefined;
```
Deletion in frontend/src/pixi/BaseApplication.ts at line 41 [14.158]
B:BD[17.58] → [12.2295:2376]
∅:D[12.2376] → [17.124:149]
∅:D[16.897] → [17.124:149]
B:BD[17.124] → [17.124:149]
B:BD[17.149] → [2.195:298]
∅:D[2.298] → [17.218:230]
∅:D[12.2472] → [17.218:230]
∅:D[18.938] → [17.218:230]
B:BD[17.218] → [17.218:230]
```
  public static appSizeFromWindowSize(window?: DeepReadonly<Vector2>): Vector2 {
    return new Vector2({
      x: Math.min(1280, window?.x || Infinity - 8),
      y: Math.min(720, window?.y || Infinity - 8),
    });
  }
```

Replacement in frontend/src/pixi/BaseApplication.ts at line 45 [14.158]

B:BD[14.2177] → [8.3028:3137]

  constructor(args: Partial<Config> = {}, props: Partial<BaseApplicationProps> = {}, isSecondTime = false) {

[14.2177]

[8.3137]

  constructor(props?: Props, isSecondConstructorCall: boolean = false) {

Replacement in frontend/src/pixi/BaseApplication.ts at line 47 [14.158]
B:BD[8.3247] → [8.3247:3272]
```
    if (!isSecondTime) {
```
[8.3247]
[8.3272]
```
    if (!(props?.args?.isSecondConstructorCall || isSecondConstructorCall)) {
```

Replacement in frontend/src/pixi/BaseApplication.ts at line 51 [14.158]

∅:D[5.487] → [16.1029:1087]

B:BD[16.1029] → [16.1029:1087]

∅:D[12.2588] → [14.2390:2391]

∅:D[16.1087] → [14.2390:2391]

B:BD[14.2390] → [14.2390:2391]

B:BD[14.2391] → [5.488:545]

∅:D[5.545] → [12.2653:2781]

B:BD[12.2653] → [12.2653:2781]

    this.config = Object.assign({}, defaultConfig, args);
    let appSize = BaseApplication.appSizeFromWindowSize(
      props.pixiComponentState && new Vector2(props.pixiComponentState.innerWidth, props.pixiComponentState.innerHeight)
    );

[5.487]

[5.546]

    // jlet appSize = appSizeFromWindowSize(
    // j  props.pixiComponentState && new Vector2(props.pixiComponentState.innerWidth, props.pixiComponentState.innerHeight)
    // j);
    let appSize = new Vector2(800, 600);

Deletion in frontend/src/pixi/BaseApplication.ts at line 73 [14.158]
B:BD[12.2836] → [5.618:646]
B:BD[5.646] → [8.3391:3392]
```
    this.isMounted = false;
```
Replacement in frontend/src/pixi/BaseApplication.ts at line 77 [14.158]
B:BD[5.767] → [5.767:816]
```
    //   updaters: this.props.gameStateUpdaters,
```
[5.767]
[5.816]
```
    //   updaters: this.props.updaters,
```
Replacement in frontend/src/pixi/BaseApplication.ts at line 112 [14.158]
B:BD[14.4588] → [12.3374:3421]
```
  public update(props: BaseApplicationProps) {
```
[14.4588]
[12.3421]
```
  public update(props: Props) {
```

Replacement in frontend/src/pixi/BaseApplication.ts at line 116 [14.158]

B:BD[12.3450] → [12.3450:3494]

∅:D[12.3494] → [10.1779:1931]

B:BD[16.1467] → [10.1779:1931]

  updateSelf(props: BaseApplicationProps) {
    this.state.appSize = BaseApplication.appSizeFromWindowSize(new Vector2(props.pixiComponentState.innerWidth, props.pixiComponentState.innerHeight));

[12.3450]

[10.1931]

  updateSelf(props: Props) {
    this.state.appSize = appSizeFromWindowSize(new Vector2(props.pixiComponentState.innerWidth, props.pixiComponentState.innerHeight));

Replacement in frontend/src/pixi/BaseApplication.ts at line 121 [14.158]
B:BD[10.2050] → [12.3495:3537]
```
  rerender(props: BaseApplicationProps) {
```
[10.2050]
[2.299]
```
  rerender(props: Props) {
```
Replacement in frontend/src/pixi/BaseApplication.ts at line 124 [14.158]
B:BD[12.3561] → [5.1211:1238]
B:BD[5.1238] → [19.350:379]
```
    if (!this.isMounted) {
      this.isMounted = true;
```
[12.3561]
[5.1238]
```
    if (!this.RootComponent) {
```
Replacement in frontend/src/pixi/BaseApplication.ts at line 130 [14.158]
B:BD[5.1386] → [5.1386:1434]
```
        updaters: this.props.gameStateUpdaters,
```
[5.1386]
[5.1434]
```
        updaters: this.props.updaters,
```
Deletion in frontend/src/pixi/BaseApplication.ts at line 141 [14.158]
B:BD[5.1796] → [5.1796:1819]
```
      this.didMount();
```
Insertion in frontend/src/pixi/BaseApplication.ts at line 142 [14.158]
[5.1825]
[16.1549]
```
    this.didMount();
```
Replacement in frontend/src/pixi/BaseApplication.ts at line 145 [14.158]
B:BD[16.1554] → [12.3562:3606]
```
  renderSelf(props: BaseApplicationProps) {
```
[16.1554]
[16.1609]
```
  renderSelf(props: Props) {
```
Replacement in frontend/src/pixi/BaseApplication.ts at line 149 [14.158]
B:BD[10.2487] → [12.3607:3657]
```
  public didUpdate(props: BaseApplicationProps) {
```
[10.2487]
[12.3657]
```
  public didUpdate(props: Props) {
```
Replacement in frontend/src/pixi/BaseApplication.ts at line 156 [14.158]
B:BD[12.3757] → [3.306:338]
```
    this.RootComponent.update({
```
[12.3757]
[12.3791]
```
    this.RootComponent?.update({
```
Replacement in frontend/src/pixi/BaseApplication.ts at line 160 [14.158]
B:BD[12.3851] → [12.3851:3897]
```
      updaters: this.props.gameStateUpdaters,
```
[12.3851]
[12.3897]
```
      updaters: this.props.updaters,
```

Replacement in frontend/src/pixi/BaseApplication.ts at line 168 [14.158]

B:BD[10.3593] → [12.4056:4173]

    this.props.fireBatch(); // fire enqueued game state updates, which should come back from react in the rerender()

[12.4055]

[14.4707]

    this.props.args.fireBatch(); // fire enqueued game state updates, which should come back from react in the rerender()

remove shim

Dependencies

In channels

Change contents

Replacement in frontend/src/components/PixiComponent.tsx at line 16 [6.97253]

Replacement in frontend/src/components/PixiComponent.tsx at line 57 [6.97253]

Insertion in frontend/src/components/PixiWrapperComponent.tsx at line 41 [11.1555]

Deletion in frontend/src/components/PixiWrapperComponent.tsx at line 48 [11.1555]

Replacement in frontend/src/pixi/BaseApplication.ts at line 5 [14.158]

Replacement in frontend/src/pixi/BaseApplication.ts at line 8 [14.158]

Deletion in frontend/src/pixi/BaseApplication.ts at line 15 [14.158]

Deletion in frontend/src/pixi/BaseApplication.ts at line 16 [14.158]

Replacement in frontend/src/pixi/BaseApplication.ts at line 18 [14.158]

Insertion in frontend/src/pixi/BaseApplication.ts at line 22 [14.158]

Insertion in frontend/src/pixi/BaseApplication.ts at line 25 [14.158]

Deletion in frontend/src/pixi/BaseApplication.ts at line 33 [14.158]

Replacement in frontend/src/pixi/BaseApplication.ts at line 35 [14.158]

Replacement in frontend/src/pixi/BaseApplication.ts at line 38 [14.158]

Deletion in frontend/src/pixi/BaseApplication.ts at line 41 [14.158]

Replacement in frontend/src/pixi/BaseApplication.ts at line 45 [14.158]

Replacement in frontend/src/pixi/BaseApplication.ts at line 47 [14.158]

Replacement in frontend/src/pixi/BaseApplication.ts at line 51 [14.158]

Deletion in frontend/src/pixi/BaseApplication.ts at line 73 [14.158]

Replacement in frontend/src/pixi/BaseApplication.ts at line 77 [14.158]

Replacement in frontend/src/pixi/BaseApplication.ts at line 112 [14.158]

Replacement in frontend/src/pixi/BaseApplication.ts at line 116 [14.158]

Replacement in frontend/src/pixi/BaseApplication.ts at line 121 [14.158]

Replacement in frontend/src/pixi/BaseApplication.ts at line 124 [14.158]

Replacement in frontend/src/pixi/BaseApplication.ts at line 130 [14.158]

Deletion in frontend/src/pixi/BaseApplication.ts at line 141 [14.158]

Insertion in frontend/src/pixi/BaseApplication.ts at line 142 [14.158]

Replacement in frontend/src/pixi/BaseApplication.ts at line 145 [14.158]

Replacement in frontend/src/pixi/BaseApplication.ts at line 149 [14.158]

Replacement in frontend/src/pixi/BaseApplication.ts at line 156 [14.158]

Replacement in frontend/src/pixi/BaseApplication.ts at line 160 [14.158]

Replacement in frontend/src/pixi/BaseApplication.ts at line 168 [14.158]