mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-03 10:22:45 -04:00
compilation errors
This commit is contained in:
parent
99d660fe48
commit
4b96d9f8cf
@ -624,8 +624,8 @@ r_traverse_single(CollisionLevelStateSingle &level_state, size_t pass) {
|
|||||||
if (level_state.has_collider(c)) {
|
if (level_state.has_collider(c)) {
|
||||||
entry._from_node = level_state.get_collider_node(c);
|
entry._from_node = level_state.get_collider_node(c);
|
||||||
|
|
||||||
if ((entry._from_node->get_from_collide_mask() &
|
if (entry._from_node->get_from_collide_mask() &
|
||||||
cnode->get_into_collide_mask()) != 0) {
|
cnode->get_into_collide_mask()) {
|
||||||
#ifdef DO_PSTATS
|
#ifdef DO_PSTATS
|
||||||
//PStatTimer collide_timer(_solid_collide_collectors[pass]);
|
//PStatTimer collide_timer(_solid_collide_collectors[pass]);
|
||||||
#endif
|
#endif
|
||||||
@ -669,8 +669,8 @@ r_traverse_single(CollisionLevelStateSingle &level_state, size_t pass) {
|
|||||||
if (level_state.has_collider(c)) {
|
if (level_state.has_collider(c)) {
|
||||||
entry._from_node = level_state.get_collider_node(c);
|
entry._from_node = level_state.get_collider_node(c);
|
||||||
|
|
||||||
if ((entry._from_node->get_from_collide_mask() &
|
if (entry._from_node->get_from_collide_mask() &
|
||||||
gnode->get_into_collide_mask()) != 0) {
|
gnode->get_into_collide_mask()) {
|
||||||
#ifdef DO_PSTATS
|
#ifdef DO_PSTATS
|
||||||
//PStatTimer collide_timer(_solid_collide_collectors[pass]);
|
//PStatTimer collide_timer(_solid_collide_collectors[pass]);
|
||||||
#endif
|
#endif
|
||||||
@ -841,8 +841,8 @@ r_traverse_double(CollisionLevelStateDouble &level_state, size_t pass) {
|
|||||||
if (level_state.has_collider(c)) {
|
if (level_state.has_collider(c)) {
|
||||||
entry._from_node = level_state.get_collider_node(c);
|
entry._from_node = level_state.get_collider_node(c);
|
||||||
|
|
||||||
if ((entry._from_node->get_from_collide_mask() &
|
if (entry._from_node->get_from_collide_mask() &
|
||||||
cnode->get_into_collide_mask()) != 0) {
|
cnode->get_into_collide_mask()) {
|
||||||
#ifdef DO_PSTATS
|
#ifdef DO_PSTATS
|
||||||
//PStatTimer collide_timer(_solid_collide_collectors[pass]);
|
//PStatTimer collide_timer(_solid_collide_collectors[pass]);
|
||||||
#endif
|
#endif
|
||||||
@ -886,8 +886,8 @@ r_traverse_double(CollisionLevelStateDouble &level_state, size_t pass) {
|
|||||||
if (level_state.has_collider(c)) {
|
if (level_state.has_collider(c)) {
|
||||||
entry._from_node = level_state.get_collider_node(c);
|
entry._from_node = level_state.get_collider_node(c);
|
||||||
|
|
||||||
if ((entry._from_node->get_from_collide_mask() &
|
if (entry._from_node->get_from_collide_mask() &
|
||||||
gnode->get_into_collide_mask()) != 0) {
|
gnode->get_into_collide_mask()) {
|
||||||
#ifdef DO_PSTATS
|
#ifdef DO_PSTATS
|
||||||
//PStatTimer collide_timer(_solid_collide_collectors[pass]);
|
//PStatTimer collide_timer(_solid_collide_collectors[pass]);
|
||||||
#endif
|
#endif
|
||||||
@ -1058,8 +1058,8 @@ r_traverse_quad(CollisionLevelStateQuad &level_state, size_t pass) {
|
|||||||
if (level_state.has_collider(c)) {
|
if (level_state.has_collider(c)) {
|
||||||
entry._from_node = level_state.get_collider_node(c);
|
entry._from_node = level_state.get_collider_node(c);
|
||||||
|
|
||||||
if ((entry._from_node->get_from_collide_mask() &
|
if (entry._from_node->get_from_collide_mask() &
|
||||||
cnode->get_into_collide_mask()) != 0) {
|
cnode->get_into_collide_mask()) {
|
||||||
#ifdef DO_PSTATS
|
#ifdef DO_PSTATS
|
||||||
//PStatTimer collide_timer(_solid_collide_collectors[pass]);
|
//PStatTimer collide_timer(_solid_collide_collectors[pass]);
|
||||||
#endif
|
#endif
|
||||||
@ -1103,8 +1103,8 @@ r_traverse_quad(CollisionLevelStateQuad &level_state, size_t pass) {
|
|||||||
if (level_state.has_collider(c)) {
|
if (level_state.has_collider(c)) {
|
||||||
entry._from_node = level_state.get_collider_node(c);
|
entry._from_node = level_state.get_collider_node(c);
|
||||||
|
|
||||||
if ((entry._from_node->get_from_collide_mask() &
|
if (entry._from_node->get_from_collide_mask() &
|
||||||
gnode->get_into_collide_mask()) != 0) {
|
gnode->get_into_collide_mask()) {
|
||||||
#ifdef DO_PSTATS
|
#ifdef DO_PSTATS
|
||||||
//PStatTimer collide_timer(_solid_collide_collectors[pass]);
|
//PStatTimer collide_timer(_solid_collide_collectors[pass]);
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user