TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 08:44:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix draw mask propagation for initially hidden nodes when when frustum culling is off

Browse Source
This commit is contained in:
rdb 2015-02-28 13:03:45 +01:00
parent 3d9d9bfc95
commit 223620e27e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
panda/src/pgraph/pandaNode.I
View File

@ -721,13 +721,15 @@ get_user_bounds(int pipeline_stage, Thread *current_thread) const {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE void PandaNode:: INLINE void PandaNode::
mark_bounds_stale(int pipeline_stage, Thread *current_thread) const { mark_bounds_stale(int pipeline_stage, Thread *current_thread) const {
// It's important that we don't hold the lock during the call to // We check whether it is already marked stale. If so, we don't have
// force_bounds_stale(). // to make the call to force_bounds_stale().
bool is_stale_bounds; bool is_stale_bounds;
{ {
CDStageReader cdata(_cycler, pipeline_stage, current_thread); CDStageReader cdata(_cycler, pipeline_stage, current_thread);
is_stale_bounds = (cdata->_last_bounds_update != cdata->_next_update); is_stale_bounds = (cdata->_last_update != cdata->_next_update);
} }
// It's important that we don't hold the lock during the call to
// force_bounds_stale().
if (!is_stale_bounds) { if (!is_stale_bounds) {
((PandaNode *)this)->force_bounds_stale(pipeline_stage, current_thread); ((PandaNode *)this)->force_bounds_stale(pipeline_stage, current_thread);
} }
@ -1833,7 +1835,7 @@ get_off_clip_planes() const {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE CPT(BoundingVolume) PandaNodePipelineReader:: INLINE CPT(BoundingVolume) PandaNodePipelineReader::
get_bounds() const { get_bounds() const {
nassertr(_cdata->_last_update == _cdata->_next_update, _cdata->_external_bounds); nassertr(_cdata->_last_bounds_update == _cdata->_next_update, _cdata->_external_bounds);
return _cdata->_external_bounds; return _cdata->_external_bounds;
} }
@ -1852,7 +1854,7 @@ get_bounds() const {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE int PandaNodePipelineReader:: INLINE int PandaNodePipelineReader::
get_nested_vertices() const { get_nested_vertices() const {
nassertr(_cdata->_last_update == _cdata->_next_update, _cdata->_nested_vertices); nassertr(_cdata->_last_bounds_update == _cdata->_next_update, _cdata->_nested_vertices);
return _cdata->_nested_vertices; return _cdata->_nested_vertices;
} }