From 6c98b96f5dff5c853d08b877b753ea1a22e8fc80 Mon Sep 17 00:00:00 2001 From: kestred Date: Tue, 21 Jan 2014 18:36:25 -0700 Subject: [PATCH] Add CMakeLists.txt for panda/pgraph. --- panda/CMakeLists.txt | 4 ++-- panda/src/pgraph/CMakeLists.txt | 6 +++++- panda/src/pgraph/antialiasAttrib.cxx | 1 + panda/src/pgraph/cullTraverserData.cxx | 1 + panda/src/pgraph/cullableObject.cxx | 2 ++ panda/src/pgraph/findApproxPath.h | 1 + panda/src/pgraph/geomDrawCallbackData.cxx | 2 ++ panda/src/pgraph/geomDrawCallbackData.h | 4 ++++ panda/src/pgraph/geomNode.cxx | 6 ++++++ panda/src/pgraph/geomTransformer.cxx | 2 ++ panda/src/pgraph/geomTransformer.h | 1 + panda/src/pgraph/loaderFileTypeBam.cxx | 1 + panda/src/pgraph/modelPool.cxx | 1 + panda/src/pgraph/portalNode.cxx | 2 ++ panda/src/pgraph/rescaleNormalAttrib.cxx | 1 + panda/src/pgraph/scissorEffect.cxx | 1 + panda/src/pgraph/scissorEffect.h | 3 +++ 17 files changed, 36 insertions(+), 3 deletions(-) diff --git a/panda/CMakeLists.txt b/panda/CMakeLists.txt index 4da1a4306b..c33f82f597 100644 --- a/panda/CMakeLists.txt +++ b/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) diff --git a/panda/src/pgraph/CMakeLists.txt b/panda/src/pgraph/CMakeLists.txt index e3003eea7c..99ab715868 100644 --- a/panda/src/pgraph/CMakeLists.txt +++ b/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 diff --git a/panda/src/pgraph/antialiasAttrib.cxx b/panda/src/pgraph/antialiasAttrib.cxx index 6a5dc4bfb5..54c41096f1 100644 --- a/panda/src/pgraph/antialiasAttrib.cxx +++ b/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" diff --git a/panda/src/pgraph/cullTraverserData.cxx b/panda/src/pgraph/cullTraverserData.cxx index 5bd8619152..a103cb2903 100644 --- a/panda/src/pgraph/cullTraverserData.cxx +++ b/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" diff --git a/panda/src/pgraph/cullableObject.cxx b/panda/src/pgraph/cullableObject.cxx index 4ea54f5923..a305c243b2 100644 --- a/panda/src/pgraph/cullableObject.cxx +++ b/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" diff --git a/panda/src/pgraph/findApproxPath.h b/panda/src/pgraph/findApproxPath.h index 324222710a..3e422048ed 100644 --- a/panda/src/pgraph/findApproxPath.h +++ b/panda/src/pgraph/findApproxPath.h @@ -20,6 +20,7 @@ #include "globPattern.h" #include "typeHandle.h" #include "pvector.h" +#include "pnotify.h" class PandaNode; diff --git a/panda/src/pgraph/geomDrawCallbackData.cxx b/panda/src/pgraph/geomDrawCallbackData.cxx index 5563b09193..40078988c3 100644 --- a/panda/src/pgraph/geomDrawCallbackData.cxx +++ b/panda/src/pgraph/geomDrawCallbackData.cxx @@ -13,6 +13,8 @@ //////////////////////////////////////////////////////////////////// #include "geomDrawCallbackData.h" +#include "cullableObject.h" +#include "graphicsStateGuardianBase.h" TypeHandle GeomDrawCallbackData::_type_handle; diff --git a/panda/src/pgraph/geomDrawCallbackData.h b/panda/src/pgraph/geomDrawCallbackData.h index 48ae66ed3c..ecce6b8476 100644 --- a/panda/src/pgraph/geomDrawCallbackData.h +++ b/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 diff --git a/panda/src/pgraph/geomNode.cxx b/panda/src/pgraph/geomNode.cxx index e6fc63f5c3..ecdaaa8f31 100644 --- a/panda/src/pgraph/geomNode.cxx +++ b/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" diff --git a/panda/src/pgraph/geomTransformer.cxx b/panda/src/pgraph/geomTransformer.cxx index 60e8d5b151..bc988fffa0 100644 --- a/panda/src/pgraph/geomTransformer.cxx +++ b/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"); diff --git a/panda/src/pgraph/geomTransformer.h b/panda/src/pgraph/geomTransformer.h index 250bb15c43..5166fc70e8 100644 --- a/panda/src/pgraph/geomTransformer.h +++ b/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; diff --git a/panda/src/pgraph/loaderFileTypeBam.cxx b/panda/src/pgraph/loaderFileTypeBam.cxx index 9fd3bc1347..a585dac81f 100644 --- a/panda/src/pgraph/loaderFileTypeBam.cxx +++ b/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" diff --git a/panda/src/pgraph/modelPool.cxx b/panda/src/pgraph/modelPool.cxx index 4b57720794..f738f7090f 100644 --- a/panda/src/pgraph/modelPool.cxx +++ b/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; diff --git a/panda/src/pgraph/portalNode.cxx b/panda/src/pgraph/portalNode.cxx index de021bbadc..f7a2d26add 100755 --- a/panda/src/pgraph/portalNode.cxx +++ b/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" diff --git a/panda/src/pgraph/rescaleNormalAttrib.cxx b/panda/src/pgraph/rescaleNormalAttrib.cxx index 33ef7f2137..3f061975f8 100644 --- a/panda/src/pgraph/rescaleNormalAttrib.cxx +++ b/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; diff --git a/panda/src/pgraph/scissorEffect.cxx b/panda/src/pgraph/scissorEffect.cxx index 0c67f9c58a..05867fd913 100644 --- a/panda/src/pgraph/scissorEffect.cxx +++ b/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; diff --git a/panda/src/pgraph/scissorEffect.h b/panda/src/pgraph/scissorEffect.h index bde3aa16d2..9a86f17fbc 100644 --- a/panda/src/pgraph/scissorEffect.h +++ b/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