TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

oops, virtual function mismatch

Browse Source
This commit is contained in:
David Rose 2001-08-21 21:39:02 +00:00
parent d260456624
commit cb8d73f25c
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
panda/src/effects/lensFlareNode.cxx
View File

@ -304,7 +304,8 @@ render_children(const vector_relation &arcs,
// Description: // Description:
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
bool LensFlareNode:: bool LensFlareNode::
sub_render(AllTransitionsWrapper &trans, RenderTraverser *trav) { sub_render(const AllTransitionsWrapper &input_trans,
AllTransitionsWrapper &, RenderTraverser *trav) {
GraphicsStateGuardian *gsg = trav->get_gsg(); GraphicsStateGuardian *gsg = trav->get_gsg();
nassertr(_light_node != (Node*) NULL, false); nassertr(_light_node != (Node*) NULL, false);
@ -321,7 +322,7 @@ sub_render(AllTransitionsWrapper &trans, RenderTraverser *trav) {
LMatrix4f modelview_mat; LMatrix4f modelview_mat;
const TransformTransition *ta; const TransformTransition *ta;
if (!get_transition_into(ta, trans)) if (!get_transition_into(ta, input_trans))
modelview_mat = LMatrix4f::ident_mat(); modelview_mat = LMatrix4f::ident_mat();
else else
modelview_mat = ta->get_matrix(); modelview_mat = ta->get_matrix();
@ -353,8 +354,8 @@ sub_render(AllTransitionsWrapper &trans, RenderTraverser *trav) {
prepare_flares(delta, light_pos, dot); prepare_flares(delta, light_pos, dot);
prepare_blind(dot, pp->get_frustum()._fnear); prepare_blind(dot, pp->get_frustum()._fnear);
render_children(_flare_arcs, trans, gsg); render_children(_flare_arcs, input_trans, gsg);
render_child(_blind_arc, trans, gsg); render_child(_blind_arc, input_trans, gsg);
//Short circuit the rendering //Short circuit the rendering
return false; return false;

3
panda/src/effects/lensFlareNode.h
View File

@ -51,7 +51,8 @@ PUBLISHED:
INLINE void set_light_source(PT_Node source); INLINE void set_light_source(PT_Node source);
public: public:
virtual bool sub_render(AllTransitionsWrapper &trans, virtual bool sub_render(const AllTransitionsWrapper &input_trans,
AllTransitionsWrapper &modify_trans,
RenderTraverser *trav); RenderTraverser *trav);
virtual bool has_sub_render() const; virtual bool has_sub_render() const;