From 36dbe8c09342fe7f6c8b9212262ce3663ba170c1 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Wed, 27 May 2009 19:28:39 +0000
Subject: [PATCH] temporary fixes to fix compiler issues

---
 panda/src/pgraphnodes/lightLensNode.I   |  4 ++++
 panda/src/pgraphnodes/lightLensNode.cxx |  5 ++++-
 panda/src/pgraphnodes/lightLensNode.h   | 10 +++++++---
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/panda/src/pgraphnodes/lightLensNode.I b/panda/src/pgraphnodes/lightLensNode.I
index 75a37ea900..3aef9e33d3 100644
--- a/panda/src/pgraphnodes/lightLensNode.I
+++ b/panda/src/pgraphnodes/lightLensNode.I
@@ -61,10 +61,14 @@ set_shadow_caster(bool caster, int buffer_xsize, int buffer_ysize, int buffer_so
   _sb_xsize = buffer_xsize;
   _sb_ysize = buffer_ysize;
   if (buffer_sort != _sb_sort) {
+    // drose: Temporarily commenting out--can't call set_sort() on an
+    // undefined class.
+    /*
     ShadowBuffers::iterator it;
     for(it = _sbuffers.begin(); it != _sbuffers.end(); ++it) {
       it->second->set_sort(buffer_sort);
     }
+    */
     _sb_sort = buffer_sort;
   }
   set_active(caster);
diff --git a/panda/src/pgraphnodes/lightLensNode.cxx b/panda/src/pgraphnodes/lightLensNode.cxx
index 9a8336f079..c1c64fd780 100644
--- a/panda/src/pgraphnodes/lightLensNode.cxx
+++ b/panda/src/pgraphnodes/lightLensNode.cxx
@@ -17,7 +17,6 @@
 #include "bamReader.h"
 #include "datagram.h"
 #include "datagramIterator.h"
-#include "graphicsEngine.h"
 
 TypeHandle LightLensNode::_type_handle;
 
@@ -76,9 +75,13 @@ LightLensNode(const LightLensNode &copy) :
 void LightLensNode::
 clear_shadow_buffers() {
   ShadowBuffers::iterator it;
+  // drose: Temporarily commenting out--can't call get_engine() or
+  // remove_window() on an undefined class.
+  /*
   for(it = _sbuffers.begin(); it != _sbuffers.end(); ++it) {
     it->first->get_engine()->remove_window(it->second);
   }
+  */
   _sbuffers.clear();
 }
 
diff --git a/panda/src/pgraphnodes/lightLensNode.h b/panda/src/pgraphnodes/lightLensNode.h
index 23c155c0de..0423e23d87 100644
--- a/panda/src/pgraphnodes/lightLensNode.h
+++ b/panda/src/pgraphnodes/lightLensNode.h
@@ -19,8 +19,8 @@
 
 #include "light.h"
 #include "camera.h"
-#include "graphicsStateGuardian.h"
-#include "graphicsOutput.h"
+#include "graphicsStateGuardianBase.h"
+#include "typedWritableReferenceCount.h"
 
 class ShaderGenerator;
 
@@ -48,7 +48,11 @@ protected:
   bool _shadow_caster;
   int _sb_xsize, _sb_ysize, _sb_sort;
   double _push_bias;
-  typedef pmap<CPT(GraphicsStateGuardian), PT(GraphicsOutput) > ShadowBuffers;
+
+  // drose: This is really a map of GSG -> GraphicsOutput.
+  // Temporarily changed it to TypedWritableReferenceCount to allow
+  // compilation without circular dependencies.
+  typedef pmap<CPT(GraphicsStateGuardianBase), PT(TypedWritableReferenceCount) > ShadowBuffers;
   ShadowBuffers _sbuffers;
 
 public: