Explorar el Código

resolve circular reference counts

David Rose hace 22 años
padre
commit
51214e65bd
Se han modificado 2 ficheros con 5 adiciones y 5 borrados
  1. 4 4
      panda/src/display/graphicsDevice.h
  2. 1 1
      panda/src/display/graphicsPipe.h

+ 4 - 4
panda/src/display/graphicsDevice.h

@@ -21,10 +21,10 @@
 
 
 #include "pandabase.h"
 #include "pandabase.h"
 
 
-#include "graphicsPipe.h"
-#include "graphicsStateGuardian.h"
-
 #include "typedReferenceCount.h"
 #include "typedReferenceCount.h"
+
+class GraphicsPipe;
+
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 //       Class : GraphicsDevice
 //       Class : GraphicsDevice
 // Description : An abstract device object that is part of Graphics
 // Description : An abstract device object that is part of Graphics
@@ -48,7 +48,7 @@ PUBLISHED:
   INLINE GraphicsPipe *get_pipe() const;
   INLINE GraphicsPipe *get_pipe() const;
 
 
 protected:
 protected:
-  PT(GraphicsPipe) _pipe;
+  GraphicsPipe *_pipe;
 
 
 public:
 public:
   static TypeHandle get_class_type() {
   static TypeHandle get_class_type() {

+ 1 - 1
panda/src/display/graphicsPipe.h

@@ -21,6 +21,7 @@
 
 
 #include "pandabase.h"
 #include "pandabase.h"
 
 
+#include "graphicsDevice.h"
 #include "typedReferenceCount.h"
 #include "typedReferenceCount.h"
 #include "pointerTo.h"
 #include "pointerTo.h"
 #include "pmutex.h"
 #include "pmutex.h"
@@ -28,7 +29,6 @@
 
 
 class HardwareChannel;
 class HardwareChannel;
 class GraphicsWindow;
 class GraphicsWindow;
-class GraphicsDevice;
 class GraphicsStateGuardian;
 class GraphicsStateGuardian;
 class FrameBufferProperties;
 class FrameBufferProperties;