|
@@ -164,7 +164,6 @@
|
|
|
|
|
|
// Collisions
|
|
// Collisions
|
|
private _checkCollisions = false;
|
|
private _checkCollisions = false;
|
|
- private _collisionGroup = -1;
|
|
|
|
private _collisionMask = -1;
|
|
private _collisionMask = -1;
|
|
public ellipsoid = new Vector3(0.5, 1, 0.5);
|
|
public ellipsoid = new Vector3(0.5, 1, 0.5);
|
|
public ellipsoidOffset = new Vector3(0, 0, 0);
|
|
public ellipsoidOffset = new Vector3(0, 0, 0);
|
|
@@ -173,12 +172,14 @@
|
|
private _diffPositionForCollisions = new Vector3(0, 0, 0);
|
|
private _diffPositionForCollisions = new Vector3(0, 0, 0);
|
|
private _newPositionForCollisions = new Vector3(0, 0, 0);
|
|
private _newPositionForCollisions = new Vector3(0, 0, 0);
|
|
|
|
|
|
- public set setCollisionGroup(mask: number) {
|
|
|
|
- this._collisionGroup = mask && !isNaN(mask) ? mask : -1;
|
|
|
|
|
|
+ private _collisionMask = -1;
|
|
|
|
+
|
|
|
|
+ public get collisionMask() {
|
|
|
|
+ return this._collisionMask;
|
|
}
|
|
}
|
|
|
|
|
|
- public set setCollisionMask(mask: number) {
|
|
|
|
- this._collisionMask = mask && !isNaN(mask) ? mask : -1;
|
|
|
|
|
|
+ public set collisionMask(mask: number) {
|
|
|
|
+ this._collisionMask = !isNaN(mask) ? mask : -1;
|
|
}
|
|
}
|
|
|
|
|
|
// Attach to bone
|
|
// Attach to bone
|