From a65b477734eaea97270f4e2a4e1a52dcc9993712 Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 19 Oct 2014 22:41:47 +0000 Subject: [PATCH] Commit patches by cfsworks: cxx: Fix missing includes masked by composite builds. misc: Fix typos in comments. config: Fix missing config forward-declarations. direct: Adjust Python imports to panda3d.* instead of pandac.*. display: Split graphicsWindow out into an extension. framework: Use if/elif/elif/endif instead of ifdef/elif/elif/endif. ode: Remove erroneous INLINE declarations. interval: Fix missing import. --- direct/src/directnotify/DirectNotify.py | 4 +- direct/src/interval/ProjectileInterval.py | 1 + direct/src/showbase/ProfileSession.py | 2 +- direct/src/showbase/VFSImporter.py | 2 +- dtool/src/cppparser/cppMakeProperty.h | 1 + dtool/src/interrogate/interfaceMaker.h | 2 + .../interfaceMakerPythonNative.cxx | 1 + .../interrogate/parameterRemapToString.cxx | 1 + .../src/interrogatedb/interrogateElement.cxx | 1 + dtool/src/prc/configDeclaration.cxx | 1 + dtool/src/prc/configVariableBase.cxx | 1 + dtool/src/prc/nativeNumericData.h | 1 + dtool/src/prc/streamReader.cxx | 1 + makepanda/makepanda.py | 2 + panda/src/audiotraits/fmodAudioManager.cxx | 1 + panda/src/audiotraits/fmodAudioSound.cxx | 2 + panda/src/audiotraits/fmodAudioSound.h | 1 + panda/src/audiotraits/openalAudioSound.h | 1 + panda/src/chan/movingPartMatrix.cxx | 1 + panda/src/chan/movingPartScalar.cxx | 1 + panda/src/chan/partBundle.cxx | 1 + panda/src/chan/partGroup.cxx | 1 + panda/src/cocoadisplay/cocoaGraphicsWindow.mm | 1 + panda/src/cocoadisplay/cocoaPandaApp.h | 1 + panda/src/cocoadisplay/cocoaPandaView.h | 3 ++ panda/src/cocoadisplay/cocoaPandaView.mm | 1 + .../cocoadisplay/cocoaPandaWindowDelegate.h | 2 + panda/src/collide/collisionFloorMesh.cxx | 1 + .../collide/collisionHandlerFluidPusher.cxx | 1 + panda/src/collide/collisionParabola.cxx | 1 + panda/src/collide/collisionPlane.cxx | 1 + panda/src/collide/collisionPolygon.cxx | 1 + panda/src/collide/collisionSegment.cxx | 2 + panda/src/collide/collisionSphere.cxx | 1 + panda/src/collide/collisionTube.cxx | 1 + panda/src/display/Sources.pp | 1 + panda/src/display/config_display.cxx | 6 --- .../display/displayRegionDrawCallbackData.cxx | 5 ++ panda/src/display/drawableRegion.cxx | 1 + panda/src/display/graphicsEngine.cxx | 1 + panda/src/display/graphicsWindow.cxx | 48 ------------------- panda/src/display/graphicsWindow.h | 11 +---- .../src/display/graphicsWindowInputDevice.cxx | 1 + panda/src/display/graphicsWindowInputDevice.h | 2 + .../graphicsWindowProcCallbackData.cxx | 1 + panda/src/display/lru.cxx | 3 ++ panda/src/downloader/identityStream.cxx | 1 + panda/src/downloader/identityStreamBuf.cxx | 1 + panda/src/egg/eggGroupNode.cxx | 3 ++ panda/src/egg/eggNode.cxx | 1 + panda/src/egg/eggParameters.h | 2 + panda/src/egg2pg/eggSaver.h | 1 + panda/src/event/asyncTaskChain.cxx | 1 + panda/src/event/asyncTaskSequence.cxx | 1 + panda/src/event/pythonTask.cxx | 1 + panda/src/express/password_hash.cxx | 1 + panda/src/express/virtualFileMount.cxx | 1 + panda/src/express/virtualFileSimple.cxx | 1 + panda/src/ffmpeg/config_ffmpeg.h | 7 +++ panda/src/ffmpeg/ffmpegAudio.cxx | 1 + panda/src/ffmpeg/ffmpegAudioCursor.cxx | 1 + panda/src/ffmpeg/ffmpegVideo.cxx | 2 +- panda/src/ffmpeg/ffmpegVideoCursor.cxx | 2 +- panda/src/ffmpeg/ffmpegVirtualFile.cxx | 2 +- panda/src/framework/config_framework.h | 1 + panda/src/framework/pandaFramework.cxx | 8 ++-- panda/src/framework/pandaFramework.h | 1 + panda/src/gobj/config_gobj.h | 2 + panda/src/gobj/geomCacheManager.cxx | 1 + panda/src/gobj/geomPrimitive.cxx | 1 + panda/src/gobj/shader.h | 2 + panda/src/gobj/texturePool.cxx | 1 + panda/src/gobj/textureStagePool.cxx | 1 + panda/src/gobj/vertexBufferContext.cxx | 1 + panda/src/gobj/vertexDataBlock.h | 1 + panda/src/gobj/vertexDataBuffer.cxx | 1 + panda/src/gobj/vertexDataPage.cxx | 3 ++ panda/src/gobj/vertexDataSaveFile.cxx | 1 + panda/src/grutil/lineSegs.cxx | 1 + panda/src/grutil/pfmVizzer.cxx | 1 + panda/src/grutil/rigidBodyCombiner.cxx | 1 + panda/src/linmath/lvecBase2.h | 1 + panda/src/mathutil/boundingLine.cxx | 1 + panda/src/mathutil/boundingPlane.cxx | 2 + panda/src/mathutil/boundingVolume.cxx | 6 +++ panda/src/mathutil/fftCompressor.cxx | 2 +- panda/src/mathutil/finiteBoundingVolume.cxx | 1 + panda/src/mathutil/randomizer.h | 1 + panda/src/mathutil/triangulator3.cxx | 1 + panda/src/movies/movieTypeRegistry.cxx | 1 + panda/src/movies/wavAudioCursor.cxx | 2 + panda/src/nativenet/socket_tcp_listen.h | 1 + panda/src/nativenet/socket_tcp_ssl.h | 1 + panda/src/nativenet/socket_udp_outgoing.h | 3 ++ panda/src/net/connectionListener.cxx | 1 + panda/src/net/connectionManager.cxx | 2 + panda/src/net/connectionReader.cxx | 1 + panda/src/net/datagramGeneratorNet.h | 1 + panda/src/ode/odeBody.cxx | 1 + panda/src/ode/odeGeom.cxx | 12 +++++ panda/src/ode/odeJoint.cxx | 12 +++++ panda/src/ode/odeJointCollection.h | 2 +- panda/src/ode/odeSpace.cxx | 5 ++ panda/src/ode/odeWorld.cxx | 1 + panda/src/ode/odeWorld.h | 8 ++-- 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 ++ panda/src/pgraphnodes/computeNode.h | 1 + panda/src/pgraphnodes/lodNodeType.cxx | 1 + panda/src/pgraphnodes/shaderGenerator.cxx | 2 + panda/src/pgraphnodes/uvScrollNode.cxx | 1 + panda/src/pipeline/lightMutexDirect.h | 2 + panda/src/pipeline/psemaphore.h | 1 + panda/src/pipeline/threadPriority.cxx | 2 + panda/src/pnmimage/pnm-image-filter.cxx | 1 + panda/src/pnmimage/pnmBrush.cxx | 1 + panda/src/pnmimage/pnmPainter.cxx | 1 - panda/src/pnmimage/pnmPainter.h | 1 + panda/src/putil/bamCache.cxx | 2 + panda/src/putil/bamCacheIndex.cxx | 3 ++ panda/src/putil/bamCacheRecord.cxx | 3 ++ panda/src/putil/bitArray.cxx | 2 + panda/src/putil/buttonMap.cxx | 1 + panda/src/putil/datagramOutputFile.h | 2 + panda/src/putil/pythonCallbackObject.cxx | 1 + panda/src/putil/pythonCallbackObject.h | 1 + panda/src/putil/sparseArray.cxx | 2 + .../src/putil/typedWritableReferenceCount.cxx | 1 + panda/src/text/config_text.h | 1 + panda/src/text/dynamicTextGlyph.cxx | 1 + panda/src/text/dynamicTextPage.cxx | 1 + panda/src/tform/trackball.cxx | 1 + 145 files changed, 237 insertions(+), 82 deletions(-) diff --git a/direct/src/directnotify/DirectNotify.py b/direct/src/directnotify/DirectNotify.py index 923de31a44..d61420e3f5 100644 --- a/direct/src/directnotify/DirectNotify.py +++ b/direct/src/directnotify/DirectNotify.py @@ -61,9 +61,7 @@ class DirectNotify: """ # We use ConfigVariableString instead of base.config, in case - # we're running before ShowBase has finished initializing; and - # we import it directly from libpandaexpress, in case we're - # running before libpanda.dll is available. + # we're running before ShowBase has finished initializing from panda3d.core import ConfigVariableString dconfigParam = ("notify-level-" + categoryName) diff --git a/direct/src/interval/ProjectileInterval.py b/direct/src/interval/ProjectileInterval.py index f2c760b1c0..7118c36f4d 100755 --- a/direct/src/interval/ProjectileInterval.py +++ b/direct/src/interval/ProjectileInterval.py @@ -3,6 +3,7 @@ __all__ = ['ProjectileInterval'] from pandac.PandaModules import * +from direct.directnotify.DirectNotifyGlobal import * from Interval import Interval from direct.showbase.PythonUtil import lerp from direct.showbase import PythonUtil diff --git a/direct/src/showbase/ProfileSession.py b/direct/src/showbase/ProfileSession.py index ad2cdc2606..c2cd4f7b67 100755 --- a/direct/src/showbase/ProfileSession.py +++ b/direct/src/showbase/ProfileSession.py @@ -1,4 +1,4 @@ -from pandac.libpandaexpressModules import TrueClock +from panda3d.core import TrueClock from direct.directnotify.DirectNotifyGlobal import directNotify from direct.showbase.PythonUtil import ( StdoutCapture, _installProfileCustomFuncs,_removeProfileCustomFuncs, diff --git a/direct/src/showbase/VFSImporter.py b/direct/src/showbase/VFSImporter.py index b219992326..82f1288ee8 100644 --- a/direct/src/showbase/VFSImporter.py +++ b/direct/src/showbase/VFSImporter.py @@ -1,4 +1,4 @@ -from libpandaexpress import Filename, VirtualFileSystem, VirtualFileMountSystem, OFileStream, copyStream +from panda3d.core import Filename, VirtualFileSystem, VirtualFileMountSystem, OFileStream, copyStream import sys import os import marshal diff --git a/dtool/src/cppparser/cppMakeProperty.h b/dtool/src/cppparser/cppMakeProperty.h index 816f9d4958..8fecfc071c 100644 --- a/dtool/src/cppparser/cppMakeProperty.h +++ b/dtool/src/cppparser/cppMakeProperty.h @@ -18,6 +18,7 @@ #include "dtoolbase.h" #include "cppDeclaration.h" +#include "cppIdentifier.h" /////////////////////////////////////////////////////////////////// // Class : CPPMakeProperty diff --git a/dtool/src/interrogate/interfaceMaker.h b/dtool/src/interrogate/interfaceMaker.h index 6e94895ae7..021cb608bf 100644 --- a/dtool/src/interrogate/interfaceMaker.h +++ b/dtool/src/interrogate/interfaceMaker.h @@ -17,6 +17,8 @@ #include "dtoolbase.h" +#include "cppMakeSeq.h" + #include "interrogate_interface.h" #include "interrogate_request.h" #include "functionWriters.h" diff --git a/dtool/src/interrogate/interfaceMakerPythonNative.cxx b/dtool/src/interrogate/interfaceMakerPythonNative.cxx index 0d16d14895..b37c088bb0 100755 --- a/dtool/src/interrogate/interfaceMakerPythonNative.cxx +++ b/dtool/src/interrogate/interfaceMakerPythonNative.cxx @@ -17,6 +17,7 @@ #include "parameterRemapUnchanged.h" #include "typeManager.h" +#include "pnotify.h" // For nout #include "interrogateDatabase.h" #include "interrogateType.h" #include "interrogateFunction.h" diff --git a/dtool/src/interrogate/parameterRemapToString.cxx b/dtool/src/interrogate/parameterRemapToString.cxx index 432b02d69f..362cd89691 100644 --- a/dtool/src/interrogate/parameterRemapToString.cxx +++ b/dtool/src/interrogate/parameterRemapToString.cxx @@ -14,6 +14,7 @@ #include "parameterRemapToString.h" #include "interrogate.h" +#include "typeManager.h" //////////////////////////////////////////////////////////////////// // Function: ParameterRemapToString::Constructor diff --git a/dtool/src/interrogatedb/interrogateElement.cxx b/dtool/src/interrogatedb/interrogateElement.cxx index 1c74a208d6..8dff1f4251 100644 --- a/dtool/src/interrogatedb/interrogateElement.cxx +++ b/dtool/src/interrogatedb/interrogateElement.cxx @@ -13,6 +13,7 @@ //////////////////////////////////////////////////////////////////// #include "interrogateElement.h" +#include "interrogateDatabase.h" #include "indexRemapper.h" #include "interrogate_datafile.h" diff --git a/dtool/src/prc/configDeclaration.cxx b/dtool/src/prc/configDeclaration.cxx index cef2fccbac..fa3e4f095e 100644 --- a/dtool/src/prc/configDeclaration.cxx +++ b/dtool/src/prc/configDeclaration.cxx @@ -14,6 +14,7 @@ #include "configDeclaration.h" #include "configVariableCore.h" +#include "config_prc.h" #include "pstrtod.h" diff --git a/dtool/src/prc/configVariableBase.cxx b/dtool/src/prc/configVariableBase.cxx index e55b54f409..7cdc6b6a98 100644 --- a/dtool/src/prc/configVariableBase.cxx +++ b/dtool/src/prc/configVariableBase.cxx @@ -13,6 +13,7 @@ //////////////////////////////////////////////////////////////////// #include "configVariableBase.h" +#include "config_prc.h" ConfigVariableBase::Unconstructed *ConfigVariableBase::_unconstructed; diff --git a/dtool/src/prc/nativeNumericData.h b/dtool/src/prc/nativeNumericData.h index 454810c89b..95ba1c7a1a 100644 --- a/dtool/src/prc/nativeNumericData.h +++ b/dtool/src/prc/nativeNumericData.h @@ -16,6 +16,7 @@ #define NATIVENUMERICDATA_H #include "dtoolbase.h" +#include "numeric_types.h" #include // for memcpy() diff --git a/dtool/src/prc/streamReader.cxx b/dtool/src/prc/streamReader.cxx index d8b5c3a675..27708563bd 100644 --- a/dtool/src/prc/streamReader.cxx +++ b/dtool/src/prc/streamReader.cxx @@ -13,6 +13,7 @@ //////////////////////////////////////////////////////////////////// #include "streamReader.h" +#include "memoryHook.h" //////////////////////////////////////////////////////////////////// diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 92aa23a7c4..d4329bc0d9 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -3276,6 +3276,7 @@ if (not RUNTIME): TargetAdd('libp3display.in', opts=['IMOD:panda3d.core', 'ILIB:libp3display', 'SRCDIR:panda/src/display']) TargetAdd('libp3display_igate.obj', input='libp3display.in', opts=["DEPENDENCYONLY"]) TargetAdd('p3display_graphicsStateGuardian_ext.obj', opts=OPTS, input='graphicsStateGuardian_ext.cxx') + TargetAdd('p3display_graphicsWindow_ext.obj', opts=OPTS, input='graphicsWindow_ext.cxx') if RTDIST and GetTarget() == 'darwin': OPTS=['DIR:panda/src/display'] @@ -3551,6 +3552,7 @@ if (not RUNTIME): TargetAdd('libpanda.dll', input='p3gobj_internalName_ext.obj') TargetAdd('libpanda.dll', input='p3pgraph_ext_composite.obj') TargetAdd('libpanda.dll', input='p3display_graphicsStateGuardian_ext.obj') + TargetAdd('libpanda.dll', input='p3display_graphicsWindow_ext.obj') if PkgSkip("FREETYPE")==0: TargetAdd('libpanda.dll', input="p3pnmtext_composite1.obj") diff --git a/panda/src/audiotraits/fmodAudioManager.cxx b/panda/src/audiotraits/fmodAudioManager.cxx index 13420c56fa..f5c190689a 100644 --- a/panda/src/audiotraits/fmodAudioManager.cxx +++ b/panda/src/audiotraits/fmodAudioManager.cxx @@ -17,6 +17,7 @@ #include "pandabase.h" #include "config_audio.h" +#include "config_fmodAudio.h" #include "dcast.h" #ifdef HAVE_FMODEX //[ diff --git a/panda/src/audiotraits/fmodAudioSound.cxx b/panda/src/audiotraits/fmodAudioSound.cxx index ff1fe1309e..7eb0fd269f 100644 --- a/panda/src/audiotraits/fmodAudioSound.cxx +++ b/panda/src/audiotraits/fmodAudioSound.cxx @@ -23,10 +23,12 @@ //Panda Headers #include "config_audio.h" +#include "config_fmodAudio.h" #include "fmodAudioSound.h" #include "string_utils.h" #include "subfileInfo.h" #include "reMutexHolder.h" +#include "virtualFileSystem.h" TypeHandle FmodAudioSound::_type_handle; diff --git a/panda/src/audiotraits/fmodAudioSound.h b/panda/src/audiotraits/fmodAudioSound.h index 436ad2c6c1..46aac1c2a3 100644 --- a/panda/src/audiotraits/fmodAudioSound.h +++ b/panda/src/audiotraits/fmodAudioSound.h @@ -77,6 +77,7 @@ #include "audioSound.h" #include "reMutex.h" +#include "fmodAudioManager.h" #include #include diff --git a/panda/src/audiotraits/openalAudioSound.h b/panda/src/audiotraits/openalAudioSound.h index 3d04677ec3..5922e0d49b 100644 --- a/panda/src/audiotraits/openalAudioSound.h +++ b/panda/src/audiotraits/openalAudioSound.h @@ -25,6 +25,7 @@ #include "audioSound.h" #include "movieAudioCursor.h" #include "trueClock.h" +#include "openalAudioManager.h" // OSX uses the OpenAL framework #ifdef IS_OSX diff --git a/panda/src/chan/movingPartMatrix.cxx b/panda/src/chan/movingPartMatrix.cxx index ad9b836fcf..de9d60e2a0 100644 --- a/panda/src/chan/movingPartMatrix.cxx +++ b/panda/src/chan/movingPartMatrix.cxx @@ -21,6 +21,7 @@ #include "datagramIterator.h" #include "bamReader.h" #include "bamWriter.h" +#include "config_chan.h" // Tell GCC that we'll take care of the instantiation explicitly here. #ifdef __GNUC__ diff --git a/panda/src/chan/movingPartScalar.cxx b/panda/src/chan/movingPartScalar.cxx index 4fc34e79dc..7f5260c7a7 100644 --- a/panda/src/chan/movingPartScalar.cxx +++ b/panda/src/chan/movingPartScalar.cxx @@ -19,6 +19,7 @@ #include "datagramIterator.h" #include "bamReader.h" #include "bamWriter.h" +#include "config_chan.h" // Tell GCC that we'll take care of the instantiation explicitly here. #ifdef __GNUC__ diff --git a/panda/src/chan/partBundle.cxx b/panda/src/chan/partBundle.cxx index 2a837cb76d..1648a87a0d 100644 --- a/panda/src/chan/partBundle.cxx +++ b/panda/src/chan/partBundle.cxx @@ -29,6 +29,7 @@ #include "bamWriter.h" #include "configVariableEnum.h" #include "loaderOptions.h" +#include "bindAnimRequest.h" #include diff --git a/panda/src/chan/partGroup.cxx b/panda/src/chan/partGroup.cxx index 16dab291b7..3b4a65d057 100644 --- a/panda/src/chan/partGroup.cxx +++ b/panda/src/chan/partGroup.cxx @@ -22,6 +22,7 @@ #include "datagramIterator.h" #include "bamReader.h" #include "bamWriter.h" +#include "transformState.h" #include diff --git a/panda/src/cocoadisplay/cocoaGraphicsWindow.mm b/panda/src/cocoadisplay/cocoaGraphicsWindow.mm index 5494e30d8e..eff69cd16d 100644 --- a/panda/src/cocoadisplay/cocoaGraphicsWindow.mm +++ b/panda/src/cocoadisplay/cocoaGraphicsWindow.mm @@ -38,6 +38,7 @@ #import #import #import +#import #import #import diff --git a/panda/src/cocoadisplay/cocoaPandaApp.h b/panda/src/cocoadisplay/cocoaPandaApp.h index a15d77a543..ab3aca2d37 100644 --- a/panda/src/cocoadisplay/cocoaPandaApp.h +++ b/panda/src/cocoadisplay/cocoaPandaApp.h @@ -13,6 +13,7 @@ //////////////////////////////////////////////////////////////////// #import +#import // This class solely exists so that we can override sendEvent in order // to prevent NSApplication from eating certain keyboard events. diff --git a/panda/src/cocoadisplay/cocoaPandaView.h b/panda/src/cocoadisplay/cocoaPandaView.h index f892c6a685..05ac92bc81 100644 --- a/panda/src/cocoadisplay/cocoaPandaView.h +++ b/panda/src/cocoadisplay/cocoaPandaView.h @@ -12,7 +12,10 @@ // //////////////////////////////////////////////////////////////////// +#include "graphicsWindow.h" + #import +#import class CocoaGraphicsWindow; diff --git a/panda/src/cocoadisplay/cocoaPandaView.mm b/panda/src/cocoadisplay/cocoaPandaView.mm index 05c73213e5..bb7d03c832 100644 --- a/panda/src/cocoadisplay/cocoaPandaView.mm +++ b/panda/src/cocoadisplay/cocoaPandaView.mm @@ -12,6 +12,7 @@ // //////////////////////////////////////////////////////////////////// +#include "config_cocoadisplay.h" #import "cocoaPandaView.h" #import "cocoaGraphicsWindow.h" diff --git a/panda/src/cocoadisplay/cocoaPandaWindowDelegate.h b/panda/src/cocoadisplay/cocoaPandaWindowDelegate.h index 78c8c2eabe..fd7333bed0 100644 --- a/panda/src/cocoadisplay/cocoaPandaWindowDelegate.h +++ b/panda/src/cocoadisplay/cocoaPandaWindowDelegate.h @@ -14,6 +14,8 @@ #import +#import "cocoaGraphicsWindow.h" + class CocoaGraphicsWindow; #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 diff --git a/panda/src/collide/collisionFloorMesh.cxx b/panda/src/collide/collisionFloorMesh.cxx index d67df63c76..63dbfd8eca 100755 --- a/panda/src/collide/collisionFloorMesh.cxx +++ b/panda/src/collide/collisionFloorMesh.cxx @@ -28,6 +28,7 @@ #include "datagramIterator.h" #include "bamReader.h" #include "bamWriter.h" +#include "boundingBox.h" #include "boundingPlane.h" #include "geom.h" #include "geomTriangles.h" diff --git a/panda/src/collide/collisionHandlerFluidPusher.cxx b/panda/src/collide/collisionHandlerFluidPusher.cxx index b3bb2f6141..8deab17d6c 100755 --- a/panda/src/collide/collisionHandlerFluidPusher.cxx +++ b/panda/src/collide/collisionHandlerFluidPusher.cxx @@ -16,6 +16,7 @@ #include "collisionNode.h" #include "collisionEntry.h" #include "collisionPolygon.h" +#include "collisionSphere.h" #include "config_collide.h" #include "dcast.h" diff --git a/panda/src/collide/collisionParabola.cxx b/panda/src/collide/collisionParabola.cxx index 6beea29da0..4ad5023e3b 100644 --- a/panda/src/collide/collisionParabola.cxx +++ b/panda/src/collide/collisionParabola.cxx @@ -22,6 +22,7 @@ #include "geomLinestrips.h" #include "geomVertexWriter.h" #include "boundingHexahedron.h" +#include "boundingSphere.h" #include "look_at.h" PStatCollector CollisionParabola::_volume_pcollector( diff --git a/panda/src/collide/collisionPlane.cxx b/panda/src/collide/collisionPlane.cxx index e5bb1a5038..5d02de8670 100644 --- a/panda/src/collide/collisionPlane.cxx +++ b/panda/src/collide/collisionPlane.cxx @@ -20,6 +20,7 @@ #include "collisionLine.h" #include "collisionRay.h" #include "collisionSegment.h" +#include "collisionParabola.h" #include "config_collide.h" #include "pointerToArray.h" #include "geomNode.h" diff --git a/panda/src/collide/collisionPolygon.cxx b/panda/src/collide/collisionPolygon.cxx index ae4d74b126..30e35e1169 100644 --- a/panda/src/collide/collisionPolygon.cxx +++ b/panda/src/collide/collisionPolygon.cxx @@ -19,6 +19,7 @@ #include "collisionLine.h" #include "collisionRay.h" #include "collisionSegment.h" +#include "collisionParabola.h" #include "config_collide.h" #include "cullTraverserData.h" #include "boundingBox.h" diff --git a/panda/src/collide/collisionSegment.cxx b/panda/src/collide/collisionSegment.cxx index 6014ca288b..af4444a0b3 100644 --- a/panda/src/collide/collisionSegment.cxx +++ b/panda/src/collide/collisionSegment.cxx @@ -28,8 +28,10 @@ #include "bamWriter.h" #include "geom.h" #include "geomLines.h" +#include "boundingSphere.h" #include "boundingHexahedron.h" #include "geomVertexWriter.h" +#include "look_at.h" TypeHandle CollisionSegment::_type_handle; diff --git a/panda/src/collide/collisionSphere.cxx b/panda/src/collide/collisionSphere.cxx index 773b11c104..23e781ddeb 100644 --- a/panda/src/collide/collisionSphere.cxx +++ b/panda/src/collide/collisionSphere.cxx @@ -19,6 +19,7 @@ #include "collisionSegment.h" #include "collisionHandler.h" #include "collisionEntry.h" +#include "collisionParabola.h" #include "config_collide.h" #include "boundingSphere.h" #include "datagram.h" diff --git a/panda/src/collide/collisionTube.cxx b/panda/src/collide/collisionTube.cxx index 20feabc9a5..f99c513e93 100644 --- a/panda/src/collide/collisionTube.cxx +++ b/panda/src/collide/collisionTube.cxx @@ -19,6 +19,7 @@ #include "collisionSegment.h" #include "collisionHandler.h" #include "collisionEntry.h" +#include "collisionParabola.h" #include "config_collide.h" #include "look_at.h" #include "geom.h" diff --git a/panda/src/display/Sources.pp b/panda/src/display/Sources.pp index dfad1153c1..118e87be77 100644 --- a/panda/src/display/Sources.pp +++ b/panda/src/display/Sources.pp @@ -31,6 +31,7 @@ graphicsStateGuardian_ext.cxx graphicsStateGuardian_ext.h \ graphicsThreadingModel.I graphicsThreadingModel.h \ graphicsWindow.I graphicsWindow.h \ + graphicsWindow_ext.cxx graphicsWindow_ext.h \ graphicsWindowInputDevice.I \ graphicsWindowInputDevice.h \ graphicsWindowProc.h \ diff --git a/panda/src/display/config_display.cxx b/panda/src/display/config_display.cxx index 6cfa88dec8..012a323317 100644 --- a/panda/src/display/config_display.cxx +++ b/panda/src/display/config_display.cxx @@ -24,9 +24,6 @@ #include "graphicsBuffer.h" #include "graphicsWindow.h" #include "graphicsDevice.h" -#ifdef HAVE_PYTHON -#include "pythonGraphicsWindowProc.h" -#endif #include "graphicsWindowProcCallbackData.h" #include "nativeWindowHandle.h" #include "parasiteBuffer.h" @@ -493,9 +490,6 @@ init_libdisplay() { GraphicsPipe::init_type(); GraphicsStateGuardian::init_type(); GraphicsWindow::init_type(); -#ifdef HAVE_PYTHON - PythonGraphicsWindowProc::init_type(); -#endif GraphicsWindowProcCallbackData::init_type(); NativeWindowHandle::init_type(); ParasiteBuffer::init_type(); diff --git a/panda/src/display/displayRegionDrawCallbackData.cxx b/panda/src/display/displayRegionDrawCallbackData.cxx index b108edab11..07e2242463 100644 --- a/panda/src/display/displayRegionDrawCallbackData.cxx +++ b/panda/src/display/displayRegionDrawCallbackData.cxx @@ -13,7 +13,12 @@ //////////////////////////////////////////////////////////////////// #include "displayRegionDrawCallbackData.h" + +#include "config_display.h" #include "cullResult.h" +#include "displayRegion.h" +#include "graphicsOutput.h" +#include "graphicsStateGuardian.h" #include "sceneSetup.h" TypeHandle DisplayRegionDrawCallbackData::_type_handle; diff --git a/panda/src/display/drawableRegion.cxx b/panda/src/display/drawableRegion.cxx index b7d03bf339..67188080bd 100644 --- a/panda/src/display/drawableRegion.cxx +++ b/panda/src/display/drawableRegion.cxx @@ -13,6 +13,7 @@ //////////////////////////////////////////////////////////////////// #include "drawableRegion.h" +#include "config_display.h" //////////////////////////////////////////////////////////////////// diff --git a/panda/src/display/graphicsEngine.cxx b/panda/src/display/graphicsEngine.cxx index e57c559525..db53b323e2 100644 --- a/panda/src/display/graphicsEngine.cxx +++ b/panda/src/display/graphicsEngine.cxx @@ -47,6 +47,7 @@ #include "config_pgraph.h" #include "displayRegionCullCallbackData.h" #include "displayRegionDrawCallbackData.h" +#include "callbackGraphicsWindow.h" #if defined(WIN32) #define WINDOWS_LEAN_AND_MEAN diff --git a/panda/src/display/graphicsWindow.cxx b/panda/src/display/graphicsWindow.cxx index cd4e3c3e43..caee3ea4ed 100644 --- a/panda/src/display/graphicsWindow.cxx +++ b/panda/src/display/graphicsWindow.cxx @@ -903,54 +903,6 @@ mouse_mode_absolute() { } -#ifdef HAVE_PYTHON - -//////////////////////////////////////////////////////////////////// -// Function: GraphicsWindow::add_custom_event_handler -// Access: Published -// Description: Adds a python event handler to be called -// when a window event occurs. -// -//////////////////////////////////////////////////////////////////// -void GraphicsWindow:: -add_python_event_handler(PyObject* handler, PyObject* name){ - PythonGraphicsWindowProc* pgwp = new PythonGraphicsWindowProc(handler, name); - _python_window_proc_classes.insert(pgwp); - add_window_proc(pgwp); -} - -//////////////////////////////////////////////////////////////////// -// Function: GraphicsWindow::remove_custom_event_handler -// Access: Published -// Description: Removes the specified python event handler. -// -//////////////////////////////////////////////////////////////////// -void GraphicsWindow:: -remove_python_event_handler(PyObject* name){ - list toRemove; - PythonWinProcClasses::iterator iter; - for (iter = _python_window_proc_classes.begin(); iter != _python_window_proc_classes.end(); ++iter) { - PythonGraphicsWindowProc* pgwp = *iter; - if (PyObject_RichCompareBool(pgwp->get_name(), name, Py_EQ) == 1) { - toRemove.push_back(pgwp); - } -#if PY_MAJOR_VERSION < 3 - else if (PyObject_Compare(pgwp->get_name(), name) == 0) { - toRemove.push_back(pgwp); - } -#endif - } - list::iterator iter2; - for (iter2 = toRemove.begin(); iter2 != toRemove.end(); ++iter2) { - PythonGraphicsWindowProc* pgwp = *iter2; - remove_window_proc(pgwp); - _python_window_proc_classes.erase(pgwp); - delete pgwp; - } -} - -#endif // HAVE_PYTHON - //////////////////////////////////////////////////////////////////// // Function: GraphicsWindow::is_touch_event // Access: Published, Virtual diff --git a/panda/src/display/graphicsWindow.h b/panda/src/display/graphicsWindow.h index 2dfe1c3f60..f30d721075 100644 --- a/panda/src/display/graphicsWindow.h +++ b/panda/src/display/graphicsWindow.h @@ -21,9 +21,6 @@ #include "graphicsWindowInputDevice.h" #include "graphicsWindowProc.h" #include "graphicsWindowProcCallbackData.h" -#ifdef HAVE_PYTHON -#include "pythonGraphicsWindowProc.h" -#endif #include "windowProperties.h" #include "mouseData.h" #include "modifierButtons.h" @@ -94,11 +91,6 @@ PUBLISHED: virtual bool move_pointer(int device, int x, int y); virtual void close_ime(); -#ifdef HAVE_PYTHON - void add_python_event_handler(PyObject* handler, PyObject* name); - void remove_python_event_handler(PyObject* name); -#endif - public: // No need to publish these. bool has_button_event(int device) const; @@ -169,7 +161,7 @@ private: bool _unexposed_draw; #ifdef HAVE_PYTHON - typedef pset PythonWinProcClasses; + typedef pset PythonWinProcClasses; PythonWinProcClasses _python_window_proc_classes; #endif @@ -191,6 +183,7 @@ private: static TypeHandle _type_handle; friend class GraphicsEngine; + friend class Extension; }; #include "graphicsWindow.I" diff --git a/panda/src/display/graphicsWindowInputDevice.cxx b/panda/src/display/graphicsWindowInputDevice.cxx index 9cbffb3e64..bbf49c10ee 100644 --- a/panda/src/display/graphicsWindowInputDevice.cxx +++ b/panda/src/display/graphicsWindowInputDevice.cxx @@ -14,6 +14,7 @@ #include "graphicsWindowInputDevice.h" +#include "graphicsWindow.h" #include "mouseButton.h" #include "keyboardButton.h" diff --git a/panda/src/display/graphicsWindowInputDevice.h b/panda/src/display/graphicsWindowInputDevice.h index 99843c32ee..af66662e64 100644 --- a/panda/src/display/graphicsWindowInputDevice.h +++ b/panda/src/display/graphicsWindowInputDevice.h @@ -28,6 +28,8 @@ #include "lightMutex.h" #include "lightMutexHolder.h" +// Forward declarations +class GraphicsWindow; //////////////////////////////////////////////////////////////////// // Class : GraphicsWindowInputDevice diff --git a/panda/src/display/graphicsWindowProcCallbackData.cxx b/panda/src/display/graphicsWindowProcCallbackData.cxx index 684efcbcfb..aab668839b 100644 --- a/panda/src/display/graphicsWindowProcCallbackData.cxx +++ b/panda/src/display/graphicsWindowProcCallbackData.cxx @@ -13,6 +13,7 @@ //////////////////////////////////////////////////////////////////// #include "graphicsWindowProcCallbackData.h" +#include "graphicsWindow.h" TypeHandle GraphicsWindowProcCallbackData::_type_handle; diff --git a/panda/src/display/lru.cxx b/panda/src/display/lru.cxx index f9361ceaac..b93fb500b0 100644 --- a/panda/src/display/lru.cxx +++ b/panda/src/display/lru.cxx @@ -21,6 +21,9 @@ //#include #include "lru.h" +#if ENABLE_MUTEX +#include "mutexHolder.h" +#endif static const int HIGH_PRIORITY_SCALE = 4; diff --git a/panda/src/downloader/identityStream.cxx b/panda/src/downloader/identityStream.cxx index f47d806c80..ce78718426 100644 --- a/panda/src/downloader/identityStream.cxx +++ b/panda/src/downloader/identityStream.cxx @@ -16,6 +16,7 @@ // This module is not compiled if OpenSSL is not available. #ifdef HAVE_OPENSSL +#include "httpChannel.h" //////////////////////////////////////////////////////////////////// // Function: IIdentityStream::Destructor diff --git a/panda/src/downloader/identityStreamBuf.cxx b/panda/src/downloader/identityStreamBuf.cxx index 90df917fcc..f4b2076291 100644 --- a/panda/src/downloader/identityStreamBuf.cxx +++ b/panda/src/downloader/identityStreamBuf.cxx @@ -16,6 +16,7 @@ // This module is not compiled if OpenSSL is not available. #ifdef HAVE_OPENSSL +#include "httpChannel.h" #ifndef HAVE_STREAMSIZE // Some compilers (notably SGI) don't define this for us diff --git a/panda/src/egg/eggGroupNode.cxx b/panda/src/egg/eggGroupNode.cxx index d21158e87a..bb8891d982 100644 --- a/panda/src/egg/eggGroupNode.cxx +++ b/panda/src/egg/eggGroupNode.cxx @@ -13,11 +13,13 @@ //////////////////////////////////////////////////////////////////// #include "eggGroupNode.h" +#include "eggGroup.h" #include "eggCoordinateSystem.h" #include "eggData.h" #include "eggFilenameNode.h" #include "eggExternalReference.h" #include "eggPrimitive.h" +#include "eggPoint.h" #include "eggPolygon.h" #include "eggCompositePrimitive.h" #include "eggMesher.h" @@ -31,6 +33,7 @@ #include "config_egg.h" #include "dSearchPath.h" +#include "virtualFileSystem.h" #include "deg_2_rad.h" #include "dcast.h" #include "bamCacheRecord.h" diff --git a/panda/src/egg/eggNode.cxx b/panda/src/egg/eggNode.cxx index d93d510081..4077561239 100644 --- a/panda/src/egg/eggNode.cxx +++ b/panda/src/egg/eggNode.cxx @@ -14,6 +14,7 @@ #include "eggNode.h" #include "eggGroupNode.h" +#include "lightMutexHolder.h" #include "config_egg.h" #include "eggTextureCollection.h" #include "dcast.h" diff --git a/panda/src/egg/eggParameters.h b/panda/src/egg/eggParameters.h index b813fd684b..56ba5799a1 100644 --- a/panda/src/egg/eggParameters.h +++ b/panda/src/egg/eggParameters.h @@ -17,6 +17,8 @@ #include "pandabase.h" +#include "numeric_types.h" + //////////////////////////////////////////////////////////////////// // Class : EggParameters // Description : The values stored in this structure are global diff --git a/panda/src/egg2pg/eggSaver.h b/panda/src/egg2pg/eggSaver.h index 2cd5064cf4..c565b258af 100755 --- a/panda/src/egg2pg/eggSaver.h +++ b/panda/src/egg2pg/eggSaver.h @@ -18,6 +18,7 @@ #include "pandabase.h" #include "luse.h" +#include "eggData.h" #include "eggTextureCollection.h" #include "eggMaterialCollection.h" diff --git a/panda/src/event/asyncTaskChain.cxx b/panda/src/event/asyncTaskChain.cxx index 11ad2b1686..ac160a978b 100644 --- a/panda/src/event/asyncTaskChain.cxx +++ b/panda/src/event/asyncTaskChain.cxx @@ -20,6 +20,7 @@ #include "pStatClient.h" #include "pStatTimer.h" #include "clockObject.h" +#include "config_event.h" #include #include // For sprintf/snprintf diff --git a/panda/src/event/asyncTaskSequence.cxx b/panda/src/event/asyncTaskSequence.cxx index 38f121e4f4..819a4f8ee5 100644 --- a/panda/src/event/asyncTaskSequence.cxx +++ b/panda/src/event/asyncTaskSequence.cxx @@ -13,6 +13,7 @@ //////////////////////////////////////////////////////////////////// #include "asyncTaskSequence.h" +#include "asyncTaskManager.h" TypeHandle AsyncTaskSequence::_type_handle; diff --git a/panda/src/event/pythonTask.cxx b/panda/src/event/pythonTask.cxx index ec18eff5ec..4ae81b5a1a 100644 --- a/panda/src/event/pythonTask.cxx +++ b/panda/src/event/pythonTask.cxx @@ -14,6 +14,7 @@ #include "pythonTask.h" #include "pnotify.h" +#include "config_event.h" #ifdef HAVE_PYTHON #include "py_panda.h" diff --git a/panda/src/express/password_hash.cxx b/panda/src/express/password_hash.cxx index 145476c63e..34670107e4 100644 --- a/panda/src/express/password_hash.cxx +++ b/panda/src/express/password_hash.cxx @@ -20,6 +20,7 @@ #include "pnotify.h" #include "openssl/evp.h" +#include "memoryHook.h" //////////////////////////////////////////////////////////////////// // Function: password_hash diff --git a/panda/src/express/virtualFileMount.cxx b/panda/src/express/virtualFileMount.cxx index 1de64d446b..4be532b8a7 100644 --- a/panda/src/express/virtualFileMount.cxx +++ b/panda/src/express/virtualFileMount.cxx @@ -14,6 +14,7 @@ #include "virtualFileMount.h" #include "virtualFileSimple.h" +#include "virtualFileSystem.h" #include "zStream.h" TypeHandle VirtualFileMount::_type_handle; diff --git a/panda/src/express/virtualFileSimple.cxx b/panda/src/express/virtualFileSimple.cxx index 7a08bb5729..330b73e30f 100644 --- a/panda/src/express/virtualFileSimple.cxx +++ b/panda/src/express/virtualFileSimple.cxx @@ -15,6 +15,7 @@ #include "virtualFileSimple.h" #include "virtualFileMount.h" #include "virtualFileList.h" +#include "dcast.h" TypeHandle VirtualFileSimple::_type_handle; diff --git a/panda/src/ffmpeg/config_ffmpeg.h b/panda/src/ffmpeg/config_ffmpeg.h index 76527c7f38..85d0c28696 100644 --- a/panda/src/ffmpeg/config_ffmpeg.h +++ b/panda/src/ffmpeg/config_ffmpeg.h @@ -26,6 +26,13 @@ ConfigureDecl(config_ffmpeg, EXPCL_FFMPEG, EXPTP_FFMPEG); NotifyCategoryDecl(ffmpeg, EXPCL_FFMPEG, EXPTP_FFMPEG); +extern ConfigVariableInt ffmpeg_max_readahead_frames; +extern ConfigVariableBool ffmpeg_show_seek_frames; +extern ConfigVariableBool ffmpeg_support_seek; +extern ConfigVariableBool ffmpeg_global_lock; +extern ConfigVariableEnum ffmpeg_thread_priority; +extern ConfigVariableInt ffmpeg_read_buffer_size; + extern EXPCL_FFMPEG void init_libffmpeg(); #endif /* CONFIG_FFMPEG_H */ diff --git a/panda/src/ffmpeg/ffmpegAudio.cxx b/panda/src/ffmpeg/ffmpegAudio.cxx index 3f2c751673..86a69622f9 100644 --- a/panda/src/ffmpeg/ffmpegAudio.cxx +++ b/panda/src/ffmpeg/ffmpegAudio.cxx @@ -12,6 +12,7 @@ // //////////////////////////////////////////////////////////////////// +#include "config_ffmpeg.h" #include "ffmpegAudio.h" #include "ffmpegAudioCursor.h" #include "dcast.h" diff --git a/panda/src/ffmpeg/ffmpegAudioCursor.cxx b/panda/src/ffmpeg/ffmpegAudioCursor.cxx index 7269209763..5cddb016c8 100644 --- a/panda/src/ffmpeg/ffmpegAudioCursor.cxx +++ b/panda/src/ffmpeg/ffmpegAudioCursor.cxx @@ -12,6 +12,7 @@ // //////////////////////////////////////////////////////////////////// +#include "config_ffmpeg.h" #include "ffmpegAudioCursor.h" #include "ffmpegAudio.h" diff --git a/panda/src/ffmpeg/ffmpegVideo.cxx b/panda/src/ffmpeg/ffmpegVideo.cxx index 2c35ce5658..c7756c435d 100644 --- a/panda/src/ffmpeg/ffmpegVideo.cxx +++ b/panda/src/ffmpeg/ffmpegVideo.cxx @@ -14,7 +14,7 @@ #include "ffmpegVideo.h" #include "ffmpegVideoCursor.h" -#include "config_movies.h" +#include "config_ffmpeg.h" #include "bamReader.h" #include "dcast.h" diff --git a/panda/src/ffmpeg/ffmpegVideoCursor.cxx b/panda/src/ffmpeg/ffmpegVideoCursor.cxx index 221987ae8e..a02dac184b 100644 --- a/panda/src/ffmpeg/ffmpegVideoCursor.cxx +++ b/panda/src/ffmpeg/ffmpegVideoCursor.cxx @@ -13,7 +13,7 @@ //////////////////////////////////////////////////////////////////// #include "ffmpegVideoCursor.h" -#include "config_movies.h" +#include "config_ffmpeg.h" #include "pStatCollector.h" #include "pStatTimer.h" #include "mutexHolder.h" diff --git a/panda/src/ffmpeg/ffmpegVirtualFile.cxx b/panda/src/ffmpeg/ffmpegVirtualFile.cxx index 8b459384a2..5d0affbfcd 100644 --- a/panda/src/ffmpeg/ffmpegVirtualFile.cxx +++ b/panda/src/ffmpeg/ffmpegVirtualFile.cxx @@ -14,7 +14,7 @@ #include "pandabase.h" -#include "config_movies.h" +#include "config_ffmpeg.h" #include "ffmpegVirtualFile.h" #include "virtualFileSystem.h" diff --git a/panda/src/framework/config_framework.h b/panda/src/framework/config_framework.h index 1cec0ac1e9..070bcfa721 100644 --- a/panda/src/framework/config_framework.h +++ b/panda/src/framework/config_framework.h @@ -28,6 +28,7 @@ NotifyCategoryDecl(framework, EXPCL_FRAMEWORK, EXPTP_FRAMEWORK); extern ConfigVariableDouble aspect_ratio; extern ConfigVariableBool show_frame_rate_meter; extern ConfigVariableBool show_scene_graph_analyzer_meter; +extern ConfigVariableString window_type; extern ConfigVariableString record_session; extern ConfigVariableString playback_session; diff --git a/panda/src/framework/pandaFramework.cxx b/panda/src/framework/pandaFramework.cxx index 5893f37b26..9225931e8b 100644 --- a/panda/src/framework/pandaFramework.cxx +++ b/panda/src/framework/pandaFramework.cxx @@ -92,16 +92,16 @@ open_framework(int &argc, char **&argv) { #ifdef LINK_ALL_STATIC // If we're statically linking, we need to explicitly link with // at least one of the available renderers. - #ifdef HAVE_GL + #if defined(HAVE_GL) extern EXPCL_PANDAGL void init_libpandagl(); init_libpandagl(); - #elif HAVE_DX9 + #elif defined(HAVE_DX9) extern EXPCL_PANDADX9 void init_libpandadx9(); init_libpandadx9(); - #elif HAVE_DX8 + #elif defined(HAVE_DX8) extern EXPCL_PANDADX8 void init_libpandadx8(); init_libpandadx8(); - #elif HAVE_TINYDISPLAY + #elif defined(HAVE_TINYDISPLAY) extern EXPCL_TINYDISPLAY void init_libtinydisplay(); init_libtinydisplay(); #endif diff --git a/panda/src/framework/pandaFramework.h b/panda/src/framework/pandaFramework.h index 775e994b86..b675edd3dd 100644 --- a/panda/src/framework/pandaFramework.h +++ b/panda/src/framework/pandaFramework.h @@ -16,6 +16,7 @@ #define PANDAFRAMEWORK_H #include "pandabase.h" +#include "config_framework.h" #include "windowFramework.h" diff --git a/panda/src/gobj/config_gobj.h b/panda/src/gobj/config_gobj.h index eed2ef4010..8bf606e5c6 100644 --- a/panda/src/gobj/config_gobj.h +++ b/panda/src/gobj/config_gobj.h @@ -23,6 +23,7 @@ #include "configVariableDouble.h" #include "configVariableFilename.h" #include "configVariableString.h" +#include "configVariableList.h" #include "autoTextureScale.h" NotifyCategoryDecl(gobj, EXPCL_PANDA_GOBJ, EXPTP_PANDA_GOBJ); @@ -84,6 +85,7 @@ extern EXPCL_PANDA_GOBJ ConfigVariableInt released_ibuffer_cache_size; extern EXPCL_PANDA_GOBJ ConfigVariableDouble default_near; extern EXPCL_PANDA_GOBJ ConfigVariableDouble default_far; +extern EXPCL_PANDA_GOBJ ConfigVariableDouble lens_far_limit; extern EXPCL_PANDA_GOBJ ConfigVariableDouble default_fov; extern EXPCL_PANDA_GOBJ ConfigVariableDouble default_iod; extern EXPCL_PANDA_GOBJ ConfigVariableDouble default_converge; diff --git a/panda/src/gobj/geomCacheManager.cxx b/panda/src/gobj/geomCacheManager.cxx index 61dc8b4a64..59596d1839 100644 --- a/panda/src/gobj/geomCacheManager.cxx +++ b/panda/src/gobj/geomCacheManager.cxx @@ -15,6 +15,7 @@ #include "geomCacheManager.h" #include "geomCacheEntry.h" #include "lightMutexHolder.h" +#include "clockObject.h" GeomCacheManager *GeomCacheManager::_global_ptr = NULL; diff --git a/panda/src/gobj/geomPrimitive.cxx b/panda/src/gobj/geomPrimitive.cxx index bd7643b971..c5bf48e677 100644 --- a/panda/src/gobj/geomPrimitive.cxx +++ b/panda/src/gobj/geomPrimitive.cxx @@ -14,6 +14,7 @@ #include "geomPrimitive.h" #include "geom.h" +#include "geomPatches.h" #include "geomVertexData.h" #include "geomVertexArrayFormat.h" #include "geomVertexColumn.h" diff --git a/panda/src/gobj/shader.h b/panda/src/gobj/shader.h index 726a322269..42a83cdc65 100755 --- a/panda/src/gobj/shader.h +++ b/panda/src/gobj/shader.h @@ -16,10 +16,12 @@ #define SHADER_H #include "pandabase.h" +#include "config_gobj.h" #include "typedWritableReferenceCount.h" #include "namable.h" #include "graphicsStateGuardianBase.h" #include "internalName.h" +#include "pta_int.h" #include "pta_float.h" #include "pta_double.h" #include "pta_stdfloat.h" diff --git a/panda/src/gobj/texturePool.cxx b/panda/src/gobj/texturePool.cxx index 92cae15cbb..4377767089 100644 --- a/panda/src/gobj/texturePool.cxx +++ b/panda/src/gobj/texturePool.cxx @@ -26,6 +26,7 @@ #include "configVariableList.h" #include "load_dso.h" #include "mutexHolder.h" +#include "dcast.h" TexturePool *TexturePool::_global_ptr; diff --git a/panda/src/gobj/textureStagePool.cxx b/panda/src/gobj/textureStagePool.cxx index fd5e4942e8..413abe19a8 100644 --- a/panda/src/gobj/textureStagePool.cxx +++ b/panda/src/gobj/textureStagePool.cxx @@ -17,6 +17,7 @@ #include "config_gobj.h" #include "mutexHolder.h" #include "configVariableEnum.h" +#include "string_utils.h" TextureStagePool *TextureStagePool::_global_ptr = (TextureStagePool *)NULL; diff --git a/panda/src/gobj/vertexBufferContext.cxx b/panda/src/gobj/vertexBufferContext.cxx index be6e48b980..ca1751bffe 100644 --- a/panda/src/gobj/vertexBufferContext.cxx +++ b/panda/src/gobj/vertexBufferContext.cxx @@ -13,6 +13,7 @@ //////////////////////////////////////////////////////////////////// #include "vertexBufferContext.h" +#include "config_gobj.h" TypeHandle VertexBufferContext::_type_handle; diff --git a/panda/src/gobj/vertexDataBlock.h b/panda/src/gobj/vertexDataBlock.h index 1c485569a4..715c0a0153 100644 --- a/panda/src/gobj/vertexDataBlock.h +++ b/panda/src/gobj/vertexDataBlock.h @@ -17,6 +17,7 @@ #include "pandabase.h" #include "simpleAllocator.h" +#include "vertexDataPage.h" #include "referenceCount.h" class VertexDataPage; diff --git a/panda/src/gobj/vertexDataBuffer.cxx b/panda/src/gobj/vertexDataBuffer.cxx index fbca451608..11bd743b2c 100644 --- a/panda/src/gobj/vertexDataBuffer.cxx +++ b/panda/src/gobj/vertexDataBuffer.cxx @@ -13,6 +13,7 @@ //////////////////////////////////////////////////////////////////// #include "vertexDataBuffer.h" +#include "config_gobj.h" #include "pStatTimer.h" TypeHandle VertexDataBuffer::_type_handle; diff --git a/panda/src/gobj/vertexDataPage.cxx b/panda/src/gobj/vertexDataPage.cxx index dc4c0aabcb..7fd13208cd 100644 --- a/panda/src/gobj/vertexDataPage.cxx +++ b/panda/src/gobj/vertexDataPage.cxx @@ -16,8 +16,11 @@ #include "configVariableInt.h" #include "vertexDataSaveFile.h" #include "vertexDataBook.h" +#include "vertexDataBlock.h" #include "pStatTimer.h" #include "memoryHook.h" +#include "config_gobj.h" +#include #ifdef HAVE_ZLIB #include diff --git a/panda/src/gobj/vertexDataSaveFile.cxx b/panda/src/gobj/vertexDataSaveFile.cxx index f3ee44cbb2..22deb2de5d 100644 --- a/panda/src/gobj/vertexDataSaveFile.cxx +++ b/panda/src/gobj/vertexDataSaveFile.cxx @@ -15,6 +15,7 @@ #include "vertexDataSaveFile.h" #include "mutexHolder.h" #include "clockObject.h" +#include "config_gobj.h" #ifndef _WIN32 #include diff --git a/panda/src/grutil/lineSegs.cxx b/panda/src/grutil/lineSegs.cxx index dfd6bd3d89..5c09d8e79f 100644 --- a/panda/src/grutil/lineSegs.cxx +++ b/panda/src/grutil/lineSegs.cxx @@ -20,6 +20,7 @@ #include "geomPoints.h" #include "geomVertexReader.h" #include "geomVertexWriter.h" +#include "colorAttrib.h" //////////////////////////////////////////////////////////////////// // Function: LineSegs::Constructor diff --git a/panda/src/grutil/pfmVizzer.cxx b/panda/src/grutil/pfmVizzer.cxx index e48f2caa33..563f1b4714 100644 --- a/panda/src/grutil/pfmVizzer.cxx +++ b/panda/src/grutil/pfmVizzer.cxx @@ -21,6 +21,7 @@ #include "geomTriangles.h" #include "geomVertexWriter.h" #include "lens.h" +#include "pnmImage.h" #include "config_grutil.h" //////////////////////////////////////////////////////////////////// diff --git a/panda/src/grutil/rigidBodyCombiner.cxx b/panda/src/grutil/rigidBodyCombiner.cxx index 9eba3b5912..1ae3a0b1a4 100644 --- a/panda/src/grutil/rigidBodyCombiner.cxx +++ b/panda/src/grutil/rigidBodyCombiner.cxx @@ -22,6 +22,7 @@ #include "geomVertexAnimationSpec.h" #include "sceneGraphReducer.h" #include "omniBoundingVolume.h" +#include "cullTraverserData.h" TypeHandle RigidBodyCombiner::_type_handle; diff --git a/panda/src/linmath/lvecBase2.h b/panda/src/linmath/lvecBase2.h index 9e8d526fb5..e5c150ceaf 100644 --- a/panda/src/linmath/lvecBase2.h +++ b/panda/src/linmath/lvecBase2.h @@ -24,6 +24,7 @@ #include "checksumHashGenerator.h" #include "mathNumbers.h" #include "deg_2_rad.h" +#include "lsimpleMatrix.h" #include "cmath.h" #include "nearly_zero.h" diff --git a/panda/src/mathutil/boundingLine.cxx b/panda/src/mathutil/boundingLine.cxx index afc66b857e..9878668322 100644 --- a/panda/src/mathutil/boundingLine.cxx +++ b/panda/src/mathutil/boundingLine.cxx @@ -14,6 +14,7 @@ #include "boundingLine.h" #include "boundingSphere.h" +#include "boundingBox.h" #include "config_mathutil.h" #include diff --git a/panda/src/mathutil/boundingPlane.cxx b/panda/src/mathutil/boundingPlane.cxx index 01a8bc5076..d5a3316d7c 100644 --- a/panda/src/mathutil/boundingPlane.cxx +++ b/panda/src/mathutil/boundingPlane.cxx @@ -14,6 +14,8 @@ #include "boundingPlane.h" #include "boundingSphere.h" +#include "boundingBox.h" +#include "boundingHexahedron.h" #include "config_mathutil.h" TypeHandle BoundingPlane::_type_handle; diff --git a/panda/src/mathutil/boundingVolume.cxx b/panda/src/mathutil/boundingVolume.cxx index 39d086dbe6..a6a70d50d6 100644 --- a/panda/src/mathutil/boundingVolume.cxx +++ b/panda/src/mathutil/boundingVolume.cxx @@ -16,6 +16,12 @@ #include "finiteBoundingVolume.h" #include "unionBoundingVolume.h" #include "intersectionBoundingVolume.h" +#include "boundingBox.h" +#include "boundingLine.h" +#include "boundingPlane.h" +#include "boundingSphere.h" +#include "boundingHexahedron.h" +#include "config_mathutil.h" #include "indent.h" diff --git a/panda/src/mathutil/fftCompressor.cxx b/panda/src/mathutil/fftCompressor.cxx index 84bb08a510..3b47952860 100644 --- a/panda/src/mathutil/fftCompressor.cxx +++ b/panda/src/mathutil/fftCompressor.cxx @@ -25,7 +25,7 @@ #ifdef HAVE_FFTW // hack..... -// this is a hack to help interigate sort out a macro +// this is a hack to help interrogate sort out a macro // in the system poll and select definitions // #ifdef howmany diff --git a/panda/src/mathutil/finiteBoundingVolume.cxx b/panda/src/mathutil/finiteBoundingVolume.cxx index 08adf02ddd..b0ff3f47dc 100644 --- a/panda/src/mathutil/finiteBoundingVolume.cxx +++ b/panda/src/mathutil/finiteBoundingVolume.cxx @@ -14,6 +14,7 @@ #include "finiteBoundingVolume.h" #include "boundingBox.h" +#include "config_mathutil.h" TypeHandle FiniteBoundingVolume::_type_handle; diff --git a/panda/src/mathutil/randomizer.h b/panda/src/mathutil/randomizer.h index 1010c37073..1e7f1f5bc6 100644 --- a/panda/src/mathutil/randomizer.h +++ b/panda/src/mathutil/randomizer.h @@ -19,6 +19,7 @@ #include "mersenne.h" #include +#include //////////////////////////////////////////////////////////////////// // Class : Randomizer diff --git a/panda/src/mathutil/triangulator3.cxx b/panda/src/mathutil/triangulator3.cxx index 92215a0bfc..0ac0367d52 100755 --- a/panda/src/mathutil/triangulator3.cxx +++ b/panda/src/mathutil/triangulator3.cxx @@ -13,6 +13,7 @@ //////////////////////////////////////////////////////////////////// #include "triangulator3.h" +#include "look_at_src.h" //////////////////////////////////////////////////////////////////// // Function: Triangulator3::Constructor diff --git a/panda/src/movies/movieTypeRegistry.cxx b/panda/src/movies/movieTypeRegistry.cxx index 751b6c5e6e..f9efd97b88 100644 --- a/panda/src/movies/movieTypeRegistry.cxx +++ b/panda/src/movies/movieTypeRegistry.cxx @@ -13,6 +13,7 @@ //////////////////////////////////////////////////////////////////// #include "movieTypeRegistry.h" +#include "string_utils.h" #include "config_movies.h" #include "config_util.h" #include "load_dso.h" diff --git a/panda/src/movies/wavAudioCursor.cxx b/panda/src/movies/wavAudioCursor.cxx index 4133b2af74..ec5dca3178 100644 --- a/panda/src/movies/wavAudioCursor.cxx +++ b/panda/src/movies/wavAudioCursor.cxx @@ -13,7 +13,9 @@ //////////////////////////////////////////////////////////////////// #include "wavAudioCursor.h" +#include "config_movies.h" #include "virtualFileSystem.h" +#include "wavAudio.h" // Tables for decompressing mu-law and A-law wav files. static PN_int16 mulaw_table[256] = { diff --git a/panda/src/nativenet/socket_tcp_listen.h b/panda/src/nativenet/socket_tcp_listen.h index 5b9f48ab32..070493ed5e 100755 --- a/panda/src/nativenet/socket_tcp_listen.h +++ b/panda/src/nativenet/socket_tcp_listen.h @@ -3,6 +3,7 @@ #include "pandabase.h" #include "socket_ip.h" +#include "socket_tcp.h" ///////////////////////////////////////////////////////////////////// // Class : Socket_TCP_Listen diff --git a/panda/src/nativenet/socket_tcp_ssl.h b/panda/src/nativenet/socket_tcp_ssl.h index eed8379db5..6845e1a383 100755 --- a/panda/src/nativenet/socket_tcp_ssl.h +++ b/panda/src/nativenet/socket_tcp_ssl.h @@ -2,6 +2,7 @@ #define __SOCKET_TCP_SSL_H__ #include "pandabase.h" +#include "config_nativenet.h" #include "socket_ip.h" #include "numeric_types.h" diff --git a/panda/src/nativenet/socket_udp_outgoing.h b/panda/src/nativenet/socket_udp_outgoing.h index 75fba03eb8..d804a79d7a 100755 --- a/panda/src/nativenet/socket_udp_outgoing.h +++ b/panda/src/nativenet/socket_udp_outgoing.h @@ -1,6 +1,9 @@ #ifndef __SOCKET_UDP_OUTGOING_H__ #define __SOCKET_UDP_OUTGOING_H__ +#include "config_nativenet.h" +#include "socket_ip.h" + ///////////////////////////////////////////////////////////////////// // Class : Socket_UDP_Outgoing // diff --git a/panda/src/net/connectionListener.cxx b/panda/src/net/connectionListener.cxx index b4059ecb71..08ea7d4d17 100644 --- a/panda/src/net/connectionListener.cxx +++ b/panda/src/net/connectionListener.cxx @@ -12,6 +12,7 @@ // //////////////////////////////////////////////////////////////////// +#include "dcast.h" #include "connectionListener.h" #include "connection.h" #include "connectionManager.h" diff --git a/panda/src/net/connectionManager.cxx b/panda/src/net/connectionManager.cxx index 8c25753cd4..964d73f030 100644 --- a/panda/src/net/connectionManager.cxx +++ b/panda/src/net/connectionManager.cxx @@ -18,6 +18,8 @@ #include "connectionWriter.h" #include "netAddress.h" #include "config_net.h" +#include "socket_udp.h" +#include "socket_tcp_listen.h" #include "lightMutexHolder.h" #include "trueClock.h" diff --git a/panda/src/net/connectionReader.cxx b/panda/src/net/connectionReader.cxx index 1d277403cc..e0a8b35fa7 100644 --- a/panda/src/net/connectionReader.cxx +++ b/panda/src/net/connectionReader.cxx @@ -13,6 +13,7 @@ //////////////////////////////////////////////////////////////////// #include "connectionReader.h" +#include "dcast.h" #include "connectionManager.h" #include "netDatagram.h" #include "datagramTCPHeader.h" diff --git a/panda/src/net/datagramGeneratorNet.h b/panda/src/net/datagramGeneratorNet.h index 1709ebab67..b26be45ff1 100644 --- a/panda/src/net/datagramGeneratorNet.h +++ b/panda/src/net/datagramGeneratorNet.h @@ -22,6 +22,7 @@ #include "queuedReturn.h" #include "pmutex.h" #include "conditionVar.h" +#include "netDatagram.h" EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_NET, EXPTP_PANDA_NET, QueuedReturn); diff --git a/panda/src/ode/odeBody.cxx b/panda/src/ode/odeBody.cxx index cbb35977ae..377ffe152a 100755 --- a/panda/src/ode/odeBody.cxx +++ b/panda/src/ode/odeBody.cxx @@ -14,6 +14,7 @@ #include "config_ode.h" #include "odeBody.h" +#include "odeJoint.h" TypeHandle OdeBody::_type_handle; diff --git a/panda/src/ode/odeGeom.cxx b/panda/src/ode/odeGeom.cxx index f7a539c1c5..ea538178d2 100755 --- a/panda/src/ode/odeGeom.cxx +++ b/panda/src/ode/odeGeom.cxx @@ -14,6 +14,18 @@ #include "config_ode.h" #include "odeGeom.h" +#include "odeSimpleSpace.h" +#include "odeQuadTreeSpace.h" +#include "odeHashSpace.h" + +#include "odeTriMeshGeom.h" +#include "odeTriMeshData.h" +#include "odeBoxGeom.h" +#include "odeCappedCylinderGeom.h" +#include "odeCylinderGeom.h" +#include "odePlaneGeom.h" +#include "odeRayGeom.h" +#include "odeSphereGeom.h" //OdeGeom::GeomSurfaceMap OdeGeom::_geom_surface_map; //OdeGeom::GeomCollideIdMap OdeGeom::_geom_collide_id_map; diff --git a/panda/src/ode/odeJoint.cxx b/panda/src/ode/odeJoint.cxx index 8aa287e30a..6d12fa3b13 100755 --- a/panda/src/ode/odeJoint.cxx +++ b/panda/src/ode/odeJoint.cxx @@ -14,6 +14,18 @@ #include "config_ode.h" #include "odeJoint.h" +#include "odeBallJoint.h" +#include "odeHingeJoint.h" +#include "odeHinge2Joint.h" +#include "odeSliderJoint.h" +#include "odeContactJoint.h" +#include "odeUniversalJoint.h" +#include "odeFixedJoint.h" +#include "odeNullJoint.h" +#include "odePlane2dJoint.h" +#include "odeAMotorJoint.h" +#include "odeLMotorJoint.h" +#include "odeBody.h" TypeHandle OdeJoint::_type_handle; diff --git a/panda/src/ode/odeJointCollection.h b/panda/src/ode/odeJointCollection.h index 38bab187fd..3c39163384 100755 --- a/panda/src/ode/odeJointCollection.h +++ b/panda/src/ode/odeJointCollection.h @@ -15,7 +15,7 @@ #ifndef ODEJOINTCOLLECTION_H #define ODEJOINTCOLLECTION_H -class OdeJoint; +#include "odeJoint.h" //////////////////////////////////////////////////////////////////// // Class : OdeJointCollection diff --git a/panda/src/ode/odeSpace.cxx b/panda/src/ode/odeSpace.cxx index e98086c711..1fd4d3fe25 100755 --- a/panda/src/ode/odeSpace.cxx +++ b/panda/src/ode/odeSpace.cxx @@ -14,6 +14,11 @@ #include "config_ode.h" #include "odeSpace.h" +#include "odeGeom.h" +#include "odeCollisionEntry.h" +#include "odeSimpleSpace.h" +#include "odeQuadTreeSpace.h" +#include "odeHashSpace.h" #include "throw_event.h" diff --git a/panda/src/ode/odeWorld.cxx b/panda/src/ode/odeWorld.cxx index e9ef94a72f..b7d76fd5b7 100755 --- a/panda/src/ode/odeWorld.cxx +++ b/panda/src/ode/odeWorld.cxx @@ -14,6 +14,7 @@ #include "config_ode.h" #include "odeWorld.h" +#include "odeBody.h" TypeHandle OdeWorld::_type_handle; diff --git a/panda/src/ode/odeWorld.h b/panda/src/ode/odeWorld.h index 7a51ba6d9a..8d7f365cf4 100755 --- a/panda/src/ode/odeWorld.h +++ b/panda/src/ode/odeWorld.h @@ -95,10 +95,10 @@ PUBLISHED: operator bool () const; public: - INLINE sSurfaceParams& get_surface(PN_uint8 surface1, PN_uint8 surface2); - INLINE void set_surface(int pos1, int pos2, sSurfaceParams& entry); - INLINE sBodyParams get_surface_body(dBodyID id); - INLINE void set_dampen_on_bodies(dBodyID id1, dBodyID id2,dReal damp); + sSurfaceParams& get_surface(PN_uint8 surface1, PN_uint8 surface2); + void set_surface(int pos1, int pos2, sSurfaceParams& entry); + sBodyParams get_surface_body(dBodyID id); + void set_dampen_on_bodies(dBodyID id1, dBodyID id2,dReal damp); private: 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 5f6d6d61b3..b76fc6b445 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 7b5e810ec6..410f9b22cb 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 diff --git a/panda/src/pgraphnodes/computeNode.h b/panda/src/pgraphnodes/computeNode.h index 1a24b6df7f..d6b835d6ce 100644 --- a/panda/src/pgraphnodes/computeNode.h +++ b/panda/src/pgraphnodes/computeNode.h @@ -18,6 +18,7 @@ #include "pandabase.h" #include "pandaNode.h" #include "callbackObject.h" +#include "callbackNode.h" #include "pointerTo.h" //////////////////////////////////////////////////////////////////// diff --git a/panda/src/pgraphnodes/lodNodeType.cxx b/panda/src/pgraphnodes/lodNodeType.cxx index 1c91002c1f..8ceb4eb860 100644 --- a/panda/src/pgraphnodes/lodNodeType.cxx +++ b/panda/src/pgraphnodes/lodNodeType.cxx @@ -14,6 +14,7 @@ #include "lodNodeType.h" #include "string_utils.h" +#include "config_pgraph.h" ostream & operator << (ostream &out, LODNodeType lnt) { diff --git a/panda/src/pgraphnodes/shaderGenerator.cxx b/panda/src/pgraphnodes/shaderGenerator.cxx index 27a90640fe..7e8dc54040 100644 --- a/panda/src/pgraphnodes/shaderGenerator.cxx +++ b/panda/src/pgraphnodes/shaderGenerator.cxx @@ -31,6 +31,7 @@ #include "texMatrixAttrib.h" #include "texGenAttrib.h" #include "colorScaleAttrib.h" +#include "clipPlaneAttrib.h" #include "fogAttrib.h" #include "texture.h" #include "ambientLight.h" @@ -39,6 +40,7 @@ #include "spotlight.h" #include "lightLensNode.h" #include "lvector4.h" +#include "config_pgraphnodes.h" TypeHandle ShaderGenerator::_type_handle; diff --git a/panda/src/pgraphnodes/uvScrollNode.cxx b/panda/src/pgraphnodes/uvScrollNode.cxx index 831c549d9f..06c2af3410 100644 --- a/panda/src/pgraphnodes/uvScrollNode.cxx +++ b/panda/src/pgraphnodes/uvScrollNode.cxx @@ -15,6 +15,7 @@ #include "uvScrollNode.h" #include "bamReader.h" +#include "cullTraverserData.h" #include "datagram.h" #include "datagramIterator.h" #include "luse.h" diff --git a/panda/src/pipeline/lightMutexDirect.h b/panda/src/pipeline/lightMutexDirect.h index 19b6d46a9e..bd2ee35071 100644 --- a/panda/src/pipeline/lightMutexDirect.h +++ b/panda/src/pipeline/lightMutexDirect.h @@ -17,6 +17,8 @@ #include "pandabase.h" #include "mutexImpl.h" +#include "mutexTrueImpl.h" +#include "pnotify.h" class Thread; diff --git a/panda/src/pipeline/psemaphore.h b/panda/src/pipeline/psemaphore.h index 8fe89a0d82..5c8e58cc18 100644 --- a/panda/src/pipeline/psemaphore.h +++ b/panda/src/pipeline/psemaphore.h @@ -18,6 +18,7 @@ #include "pandabase.h" #include "pmutex.h" #include "conditionVar.h" +#include "mutexHolder.h" //////////////////////////////////////////////////////////////////// // Class : Semaphore diff --git a/panda/src/pipeline/threadPriority.cxx b/panda/src/pipeline/threadPriority.cxx index b4b565f673..b1746c442a 100644 --- a/panda/src/pipeline/threadPriority.cxx +++ b/panda/src/pipeline/threadPriority.cxx @@ -13,6 +13,8 @@ //////////////////////////////////////////////////////////////////// #include "threadPriority.h" +#include "pnotify.h" // nassertr +#include "pipeline.h" ostream & operator << (ostream &out, ThreadPriority pri) { diff --git a/panda/src/pnmimage/pnm-image-filter.cxx b/panda/src/pnmimage/pnm-image-filter.cxx index ae687a8b16..0de628050a 100644 --- a/panda/src/pnmimage/pnm-image-filter.cxx +++ b/panda/src/pnmimage/pnm-image-filter.cxx @@ -35,6 +35,7 @@ #include "pandabase.h" #include #include "cmath.h" +#include "thread.h" #include "pnmImage.h" #include "pfmFile.h" diff --git a/panda/src/pnmimage/pnmBrush.cxx b/panda/src/pnmimage/pnmBrush.cxx index 8e93eabdab..d6105c030f 100644 --- a/panda/src/pnmimage/pnmBrush.cxx +++ b/panda/src/pnmimage/pnmBrush.cxx @@ -13,6 +13,7 @@ //////////////////////////////////////////////////////////////////// #include "pnmBrush.h" +#include "pnmImage.h" #include "config_pnmimage.h" #include "cmath.h" diff --git a/panda/src/pnmimage/pnmPainter.cxx b/panda/src/pnmimage/pnmPainter.cxx index 7b4ec50ea9..60bd988498 100644 --- a/panda/src/pnmimage/pnmPainter.cxx +++ b/panda/src/pnmimage/pnmPainter.cxx @@ -13,7 +13,6 @@ //////////////////////////////////////////////////////////////////// #include "pnmPainter.h" -#include "pnmBrush.h" //////////////////////////////////////////////////////////////////// // Function: PNMPainter::Constructor diff --git a/panda/src/pnmimage/pnmPainter.h b/panda/src/pnmimage/pnmPainter.h index 93a5b6db44..edc50cc9ae 100644 --- a/panda/src/pnmimage/pnmPainter.h +++ b/panda/src/pnmimage/pnmPainter.h @@ -16,6 +16,7 @@ #define PNMPAINTER_H #include "pandabase.h" +#include "pnmBrush.h" class PNMImage; diff --git a/panda/src/putil/bamCache.cxx b/panda/src/putil/bamCache.cxx index d6223389e6..daf64f40c0 100644 --- a/panda/src/putil/bamCache.cxx +++ b/panda/src/putil/bamCache.cxx @@ -14,6 +14,8 @@ #include "bamCache.h" #include "bamCacheIndex.h" +#include "bamReader.h" +#include "bamWriter.h" #include "hashVal.h" #include "datagramInputFile.h" #include "datagramOutputFile.h" diff --git a/panda/src/putil/bamCacheIndex.cxx b/panda/src/putil/bamCacheIndex.cxx index ae993fc88a..6ff14ab583 100644 --- a/panda/src/putil/bamCacheIndex.cxx +++ b/panda/src/putil/bamCacheIndex.cxx @@ -13,6 +13,9 @@ //////////////////////////////////////////////////////////////////// #include "bamCacheIndex.h" +#include "bamReader.h" +#include "bamWriter.h" +#include "config_util.h" // util_cat #include "indent.h" #include diff --git a/panda/src/putil/bamCacheRecord.cxx b/panda/src/putil/bamCacheRecord.cxx index 96f5c7f092..79a12ea2da 100644 --- a/panda/src/putil/bamCacheRecord.cxx +++ b/panda/src/putil/bamCacheRecord.cxx @@ -13,9 +13,12 @@ //////////////////////////////////////////////////////////////////// #include "bamCacheRecord.h" +#include "bamReader.h" +#include "bamWriter.h" #include "virtualFileSystem.h" #include "virtualFile.h" #include "indent.h" +#include "config_util.h" // util_cat TypeHandle BamCacheRecord::_type_handle; diff --git a/panda/src/putil/bitArray.cxx b/panda/src/putil/bitArray.cxx index 323cfc1e1d..9ce4474d7b 100755 --- a/panda/src/putil/bitArray.cxx +++ b/panda/src/putil/bitArray.cxx @@ -14,6 +14,8 @@ #include "bitArray.h" #include "sparseArray.h" +#include "datagram.h" +#include "datagramIterator.h" TypeHandle BitArray::_type_handle; diff --git a/panda/src/putil/buttonMap.cxx b/panda/src/putil/buttonMap.cxx index 40f609760c..db88e6df24 100644 --- a/panda/src/putil/buttonMap.cxx +++ b/panda/src/putil/buttonMap.cxx @@ -13,6 +13,7 @@ //////////////////////////////////////////////////////////////////// #include "buttonMap.h" +#include "indent.h" TypeHandle ButtonMap::_type_handle; diff --git a/panda/src/putil/datagramOutputFile.h b/panda/src/putil/datagramOutputFile.h index 7c40d2b37a..a3a292bdba 100644 --- a/panda/src/putil/datagramOutputFile.h +++ b/panda/src/putil/datagramOutputFile.h @@ -21,6 +21,8 @@ #include "filename.h" #include "fileReference.h" #include "virtualFile.h" +#include "virtualFileSystem.h" +#include "config_util.h" //////////////////////////////////////////////////////////////////// // Class : DatagramOutputFile diff --git a/panda/src/putil/pythonCallbackObject.cxx b/panda/src/putil/pythonCallbackObject.cxx index 2b0b26baf0..1160877901 100644 --- a/panda/src/putil/pythonCallbackObject.cxx +++ b/panda/src/putil/pythonCallbackObject.cxx @@ -18,6 +18,7 @@ #include "py_panda.h" #include "thread.h" #include "callbackData.h" +#include "config_util.h" TypeHandle PythonCallbackObject::_type_handle; diff --git a/panda/src/putil/pythonCallbackObject.h b/panda/src/putil/pythonCallbackObject.h index a6e11b3e35..4e1c03889f 100644 --- a/panda/src/putil/pythonCallbackObject.h +++ b/panda/src/putil/pythonCallbackObject.h @@ -19,6 +19,7 @@ #ifdef HAVE_PYTHON +#include "py_panda.h" #include "callbackObject.h" //////////////////////////////////////////////////////////////////// diff --git a/panda/src/putil/sparseArray.cxx b/panda/src/putil/sparseArray.cxx index 546416c97a..418a28edfc 100644 --- a/panda/src/putil/sparseArray.cxx +++ b/panda/src/putil/sparseArray.cxx @@ -14,6 +14,8 @@ #include "sparseArray.h" #include "bitArray.h" +#include "datagram.h" +#include "datagramIterator.h" TypeHandle SparseArray::_type_handle; diff --git a/panda/src/putil/typedWritableReferenceCount.cxx b/panda/src/putil/typedWritableReferenceCount.cxx index 0de2d392fd..9e5bcb2910 100644 --- a/panda/src/putil/typedWritableReferenceCount.cxx +++ b/panda/src/putil/typedWritableReferenceCount.cxx @@ -13,6 +13,7 @@ //////////////////////////////////////////////////////////////////// #include "typedWritableReferenceCount.h" +#include "dcast.h" TypeHandle TypedWritableReferenceCount::_type_handle; diff --git a/panda/src/text/config_text.h b/panda/src/text/config_text.h index fcd9465899..6d4d01f6af 100644 --- a/panda/src/text/config_text.h +++ b/panda/src/text/config_text.h @@ -53,6 +53,7 @@ extern ConfigVariableDouble text_default_underscore_height; extern ConfigVariableEnum text_minfilter; extern ConfigVariableEnum text_magfilter; extern ConfigVariableEnum text_wrap_mode; +extern ConfigVariableEnum text_quality_level; extern ConfigVariableEnum text_render_mode; extern EXPCL_PANDA_TEXT void init_libtext(); diff --git a/panda/src/text/dynamicTextGlyph.cxx b/panda/src/text/dynamicTextGlyph.cxx index a63615340c..3702d0e866 100644 --- a/panda/src/text/dynamicTextGlyph.cxx +++ b/panda/src/text/dynamicTextGlyph.cxx @@ -16,6 +16,7 @@ #ifdef HAVE_FREETYPE +#include "dynamicTextFont.h" #include "dynamicTextPage.h" #include "geomTextGlyph.h" #include "geomVertexData.h" diff --git a/panda/src/text/dynamicTextPage.cxx b/panda/src/text/dynamicTextPage.cxx index 7d3b5764bb..f42063c0fd 100644 --- a/panda/src/text/dynamicTextPage.cxx +++ b/panda/src/text/dynamicTextPage.cxx @@ -14,6 +14,7 @@ #include "dynamicTextPage.h" #include "dynamicTextFont.h" +#include "config_text.h" #ifdef HAVE_FREETYPE diff --git a/panda/src/tform/trackball.cxx b/panda/src/tform/trackball.cxx index 0f66a8a927..bf5f8c3a23 100644 --- a/panda/src/tform/trackball.cxx +++ b/panda/src/tform/trackball.cxx @@ -22,6 +22,7 @@ #include "linmath_events.h" #include "mouseButton.h" #include "keyboardButton.h" +#include "config_tform.h" TypeHandle Trackball::_type_handle;