Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
e0eb9a8a
Unverified
Commit
e0eb9a8a
authored
Apr 14, 2020
by
Rémi Verschelde
Committed by
GitHub
Apr 14, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #37826 from nekomatata/direct-body-state-sleep
Fix set_sleep_state in Bullet body direct state
parents
3afa3db0
30b184cb
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
rigid_body_bullet.cpp
modules/bullet/rigid_body_bullet.cpp
+2
-2
rigid_body_bullet.h
modules/bullet/rigid_body_bullet.h
+1
-1
body_3d_sw.h
servers/physics_3d/body_3d_sw.h
+1
-1
physics_server_3d.h
servers/physics_server_3d.h
+1
-1
No files found.
modules/bullet/rigid_body_bullet.cpp
View file @
e0eb9a8a
...
...
@@ -138,8 +138,8 @@ void BulletPhysicsDirectBodyState3D::apply_torque_impulse(const Vector3 &p_impul
body
->
apply_torque_impulse
(
p_impulse
);
}
void
BulletPhysicsDirectBodyState3D
::
set_sleep_state
(
bool
p_
enable
)
{
body
->
set_activation_state
(
p_enable
);
void
BulletPhysicsDirectBodyState3D
::
set_sleep_state
(
bool
p_
sleep
)
{
body
->
set_activation_state
(
!
p_sleep
);
}
bool
BulletPhysicsDirectBodyState3D
::
is_sleeping
()
const
{
...
...
modules/bullet/rigid_body_bullet.h
View file @
e0eb9a8a
...
...
@@ -117,7 +117,7 @@ public:
virtual
void
apply_impulse
(
const
Vector3
&
p_pos
,
const
Vector3
&
p_impulse
);
virtual
void
apply_torque_impulse
(
const
Vector3
&
p_impulse
);
virtual
void
set_sleep_state
(
bool
p_
enable
);
virtual
void
set_sleep_state
(
bool
p_
sleep
);
virtual
bool
is_sleeping
()
const
;
virtual
int
get_contact_count
()
const
;
...
...
servers/physics_3d/body_3d_sw.h
View file @
e0eb9a8a
...
...
@@ -421,7 +421,7 @@ public:
virtual
void
apply_impulse
(
const
Vector3
&
p_pos
,
const
Vector3
&
p_j
)
{
body
->
apply_impulse
(
p_pos
,
p_j
);
}
virtual
void
apply_torque_impulse
(
const
Vector3
&
p_j
)
{
body
->
apply_torque_impulse
(
p_j
);
}
virtual
void
set_sleep_state
(
bool
p_
enable
)
{
body
->
set_active
(
!
p_enable
);
}
virtual
void
set_sleep_state
(
bool
p_
sleep
)
{
body
->
set_active
(
!
p_sleep
);
}
virtual
bool
is_sleeping
()
const
{
return
!
body
->
is_active
();
}
virtual
int
get_contact_count
()
const
{
return
body
->
contact_count
;
}
...
...
servers/physics_server_3d.h
View file @
e0eb9a8a
...
...
@@ -70,7 +70,7 @@ public:
virtual
void
apply_impulse
(
const
Vector3
&
p_pos
,
const
Vector3
&
p_j
)
=
0
;
virtual
void
apply_torque_impulse
(
const
Vector3
&
p_j
)
=
0
;
virtual
void
set_sleep_state
(
bool
p_
enable
)
=
0
;
virtual
void
set_sleep_state
(
bool
p_
sleep
)
=
0
;
virtual
bool
is_sleeping
()
const
=
0
;
virtual
int
get_contact_count
()
const
=
0
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment