Skip to content

Edit details to be more realistic #1992

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
JadePie wants to merge 2 commits into
base: master
Choose a base branch
from
+12 −12
Open

Edit details to be more realistic #1992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e240c4
define changes
JadePie Aug 2, 2023
a194d24
changed mass to realistic values
JadePie Aug 2, 2023
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
8 changes: 4 additions & 4 deletions samples/character/res/common/sample.physics
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ collisionObject basketball
{
type = RIGID_BODY
shape = SPHERE
mass = 1.0
mass = 0.6
friction = 0.5
restitution = 1.0
linearDamping = 0.1
Expand All @@ -13,7 +13,7 @@ collisionObject chair
{
type = RIGID_BODY
shape = BOX
mass = 5.0
mass = 42.0
friction = 1.0
restitution = 0.0
linearDamping = 0.9
Expand All @@ -24,7 +24,7 @@ collisionObject table
{
type = RIGID_BODY
shape = BOX
mass = 0.0
mass = 100.0
friction = 0.5
restitution = 0.75
linearDamping = 0.1
Expand Down Expand Up @@ -61,7 +61,7 @@ collisionObject boy
height = 6.0
center = 0, 3.0, 0
centerAbsolute = true
mass = 20.0
mass = 40.0
maxStepHeight = 0
maxSlopeAngle = 0
}
Expand Down
16 changes: 8 additions & 8 deletions samples/character/src/CharacterGame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
CharacterGame game;

// Input flags
#define NORTH 1
#define SOUTH 2
#define EAST 4
#define NORTH 2
#define SOUTH 4
#define EAST 6
#define WEST 8
#define RUNNING 16
#define RUNNING 12

// Character defines
#define WALK_SPEED 5.0f
#define STRAFE_SPEED 1.5f
#define RUN_SPEED 15.0f
#define CAMERA_FOCUS_DISTANCE 16.0f
#define WALK_SPEED 6.0f
#define STRAFE_SPEED 2.0f
#define RUN_SPEED 20.0f
#define CAMERA_FOCUS_DISTANCE 19.0f

#define BUTTON_1 0
#define BUTTON_2 1
Expand Down