Browse Source

Add CMakeLists.txt for panda/pgraph.

kestred 12 years ago
parent
commit
6c98b96f5d

+ 2 - 2
panda/CMakeLists.txt

@@ -14,9 +14,9 @@ add_subdirectory(src/event)
 add_subdirectory(src/mathutil)
 add_subdirectory(src/gsgbase)
 add_subdirectory(src/pnmimage)
-
 add_subdirectory(src/gobj)
-#add_subdirectory(src/pgraph)
+add_subdirectory(src/pgraph)
+
 #add_subdirectory(src/display)
 #add_subdirectory(src/framework)
 #add_subdirectory(src/testbed)

+ 5 - 1
panda/src/pgraph/CMakeLists.txt

@@ -196,9 +196,13 @@ set(P3PGRAPH_SOURCES
   workingNodePath.cxx
 )
 
+if(HAVE_EIGEN)
+  include_directories(${EIGEN3_INCLUDE_DIR})
+endif()
+
 composite_sources(p3pgraph P3PGRAPH_SOURCES)
 add_library(p3pgraph ${P3PGRAPH_HEADERS} ${P3PGRAPH_SOURCES})
-target_link_libraries(p3pgraph) #p3gobj
+target_link_libraries(p3pgraph p3gobj)
 target_interrogate(p3pgraph ALL)
     # p3gobj p3event p3gsgbase p3putil p3linmath p3downloader
 

+ 1 - 0
panda/src/pgraph/antialiasAttrib.cxx

@@ -13,6 +13,7 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "antialiasAttrib.h"
+#include "config_pgraph.h"
 #include "graphicsStateGuardianBase.h"
 #include "dcast.h"
 #include "bamReader.h"

+ 1 - 0
panda/src/pgraph/cullTraverserData.cxx

@@ -23,6 +23,7 @@
 #include "boundingPlane.h"
 #include "billboardEffect.h"
 #include "compassEffect.h"
+#include "occluderEffect.h"
 #include "polylightEffect.h"
 #include "renderState.h"
 

+ 2 - 0
panda/src/pgraph/cullableObject.cxx

@@ -15,7 +15,9 @@
 #include "cullableObject.h"
 #include "lightAttrib.h"
 #include "nodePath.h"
+#include "colorAttrib.h"
 #include "texGenAttrib.h"
+#include "textureAttrib.h"
 #include "renderState.h"
 #include "clockObject.h"
 #include "cullTraverser.h"

+ 1 - 0
panda/src/pgraph/findApproxPath.h

@@ -20,6 +20,7 @@
 #include "globPattern.h"
 #include "typeHandle.h"
 #include "pvector.h"
+#include "pnotify.h"
 
 class PandaNode;
 

+ 2 - 0
panda/src/pgraph/geomDrawCallbackData.cxx

@@ -13,6 +13,8 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "geomDrawCallbackData.h"
+#include "cullableObject.h"
+#include "graphicsStateGuardianBase.h"
 
 TypeHandle GeomDrawCallbackData::_type_handle;
 

+ 4 - 0
panda/src/pgraph/geomDrawCallbackData.h

@@ -18,6 +18,10 @@
 #include "pandabase.h"
 #include "callbackData.h"
 
+// Forward declarations
+class CullableObject;
+class GraphicsStateGuardianBase;
+
 ////////////////////////////////////////////////////////////////////
 //       Class : GeomDrawCallbackData
 // Description : This specialization on CallbackData is passed when

+ 6 - 0
panda/src/pgraph/geomNode.cxx

@@ -19,11 +19,16 @@
 #include "accumulatedAttribs.h"
 #include "colorAttrib.h"
 #include "colorScaleAttrib.h"
+#include "cullFaceAttrib.h"
 #include "texMatrixAttrib.h"
 #include "textureAttrib.h"
 #include "shaderAttrib.h"
 #include "bamReader.h"
 #include "bamWriter.h"
+#include "cullableObject.h"
+#include "cullHandler.h"
+#include "cullTraverser.h"
+#include "cullTraverserData.h"
 #include "datagram.h"
 #include "datagramIterator.h"
 #include "indent.h"
@@ -31,6 +36,7 @@
 #include "config_pgraph.h"
 #include "graphicsStateGuardianBase.h"
 #include "boundingBox.h"
+#include "boundingSphere.h"
 #include "config_mathutil.h"
 
 

+ 2 - 0
panda/src/pgraph/geomTransformer.cxx

@@ -28,6 +28,8 @@
 #include "geomMunger.h"
 #include "texture.h"
 #include "texturePeeker.h"
+#include "textureAttrib.h"
+#include "colorAttrib.h"
 #include "config_pgraph.h"
 
 PStatCollector GeomTransformer::_apply_vertex_collector("*:Flatten:apply:vertex");

+ 1 - 0
panda/src/pgraph/geomTransformer.h

@@ -20,6 +20,7 @@
 #include "luse.h"
 #include "geom.h"
 #include "geomVertexData.h"
+#include "texMatrixAttrib.h"
 
 class GeomNode;
 class RenderState;

+ 1 - 0
panda/src/pgraph/loaderFileTypeBam.cxx

@@ -16,6 +16,7 @@
 #include "config_pgraph.h"
 #include "bamFile.h"
 #include "bamCacheRecord.h"
+#include "modelRoot.h"
 #include "loaderOptions.h"
 
 #include "dcast.h"

+ 1 - 0
panda/src/pgraph/modelPool.cxx

@@ -16,6 +16,7 @@
 #include "loader.h"
 #include "config_pgraph.h"
 #include "lightMutexHolder.h"
+#include "virtualFileSystem.h"
 
 
 ModelPool *ModelPool::_global_ptr = (ModelPool *)NULL;

+ 2 - 0
panda/src/pgraph/portalNode.cxx

@@ -20,12 +20,14 @@
 #include "renderState.h"
 #include "portalClipper.h"
 #include "transformState.h"
+#include "clipPlaneAttrib.h"
 #include "colorScaleAttrib.h"
 #include "transparencyAttrib.h"
 #include "datagram.h"
 #include "datagramIterator.h"
 #include "bamReader.h"
 #include "bamWriter.h"
+#include "boundingSphere.h"
 
 #include "plane.h"
 

+ 1 - 0
panda/src/pgraph/rescaleNormalAttrib.cxx

@@ -21,6 +21,7 @@
 #include "datagram.h"
 #include "datagramIterator.h"
 #include "configVariableEnum.h"
+#include "config_pgraph.h"
 
 TypeHandle RescaleNormalAttrib::_type_handle;
 int RescaleNormalAttrib::_attrib_slot;

+ 1 - 0
panda/src/pgraph/scissorEffect.cxx

@@ -22,6 +22,7 @@
 #include "datagram.h"
 #include "datagramIterator.h"
 #include "boundingHexahedron.h"
+#include "lens.h"
 
 TypeHandle ScissorEffect::_type_handle;
 

+ 3 - 0
panda/src/pgraph/scissorEffect.h

@@ -21,6 +21,9 @@
 #include "luse.h"
 #include "nodePath.h"
 
+// Forward declarations
+class Lens;
+
 ////////////////////////////////////////////////////////////////////
 //       Class : ScissorEffect
 // Description : This provides a higher-level wrapper around