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

Adding back ZoneComponent #5123

Draft
wants to merge 57 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 45 commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
e6a027a
Added `zone` and `zones` to Entity
MushAsterion Mar 4, 2023
8dbaf61
Updated `ZoneComponentData` content
MushAsterion Mar 4, 2023
e771768
Extended `ZoneComponentSystem`
MushAsterion Mar 4, 2023
bb527dc
[BREAKING] Extended `ZoneComponent`
MushAsterion Mar 4, 2023
ce0b989
Fixed missing `.js` in import
MushAsterion Mar 4, 2023
bcf2695
Fixed Lint
MushAsterion Mar 4, 2023
dfe14e8
Removed data
MushAsterion Mar 4, 2023
c6a344f
Added missing documentation
MushAsterion Mar 4, 2023
bccc6c7
Added back data.
MushAsterion Mar 5, 2023
67ff406
Fixed documentation into @property
MushAsterion Mar 5, 2023
c8a23cb
Added `zoneCheck`
MushAsterion Mar 5, 2023
dd1db06
Added `zoneCheck`
MushAsterion Mar 5, 2023
27d4890
Added `zoneCheck`
MushAsterion Mar 5, 2023
c7feab6
Added `zoneCheck`
MushAsterion Mar 5, 2023
1f9a3f2
Merge branch 'playcanvas:main' into zone-component
MushAsterion Mar 10, 2023
5d41404
Merge branch 'playcanvas:main' into zone-component
MushAsterion Mar 11, 2023
72a516e
Merge branch 'playcanvas:main' into zone-component
MushAsterion Mar 17, 2023
957ddff
Merge branch 'playcanvas:main' into zone-component
MushAsterion Mar 18, 2023
ec462f5
Merge branch 'playcanvas:main' into zone-component
MushAsterion Mar 22, 2023
a1c15c2
Merge branch 'playcanvas:main' into zone-component
MushAsterion Mar 25, 2023
5ba7ce4
Merge branch 'playcanvas:main' into zone-component
MushAsterion Apr 2, 2023
e3d3067
Merge branch 'playcanvas:main' into zone-component
MushAsterion Apr 8, 2023
52a694e
Merge branch 'playcanvas:main' into zone-component
MushAsterion Apr 13, 2023
cc07f78
Revert "Merge branch 'playcanvas:main' into zone-component"
MushAsterion Apr 13, 2023
fdf1ef9
Revert "Revert "Merge branch 'playcanvas:main' into zone-component""
MushAsterion Apr 13, 2023
b65adad
Revert "Revert "Revert "Merge branch 'playcanvas:main' into zone-comp…
MushAsterion Apr 13, 2023
9875b60
Revert "Revert "Merge branch 'playcanvas:main' into zone-component""
MushAsterion Apr 13, 2023
fe80886
Merge branch 'playcanvas:main' into zone-component
MushAsterion Apr 17, 2023
0042976
Merge branch 'playcanvas:main' into zone-component
MushAsterion Apr 18, 2023
9d21a62
Merge branch 'playcanvas:main' into zone-component
MushAsterion Apr 26, 2023
fd47a9c
Merge branch 'playcanvas:main' into zone-component
MushAsterion Apr 29, 2023
664d77f
Merge branch 'playcanvas:main' into zone-component
MushAsterion May 10, 2023
7beb100
Merge branch 'playcanvas:main' into zone-component
MushAsterion May 12, 2023
40ae0b0
Merge branch 'playcanvas:main' into zone-component
MushAsterion May 28, 2023
479242f
Merge branch 'playcanvas:main' into zone-component
MushAsterion Jun 20, 2023
09b65e8
Merge branch 'playcanvas:main' into zone-component
MushAsterion Jun 28, 2023
c6a8a3f
Merge branch 'playcanvas:main' into zone-component
MushAsterion Jul 24, 2023
092ee2d
Merge branch 'playcanvas:main' into zone-component
MushAsterion Jul 28, 2023
92b2604
Merge branch 'playcanvas:main' into zone-component
MushAsterion Jul 31, 2023
1dcd2cc
Merge branch 'playcanvas:main' into zone-component
MushAsterion Aug 10, 2023
fbd87c7
Merge branch 'playcanvas:main' into zone-component
MushAsterion Aug 17, 2023
95b39bd
Merge branch 'playcanvas:main' into zone-component
MushAsterion Aug 22, 2023
77908c1
Updated entering/leaving order of addition/removal
MushAsterion Aug 22, 2023
7870b8d
Updated zone events documentation on entity
MushAsterion Aug 22, 2023
ed88ad7
Fixed documentation for enter/leave events
MushAsterion Aug 22, 2023
97f15c9
Merge branch 'playcanvas:main' into zone-component
MushAsterion Aug 24, 2023
4f34653
Fixing entities removal/addition order
MushAsterion Aug 24, 2023
bde0612
Merge branch 'playcanvas:main' into zone-component
MushAsterion Oct 16, 2023
36b697e
Moved events trigger after all operations
MushAsterion Oct 31, 2023
af8f531
Fixed ESLint
MushAsterion Oct 31, 2023
7082d03
Merge branch 'playcanvas:main' into zone-component
MushAsterion Oct 31, 2023
43cb16e
Moved breaking changes to deprecated
MushAsterion Oct 31, 2023
e9cb221
Merge remote-tracking branch 'upstream/main' into zone-component
MushAsterion Feb 14, 2024
8e625c5
Fixed ESLint
MushAsterion Feb 14, 2024
721f4fc
Merge remote-tracking branch 'upstream/main' into zone-component
MushAsterion Mar 29, 2024
ce09933
Merge branch 'playcanvas:main' into zone-component
MushAsterion May 11, 2024
acdd418
Merge branch 'playcanvas:main' into zone-component
MushAsterion May 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions src/framework/components/collision/component.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ const _quat = new Quat();
* an asset id. Defaults to null. If not set then the asset property will be checked instead.
* @property {import('../../../scene/model.js').Model} model The model that is added to the scene
* graph for the mesh collision volume.
* @property {boolean} zoneCheck Whether this collider should be used to detect if entity is within zone. Defaults to false.
* @augments Component
* @category Physics
*/
Expand Down
1 change: 1 addition & 0 deletions src/framework/components/collision/data.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ class CollisionComponentData {
this.height = 2;
this.asset = null;
this.renderAsset = null;
this.zoneCheck = false;

// Non-serialized properties
this.shape = null;
Expand Down
11 changes: 8 additions & 3 deletions src/framework/components/collision/system.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ const _schema = [
'renderAsset',
'shape',
'model',
'render'
'render',
'zoneCheck'
];

// Collision system implementations
Expand Down Expand Up @@ -205,7 +206,8 @@ class CollisionSystemImpl {
asset: src.data.asset,
renderAsset: src.data.renderAsset,
model: src.data.model,
render: src.data.render
render: src.data.render,
zoneCheck: src.data.zoneCheck
};

return this.system.addComponent(clone, data);
Expand Down Expand Up @@ -608,7 +610,8 @@ class CollisionComponentSystem extends ComponentSystem {
'renderAsset',
'enabled',
'linearOffset',
'angularOffset'
'angularOffset',
'zoneCheck'
];

// duplicate the input data because we are modifying it
Expand Down Expand Up @@ -661,6 +664,8 @@ class CollisionComponentSystem extends ComponentSystem {
}
}

component.data.zoneCheck = !!data.zoneCheck;

const impl = this._createImplementation(data.type);
impl.beforeInitialize(component, data);

Expand Down