Skip to content

CharacterController has allowGod option #31

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.

Sign up for GitHub

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

Open
ghost wants to merge 2 commits into
base: master
Choose a base branch
from
Open

CharacterController has allowGod option #31

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9121d6d
CharacterController has allowGod option
Mar 31, 2014
de041d1
using disableGod as option name
Apr 15, 2014
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
43 changes: 23 additions & 20 deletions tslib/charactercontroller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class CharacterController
onGround : boolean;
dead : boolean;
god : boolean;
disableGod : boolean;

walkDirection : any; // v3

Expand Down Expand Up @@ -132,6 +133,7 @@ class CharacterController
c.onGround = false;
c.dead = false;
c.god = false;
c.disableGod = false;

if (params)
{
Expand All @@ -144,6 +146,7 @@ class CharacterController
c.maxSpeed = params.maxSpeed || c.maxSpeed;
c.maxStepHeight = params.maxStepHeight || c.maxStepHeight;
c.maxJumpHeight = params.maxJumpHeight || c.maxJumpHeight;
c.disableGod = params.disableGod != null ? params.disableGod : c.disableGod;
}

var at = md.m43At(matrix);
Expand Down Expand Up @@ -261,16 +264,7 @@ class CharacterController
}
if (keynum === keyCodes.G)
{
c.god = !c.god;
if (c.god)
{
c.character.velocity = c.md.v3BuildZero();
}
else
{
var characterPosition = c.md.m43Pos(c.matrix);
c.character.position = c.md.v3Add(characterPosition, c.physicsHeightOffset);
}
c.setGod(!c.god);
}
else if (keynum === keyCodes.RETURN)
{
Expand Down Expand Up @@ -383,16 +377,7 @@ class CharacterController
}
if (buttonnum === padCodes.BACK)
{
c.god = !c.god;
if (c.god)
{
c.character.velocity = c.md.v3BuildZero();
}
else
{
var characterPosition = c.md.m43Pos(c.matrix);
c.character.position = c.md.v3Add(characterPosition, c.physicsHeightOffset);
}
c.setGod(!c.god);
}
};

Expand Down Expand Up @@ -543,6 +528,24 @@ class CharacterController
return c;
}

setGod(newGod)
{
if (newGod && this.disableGod)
{
return;
}
this.god = newGod;
if (this.god)
{
this.character.velocity = this.md.v3BuildZero();
}
else
{
var characterPosition = this.md.m43Pos(this.matrix);
this.character.position = this.md.v3Add(characterPosition, this.physicsHeightOffset);
}
}

rotate(turn, pitch)
{
var md = this.md;
Expand Down