Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: the bug that inputmanager cannot be obtained #589

Merged
merged 96 commits into from
Nov 16, 2021
Merged
Changes from all commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
0abcd9c
feat:Support atlas #197
Jul 19, 2021
54710a3
Merge branch 'oasis-engine:dev/0.5' into dev/0.5
cptbtptpbcptdtptp Jul 19, 2021
464262b
feat:Support atlas #197
Jul 19, 2021
a6b83d5
Merge branch 'dev/0.5' of https://github.com/cptbtptpbcptdtptp/engine…
Jul 19, 2021
b0e396e
Merge branch 'oasis-engine:dev/0.5' into dev/0.5
cptbtptpbcptdtptp Jul 20, 2021
907b2f1
feat:Support atlas
Jul 21, 2021
8b9c8d6
feat:Support atlas
Jul 21, 2021
390d11a
feat:Support atlas
Jul 22, 2021
733d119
feat:Support atlas
Jul 22, 2021
c068a35
feat:Support atlas
Jul 22, 2021
6c50d6c
feat:Support atlas
Jul 30, 2021
d4e6820
feat:Support atlas
Jul 30, 2021
de5b981
feat:Support atlas
Aug 2, 2021
a074507
feat:Support atlas
cptbtptpbcptdtptp Aug 2, 2021
1d0a217
feat:Support atlas
cptbtptpbcptdtptp Aug 2, 2021
c9c6d7b
feat:Support atlas
cptbtptpbcptdtptp Aug 2, 2021
2978b44
feat:Support atlas
cptbtptpbcptdtptp Aug 2, 2021
485e550
feat:Support atlas
cptbtptpbcptdtptp Aug 2, 2021
e79604e
feat:Support atlas
cptbtptpbcptdtptp Aug 2, 2021
f1bfb2c
refactor: opt code
GuoLei1990 Aug 2, 2021
58c321a
Merge pull request #2 from GuoLei1990/Atlas
cptbtptpbcptdtptp Aug 2, 2021
97b0ea0
Merge branch 'oasis-engine:dev/0.5' into dev/0.5
cptbtptpbcptdtptp Aug 6, 2021
155933c
fix:opt atlas code
cptbtptpbcptdtptp Aug 6, 2021
c10c61c
fix:opt atlas code
cptbtptpbcptdtptp Aug 6, 2021
5e65294
fix:opt atlas code
cptbtptpbcptdtptp Aug 6, 2021
83ff1b5
fix:atlas support rotation
cptbtptpbcptdtptp Aug 10, 2021
1568df3
Merge branch 'dev/0.5' of https://github.com/oasis-engine/engine into…
cptbtptpbcptdtptp Aug 10, 2021
a91d5e9
fix:atlas support rotation
cptbtptpbcptdtptp Aug 10, 2021
0f60cac
fix:atlas support rotation
cptbtptpbcptdtptp Aug 10, 2021
066caf9
fix:Fixed sprite’s rect display error when packaged into an atlas and…
cptbtptpbcptdtptp Aug 15, 2021
4c4222d
fix:Fixed sprite’s rect display error when packaged into an atlas and…
cptbtptpbcptdtptp Aug 16, 2021
b65ffbf
Merge branch 'dev/0.5' of https://github.com/oasis-engine/engine into…
cptbtptpbcptdtptp Aug 16, 2021
1630680
fix:Fixed sprite’s rect display error when packaged into an atlas and…
cptbtptpbcptdtptp Aug 17, 2021
fb91468
fix:Fixed sprite’s rect display error when packaged into an atlas and…
cptbtptpbcptdtptp Aug 18, 2021
ae70757
fix:Fixed sprite’s rect display error when packaged into an atlas and…
cptbtptpbcptdtptp Aug 18, 2021
b59a9fe
fix:Fixed sprite’s rect display error when packaged into an atlas and…
cptbtptpbcptdtptp Aug 18, 2021
65478e7
fix:Fixed sprite’s rect display error when packaged into an atlas and…
cptbtptpbcptdtptp Aug 18, 2021
9e1631a
fix:Fixed sprite’s rect display error when packaged into an atlas and…
cptbtptpbcptdtptp Aug 18, 2021
5035233
fix:Fixed sprite’s rect display error when packaged into an atlas and…
cptbtptpbcptdtptp Aug 18, 2021
5d8c28f
Merge branch 'oasis-engine:dev/0.5' into dev/0.5
cptbtptpbcptdtptp Aug 18, 2021
c20f994
feat:Add the function of relative path loading
cptbtptpbcptdtptp Aug 18, 2021
2fa4145
Merge branch 'dev/0.5' of https://github.com/oasis-engine/engine into…
cptbtptpbcptdtptp Aug 26, 2021
6482632
feat:SpriteAtlas Adaptation Editor Workflow
cptbtptpbcptdtptp Aug 30, 2021
509125e
feat:SpriteAtlas Adaptation Editor Workflow
cptbtptpbcptdtptp Aug 30, 2021
18d25ca
feat:SpriteAtlas Adaptation Editor Workflow
cptbtptpbcptdtptp Aug 31, 2021
746815c
Merge branch 'dev/0.5' of https://github.com/oasis-engine/engine into…
cptbtptpbcptdtptp Aug 31, 2021
7f029a3
feat:SpriteAtlas Adaptation Editor Workflow
cptbtptpbcptdtptp Aug 31, 2021
aa86809
Merge branch 'dev/0.5' of https://github.com/oasis-engine/engine into…
cptbtptpbcptdtptp Sep 1, 2021
fe07a29
fix:code err
cptbtptpbcptdtptp Sep 1, 2021
945db6b
Merge branch 'dev/0.5' of https://github.com/oasis-engine/engine into…
cptbtptpbcptdtptp Sep 2, 2021
8324161
Merge branch 'dev/0.6' of https://github.com/oasis-engine/engine into…
cptbtptpbcptdtptp Sep 7, 2021
5a8ad2a
feat: Add InputManager.
cptbtptpbcptdtptp Sep 8, 2021
9ada64a
Merge branch 'oasis-engine:dev/0.6' into dev/0.6
cptbtptpbcptdtptp Sep 8, 2021
8965e6f
feat: Opt code.
cptbtptpbcptdtptp Sep 8, 2021
3594299
Merge branch 'dev/0.6' of https://github.com/cptbtptpbcptdtptp/engine…
cptbtptpbcptdtptp Sep 8, 2021
9139826
feat: Opt code.
cptbtptpbcptdtptp Sep 12, 2021
9995fa4
feat: Opt code.
cptbtptpbcptdtptp Sep 13, 2021
ab2b889
feat: Opt code.
cptbtptpbcptdtptp Sep 13, 2021
33af812
feat: Opt code.
cptbtptpbcptdtptp Sep 13, 2021
a6aefa9
feat: Opt code.
cptbtptpbcptdtptp Sep 13, 2021
5f1298e
feat: Opt code.
cptbtptpbcptdtptp Sep 14, 2021
82b2f24
feat: Opt code.
cptbtptpbcptdtptp Sep 14, 2021
a4868b2
feat: Opt code.
cptbtptpbcptdtptp Sep 14, 2021
0545e14
feat: Opt code.
cptbtptpbcptdtptp Sep 14, 2021
39691a9
feat: Opt code.
cptbtptpbcptdtptp Sep 14, 2021
4a20e9c
feat: Opt code.
cptbtptpbcptdtptp Sep 14, 2021
1b20034
feat: Opt code.
cptbtptpbcptdtptp Sep 15, 2021
b16910a
feat: Opt code.
cptbtptpbcptdtptp Sep 15, 2021
805d4d0
feat: Opt code.
cptbtptpbcptdtptp Sep 22, 2021
b4d099c
feat: Opt code.
cptbtptpbcptdtptp Sep 22, 2021
2190bb3
feat: Opt code.
cptbtptpbcptdtptp Sep 23, 2021
b06a809
feat: Opt code.
cptbtptpbcptdtptp Sep 23, 2021
18132ed
feat: Opt code.
cptbtptpbcptdtptp Sep 26, 2021
1816ac9
feat: Opt code.
cptbtptpbcptdtptp Sep 26, 2021
757d91d
feat: Opt code.
cptbtptpbcptdtptp Sep 26, 2021
66882b0
feat: Opt code.
cptbtptpbcptdtptp Sep 28, 2021
7ebef93
feat: Opt code.
cptbtptpbcptdtptp Sep 28, 2021
1efbd11
feat: Opt code.
cptbtptpbcptdtptp Sep 29, 2021
702579e
feat: Opt code.
cptbtptpbcptdtptp Sep 29, 2021
b23e00a
feat: Opt code.
cptbtptpbcptdtptp Sep 30, 2021
954ee3b
feat: Opt code.
cptbtptpbcptdtptp Sep 30, 2021
23da93b
fix:InputManager modify timing
cptbtptpbcptdtptp Oct 6, 2021
6d1d7b6
fix:InputManager modify timing
cptbtptpbcptdtptp Oct 8, 2021
550676c
fix:InputManager modify timing
cptbtptpbcptdtptp Oct 8, 2021
0f37299
fix:InputManager modify timing
cptbtptpbcptdtptp Oct 8, 2021
dcacf22
Merge branch 'dev/0.6' of https://github.com/oasis-engine/engine into…
cptbtptpbcptdtptp Oct 9, 2021
3d4a8b7
fix:Sprite add clone function
cptbtptpbcptdtptp Oct 10, 2021
8332a54
fix:Sprite add clone function
cptbtptpbcptdtptp Oct 10, 2021
c4dc776
Merge branch 'dev/0.6' of https://github.com/oasis-engine/engine into…
cptbtptpbcptdtptp Oct 16, 2021
466beab
fix:Sprite add clone function
cptbtptpbcptdtptp Oct 25, 2021
d6371f2
fix: the compatibility problem of IOS lower version
cptbtptpbcptdtptp Nov 10, 2021
95bbd51
fix: the compatibility problem of IOS lower version
cptbtptpbcptdtptp Nov 10, 2021
d6ff064
Merge branch 'oasis-engine:dev/0.6' into dev/0.6
cptbtptpbcptdtptp Nov 10, 2021
c0d23a9
Merge branch 'oasis-engine:main' into dev/0.6
cptbtptpbcptdtptp Nov 16, 2021
054aa10
fix: the bug that inputmanager cannot be obtained
cptbtptpbcptdtptp Nov 16, 2021
6577d40
fix: the bug that inputmanager cannot be obtained
cptbtptpbcptdtptp Nov 16, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions packages/core/src/Engine.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export class Engine extends EventDispatcher {

/** Physics manager of Engine. */
readonly physicsManager: PhysicsManager;
readonly inputManager: InputManager;

_componentsManager: ComponentsManager = new ComponentsManager();
_hardwareRenderer: IHardwareRenderer;
Expand All @@ -72,8 +73,6 @@ export class Engine extends EventDispatcher {
/** @internal */
_spriteMaskManager: SpriteMaskManager;
/** @internal */
_inputManager: InputManager;
/** @internal */
_macroCollection: ShaderMacroCollection = new ShaderMacroCollection();

protected _canvas: Canvas;
Expand Down Expand Up @@ -196,7 +195,7 @@ export class Engine extends EventDispatcher {
this._spriteDefaultMaterial = this._createSpriteMaterial();
this._spriteMaskDefaultMaterial = this._createSpriteMaskMaterial();

this._inputManager = new InputManager(this);
this.inputManager = new InputManager(this);

const whitePixel = new Uint8Array([255, 255, 255, 255]);

Expand Down Expand Up @@ -278,7 +277,7 @@ export class Engine extends EventDispatcher {
this.physicsManager._update(deltaTime / 1000.0);
componentsManager.callColliderOnLateUpdate();
}
this._inputManager._update();
this.inputManager._update();
componentsManager.callScriptOnUpdate(deltaTime);
componentsManager.callAnimationUpdate(deltaTime);
componentsManager.callScriptOnLateUpdate(deltaTime);
Expand Down Expand Up @@ -308,7 +307,7 @@ export class Engine extends EventDispatcher {
if (this._sceneManager) {
this._whiteTexture2D.destroy(true);
this._whiteTextureCube.destroy(true);
this._inputManager._destroy();
this.inputManager._destroy();
this.trigger(new Event("shutdown", this));
engineFeatureManager.callFeatureMethod(this, "shutdown", [this]);

Expand Down