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

return status from recompute_if_stale()

Browse Source
This commit is contained in:
David Rose 2012-01-03 01:47:02 +00:00
parent abb7a76368
commit 8f68dd373b
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
panda/src/distort/projectionScreen.cxx
View File

@ -345,12 +345,13 @@ recompute() {
// Description: Calls recompute() only if the relative transform
// between the ProjectionScreen and the projector has
// changed, or if any other relevant property has
// changed.
// changed. Returns true if recomputed, false
// otherwise.
////////////////////////////////////////////////////////////////////
void ProjectionScreen::
bool ProjectionScreen::
recompute_if_stale() {
NodePath this_np(NodePath::any_path(this));
recompute_if_stale(this_np);
return recompute_if_stale(this_np);
}
////////////////////////////////////////////////////////////////////
@ -359,17 +360,19 @@ recompute_if_stale() {
// Description: Calls recompute() only if the relative transform
// between the ProjectionScreen and the projector has
// changed, or if any other relevant property has
// changed.
// changed. Returns true if recomputed, false
// otherwise.
////////////////////////////////////////////////////////////////////
void ProjectionScreen::
bool ProjectionScreen::
recompute_if_stale(const NodePath &this_np) {
nassertv(!this_np.is_empty() && this_np.node() == this);
nassertr(!this_np.is_empty() && this_np.node() == this, false);
if (_projector_node != (LensNode *)NULL &&
_projector_node->get_lens() != (Lens *)NULL) {
UpdateSeq lens_change = _projector_node->get_lens()->get_last_change();
if (_stale || lens_change != _projector_lens_change) {
recompute();
return true;
} else {
// Get the relative transform to ensure it hasn't changed.
@ -379,9 +382,12 @@ recompute_if_stale(const NodePath &this_np) {
_rel_top_mat = top_mat;
_computed_rel_top_mat = true;
do_recompute(this_np);
return true;
}
}
}
return false;
}
////////////////////////////////////////////////////////////////////

4
panda/src/distort/projectionScreen.h
View File

@ -95,8 +95,8 @@ PUBLISHED:
void recompute();
INLINE const UpdateSeq &get_last_screen() const;
void recompute_if_stale();
void recompute_if_stale(const NodePath &this_np);
bool recompute_if_stale();
bool recompute_if_stale(const NodePath &this_np);
private:
void do_recompute(const NodePath &this_np);