Browse Source

oops, virtual function mismatch

David Rose 24 years ago
parent
commit
cb8d73f25c
2 changed files with 7 additions and 5 deletions
  1. 5 4
      panda/src/effects/lensFlareNode.cxx
  2. 2 1
      panda/src/effects/lensFlareNode.h

+ 5 - 4
panda/src/effects/lensFlareNode.cxx

@@ -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_child(_blind_arc, trans, gsg);
+  render_children(_flare_arcs, input_trans, gsg);
+  render_child(_blind_arc, input_trans, gsg);
 
 
   //Short circuit the rendering
   //Short circuit the rendering
   return false;
   return false;

+ 2 - 1
panda/src/effects/lensFlareNode.h

@@ -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;