From 220d33e006d21d0bb33f27706a24b7e29217dafa Mon Sep 17 00:00:00 2001 From: Zachary Pavlov Date: Fri, 20 Jul 2007 23:02:51 +0000 Subject: [PATCH] okay, this is going to be a big commit. The basic idea here is to add transparent defines to allow for directory based dlls later. This will let us build tau again. ugggg --- panda/src/audio/audioDSP.h | 2 +- panda/src/audio/audioLoadRequest.h | 2 +- panda/src/audio/audioManager.h | 2 +- panda/src/audio/audioSound.h | 2 +- panda/src/audio/config_audio.h | 32 +++--- panda/src/audio/nullAudioDSP.h | 2 +- panda/src/audio/nullAudioManager.h | 2 +- panda/src/audio/nullAudioSound.h | 2 +- panda/src/chan/animBundle.h | 2 +- panda/src/chan/animBundleNode.h | 2 +- panda/src/chan/animChannel.h | 8 +- panda/src/chan/animChannelBase.h | 2 +- panda/src/chan/animChannelMatrixDynamic.h | 2 +- panda/src/chan/animChannelMatrixFixed.h | 4 +- panda/src/chan/animChannelMatrixXfmTable.h | 2 +- panda/src/chan/animChannelScalarDynamic.h | 2 +- panda/src/chan/animChannelScalarTable.h | 2 +- panda/src/chan/animControl.h | 2 +- panda/src/chan/animControlCollection.h | 2 +- panda/src/chan/animGroup.h | 2 +- panda/src/chan/auto_bind.h | 2 +- panda/src/chan/config_chan.h | 10 +- panda/src/chan/movingPartBase.h | 2 +- panda/src/chan/movingPartMatrix.h | 4 +- panda/src/chan/movingPartScalar.h | 4 +- panda/src/chan/partBundle.h | 2 +- panda/src/chan/partBundleNode.h | 2 +- panda/src/chan/partGroup.h | 2 +- panda/src/chan/partSubset.h | 2 +- panda/src/chan/vector_PartGroupStar.cxx | 4 +- panda/src/chan/vector_PartGroupStar.h | 4 +- panda/src/char/character.h | 2 +- panda/src/char/characterJoint.h | 2 +- panda/src/char/characterJointBundle.h | 2 +- panda/src/char/characterJointEffect.h | 2 +- panda/src/char/characterSlider.h | 2 +- panda/src/char/characterVertexSlider.h | 2 +- panda/src/char/config_char.h | 6 +- panda/src/char/jointVertexTransform.h | 2 +- panda/src/collide/collisionDSSolid.h | 2 +- panda/src/collide/collisionEntry.h | 2 +- panda/src/collide/collisionFloorMesh.cxx | 3 +- panda/src/collide/collisionFloorMesh.h | 2 +- panda/src/collide/collisionGeom.h | 2 +- panda/src/collide/collisionHandler.h | 2 +- panda/src/collide/collisionHandlerEvent.h | 2 +- panda/src/collide/collisionHandlerFloor.h | 2 +- panda/src/collide/collisionHandlerGravity.h | 2 +- panda/src/collide/collisionHandlerPhysical.h | 2 +- panda/src/collide/collisionHandlerPusher.h | 2 +- panda/src/collide/collisionHandlerQueue.h | 2 +- panda/src/collide/collisionInvSphere.h | 2 +- panda/src/collide/collisionLine.h | 2 +- panda/src/collide/collisionNode.h | 2 +- panda/src/collide/collisionPlane.h | 2 +- panda/src/collide/collisionPolygon.h | 2 +- panda/src/collide/collisionRay.h | 2 +- panda/src/collide/collisionRecorder.h | 2 +- panda/src/collide/collisionSegment.h | 2 +- panda/src/collide/collisionSolid.h | 2 +- panda/src/collide/collisionSphere.h | 2 +- panda/src/collide/collisionTraverser.h | 2 +- panda/src/collide/collisionTube.h | 2 +- panda/src/collide/collisionVisualizer.h | 2 +- panda/src/collide/config_collide.h | 12 +- panda/src/cull/binCullHandler.h | 2 +- panda/src/cull/config_cull.h | 6 +- panda/src/cull/cullBinBackToFront.h | 2 +- panda/src/cull/cullBinFixed.h | 2 +- panda/src/cull/cullBinFrontToBack.h | 2 +- panda/src/cull/cullBinStateSorted.h | 2 +- panda/src/cull/cullBinUnsorted.h | 2 +- panda/src/cull/drawCullHandler.h | 2 +- panda/src/device/analogNode.h | 2 +- panda/src/device/buttonNode.h | 2 +- panda/src/device/clientAnalogDevice.h | 2 +- panda/src/device/clientBase.h | 2 +- panda/src/device/clientButtonDevice.h | 2 +- panda/src/device/clientDevice.h | 2 +- panda/src/device/clientDialDevice.h | 2 +- panda/src/device/clientTrackerDevice.h | 2 +- panda/src/device/config_device.h | 4 +- panda/src/device/dialNode.h | 2 +- panda/src/device/mouseAndKeyboard.h | 2 +- panda/src/device/trackerData.h | 2 +- panda/src/device/trackerNode.h | 2 +- panda/src/device/virtualMouse.h | 2 +- panda/src/dgraph/config_dgraph.h | 2 +- panda/src/dgraph/dataGraphTraverser.h | 2 +- panda/src/dgraph/dataNode.h | 2 +- panda/src/dgraph/dataNodeTransmit.h | 2 +- panda/src/display/config_display.h | 98 ++++++++-------- panda/src/display/displayInformation.h | 2 +- panda/src/display/displayRegion.h | 8 +- panda/src/display/displaySearchParameters.h | 2 +- panda/src/display/drawableRegion.h | 2 +- panda/src/display/frameBufferProperties.h | 2 +- panda/src/display/graphicsBuffer.h | 2 +- panda/src/display/graphicsDevice.h | 2 +- panda/src/display/graphicsEngine.h | 2 +- panda/src/display/graphicsOutput.h | 4 +- panda/src/display/graphicsPipe.h | 2 +- panda/src/display/graphicsPipeSelection.h | 2 +- panda/src/display/graphicsStateGuardian.h | 2 +- panda/src/display/graphicsThreadingModel.h | 2 +- panda/src/display/graphicsWindow.h | 2 +- .../src/display/graphicsWindowInputDevice.cxx | 4 +- panda/src/display/graphicsWindowInputDevice.h | 6 +- panda/src/display/lru.h | 4 +- panda/src/display/parasiteBuffer.h | 2 +- panda/src/display/renderBuffer.h | 2 +- panda/src/display/standardMunger.h | 2 +- panda/src/display/stencilRenderStates.h | 2 +- panda/src/display/windowProperties.h | 10 +- panda/src/egg2pg/eggLoader.cxx | 15 +++ panda/src/egg2pg/eggLoader.h | 1 + panda/src/event/asyncTask.h | 2 +- panda/src/event/asyncTaskManager.h | 2 +- panda/src/event/buttonEvent.h | 2 +- panda/src/event/buttonEventList.h | 2 +- panda/src/event/config_event.h | 2 +- panda/src/event/event.h | 2 +- panda/src/event/eventHandler.h | 2 +- panda/src/event/eventParameter.h | 14 +-- panda/src/event/eventQueue.h | 2 +- panda/src/event/eventReceiver.h | 2 +- panda/src/event/pt_Event.h | 6 +- panda/src/express/pointerToArrayBase.cxx | 2 +- panda/src/gobj/bufferContext.h | 2 +- panda/src/gobj/bufferContextChain.h | 2 +- panda/src/gobj/bufferResidencyTracker.h | 2 +- panda/src/gobj/config_gobj.cxx | 2 +- panda/src/gobj/config_gobj.h | 66 +++++------ panda/src/gobj/geom.h | 6 +- panda/src/gobj/geomCacheEntry.h | 2 +- panda/src/gobj/geomCacheManager.h | 2 +- panda/src/gobj/geomContext.h | 2 +- panda/src/gobj/geomEnums.h | 6 +- panda/src/gobj/geomLines.h | 2 +- panda/src/gobj/geomLinestrips.h | 2 +- panda/src/gobj/geomMunger.h | 4 +- panda/src/gobj/geomPoints.h | 2 +- panda/src/gobj/geomPrimitive.h | 6 +- panda/src/gobj/geomTriangles.h | 2 +- panda/src/gobj/geomTrifans.h | 2 +- panda/src/gobj/geomTristrips.h | 2 +- panda/src/gobj/geomVertexAnimationSpec.h | 2 +- panda/src/gobj/geomVertexArrayData.h | 6 +- panda/src/gobj/geomVertexArrayFormat.h | 4 +- panda/src/gobj/geomVertexColumn.h | 2 +- panda/src/gobj/geomVertexData.h | 10 +- panda/src/gobj/geomVertexFormat.h | 4 +- panda/src/gobj/geomVertexReader.h | 2 +- panda/src/gobj/geomVertexRewriter.h | 2 +- panda/src/gobj/geomVertexWriter.h | 2 +- panda/src/gobj/indexBufferContext.h | 2 +- panda/src/gobj/internalName.h | 2 +- panda/src/gobj/lens.h | 4 +- panda/src/gobj/material.h | 2 +- panda/src/gobj/materialPool.h | 2 +- panda/src/gobj/matrixLens.h | 2 +- panda/src/gobj/occlusionQueryContext.h | 2 +- panda/src/gobj/orthographicLens.h | 2 +- panda/src/gobj/perspectiveLens.h | 2 +- panda/src/gobj/preparedGraphicsObjects.h | 2 +- panda/src/gobj/queryContext.h | 2 +- panda/src/gobj/savedContext.h | 2 +- panda/src/gobj/shaderContext.h | 2 +- panda/src/gobj/shaderExpansion.h | 2 +- panda/src/gobj/simpleAllocator.h | 4 +- panda/src/gobj/simpleLru.h | 4 +- panda/src/gobj/sliderTable.h | 4 +- panda/src/gobj/texture.h | 18 +-- panda/src/gobj/textureContext.h | 2 +- panda/src/gobj/texturePool.h | 2 +- panda/src/gobj/texturePoolFilter.h | 2 +- panda/src/gobj/textureStage.h | 10 +- panda/src/gobj/transformBlend.h | 4 +- panda/src/gobj/transformBlendTable.h | 4 +- panda/src/gobj/transformTable.h | 4 +- panda/src/gobj/userVertexSlider.h | 4 +- panda/src/gobj/userVertexTransform.h | 4 +- panda/src/gobj/vertexBufferContext.h | 2 +- panda/src/gobj/vertexDataBlock.h | 2 +- panda/src/gobj/vertexDataBook.h | 2 +- panda/src/gobj/vertexDataBuffer.h | 2 +- panda/src/gobj/vertexDataPage.h | 2 +- panda/src/gobj/vertexDataSaveFile.h | 4 +- panda/src/gobj/vertexSlider.h | 4 +- panda/src/gobj/vertexTransform.h | 4 +- panda/src/gobj/videoTexture.h | 2 +- panda/src/grutil/cardMaker.h | 2 +- panda/src/grutil/config_grutil.h | 4 +- panda/src/grutil/ffmpegTexture.h | 2 +- panda/src/grutil/fisheyeMaker.h | 2 +- panda/src/grutil/frameRateMeter.h | 2 +- panda/src/grutil/heightfieldTesselator.h | 2 +- panda/src/grutil/lineSegs.h | 2 +- panda/src/grutil/movieTexture.h | 2 +- panda/src/grutil/multitexReducer.h | 2 +- panda/src/grutil/nodeVertexTransform.h | 2 +- panda/src/grutil/openCVTexture.h | 2 +- panda/src/grutil/pipeOcclusionCullTraverser.h | 2 +- panda/src/grutil/rigidBodyCombiner.h | 2 +- panda/src/gsgbase/graphicsStateGuardianBase.h | 2 +- panda/src/helix/HelixClient.h | 2 +- panda/src/helix/config_helix.h | 2 +- panda/src/lerp/config_lerp.h | 2 +- panda/src/lerp/lerp.h | 4 +- panda/src/lerp/lerpblend.h | 10 +- panda/src/lerp/lerpfunctor.h | 48 ++++---- panda/src/linmath/compose_matrix.h | 4 +- panda/src/linmath/compose_matrix_src.h | 12 +- panda/src/linmath/config_linmath.h | 8 +- panda/src/linmath/coordinateSystem.h | 10 +- panda/src/linmath/lmatrix3_src.h | 2 +- panda/src/linmath/lmatrix4_src.h | 2 +- panda/src/linmath/lorientation_src.h | 2 +- panda/src/linmath/lpoint2_src.h | 2 +- panda/src/linmath/lpoint3_src.h | 2 +- panda/src/linmath/lpoint4_src.h | 2 +- panda/src/linmath/lquaternion_src.h | 2 +- panda/src/linmath/lrotation_src.h | 2 +- panda/src/linmath/lvecBase2_src.h | 2 +- panda/src/linmath/lvecBase3_src.h | 2 +- panda/src/linmath/lvecBase4_src.h | 2 +- panda/src/linmath/lvector2_src.h | 2 +- panda/src/linmath/lvector3_src.h | 2 +- panda/src/linmath/lvector4_src.h | 2 +- panda/src/linmath/mathNumbers.h | 2 +- panda/src/linmath/vector_Colorf.cxx | 4 +- panda/src/linmath/vector_Colorf.h | 4 +- panda/src/linmath/vector_LPoint2f.cxx | 4 +- panda/src/linmath/vector_LPoint2f.h | 4 +- panda/src/linmath/vector_LVecBase3f.cxx | 4 +- panda/src/linmath/vector_LVecBase3f.h | 4 +- panda/src/linmath/vector_Normalf.cxx | 4 +- panda/src/linmath/vector_Normalf.h | 4 +- panda/src/linmath/vector_Vertexf.cxx | 4 +- panda/src/linmath/vector_Vertexf.h | 4 +- panda/src/mathutil/boundingBox.h | 2 +- panda/src/mathutil/boundingHexahedron.h | 2 +- panda/src/mathutil/boundingLine.h | 2 +- panda/src/mathutil/boundingPlane.h | 2 +- panda/src/mathutil/boundingSphere.h | 2 +- panda/src/mathutil/boundingVolume.h | 6 +- panda/src/mathutil/config_mathutil.h | 4 +- panda/src/mathutil/fftCompressor.h | 2 +- panda/src/mathutil/finiteBoundingVolume.h | 2 +- panda/src/mathutil/frustum_src.h | 2 +- panda/src/mathutil/geometricBoundingVolume.h | 2 +- panda/src/mathutil/linmath_events.h | 6 +- panda/src/mathutil/look_at_src.h | 4 +- panda/src/mathutil/mersenne.h | 2 +- panda/src/mathutil/omniBoundingVolume.h | 2 +- panda/src/mathutil/perlinNoise.h | 2 +- panda/src/mathutil/perlinNoise2.h | 2 +- panda/src/mathutil/perlinNoise3.h | 2 +- panda/src/mathutil/plane_src.h | 2 +- panda/src/mathutil/randomizer.h | 2 +- panda/src/mathutil/rotate_to.h | 8 +- panda/src/mathutil/stackedPerlinNoise2.h | 2 +- panda/src/mathutil/stackedPerlinNoise3.h | 2 +- panda/src/mathutil/triangulator.h | 2 +- panda/src/movies/config_movies.h | 6 +- panda/src/movies/movie.h | 2 +- panda/src/movies/movieAudio.h | 2 +- panda/src/movies/movieVideo.h | 2 +- .../nativenet/buffered_datagramconnection.h | 2 +- panda/src/nativenet/config_nativenet.h | 4 +- panda/src/nativenet/membuffer.h | 2 +- panda/src/nativenet/ringbuffer.h | 2 +- panda/src/nativenet/socket_address.h | 2 +- panda/src/nativenet/socket_ip.h | 2 +- panda/src/nativenet/socket_tcp.h | 2 +- panda/src/nativenet/socket_tcp_listen.h | 2 +- panda/src/nativenet/socket_tcp_ssl.h | 4 +- panda/src/nativenet/socket_udp.h | 2 +- panda/src/nativenet/socket_udp_incoming.h | 2 +- panda/src/nativenet/socket_udp_outgoing.h | 2 +- panda/src/net/config_net.h | 4 +- panda/src/net/connection.h | 2 +- panda/src/net/connectionListener.h | 2 +- panda/src/net/connectionManager.h | 2 +- panda/src/net/connectionReader.h | 2 +- panda/src/net/connectionWriter.h | 2 +- panda/src/net/datagramQueue.h | 2 +- panda/src/net/datagramTCPHeader.h | 2 +- panda/src/net/datagramUDPHeader.h | 2 +- panda/src/net/netAddress.h | 2 +- panda/src/net/netDatagram.h | 2 +- panda/src/net/queuedConnectionListener.h | 6 +- panda/src/net/queuedConnectionManager.h | 4 +- panda/src/net/queuedConnectionReader.h | 4 +- panda/src/net/recentConnectionReader.h | 2 +- panda/src/pandabase/libpandabase.in | 32 +++--- panda/src/pandabase/pandasymbols.h | 106 ++++++++++++++++++ panda/src/parametrics/config_parametrics.h | 2 +- panda/src/parametrics/cubicCurveseg.h | 2 +- panda/src/parametrics/nurbsBasisVector.h | 2 +- panda/src/parametrics/nurbsCurve.h | 2 +- panda/src/parametrics/nurbsCurveEvaluator.h | 2 +- panda/src/parametrics/nurbsCurveInterface.h | 2 +- panda/src/parametrics/nurbsCurveResult.h | 2 +- panda/src/parametrics/nurbsSurfaceEvaluator.h | 2 +- panda/src/parametrics/nurbsSurfaceResult.h | 2 +- panda/src/parametrics/nurbsVertex.h | 2 +- panda/src/parametrics/parametricCurve.h | 2 +- .../parametrics/parametricCurveCollection.h | 2 +- panda/src/parametrics/piecewiseCurve.h | 2 +- panda/src/parametrics/ropeNode.h | 4 +- panda/src/parametrics/sheetNode.h | 4 +- panda/src/pgraph/accumulatedAttribs.h | 2 +- panda/src/pgraph/alphaTestAttrib.h | 2 +- panda/src/pgraph/ambientLight.h | 2 +- panda/src/pgraph/antialiasAttrib.h | 2 +- panda/src/pgraph/attribNodeRegistry.h | 2 +- panda/src/pgraph/attribSlots.h | 2 +- panda/src/pgraph/audioVolumeAttrib.h | 2 +- panda/src/pgraph/auxSceneData.h | 2 +- panda/src/pgraph/bamFile.h | 2 +- panda/src/pgraph/billboardEffect.h | 2 +- panda/src/pgraph/camera.h | 2 +- panda/src/pgraph/clipPlaneAttrib.h | 2 +- panda/src/pgraph/colorAttrib.h | 2 +- panda/src/pgraph/colorBlendAttrib.h | 2 +- panda/src/pgraph/colorScaleAttrib.h | 2 +- panda/src/pgraph/colorWriteAttrib.h | 2 +- panda/src/pgraph/compassEffect.h | 2 +- panda/src/pgraph/config_pgraph.h | 12 +- panda/src/pgraph/cullBin.h | 2 +- panda/src/pgraph/cullBinAttrib.h | 2 +- panda/src/pgraph/cullBinEnums.h | 2 +- panda/src/pgraph/cullBinManager.h | 6 +- panda/src/pgraph/cullFaceAttrib.h | 2 +- panda/src/pgraph/cullHandler.h | 2 +- panda/src/pgraph/cullPlanes.h | 2 +- panda/src/pgraph/cullResult.h | 2 +- panda/src/pgraph/cullTraverser.h | 2 +- panda/src/pgraph/cullTraverserData.h | 2 +- panda/src/pgraph/cullableObject.h | 2 +- panda/src/pgraph/decalEffect.h | 2 +- panda/src/pgraph/depthOffsetAttrib.h | 2 +- panda/src/pgraph/depthTestAttrib.h | 2 +- panda/src/pgraph/depthWriteAttrib.h | 2 +- panda/src/pgraph/directionalLight.h | 4 +- panda/src/pgraph/drawMaskAttrib.h | 2 +- panda/src/pgraph/eventStorePandaNode.h | 2 +- panda/src/pgraph/fadeLodNode.h | 2 +- panda/src/pgraph/fadeLodNodeData.h | 2 +- panda/src/pgraph/fog.h | 4 +- panda/src/pgraph/fogAttrib.h | 2 +- panda/src/pgraph/geomNode.h | 6 +- panda/src/pgraph/geomTransformer.h | 2 +- panda/src/pgraph/internalNameCollection.h | 2 +- panda/src/pgraph/lensNode.h | 2 +- panda/src/pgraph/light.h | 4 +- panda/src/pgraph/lightAttrib.h | 2 +- panda/src/pgraph/lightLensNode.h | 2 +- panda/src/pgraph/lightNode.h | 2 +- panda/src/pgraph/loader.h | 4 +- panda/src/pgraph/loaderFileType.h | 2 +- panda/src/pgraph/loaderFileTypeBam.h | 2 +- panda/src/pgraph/loaderFileTypeRegistry.h | 2 +- panda/src/pgraph/loaderOptions.h | 2 +- panda/src/pgraph/lodNode.h | 4 +- panda/src/pgraph/lodNodeType.h | 4 +- panda/src/pgraph/materialAttrib.h | 2 +- panda/src/pgraph/materialCollection.h | 2 +- panda/src/pgraph/modelFlattenRequest.h | 2 +- panda/src/pgraph/modelLoadRequest.h | 2 +- panda/src/pgraph/modelNode.h | 2 +- panda/src/pgraph/modelPool.h | 2 +- panda/src/pgraph/modelRoot.h | 2 +- panda/src/pgraph/nodePath.h | 2 +- panda/src/pgraph/nodePathCollection.h | 2 +- panda/src/pgraph/nodePathComponent.h | 4 +- panda/src/pgraph/nodePathLerps.h | 16 +-- panda/src/pgraph/pandaNode.cxx | 5 +- panda/src/pgraph/pandaNode.h | 20 ++-- panda/src/pgraph/pandaNodeChain.h | 2 +- panda/src/pgraph/planeNode.h | 4 +- panda/src/pgraph/pointLight.h | 4 +- panda/src/pgraph/polylightEffect.h | 2 +- panda/src/pgraph/polylightNode.h | 2 +- panda/src/pgraph/portalClipper.h | 2 +- panda/src/pgraph/portalNode.h | 2 +- panda/src/pgraph/renderAttrib.h | 2 +- panda/src/pgraph/renderEffect.h | 2 +- panda/src/pgraph/renderEffects.h | 2 +- panda/src/pgraph/renderModeAttrib.h | 2 +- panda/src/pgraph/renderState.h | 2 +- panda/src/pgraph/rescaleNormalAttrib.h | 6 +- panda/src/pgraph/sceneGraphAnalyzer.h | 2 +- panda/src/pgraph/sceneGraphReducer.h | 2 +- panda/src/pgraph/sceneSetup.h | 2 +- panda/src/pgraph/selectiveChildNode.h | 2 +- panda/src/pgraph/sequenceNode.h | 2 +- panda/src/pgraph/shadeModelAttrib.h | 2 +- panda/src/pgraph/shader.h | 2 +- panda/src/pgraph/shaderAttrib.h | 2 +- panda/src/pgraph/shaderInput.h | 2 +- panda/src/pgraph/shaderPool.h | 2 +- panda/src/pgraph/showBoundsEffect.h | 2 +- panda/src/pgraph/spotlight.h | 4 +- panda/src/pgraph/stateMunger.h | 2 +- panda/src/pgraph/stencilAttrib.h | 2 +- panda/src/pgraph/switchNode.h | 4 +- panda/src/pgraph/texGenAttrib.h | 2 +- panda/src/pgraph/texMatrixAttrib.h | 2 +- panda/src/pgraph/texProjectorEffect.h | 2 +- panda/src/pgraph/textureAttrib.h | 2 +- panda/src/pgraph/textureCollection.h | 2 +- panda/src/pgraph/textureStageCollection.h | 2 +- panda/src/pgraph/transformState.h | 2 +- panda/src/pgraph/transparencyAttrib.h | 2 +- panda/src/pgraph/weakNodePath.h | 2 +- panda/src/pgraph/workingNodePath.h | 2 +- panda/src/pgui/config_pgui.h | 4 +- panda/src/pgui/pgButton.h | 2 +- panda/src/pgui/pgButtonNotify.h | 2 +- panda/src/pgui/pgCullTraverser.h | 2 +- panda/src/pgui/pgEntry.h | 2 +- panda/src/pgui/pgFrameStyle.h | 2 +- panda/src/pgui/pgItem.h | 2 +- panda/src/pgui/pgItemNotify.h | 2 +- panda/src/pgui/pgMouseWatcherBackground.h | 2 +- panda/src/pgui/pgMouseWatcherGroup.h | 2 +- panda/src/pgui/pgMouseWatcherParameter.h | 2 +- panda/src/pgui/pgMouseWatcherRegion.h | 2 +- panda/src/pgui/pgScrollFrame.h | 2 +- panda/src/pgui/pgSliderBar.h | 2 +- panda/src/pgui/pgSliderBarNotify.h | 2 +- panda/src/pgui/pgTop.h | 2 +- panda/src/pgui/pgVirtualFrame.h | 2 +- panda/src/pgui/pgWaitBar.h | 2 +- panda/src/pipeline/blockerSimple.h | 2 +- panda/src/pipeline/conditionVar.h | 4 +- panda/src/pipeline/conditionVarDebug.h | 2 +- panda/src/pipeline/conditionVarDirect.h | 2 +- panda/src/pipeline/conditionVarDummyImpl.h | 2 +- panda/src/pipeline/conditionVarFull.h | 4 +- panda/src/pipeline/conditionVarFullDebug.h | 2 +- panda/src/pipeline/conditionVarFullDirect.h | 2 +- .../src/pipeline/conditionVarFullWin32Impl.h | 2 +- panda/src/pipeline/conditionVarPosixImpl.h | 2 +- panda/src/pipeline/conditionVarSimpleImpl.h | 2 +- panda/src/pipeline/conditionVarSpinlockImpl.h | 2 +- panda/src/pipeline/conditionVarWin32Impl.h | 2 +- panda/src/pipeline/config_pipeline.h | 8 +- panda/src/pipeline/cycleData.h | 4 +- panda/src/pipeline/cyclerHolder.h | 2 +- panda/src/pipeline/externalThread.h | 2 +- panda/src/pipeline/mainThread.h | 2 +- panda/src/pipeline/mutexDebug.h | 2 +- panda/src/pipeline/mutexDirect.h | 2 +- panda/src/pipeline/mutexHolder.h | 2 +- panda/src/pipeline/mutexSimpleImpl.h | 2 +- panda/src/pipeline/pipeline.h | 2 +- panda/src/pipeline/pipelineCyclerDummyImpl.h | 2 +- panda/src/pipeline/pipelineCyclerLinks.h | 2 +- .../src/pipeline/pipelineCyclerTrivialImpl.h | 2 +- panda/src/pipeline/pipelineCyclerTrueImpl.h | 2 +- panda/src/pipeline/pmutex.h | 4 +- panda/src/pipeline/pythonThread.h | 2 +- panda/src/pipeline/reMutex.h | 4 +- panda/src/pipeline/reMutexDirect.h | 2 +- panda/src/pipeline/reMutexHolder.h | 2 +- panda/src/pipeline/reMutexSimpleImpl.h | 2 +- panda/src/pipeline/thread.h | 4 +- panda/src/pipeline/threadDummyImpl.h | 2 +- panda/src/pipeline/threadPosixImpl.h | 2 +- panda/src/pipeline/threadSimpleImpl.h | 2 +- panda/src/pipeline/threadSimpleManager.h | 2 +- panda/src/pipeline/threadWin32Impl.h | 2 +- panda/src/pnmimage/config_pnmimage.h | 4 +- panda/src/pnmimage/pnmBrush.cxx | 22 ++-- panda/src/pnmimage/pnmBrush.h | 2 +- panda/src/pnmimage/pnmFileType.h | 2 +- panda/src/pnmimage/pnmFileTypeRegistry.h | 2 +- panda/src/pnmimage/pnmImage.h | 2 +- panda/src/pnmimage/pnmImageHeader.h | 2 +- panda/src/pnmimage/pnmPainter.h | 2 +- panda/src/pnmimage/pnmReader.h | 2 +- panda/src/pnmimage/pnmWriter.h | 2 +- panda/src/pnmimage/pnmbitio.cxx | 10 +- panda/src/pnmimage/pnmbitio.h | 10 +- panda/src/pnmimage/pnmimage_base.h | 28 ++--- panda/src/pnmimage/ppmcmap.h | 8 +- .../src/pnmimagetypes/config_pnmimagetypes.h | 30 ++--- panda/src/pnmimagetypes/pnmFileTypeAlias.h | 2 +- panda/src/pnmimagetypes/pnmFileTypeBMP.h | 2 +- panda/src/pnmimagetypes/pnmFileTypeIMG.h | 2 +- panda/src/pnmimagetypes/pnmFileTypeJPG.h | 2 +- panda/src/pnmimagetypes/pnmFileTypePNG.h | 2 +- panda/src/pnmimagetypes/pnmFileTypePNM.h | 2 +- panda/src/pnmimagetypes/pnmFileTypeSGI.h | 2 +- .../src/pnmimagetypes/pnmFileTypeSoftImage.h | 2 +- panda/src/pnmimagetypes/pnmFileTypeTGA.h | 2 +- panda/src/pnmimagetypes/pnmFileTypeTIFF.h | 2 +- panda/src/pnmtext/config_pnmtext.h | 4 +- panda/src/pnmtext/freetypeFont.h | 2 +- panda/src/pnmtext/pnmTextGlyph.h | 2 +- panda/src/pnmtext/pnmTextMaker.h | 2 +- panda/src/pstatclient/config_pstats.h | 28 ++--- panda/src/pstatclient/pStatClient.h | 4 +- .../pstatclient/pStatClientControlMessage.h | 2 +- panda/src/pstatclient/pStatClientImpl.h | 2 +- panda/src/pstatclient/pStatClientVersion.h | 2 +- panda/src/pstatclient/pStatCollector.h | 2 +- panda/src/pstatclient/pStatCollectorDef.h | 2 +- panda/src/pstatclient/pStatCollectorForward.h | 2 +- panda/src/pstatclient/pStatFrameData.h | 2 +- panda/src/pstatclient/pStatProperties.h | 4 +- .../pstatclient/pStatServerControlMessage.h | 2 +- panda/src/pstatclient/pStatThread.h | 2 +- panda/src/pstatclient/pStatTimer.h | 2 +- panda/src/putil/animInterface.h | 4 +- panda/src/putil/bamCache.h | 2 +- panda/src/putil/bamCacheIndex.h | 2 +- panda/src/putil/bamCacheRecord.h | 2 +- panda/src/putil/bamEndian.h | 4 +- panda/src/putil/bamReader.h | 2 +- panda/src/putil/bamReaderParam.h | 2 +- panda/src/putil/bamTextureMode.h | 4 +- panda/src/putil/bamWriter.h | 2 +- panda/src/putil/bitArray.h | 2 +- panda/src/putil/bitMask.h | 4 +- panda/src/putil/buttonHandle.h | 2 +- panda/src/putil/buttonRegistry.h | 4 +- .../putil/cachedTypedWritableReferenceCount.h | 2 +- panda/src/putil/clockObject.h | 10 +- panda/src/putil/config_util.h | 26 ++--- panda/src/putil/configurable.h | 2 +- panda/src/putil/copyOnWriteObject.h | 2 +- panda/src/putil/copyOnWritePointer.h | 2 +- panda/src/putil/datagramInputFile.h | 2 +- panda/src/putil/datagramOutputFile.h | 2 +- panda/src/putil/factoryBase.h | 2 +- panda/src/putil/factoryParam.h | 2 +- panda/src/putil/factoryParams.h | 2 +- panda/src/putil/globalPointerRegistry.h | 2 +- panda/src/putil/ioPtaDatagramFloat.h | 2 +- panda/src/putil/ioPtaDatagramInt.h | 2 +- panda/src/putil/ioPtaDatagramShort.h | 2 +- panda/src/putil/keyboardButton.h | 2 +- panda/src/putil/lineStream.h | 2 +- panda/src/putil/lineStreamBuf.h | 2 +- panda/src/putil/linkedListNode.h | 2 +- panda/src/putil/load_prc_file.cxx | 2 +- panda/src/putil/load_prc_file.h | 8 +- panda/src/putil/modifierButtons.h | 2 +- panda/src/putil/mouseButton.h | 2 +- panda/src/putil/mouseData.h | 2 +- panda/src/putil/nameUniquifier.h | 2 +- panda/src/putil/nodeCachedReferenceCount.h | 2 +- panda/src/putil/pta_double.h | 8 +- panda/src/putil/pta_float.h | 8 +- panda/src/putil/pta_int.h | 8 +- panda/src/putil/pta_ushort.h | 8 +- panda/src/putil/sparseArray.h | 2 +- panda/src/putil/stringStream.h | 2 +- panda/src/putil/stringStreamBuf.h | 2 +- panda/src/putil/string_utils.h | 38 +++---- panda/src/putil/timedCycle.h | 2 +- panda/src/putil/typedWritable.h | 2 +- panda/src/putil/typedWritableReferenceCount.h | 2 +- panda/src/putil/uniqueIdAllocator.cxx | 2 +- panda/src/putil/uniqueIdAllocator.h | 2 +- panda/src/putil/updateSeq.h | 2 +- panda/src/putil/vector_double.cxx | 4 +- panda/src/putil/vector_double.h | 4 +- panda/src/putil/vector_float.cxx | 4 +- panda/src/putil/vector_float.h | 4 +- panda/src/putil/vector_typedWritable.cxx | 4 +- panda/src/putil/vector_typedWritable.h | 4 +- panda/src/putil/vector_ulong.cxx | 4 +- panda/src/putil/vector_ulong.h | 4 +- panda/src/putil/vector_ushort.cxx | 4 +- panda/src/putil/vector_ushort.h | 4 +- panda/src/putil/vector_writable.cxx | 4 +- panda/src/putil/vector_writable.h | 4 +- panda/src/putil/writableConfigurable.h | 2 +- panda/src/putil/writableParam.h | 2 +- panda/src/recorder/config_recorder.h | 4 +- panda/src/recorder/mouseRecorder.h | 2 +- panda/src/recorder/recorderBase.h | 2 +- panda/src/recorder/recorderController.h | 2 +- panda/src/recorder/recorderFrame.h | 2 +- panda/src/recorder/recorderHeader.h | 2 +- panda/src/recorder/recorderTable.h | 2 +- panda/src/recorder/socketStreamRecorder.h | 2 +- panda/src/text/config_text.h | 4 +- panda/src/text/dynamicTextFont.h | 2 +- panda/src/text/dynamicTextGlyph.h | 2 +- panda/src/text/dynamicTextPage.h | 2 +- panda/src/text/fontPool.h | 2 +- panda/src/text/geomTextGlyph.h | 2 +- panda/src/text/staticTextFont.h | 2 +- panda/src/text/textAssembler.h | 2 +- panda/src/text/textFont.h | 10 +- panda/src/text/textGlyph.h | 2 +- panda/src/text/textGraphic.h | 2 +- panda/src/text/textNode.h | 2 +- panda/src/text/textProperties.h | 2 +- panda/src/text/textPropertiesManager.h | 2 +- panda/src/tform/buttonThrower.h | 2 +- panda/src/tform/config_tform.h | 26 ++--- panda/src/tform/driveInterface.h | 2 +- panda/src/tform/mouseInterfaceNode.h | 2 +- panda/src/tform/mouseSubregion.h | 2 +- panda/src/tform/mouseWatcher.h | 2 +- panda/src/tform/mouseWatcherGroup.h | 2 +- panda/src/tform/mouseWatcherParameter.h | 2 +- panda/src/tform/mouseWatcherRegion.h | 2 +- panda/src/tform/trackball.h | 2 +- panda/src/tform/transform2sg.h | 2 +- panda/src/vrpn/config_vrpn.h | 2 +- panda/src/vrpn/vrpnClient.h | 2 +- 619 files changed, 1201 insertions(+), 1077 deletions(-) diff --git a/panda/src/audio/audioDSP.h b/panda/src/audio/audioDSP.h index ff4a5f9680..3008ee2764 100644 --- a/panda/src/audio/audioDSP.h +++ b/panda/src/audio/audioDSP.h @@ -27,7 +27,7 @@ class AudioManager; -class EXPCL_PANDA AudioDSP : public TypedReferenceCount { +class EXPCL_PANDA_AUDIO AudioDSP : public TypedReferenceCount { PUBLISHED: virtual void reset(); virtual void remove(); diff --git a/panda/src/audio/audioLoadRequest.h b/panda/src/audio/audioLoadRequest.h index 4555a54d09..4e08a9522f 100644 --- a/panda/src/audio/audioLoadRequest.h +++ b/panda/src/audio/audioLoadRequest.h @@ -35,7 +35,7 @@ // and add it to the loader via load_async(), to begin // an asynchronous load. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA AudioLoadRequest : public AsyncTask { +class EXPCL_PANDA_AUDIO AudioLoadRequest : public AsyncTask { PUBLISHED: INLINE AudioLoadRequest(AudioManager *audio_manager, const string &filename, bool positional); diff --git a/panda/src/audio/audioManager.h b/panda/src/audio/audioManager.h index f2ffc6eb30..2c2cc56478 100644 --- a/panda/src/audio/audioManager.h +++ b/panda/src/audio/audioManager.h @@ -27,7 +27,7 @@ typedef PT(AudioManager) Create_AudioManager_proc(); -class EXPCL_PANDA AudioManager : public TypedReferenceCount { +class EXPCL_PANDA_AUDIO AudioManager : public TypedReferenceCount { PUBLISHED: diff --git a/panda/src/audio/audioSound.h b/panda/src/audio/audioSound.h index 540b738d53..9ce4065e34 100644 --- a/panda/src/audio/audioSound.h +++ b/panda/src/audio/audioSound.h @@ -29,7 +29,7 @@ class AudioManager; -class EXPCL_PANDA AudioSound : public TypedReferenceCount { +class EXPCL_PANDA_AUDIO AudioSound : public TypedReferenceCount { PUBLISHED: virtual ~AudioSound(); diff --git a/panda/src/audio/config_audio.h b/panda/src/audio/config_audio.h index 220d4b9efb..140cff63fa 100644 --- a/panda/src/audio/config_audio.h +++ b/panda/src/audio/config_audio.h @@ -31,31 +31,31 @@ #pragma warning (disable : 4231) #endif -NotifyCategoryDecl(audio, EXPCL_PANDA, EXPTP_PANDA); +NotifyCategoryDecl(audio, EXPCL_PANDA_AUDIO, EXPTP_PANDA_AUDIO); -extern EXPCL_PANDA ConfigVariableBool audio_active; -extern EXPCL_PANDA ConfigVariableInt audio_cache_limit; -extern EXPCL_PANDA ConfigVariableDouble audio_volume; -extern EXPCL_PANDA ConfigVariableFilename audio_dls_file; +extern EXPCL_PANDA_AUDIO ConfigVariableBool audio_active; +extern EXPCL_PANDA_AUDIO ConfigVariableInt audio_cache_limit; +extern EXPCL_PANDA_AUDIO ConfigVariableDouble audio_volume; +extern EXPCL_PANDA_AUDIO ConfigVariableFilename audio_dls_file; //We Need This one. -extern EXPCL_PANDA ConfigVariableString audio_library_name; +extern EXPCL_PANDA_AUDIO ConfigVariableString audio_library_name; // Config vars for Fmod: -extern EXPCL_PANDA ConfigVariableInt fmod_number_of_sound_channels; -extern EXPCL_PANDA ConfigVariableBool fmod_use_surround_sound; +extern EXPCL_PANDA_AUDIO ConfigVariableInt fmod_number_of_sound_channels; +extern EXPCL_PANDA_AUDIO ConfigVariableBool fmod_use_surround_sound; // Config vars for Miles: -extern EXPCL_PANDA ConfigVariableBool audio_software_midi; -extern EXPCL_PANDA ConfigVariableFilename audio_dls_file; -extern EXPCL_PANDA ConfigVariableBool audio_play_midi; -extern EXPCL_PANDA ConfigVariableBool audio_play_wave; -extern EXPCL_PANDA ConfigVariableBool audio_play_mp3; -extern EXPCL_PANDA ConfigVariableInt audio_output_rate; -extern EXPCL_PANDA ConfigVariableInt audio_output_bits; -extern EXPCL_PANDA ConfigVariableInt audio_output_channels; +extern EXPCL_PANDA_AUDIO ConfigVariableBool audio_software_midi; +extern EXPCL_PANDA_AUDIO ConfigVariableFilename audio_dls_file; +extern EXPCL_PANDA_AUDIO ConfigVariableBool audio_play_midi; +extern EXPCL_PANDA_AUDIO ConfigVariableBool audio_play_wave; +extern EXPCL_PANDA_AUDIO ConfigVariableBool audio_play_mp3; +extern EXPCL_PANDA_AUDIO ConfigVariableInt audio_output_rate; +extern EXPCL_PANDA_AUDIO ConfigVariableInt audio_output_bits; +extern EXPCL_PANDA_AUDIO ConfigVariableInt audio_output_channels; diff --git a/panda/src/audio/nullAudioDSP.h b/panda/src/audio/nullAudioDSP.h index 55af330252..7ee69228bf 100644 --- a/panda/src/audio/nullAudioDSP.h +++ b/panda/src/audio/nullAudioDSP.h @@ -27,7 +27,7 @@ class AudioManager; -class EXPCL_PANDA nullAudioDSP : public TypedReferenceCount { +class EXPCL_PANDA_AUDIO nullAudioDSP : public TypedReferenceCount { PUBLISHED: virtual void reset(); virtual void remove(); diff --git a/panda/src/audio/nullAudioManager.h b/panda/src/audio/nullAudioManager.h index 3fca7c2a69..e35fe86eac 100644 --- a/panda/src/audio/nullAudioManager.h +++ b/panda/src/audio/nullAudioManager.h @@ -23,7 +23,7 @@ #include "audioManager.h" #include "nullAudioSound.h" -class EXPCL_PANDA NullAudioManager : public AudioManager { +class EXPCL_PANDA_AUDIO NullAudioManager : public AudioManager { // All of these methods are stubbed out to some degree. // If you're looking for a starting place for a new AudioManager, // please consider looking at the milesAudioManager. diff --git a/panda/src/audio/nullAudioSound.h b/panda/src/audio/nullAudioSound.h index c845f41f60..c63a623a2f 100644 --- a/panda/src/audio/nullAudioSound.h +++ b/panda/src/audio/nullAudioSound.h @@ -26,7 +26,7 @@ // This class intentionally does next to nothing. // It's used as a placeholder when you don't want a sound // system. -class EXPCL_PANDA NullAudioSound : public AudioSound { +class EXPCL_PANDA_AUDIO NullAudioSound : public AudioSound { // All of these methods are stubbed out to some degree. // If you're looking for a starting place for a new AudioManager, // please consider looking at the milesAudioManager. diff --git a/panda/src/chan/animBundle.h b/panda/src/chan/animBundle.h index f649ac2fbd..7db460062e 100644 --- a/panda/src/chan/animBundle.h +++ b/panda/src/chan/animBundle.h @@ -32,7 +32,7 @@ class FactoryParams; // knows the frame rate and number of frames of all the // channels in the hierarchy (which must all match). //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA AnimBundle : public AnimGroup { +class EXPCL_PANDA_CHAN AnimBundle : public AnimGroup { protected: AnimBundle(AnimGroup *parent, const AnimBundle ©); diff --git a/panda/src/chan/animBundleNode.h b/panda/src/chan/animBundleNode.h index 49c88007ce..d33f67e385 100644 --- a/panda/src/chan/animBundleNode.h +++ b/panda/src/chan/animBundleNode.h @@ -32,7 +32,7 @@ // AnimBundle. Like AnimBundleNode, it exists solely to // make it easy to store AnimBundles in the scene graph. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA AnimBundleNode : public PandaNode { +class EXPCL_PANDA_CHAN AnimBundleNode : public PandaNode { public: INLINE AnimBundleNode(const string &name, AnimBundle *bundle); diff --git a/panda/src/chan/animChannel.h b/panda/src/chan/animChannel.h index af714ee07b..0eec0424ed 100644 --- a/panda/src/chan/animChannel.h +++ b/panda/src/chan/animChannel.h @@ -82,7 +82,7 @@ private: // And now we instantiate a few useful types. -class EXPCL_PANDA ACMatrixSwitchType { +class EXPCL_PANDA_CHAN ACMatrixSwitchType { public: typedef LMatrix4f ValueType; static const char *get_channel_type_name() { return "AnimChannelMatrix"; } @@ -100,11 +100,11 @@ public: } }; -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, AnimChannel); +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_CHAN, EXPTP_PANDA_CHAN, AnimChannel); typedef AnimChannel AnimChannelMatrix; -class EXPCL_PANDA ACScalarSwitchType { +class EXPCL_PANDA_CHAN ACScalarSwitchType { public: typedef float ValueType; static const char *get_channel_type_name() { return "AnimChannelScalar"; } @@ -123,7 +123,7 @@ public: } }; -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, AnimChannel); +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_CHAN, EXPTP_PANDA_CHAN, AnimChannel); typedef AnimChannel AnimChannelScalar; diff --git a/panda/src/chan/animChannelBase.h b/panda/src/chan/animChannelBase.h index 31da1152ac..4c369770cc 100644 --- a/panda/src/chan/animChannelBase.h +++ b/panda/src/chan/animChannelBase.h @@ -34,7 +34,7 @@ // a table read from an egg file (but possibly computed // or generated in any other way). //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA AnimChannelBase : public AnimGroup { +class EXPCL_PANDA_CHAN AnimChannelBase : public AnimGroup { protected: // The default constructor is protected: don't try to create an // AnimChannel without a parent. To create an AnimChannel hierarchy, diff --git a/panda/src/chan/animChannelMatrixDynamic.h b/panda/src/chan/animChannelMatrixDynamic.h index 35fbb5dac8..e64abd3457 100644 --- a/panda/src/chan/animChannelMatrixDynamic.h +++ b/panda/src/chan/animChannelMatrixDynamic.h @@ -38,7 +38,7 @@ // the node whose transform will be copied to the joint // each frame. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA AnimChannelMatrixDynamic : public AnimChannelMatrix { +class EXPCL_PANDA_CHAN AnimChannelMatrixDynamic : public AnimChannelMatrix { protected: AnimChannelMatrixDynamic(); AnimChannelMatrixDynamic(AnimGroup *parent, const AnimChannelMatrixDynamic ©); diff --git a/panda/src/chan/animChannelMatrixFixed.h b/panda/src/chan/animChannelMatrixFixed.h index c2fc1f61f2..357b9c1e51 100644 --- a/panda/src/chan/animChannelMatrixFixed.h +++ b/panda/src/chan/animChannelMatrixFixed.h @@ -24,14 +24,14 @@ #include "animChannel.h" #include "luse.h" -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, AnimChannel); +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_CHAN, EXPTP_PANDA_CHAN, AnimChannel); //////////////////////////////////////////////////////////////////// // Class : AnimChannelMatrixFixed // Description : A specialization on AnimChannel to add all the // special matrix component operations. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA AnimChannelMatrixFixed : public AnimChannel { +class EXPCL_PANDA_CHAN AnimChannelMatrixFixed : public AnimChannel { protected: AnimChannelMatrixFixed(AnimGroup *parent, const AnimChannelMatrixFixed ©); diff --git a/panda/src/chan/animChannelMatrixXfmTable.h b/panda/src/chan/animChannelMatrixXfmTable.h index 37a9328fe6..107ab84edc 100644 --- a/panda/src/chan/animChannelMatrixXfmTable.h +++ b/panda/src/chan/animChannelMatrixXfmTable.h @@ -35,7 +35,7 @@ // sub-tables, each representing one component of the // transform: scale, rotate, translate. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA AnimChannelMatrixXfmTable : public AnimChannelMatrix { +class EXPCL_PANDA_CHAN AnimChannelMatrixXfmTable : public AnimChannelMatrix { protected: AnimChannelMatrixXfmTable(); AnimChannelMatrixXfmTable(AnimGroup *parent, const AnimChannelMatrixXfmTable ©); diff --git a/panda/src/chan/animChannelScalarDynamic.h b/panda/src/chan/animChannelScalarDynamic.h index 8c3f200e48..17e5f4f2fd 100644 --- a/panda/src/chan/animChannelScalarDynamic.h +++ b/panda/src/chan/animChannelScalarDynamic.h @@ -38,7 +38,7 @@ class TransformState; // the node whose X component will be copied to the // scalar each frame. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA AnimChannelScalarDynamic : public AnimChannelScalar { +class EXPCL_PANDA_CHAN AnimChannelScalarDynamic : public AnimChannelScalar { protected: AnimChannelScalarDynamic(); AnimChannelScalarDynamic(AnimGroup *parent, const AnimChannelScalarDynamic ©); diff --git a/panda/src/chan/animChannelScalarTable.h b/panda/src/chan/animChannelScalarTable.h index f9a442cfe8..161a141874 100644 --- a/panda/src/chan/animChannelScalarTable.h +++ b/panda/src/chan/animChannelScalarTable.h @@ -32,7 +32,7 @@ // read from a table such as might have been read from // an egg file. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA AnimChannelScalarTable : public AnimChannelScalar { +class EXPCL_PANDA_CHAN AnimChannelScalarTable : public AnimChannelScalar { protected: AnimChannelScalarTable(); AnimChannelScalarTable(AnimGroup *parent, const AnimChannelScalarTable ©); diff --git a/panda/src/chan/animControl.h b/panda/src/chan/animControl.h index cee955fef2..8d145dfa74 100644 --- a/panda/src/chan/animControl.h +++ b/panda/src/chan/animControl.h @@ -39,7 +39,7 @@ class AnimChannelBase; // animation: whether started, stopped, or looping, and // the current frame number and play rate. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA AnimControl : public ReferenceCount, public AnimInterface { +class EXPCL_PANDA_CHAN AnimControl : public ReferenceCount, public AnimInterface { public: AnimControl(PartBundle *part, AnimBundle *anim, int channel_index, const BitArray &bound_joints); diff --git a/panda/src/chan/animControlCollection.h b/panda/src/chan/animControlCollection.h index 48bd23b9c7..a4d66075f6 100644 --- a/panda/src/chan/animControlCollection.h +++ b/panda/src/chan/animControlCollection.h @@ -38,7 +38,7 @@ // previous control's reference count (and possibly // delete it, unbinding its animation). //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA AnimControlCollection { +class EXPCL_PANDA_CHAN AnimControlCollection { PUBLISHED: AnimControlCollection(); ~AnimControlCollection(); diff --git a/panda/src/chan/animGroup.h b/panda/src/chan/animGroup.h index e88f88fca9..6767063c79 100644 --- a/panda/src/chan/animGroup.h +++ b/panda/src/chan/animGroup.h @@ -37,7 +37,7 @@ class FactoryParams; // AnimChannels. The root of the hierarchy must be an // AnimBundle. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA AnimGroup : public TypedWritableReferenceCount, public Namable { +class EXPCL_PANDA_CHAN AnimGroup : public TypedWritableReferenceCount, public Namable { protected: AnimGroup(const string &name = ""); AnimGroup(AnimGroup *parent, const AnimGroup ©); diff --git a/panda/src/chan/auto_bind.h b/panda/src/chan/auto_bind.h index cc88780ceb..f8ce0c4671 100644 --- a/panda/src/chan/auto_bind.h +++ b/panda/src/chan/auto_bind.h @@ -36,7 +36,7 @@ BEGIN_PUBLISH // The list of all resulting AnimControls created is // filled into controls. //////////////////////////////////////////////////////////////////// -EXPCL_PANDA void +EXPCL_PANDA_CHAN void auto_bind(PandaNode *root_node, AnimControlCollection &controls, int hierarchy_match_flags = 0); END_PUBLISH diff --git a/panda/src/chan/config_chan.h b/panda/src/chan/config_chan.h index 63e96f416c..f3b63fa87d 100644 --- a/panda/src/chan/config_chan.h +++ b/panda/src/chan/config_chan.h @@ -25,11 +25,11 @@ #include "configVariableInt.h" // Configure variables for chan package. -NotifyCategoryDecl(chan, EXPCL_PANDA, EXPTP_PANDA); +NotifyCategoryDecl(chan, EXPCL_PANDA_CHAN, EXPTP_PANDA_CHAN); -EXPCL_PANDA extern ConfigVariableBool compress_channels; -EXPCL_PANDA extern ConfigVariableInt compress_chan_quality; -EXPCL_PANDA extern ConfigVariableBool read_compressed_channels; -EXPCL_PANDA extern ConfigVariableBool interpolate_frames; +EXPCL_PANDA_CHAN extern ConfigVariableBool compress_channels; +EXPCL_PANDA_CHAN extern ConfigVariableInt compress_chan_quality; +EXPCL_PANDA_CHAN extern ConfigVariableBool read_compressed_channels; +EXPCL_PANDA_CHAN extern ConfigVariableBool interpolate_frames; #endif diff --git a/panda/src/chan/movingPartBase.h b/panda/src/chan/movingPartBase.h index 08e4cb42bf..44fc2b699e 100644 --- a/panda/src/chan/movingPartBase.h +++ b/panda/src/chan/movingPartBase.h @@ -35,7 +35,7 @@ // MovingPartBase does not have a particular value type. // See the derived template class, MovingPart, for this. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA MovingPartBase : public PartGroup { +class EXPCL_PANDA_CHAN MovingPartBase : public PartGroup { protected: INLINE MovingPartBase(const MovingPartBase ©); diff --git a/panda/src/chan/movingPartMatrix.h b/panda/src/chan/movingPartMatrix.h index 1d48792e2b..8546c44b5d 100644 --- a/panda/src/chan/movingPartMatrix.h +++ b/panda/src/chan/movingPartMatrix.h @@ -26,14 +26,14 @@ #include "animChannelFixed.h" #include "cmath.h" -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, MovingPart); +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_CHAN, EXPTP_PANDA_CHAN, MovingPart); //////////////////////////////////////////////////////////////////// // Class : MovingPartMatrix // Description : This is a particular kind of MovingPart that accepts // a matrix each frame. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA MovingPartMatrix : public MovingPart { +class EXPCL_PANDA_CHAN MovingPartMatrix : public MovingPart { protected: INLINE MovingPartMatrix(const MovingPartMatrix ©); diff --git a/panda/src/chan/movingPartScalar.h b/panda/src/chan/movingPartScalar.h index 86a6192669..f42d9635a0 100644 --- a/panda/src/chan/movingPartScalar.h +++ b/panda/src/chan/movingPartScalar.h @@ -25,14 +25,14 @@ #include "animChannel.h" #include "animChannelFixed.h" -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, MovingPart); +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_CHAN, EXPTP_PANDA_CHAN, MovingPart); //////////////////////////////////////////////////////////////////// // Class : MovingPartScalar // Description : This is a particular kind of MovingPart that accepts // a scalar each frame. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA MovingPartScalar : public MovingPart { +class EXPCL_PANDA_CHAN MovingPartScalar : public MovingPart { protected: INLINE MovingPartScalar(const MovingPartScalar ©); diff --git a/panda/src/chan/partBundle.h b/panda/src/chan/partBundle.h index 1a5dcd0c8a..b31ba915c9 100644 --- a/panda/src/chan/partBundle.h +++ b/panda/src/chan/partBundle.h @@ -44,7 +44,7 @@ class TransformState; // defines the hierarchy of moving parts that make up an // animatable object. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PartBundle : public PartGroup { +class EXPCL_PANDA_CHAN PartBundle : public PartGroup { public: // This is passed down through the MovingParts during the diff --git a/panda/src/chan/partBundleNode.h b/panda/src/chan/partBundleNode.h index f3dd1f42bd..7429ad3d8c 100644 --- a/panda/src/chan/partBundleNode.h +++ b/panda/src/chan/partBundleNode.h @@ -33,7 +33,7 @@ // PartBundle. Like AnimBundleNode, it exists solely to // make it easy to store PartBundles in the scene graph. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PartBundleNode : public PandaNode { +class EXPCL_PANDA_CHAN PartBundleNode : public PandaNode { public: INLINE PartBundleNode(const string &name, PartBundle *bundle); diff --git a/panda/src/chan/partGroup.h b/panda/src/chan/partGroup.h index 76fd0d0acc..34e0023bb2 100644 --- a/panda/src/chan/partGroup.h +++ b/panda/src/chan/partGroup.h @@ -46,7 +46,7 @@ class AnimChannelBase; // Description : This is the base class for PartRoot and // MovingPart. It defines a hierarchy of MovingParts. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PartGroup : public TypedWritableReferenceCount, public Namable { +class EXPCL_PANDA_CHAN PartGroup : public TypedWritableReferenceCount, public Namable { public: // This enum defines bits which may be passed into check_hierarchy() // and PartBundle::bind_anim() to allow an inexact match of channel diff --git a/panda/src/chan/partSubset.h b/panda/src/chan/partSubset.h index 14b4d9c7fe..2e8c8f81d6 100644 --- a/panda/src/chan/partSubset.h +++ b/panda/src/chan/partSubset.h @@ -29,7 +29,7 @@ // Only those part names within the subset will be // included in the bind. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PartSubset { +class EXPCL_PANDA_CHAN PartSubset { PUBLISHED: PartSubset(); PartSubset(const PartSubset ©); diff --git a/panda/src/chan/vector_PartGroupStar.cxx b/panda/src/chan/vector_PartGroupStar.cxx index dae84e16f7..cfaf62008e 100644 --- a/panda/src/chan/vector_PartGroupStar.cxx +++ b/panda/src/chan/vector_PartGroupStar.cxx @@ -18,8 +18,8 @@ #include "vector_PartGroupStar.h" -#define EXPCL EXPCL_PANDA -#define EXPTP EXPTP_PANDA +#define EXPCL EXPCL_PANDA_CHAN +#define EXPTP EXPTP_PANDA_CHAN #define TYPE PartGroup * #define NAME vector_PartGroupStar diff --git a/panda/src/chan/vector_PartGroupStar.h b/panda/src/chan/vector_PartGroupStar.h index 726950e68e..40925924ea 100644 --- a/panda/src/chan/vector_PartGroupStar.h +++ b/panda/src/chan/vector_PartGroupStar.h @@ -33,8 +33,8 @@ // vector again. //////////////////////////////////////////////////////////////////// -#define EXPCL EXPCL_PANDA -#define EXPTP EXPTP_PANDA +#define EXPCL EXPCL_PANDA_CHAN +#define EXPTP EXPTP_PANDA_CHAN #define TYPE PartGroup * #define NAME vector_PartGroupStar diff --git a/panda/src/char/character.h b/panda/src/char/character.h index 7351b68992..20747878e3 100644 --- a/panda/src/char/character.h +++ b/panda/src/char/character.h @@ -42,7 +42,7 @@ class ComputedVertices; // Description : An animated character, with skeleton-morph animation // and either soft-skinned or hard-skinned vertices. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA Character : public PartBundleNode { +class EXPCL_PANDA_CHAR Character : public PartBundleNode { protected: Character(const Character ©, bool copy_bundles); diff --git a/panda/src/char/characterJoint.h b/panda/src/char/characterJoint.h index 6e44169383..c0691daa2f 100644 --- a/panda/src/char/characterJoint.h +++ b/panda/src/char/characterJoint.h @@ -33,7 +33,7 @@ class Character; // Description : This represents one joint of the character's // animation, containing an animating transform matrix. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CharacterJoint : public MovingPartMatrix { +class EXPCL_PANDA_CHAR CharacterJoint : public MovingPartMatrix { protected: CharacterJoint(); CharacterJoint(const CharacterJoint ©); diff --git a/panda/src/char/characterJointBundle.h b/panda/src/char/characterJointBundle.h index 084ccddf28..669d170da1 100644 --- a/panda/src/char/characterJointBundle.h +++ b/panda/src/char/characterJointBundle.h @@ -32,7 +32,7 @@ class Character; // Description : The collection of all the joints and sliders in the // character. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CharacterJointBundle : public PartBundle { +class EXPCL_PANDA_CHAR CharacterJointBundle : public PartBundle { protected: INLINE CharacterJointBundle(const CharacterJointBundle ©); diff --git a/panda/src/char/characterJointEffect.h b/panda/src/char/characterJointEffect.h index fdc326623f..55d46397ba 100644 --- a/panda/src/char/characterJointEffect.h +++ b/panda/src/char/characterJointEffect.h @@ -38,7 +38,7 @@ // node will automatically force the indicated character // to be updated first. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CharacterJointEffect : public RenderEffect { +class EXPCL_PANDA_CHAR CharacterJointEffect : public RenderEffect { private: INLINE CharacterJointEffect(); diff --git a/panda/src/char/characterSlider.h b/panda/src/char/characterSlider.h index c2b80aff5a..cb605a5d38 100644 --- a/panda/src/char/characterSlider.h +++ b/panda/src/char/characterSlider.h @@ -32,7 +32,7 @@ class CharacterVertexSlider; // generally between 0 and 1, that controls the effects // of one or more morphs within the character. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CharacterSlider : public MovingPartScalar { +class EXPCL_PANDA_CHAR CharacterSlider : public MovingPartScalar { protected: CharacterSlider(); CharacterSlider(const CharacterSlider ©); diff --git a/panda/src/char/characterVertexSlider.h b/panda/src/char/characterVertexSlider.h index 0dfc045117..e0834bd55a 100644 --- a/panda/src/char/characterVertexSlider.h +++ b/panda/src/char/characterVertexSlider.h @@ -30,7 +30,7 @@ // returns the slider value associated with a particular // CharacterSlider object. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CharacterVertexSlider : public VertexSlider { +class EXPCL_PANDA_CHAR CharacterVertexSlider : public VertexSlider { private: CharacterVertexSlider(); diff --git a/panda/src/char/config_char.h b/panda/src/char/config_char.h index f8c22ea0ff..1f4839d4ce 100644 --- a/panda/src/char/config_char.h +++ b/panda/src/char/config_char.h @@ -25,12 +25,12 @@ // CPPParser can't handle token-pasting to a keyword. #ifndef CPPPARSER -NotifyCategoryDecl(char, EXPCL_PANDA, EXPTP_PANDA); +NotifyCategoryDecl(char, EXPCL_PANDA_CHAR, EXPTP_PANDA_CHAR); #endif // Configure variables for char package. -extern EXPCL_PANDA ConfigVariableBool even_animation; +extern EXPCL_PANDA_CHAR ConfigVariableBool even_animation; -extern EXPCL_PANDA void init_libchar(); +extern EXPCL_PANDA_CHAR void init_libchar(); #endif diff --git a/panda/src/char/jointVertexTransform.h b/panda/src/char/jointVertexTransform.h index fdfc4bc69c..f6c26df664 100644 --- a/panda/src/char/jointVertexTransform.h +++ b/panda/src/char/jointVertexTransform.h @@ -38,7 +38,7 @@ // are used to implement soft-skinned vertices for an // animated character. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA JointVertexTransform : public VertexTransform { +class EXPCL_PANDA_CHAR JointVertexTransform : public VertexTransform { private: JointVertexTransform(); diff --git a/panda/src/collide/collisionDSSolid.h b/panda/src/collide/collisionDSSolid.h index 7d593d8377..0349db64ef 100755 --- a/panda/src/collide/collisionDSSolid.h +++ b/panda/src/collide/collisionDSSolid.h @@ -30,7 +30,7 @@ // of two spheres (potentially a lens) and two half-spaces // (planes). //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CollisionDSSolid: public CollisionSolid { +class EXPCL_PANDA_COLLIDE CollisionDSSolid: public CollisionSolid { PUBLISHED: INLINE CollisionDSSolid( const LPoint3f ¢er_a, float radius_a, diff --git a/panda/src/collide/collisionEntry.h b/panda/src/collide/collisionEntry.h index 13d9897e6b..624906ed0d 100644 --- a/panda/src/collide/collisionEntry.h +++ b/panda/src/collide/collisionEntry.h @@ -47,7 +47,7 @@ // is up to the handler to determine what information is // known and to do the right thing with it. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CollisionEntry : public TypedWritableReferenceCount { +class EXPCL_PANDA_COLLIDE CollisionEntry : public TypedWritableReferenceCount { public: INLINE CollisionEntry(); CollisionEntry(const CollisionEntry ©); diff --git a/panda/src/collide/collisionFloorMesh.cxx b/panda/src/collide/collisionFloorMesh.cxx index e36196561d..4ffdd78f50 100755 --- a/panda/src/collide/collisionFloorMesh.cxx +++ b/panda/src/collide/collisionFloorMesh.cxx @@ -147,8 +147,7 @@ PT(CollisionEntry) CollisionFloorMesh:: test_intersection_from_ray(const CollisionEntry &entry) const { const CollisionRay *ray; DCAST_INTO_R(ray, entry.get_from(), 0); - const LMatrix4f &wrt_mat = entry.get_wrt_mat(); - LPoint3f from_origin = ray->get_origin() * wrt_mat; + LPoint3f from_origin = ray->get_origin() * entry.get_wrt_mat(); double fx=from_origin[0]; double fy=from_origin[1]; diff --git a/panda/src/collide/collisionFloorMesh.h b/panda/src/collide/collisionFloorMesh.h index bb2341ff48..66ab6bfa80 100755 --- a/panda/src/collide/collisionFloorMesh.h +++ b/panda/src/collide/collisionFloorMesh.h @@ -34,7 +34,7 @@ class GeomNode; // Description : This object represents a solid made entirely of triangles, which // will only be tested again z axis aligned rays //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CollisionFloorMesh : public CollisionSolid { +class EXPCL_PANDA_COLLIDE CollisionFloorMesh : public CollisionSolid { public: typedef struct { unsigned int p1; diff --git a/panda/src/collide/collisionGeom.h b/panda/src/collide/collisionGeom.h index 8fc24e01dd..8c1d447457 100644 --- a/panda/src/collide/collisionGeom.h +++ b/panda/src/collide/collisionGeom.h @@ -34,7 +34,7 @@ // directly; it is created only by the // CollisionTraverser, as needed. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CollisionGeom : public CollisionPolygon { +class EXPCL_PANDA_COLLIDE CollisionGeom : public CollisionPolygon { private: INLINE CollisionGeom(const LVecBase3f &a, const LVecBase3f &b, const LVecBase3f &c); diff --git a/panda/src/collide/collisionHandler.h b/panda/src/collide/collisionHandler.h index 422afda547..6d62cfe23c 100644 --- a/panda/src/collide/collisionHandler.h +++ b/panda/src/collide/collisionHandler.h @@ -33,7 +33,7 @@ class CollisionEntry; // that is processing collisions in order to specify how // to dispatch detected collisions. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CollisionHandler : public TypedReferenceCount { +class EXPCL_PANDA_COLLIDE CollisionHandler : public TypedReferenceCount { public: virtual void begin_group(); virtual void add_entry(CollisionEntry *entry); diff --git a/panda/src/collide/collisionHandlerEvent.h b/panda/src/collide/collisionHandlerEvent.h index e2dd4fa988..91c6384e19 100644 --- a/panda/src/collide/collisionHandlerEvent.h +++ b/panda/src/collide/collisionHandlerEvent.h @@ -37,7 +37,7 @@ // event will be a pointer to the CollisionEntry that // triggered it. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CollisionHandlerEvent : public CollisionHandler { +class EXPCL_PANDA_COLLIDE CollisionHandlerEvent : public CollisionHandler { PUBLISHED: CollisionHandlerEvent(); diff --git a/panda/src/collide/collisionHandlerFloor.h b/panda/src/collide/collisionHandlerFloor.h index dee3ba9430..72f63c4cc7 100644 --- a/panda/src/collide/collisionHandlerFloor.h +++ b/panda/src/collide/collisionHandlerFloor.h @@ -32,7 +32,7 @@ // of varying height by casting a ray down from the // avatar's head. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CollisionHandlerFloor : public CollisionHandlerPhysical { +class EXPCL_PANDA_COLLIDE CollisionHandlerFloor : public CollisionHandlerPhysical { PUBLISHED: CollisionHandlerFloor(); virtual ~CollisionHandlerFloor(); diff --git a/panda/src/collide/collisionHandlerGravity.h b/panda/src/collide/collisionHandlerGravity.h index 5dcf261dd4..1eaf854dc8 100755 --- a/panda/src/collide/collisionHandlerGravity.h +++ b/panda/src/collide/collisionHandlerGravity.h @@ -32,7 +32,7 @@ // of varying height by casting a ray down from the // avatar's head. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CollisionHandlerGravity : public CollisionHandlerPhysical { +class EXPCL_PANDA_COLLIDE CollisionHandlerGravity : public CollisionHandlerPhysical { PUBLISHED: CollisionHandlerGravity(); virtual ~CollisionHandlerGravity(); diff --git a/panda/src/collide/collisionHandlerPhysical.h b/panda/src/collide/collisionHandlerPhysical.h index d2fb301d87..ff38ab1324 100644 --- a/panda/src/collide/collisionHandlerPhysical.h +++ b/panda/src/collide/collisionHandlerPhysical.h @@ -35,7 +35,7 @@ // their moving bodies: they need to update the nodes' // positions based on the effects of the collision. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CollisionHandlerPhysical : public CollisionHandlerEvent { +class EXPCL_PANDA_COLLIDE CollisionHandlerPhysical : public CollisionHandlerEvent { public: CollisionHandlerPhysical(); virtual ~CollisionHandlerPhysical(); diff --git a/panda/src/collide/collisionHandlerPusher.h b/panda/src/collide/collisionHandlerPusher.h index 92ab8ef293..11761de1c1 100644 --- a/panda/src/collide/collisionHandlerPusher.h +++ b/panda/src/collide/collisionHandlerPusher.h @@ -30,7 +30,7 @@ // walls. This is the simplest kind of "real-world" // collisions you can have. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CollisionHandlerPusher : public CollisionHandlerPhysical { +class EXPCL_PANDA_COLLIDE CollisionHandlerPusher : public CollisionHandlerPhysical { PUBLISHED: CollisionHandlerPusher(); virtual ~CollisionHandlerPusher(); diff --git a/panda/src/collide/collisionHandlerQueue.h b/panda/src/collide/collisionHandlerQueue.h index 949b427ecf..aea4c2e610 100644 --- a/panda/src/collide/collisionHandlerQueue.h +++ b/panda/src/collide/collisionHandlerQueue.h @@ -33,7 +33,7 @@ // useful when a simple intersection test is being made, // e.g. for picking from the window. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CollisionHandlerQueue : public CollisionHandler { +class EXPCL_PANDA_COLLIDE CollisionHandlerQueue : public CollisionHandler { PUBLISHED: CollisionHandlerQueue(); diff --git a/panda/src/collide/collisionInvSphere.h b/panda/src/collide/collisionInvSphere.h index f2b4754926..4c71234f19 100644 --- a/panda/src/collide/collisionInvSphere.h +++ b/panda/src/collide/collisionInvSphere.h @@ -32,7 +32,7 @@ // constraining objects to remain within a spherical // perimeter. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CollisionInvSphere : public CollisionSphere { +class EXPCL_PANDA_COLLIDE CollisionInvSphere : public CollisionSphere { PUBLISHED: INLINE CollisionInvSphere(const LPoint3f ¢er, float radius); INLINE CollisionInvSphere(float cx, float cy, float cz, float radius); diff --git a/panda/src/collide/collisionLine.h b/panda/src/collide/collisionLine.h index d3afd6b973..fec8c4bc9a 100644 --- a/panda/src/collide/collisionLine.h +++ b/panda/src/collide/collisionLine.h @@ -29,7 +29,7 @@ // that it extends in both directions. It is, however, // directional. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CollisionLine : public CollisionRay { +class EXPCL_PANDA_COLLIDE CollisionLine : public CollisionRay { PUBLISHED: INLINE CollisionLine(); INLINE CollisionLine(const LPoint3f &origin, const LVector3f &direction); diff --git a/panda/src/collide/collisionNode.h b/panda/src/collide/collisionNode.h index 79376eae56..4d1b38e5c4 100644 --- a/panda/src/collide/collisionNode.h +++ b/panda/src/collide/collisionNode.h @@ -34,7 +34,7 @@ // with, or an animated object twirling around in the // world and running into things. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CollisionNode : public PandaNode { +class EXPCL_PANDA_COLLIDE CollisionNode : public PandaNode { PUBLISHED: CollisionNode(const string &name); diff --git a/panda/src/collide/collisionPlane.h b/panda/src/collide/collisionPlane.h index f036625811..2d9c2d45b9 100644 --- a/panda/src/collide/collisionPlane.h +++ b/panda/src/collide/collisionPlane.h @@ -30,7 +30,7 @@ // Class : CollisionPlane // Description : //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CollisionPlane : public CollisionSolid { +class EXPCL_PANDA_COLLIDE CollisionPlane : public CollisionSolid { protected: INLINE CollisionPlane(); diff --git a/panda/src/collide/collisionPolygon.h b/panda/src/collide/collisionPolygon.h index 4460f2efab..d8378d7ae4 100644 --- a/panda/src/collide/collisionPolygon.h +++ b/panda/src/collide/collisionPolygon.h @@ -33,7 +33,7 @@ class GeomNode; // Class : CollisionPolygon // Description : //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CollisionPolygon : public CollisionPlane { +class EXPCL_PANDA_COLLIDE CollisionPolygon : public CollisionPlane { PUBLISHED: INLINE CollisionPolygon(const LVecBase3f &a, const LVecBase3f &b, const LVecBase3f &c); diff --git a/panda/src/collide/collisionRay.h b/panda/src/collide/collisionRay.h index 0ff31c4af0..0f87a7181c 100644 --- a/panda/src/collide/collisionRay.h +++ b/panda/src/collide/collisionRay.h @@ -33,7 +33,7 @@ class LensNode; // Useful for picking from a window, or for gravity // effects. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CollisionRay : public CollisionSolid { +class EXPCL_PANDA_COLLIDE CollisionRay : public CollisionSolid { PUBLISHED: INLINE CollisionRay(); INLINE CollisionRay(const LPoint3f &origin, const LVector3f &direction); diff --git a/panda/src/collide/collisionRecorder.h b/panda/src/collide/collisionRecorder.h index 213749a5e1..43631316fc 100644 --- a/panda/src/collide/collisionRecorder.h +++ b/panda/src/collide/collisionRecorder.h @@ -35,7 +35,7 @@ class CollisionEntry; // class that just provides an interface for recording // collisions tested and detected each frame. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CollisionRecorder : public TypedObject { +class EXPCL_PANDA_COLLIDE CollisionRecorder : public TypedObject { protected: CollisionRecorder(); public: diff --git a/panda/src/collide/collisionSegment.h b/panda/src/collide/collisionSegment.h index 3ed1c8d925..ff0e36f26f 100644 --- a/panda/src/collide/collisionSegment.h +++ b/panda/src/collide/collisionSegment.h @@ -36,7 +36,7 @@ class LensNode; // intersecting a solid, the reported intersection point // is generally the closest on the segment to point A. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CollisionSegment : public CollisionSolid { +class EXPCL_PANDA_COLLIDE CollisionSegment : public CollisionSolid { PUBLISHED: INLINE CollisionSegment(); INLINE CollisionSegment(const LPoint3f &a, const LPoint3f &db); diff --git a/panda/src/collide/collisionSolid.h b/panda/src/collide/collisionSolid.h index 9b3da30836..325e8735c2 100644 --- a/panda/src/collide/collisionSolid.h +++ b/panda/src/collide/collisionSolid.h @@ -51,7 +51,7 @@ class CullTraverserData; // function calls handle the subset of the N*N // intersection tests that we care about. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CollisionSolid : public CopyOnWriteObject { +class EXPCL_PANDA_COLLIDE CollisionSolid : public CopyOnWriteObject { public: CollisionSolid(); CollisionSolid(const CollisionSolid ©); diff --git a/panda/src/collide/collisionSphere.h b/panda/src/collide/collisionSphere.h index ca7e0b3a7c..643670b84b 100644 --- a/panda/src/collide/collisionSphere.h +++ b/panda/src/collide/collisionSphere.h @@ -27,7 +27,7 @@ // Class : CollisionSphere // Description : A spherical collision volume or object. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CollisionSphere : public CollisionSolid { +class EXPCL_PANDA_COLLIDE CollisionSphere : public CollisionSolid { PUBLISHED: INLINE CollisionSphere(const LPoint3f ¢er, float radius); INLINE CollisionSphere(float cx, float cy, float cz, float radius); diff --git a/panda/src/collide/collisionTraverser.h b/panda/src/collide/collisionTraverser.h index 90c7639b56..7f0b99059f 100644 --- a/panda/src/collide/collisionTraverser.h +++ b/panda/src/collide/collisionTraverser.h @@ -50,7 +50,7 @@ class CollisionEntry; // indicated root, calling the appropriate // CollisionHandler for each detected collision. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CollisionTraverser : public Namable { +class EXPCL_PANDA_COLLIDE CollisionTraverser : public Namable { PUBLISHED: CollisionTraverser(const string &name = "ctrav"); ~CollisionTraverser(); diff --git a/panda/src/collide/collisionTube.h b/panda/src/collide/collisionTube.h index 4f05a2c9d7..180a1e19c4 100644 --- a/panda/src/collide/collisionTube.h +++ b/panda/src/collide/collisionTube.h @@ -31,7 +31,7 @@ // instead of flat ends. It looks more like a Contac // pill. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CollisionTube : public CollisionSolid { +class EXPCL_PANDA_COLLIDE CollisionTube : public CollisionSolid { PUBLISHED: INLINE CollisionTube(const LPoint3f &a, const LPoint3f &db, float radius); diff --git a/panda/src/collide/collisionVisualizer.h b/panda/src/collide/collisionVisualizer.h index d2556a5f06..2a20ae16ba 100644 --- a/panda/src/collide/collisionVisualizer.h +++ b/panda/src/collide/collisionVisualizer.h @@ -38,7 +38,7 @@ // It may be parented anywhere in the scene graph where // it will be rendered to achieve this. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CollisionVisualizer : public PandaNode, public CollisionRecorder { +class EXPCL_PANDA_COLLIDE CollisionVisualizer : public PandaNode, public CollisionRecorder { PUBLISHED: CollisionVisualizer(const string &name); virtual ~CollisionVisualizer(); diff --git a/panda/src/collide/config_collide.h b/panda/src/collide/config_collide.h index 91b9239a48..ca929e548d 100644 --- a/panda/src/collide/config_collide.h +++ b/panda/src/collide/config_collide.h @@ -23,13 +23,13 @@ #include "notifyCategoryProxy.h" #include "configVariableBool.h" -NotifyCategoryDecl(collide, EXPCL_PANDA, EXPTP_PANDA); +NotifyCategoryDecl(collide, EXPCL_PANDA_COLLIDE, EXPTP_PANDA_COLLIDE); -extern EXPCL_PANDA ConfigVariableBool respect_prev_transform; -extern EXPCL_PANDA ConfigVariableBool respect_effective_normal; -extern EXPCL_PANDA ConfigVariableBool allow_collider_multiple; -extern EXPCL_PANDA ConfigVariableBool flatten_collision_nodes; +extern EXPCL_PANDA_COLLIDE ConfigVariableBool respect_prev_transform; +extern EXPCL_PANDA_COLLIDE ConfigVariableBool respect_effective_normal; +extern EXPCL_PANDA_COLLIDE ConfigVariableBool allow_collider_multiple; +extern EXPCL_PANDA_COLLIDE ConfigVariableBool flatten_collision_nodes; -extern EXPCL_PANDA void init_libcollide(); +extern EXPCL_PANDA_COLLIDE void init_libcollide(); #endif diff --git a/panda/src/cull/binCullHandler.h b/panda/src/cull/binCullHandler.h index 89458f5a71..1ec463bd19 100644 --- a/panda/src/cull/binCullHandler.h +++ b/panda/src/cull/binCullHandler.h @@ -31,7 +31,7 @@ // drawing). This is the kind of CullHandler to use for // most normal rendering needs. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA BinCullHandler : public CullHandler { +class EXPCL_PANDA_CULL BinCullHandler : public CullHandler { public: INLINE BinCullHandler(CullResult *cull_result); diff --git a/panda/src/cull/config_cull.h b/panda/src/cull/config_cull.h index 78b7105665..e0b406c61e 100644 --- a/panda/src/cull/config_cull.h +++ b/panda/src/cull/config_cull.h @@ -28,9 +28,9 @@ class DSearchPath; -ConfigureDecl(config_cull, EXPCL_PANDA, EXPTP_PANDA); -NotifyCategoryDecl(cull, EXPCL_PANDA, EXPTP_PANDA); +ConfigureDecl(config_cull, EXPCL_PANDA_CULL, EXPTP_PANDA_CULL); +NotifyCategoryDecl(cull, EXPCL_PANDA_CULL, EXPTP_PANDA_CULL); -extern EXPCL_PANDA void init_libcull(); +extern EXPCL_PANDA_CULL void init_libcull(); #endif diff --git a/panda/src/cull/cullBinBackToFront.h b/panda/src/cull/cullBinBackToFront.h index cff60ef518..132f921769 100644 --- a/panda/src/cull/cullBinBackToFront.h +++ b/panda/src/cull/cullBinBackToFront.h @@ -35,7 +35,7 @@ // rendering transparent and semi-transparent geometry // that must be sorted from back to front. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CullBinBackToFront : public CullBin { +class EXPCL_PANDA_CULL CullBinBackToFront : public CullBin { public: INLINE CullBinBackToFront(const string &name, GraphicsStateGuardianBase *gsg, diff --git a/panda/src/cull/cullBinFixed.h b/panda/src/cull/cullBinFixed.h index 71395f94cf..dff8988755 100644 --- a/panda/src/cull/cullBinFixed.h +++ b/panda/src/cull/cullBinFixed.h @@ -38,7 +38,7 @@ // draw_order, they are drawn in scene-graph order (as // with CullBinUnsorted). //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CullBinFixed : public CullBin { +class EXPCL_PANDA_CULL CullBinFixed : public CullBin { public: INLINE CullBinFixed(const string &name, GraphicsStateGuardianBase *gsg, diff --git a/panda/src/cull/cullBinFrontToBack.h b/panda/src/cull/cullBinFrontToBack.h index ebf1d9e1f3..a78e05ebf0 100644 --- a/panda/src/cull/cullBinFrontToBack.h +++ b/panda/src/cull/cullBinFrontToBack.h @@ -36,7 +36,7 @@ // This is useful for rendering opaque geometry, taking // optimal advantage of a hierarchical Z-buffer. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CullBinFrontToBack : public CullBin { +class EXPCL_PANDA_CULL CullBinFrontToBack : public CullBin { public: INLINE CullBinFrontToBack(const string &name, GraphicsStateGuardianBase *gsg, diff --git a/panda/src/cull/cullBinStateSorted.h b/panda/src/cull/cullBinStateSorted.h index 5c6e13974b..804e676d47 100644 --- a/panda/src/cull/cullBinStateSorted.h +++ b/panda/src/cull/cullBinStateSorted.h @@ -40,7 +40,7 @@ // Z-buffer algorithms which can early-out when an // object appears behind another one. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CullBinStateSorted : public CullBin { +class EXPCL_PANDA_CULL CullBinStateSorted : public CullBin { public: INLINE CullBinStateSorted(const string &name, GraphicsStateGuardianBase *gsg, diff --git a/panda/src/cull/cullBinUnsorted.h b/panda/src/cull/cullBinUnsorted.h index 78ff7900f2..00b3af8f94 100644 --- a/panda/src/cull/cullBinUnsorted.h +++ b/panda/src/cull/cullBinUnsorted.h @@ -31,7 +31,7 @@ // the same order it was encountered, which will be in // scene-graph order. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CullBinUnsorted : public CullBin { +class EXPCL_PANDA_CULL CullBinUnsorted : public CullBin { public: INLINE CullBinUnsorted(const string &name, GraphicsStateGuardianBase *gsg, diff --git a/panda/src/cull/drawCullHandler.h b/panda/src/cull/drawCullHandler.h index 233901d107..13b9b4d217 100644 --- a/panda/src/cull/drawCullHandler.h +++ b/panda/src/cull/drawCullHandler.h @@ -35,7 +35,7 @@ class GraphicsStateGuardianBase; // than separating out draw and cull, if state sorting // and multiprocessing are not required. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA DrawCullHandler : public CullHandler { +class EXPCL_PANDA_CULL DrawCullHandler : public CullHandler { public: INLINE DrawCullHandler(GraphicsStateGuardianBase *gsg); diff --git a/panda/src/device/analogNode.h b/panda/src/device/analogNode.h index cf7a58c170..2fde5ea689 100644 --- a/panda/src/device/analogNode.h +++ b/panda/src/device/analogNode.h @@ -46,7 +46,7 @@ // position data. In this way, an AnalogNode may be // used in place of a mouse. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA AnalogNode : public DataNode { +class EXPCL_PANDA_DEVICE AnalogNode : public DataNode { PUBLISHED: AnalogNode(ClientBase *client, const string &device_name); virtual ~AnalogNode(); diff --git a/panda/src/device/buttonNode.h b/panda/src/device/buttonNode.h index cbc8ace251..4d992c18db 100644 --- a/panda/src/device/buttonNode.h +++ b/panda/src/device/buttonNode.h @@ -42,7 +42,7 @@ // down events on the data graph for each button state // change. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ButtonNode : public DataNode { +class EXPCL_PANDA_DEVICE ButtonNode : public DataNode { PUBLISHED: ButtonNode(ClientBase *client, const string &device_name); virtual ~ButtonNode(); diff --git a/panda/src/device/clientAnalogDevice.h b/panda/src/device/clientAnalogDevice.h index 1698d7e0ae..353a96ee6f 100644 --- a/panda/src/device/clientAnalogDevice.h +++ b/panda/src/device/clientAnalogDevice.h @@ -35,7 +35,7 @@ // to 1, reflecting the current position of the control // within its total range of motion. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ClientAnalogDevice : public ClientDevice { +class EXPCL_PANDA_DEVICE ClientAnalogDevice : public ClientDevice { protected: INLINE ClientAnalogDevice(ClientBase *client, const string &device_name); diff --git a/panda/src/device/clientBase.h b/panda/src/device/clientBase.h index 15fe61563f..bce294363f 100644 --- a/panda/src/device/clientBase.h +++ b/panda/src/device/clientBase.h @@ -48,7 +48,7 @@ // TrackerNode etc. to put these devices in the data // graph. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ClientBase : public TypedReferenceCount { +class EXPCL_PANDA_DEVICE ClientBase : public TypedReferenceCount { protected: ClientBase(); diff --git a/panda/src/device/clientButtonDevice.h b/panda/src/device/clientButtonDevice.h index 569c05545e..68d19d9276 100644 --- a/panda/src/device/clientButtonDevice.h +++ b/panda/src/device/clientButtonDevice.h @@ -38,7 +38,7 @@ // class to a sequence of ButtonHandles specified by the // user. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ClientButtonDevice : public ClientDevice { +class EXPCL_PANDA_DEVICE ClientButtonDevice : public ClientDevice { protected: ClientButtonDevice(ClientBase *client, const string &device_name); diff --git a/panda/src/device/clientDevice.h b/panda/src/device/clientDevice.h index 58566dc1d3..ea7b2b85b4 100644 --- a/panda/src/device/clientDevice.h +++ b/panda/src/device/clientDevice.h @@ -36,7 +36,7 @@ class ClientBase; // This is an abstract interface; the actual // implementations are in ClientTrackerDevice, etc. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ClientDevice : public TypedReferenceCount { +class EXPCL_PANDA_DEVICE ClientDevice : public TypedReferenceCount { protected: ClientDevice(ClientBase *client, TypeHandle device_type, const string &device_name); diff --git a/panda/src/device/clientDialDevice.h b/panda/src/device/clientDialDevice.h index 0291af0d32..62781badbb 100644 --- a/panda/src/device/clientDialDevice.h +++ b/panda/src/device/clientDialDevice.h @@ -36,7 +36,7 @@ // Therefore it does not have a specific position at any // given time, unlike an AnalogDevice. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ClientDialDevice : public ClientDevice { +class EXPCL_PANDA_DEVICE ClientDialDevice : public ClientDevice { protected: INLINE ClientDialDevice(ClientBase *client, const string &device_name); diff --git a/panda/src/device/clientTrackerDevice.h b/panda/src/device/clientTrackerDevice.h index 57e0d05e26..51ebb1a735 100644 --- a/panda/src/device/clientTrackerDevice.h +++ b/panda/src/device/clientTrackerDevice.h @@ -30,7 +30,7 @@ // TrackerNode, that records the data from a single // tracker device. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ClientTrackerDevice : public ClientDevice { +class EXPCL_PANDA_DEVICE ClientTrackerDevice : public ClientDevice { protected: INLINE ClientTrackerDevice(ClientBase *client, const string &device_name); diff --git a/panda/src/device/config_device.h b/panda/src/device/config_device.h index a63188159e..7a2b3d0898 100644 --- a/panda/src/device/config_device.h +++ b/panda/src/device/config_device.h @@ -23,10 +23,10 @@ #include "notifyCategoryProxy.h" #include "configVariableBool.h" -NotifyCategoryDecl(device, EXPCL_PANDA, EXPTP_PANDA); +NotifyCategoryDecl(device, EXPCL_PANDA_DEVICE, EXPTP_PANDA_DEVICE); extern ConfigVariableBool asynchronous_clients; -extern EXPCL_PANDA void init_libdevice(); +extern EXPCL_PANDA_DEVICE void init_libdevice(); #endif diff --git a/panda/src/device/dialNode.h b/panda/src/device/dialNode.h index ee8e7bb448..7481d168ca 100644 --- a/panda/src/device/dialNode.h +++ b/panda/src/device/dialNode.h @@ -40,7 +40,7 @@ // Therefore it does not have a specific position at any // given time, unlike an AnalogDevice. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA DialNode : public DataNode { +class EXPCL_PANDA_DEVICE DialNode : public DataNode { PUBLISHED: DialNode(ClientBase *client, const string &device_name); virtual ~DialNode(); diff --git a/panda/src/device/mouseAndKeyboard.h b/panda/src/device/mouseAndKeyboard.h index 49c292b78e..40dba3cd58 100644 --- a/panda/src/device/mouseAndKeyboard.h +++ b/panda/src/device/mouseAndKeyboard.h @@ -47,7 +47,7 @@ // EventThrower to the MouseAndKeyboard object; // otherwise, the events will be discarded. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA MouseAndKeyboard : public DataNode { +class EXPCL_PANDA_DEVICE MouseAndKeyboard : public DataNode { PUBLISHED: MouseAndKeyboard(GraphicsWindow *window, int device, const string &name); void set_source(GraphicsWindow *window, int device); diff --git a/panda/src/device/trackerData.h b/panda/src/device/trackerData.h index 8376cf63fd..e7fea1aa1f 100644 --- a/panda/src/device/trackerData.h +++ b/panda/src/device/trackerData.h @@ -26,7 +26,7 @@ // Class : TrackerData // Description : Stores the kinds of data that a tracker might output. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA TrackerData { +class EXPCL_PANDA_DEVICE TrackerData { public: INLINE TrackerData(); INLINE TrackerData(const TrackerData ©); diff --git a/panda/src/device/trackerNode.h b/panda/src/device/trackerNode.h index d7b0b53130..bbab569dbe 100644 --- a/panda/src/device/trackerNode.h +++ b/panda/src/device/trackerNode.h @@ -37,7 +37,7 @@ // makes it available as a transformation on the data // graph. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA TrackerNode : public DataNode { +class EXPCL_PANDA_DEVICE TrackerNode : public DataNode { PUBLISHED: TrackerNode(ClientBase *client, const string &device_name); virtual ~TrackerNode(); diff --git a/panda/src/device/virtualMouse.h b/panda/src/device/virtualMouse.h index 9b37ea9f57..471ec150cf 100644 --- a/panda/src/device/virtualMouse.h +++ b/panda/src/device/virtualMouse.h @@ -37,7 +37,7 @@ // the mouse wherever he/she wants, and to insert // keypresses on demand. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA VirtualMouse : public DataNode { +class EXPCL_PANDA_DEVICE VirtualMouse : public DataNode { PUBLISHED: VirtualMouse(const string &name); diff --git a/panda/src/dgraph/config_dgraph.h b/panda/src/dgraph/config_dgraph.h index 8d9603a88d..491f2812ea 100644 --- a/panda/src/dgraph/config_dgraph.h +++ b/panda/src/dgraph/config_dgraph.h @@ -23,6 +23,6 @@ #include "notifyCategoryProxy.h" -NotifyCategoryDecl(dgraph, EXPCL_PANDA, EXPTP_PANDA); +NotifyCategoryDecl(dgraph, EXPCL_PANDA_DGRAPH, EXPTP_PANDA_DGRAPH); #endif diff --git a/panda/src/dgraph/dataGraphTraverser.h b/panda/src/dgraph/dataGraphTraverser.h index d925872524..665ac9f6bc 100644 --- a/panda/src/dgraph/dataGraphTraverser.h +++ b/panda/src/dgraph/dataGraphTraverser.h @@ -36,7 +36,7 @@ class PandaNode; // input devices, etc. See the overview of the data // graph in dataNode.h. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA DataGraphTraverser { +class EXPCL_PANDA_DGRAPH DataGraphTraverser { PUBLISHED: DataGraphTraverser(Thread *current_thread = Thread::get_current_thread()); ~DataGraphTraverser(); diff --git a/panda/src/dgraph/dataNode.h b/panda/src/dgraph/dataNode.h index 7463834ff1..e2d47ceab5 100644 --- a/panda/src/dgraph/dataNode.h +++ b/panda/src/dgraph/dataNode.h @@ -65,7 +65,7 @@ class DataNodeTransmit; // PipelineCycler. The data graph is intended to be // used only within a single thread. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA DataNode : public PandaNode { +class EXPCL_PANDA_DGRAPH DataNode : public PandaNode { PUBLISHED: INLINE DataNode(const string &name); diff --git a/panda/src/dgraph/dataNodeTransmit.h b/panda/src/dgraph/dataNodeTransmit.h index c4bb8a1dfb..965c17741c 100644 --- a/panda/src/dgraph/dataNodeTransmit.h +++ b/panda/src/dgraph/dataNodeTransmit.h @@ -36,7 +36,7 @@ class BamWriter; // array of EventParameters, one for each registered // input or output wire. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA DataNodeTransmit : public TypedWritable { +class EXPCL_PANDA_DGRAPH DataNodeTransmit : public TypedWritable { public: INLINE DataNodeTransmit(); INLINE DataNodeTransmit(const DataNodeTransmit ©); diff --git a/panda/src/display/config_display.h b/panda/src/display/config_display.h index 9b4ac05484..777749a083 100644 --- a/panda/src/display/config_display.h +++ b/panda/src/display/config_display.h @@ -33,63 +33,63 @@ #include "pvector.h" -ConfigureDecl(config_display, EXPCL_PANDA, EXPTP_PANDA); -NotifyCategoryDecl(display, EXPCL_PANDA, EXPTP_PANDA); -NotifyCategoryDecl(gsg, EXPCL_PANDA, EXPTP_PANDA); +ConfigureDecl(config_display, EXPCL_PANDA_DISPLAY, EXPTP_PANDA_DISPLAY); +NotifyCategoryDecl(display, EXPCL_PANDA_DISPLAY, EXPTP_PANDA_DISPLAY); +NotifyCategoryDecl(gsg, EXPCL_PANDA_DISPLAY, EXPTP_PANDA_DISPLAY); -extern EXPCL_PANDA ConfigVariableBool view_frustum_cull; -extern EXPCL_PANDA ConfigVariableBool pstats_unused_states; +extern EXPCL_PANDA_DISPLAY ConfigVariableBool view_frustum_cull; +extern EXPCL_PANDA_DISPLAY ConfigVariableBool pstats_unused_states; -extern EXPCL_PANDA ConfigVariableString threading_model; -extern EXPCL_PANDA ConfigVariableBool allow_nonpipeline_threads; -extern EXPCL_PANDA ConfigVariableBool auto_flip; -extern EXPCL_PANDA ConfigVariableBool sync_flip; -extern EXPCL_PANDA ConfigVariableBool yield_timeslice; +extern EXPCL_PANDA_DISPLAY ConfigVariableString threading_model; +extern EXPCL_PANDA_DISPLAY ConfigVariableBool allow_nonpipeline_threads; +extern EXPCL_PANDA_DISPLAY ConfigVariableBool auto_flip; +extern EXPCL_PANDA_DISPLAY ConfigVariableBool sync_flip; +extern EXPCL_PANDA_DISPLAY ConfigVariableBool yield_timeslice; -extern EXPCL_PANDA ConfigVariableString screenshot_filename; -extern EXPCL_PANDA ConfigVariableString screenshot_extension; +extern EXPCL_PANDA_DISPLAY ConfigVariableString screenshot_filename; +extern EXPCL_PANDA_DISPLAY ConfigVariableString screenshot_extension; -extern EXPCL_PANDA ConfigVariableBool prefer_texture_buffer; -extern EXPCL_PANDA ConfigVariableBool prefer_parasite_buffer; -extern EXPCL_PANDA ConfigVariableBool prefer_single_buffer; +extern EXPCL_PANDA_DISPLAY ConfigVariableBool prefer_texture_buffer; +extern EXPCL_PANDA_DISPLAY ConfigVariableBool prefer_parasite_buffer; +extern EXPCL_PANDA_DISPLAY ConfigVariableBool prefer_single_buffer; -extern EXPCL_PANDA ConfigVariableBool support_render_texture; -extern EXPCL_PANDA ConfigVariableBool support_rescale_normal; -extern EXPCL_PANDA ConfigVariableBool copy_texture_inverted; -extern EXPCL_PANDA ConfigVariableBool window_inverted; -extern EXPCL_PANDA ConfigVariableBool red_blue_stereo; -extern EXPCL_PANDA ConfigVariableString red_blue_stereo_colors; -extern EXPCL_PANDA ConfigVariableBool auto_generate_mipmaps; -extern EXPCL_PANDA ConfigVariableBool color_scale_via_lighting; -extern EXPCL_PANDA ConfigVariableBool alpha_scale_via_texture; +extern EXPCL_PANDA_DISPLAY ConfigVariableBool support_render_texture; +extern EXPCL_PANDA_DISPLAY ConfigVariableBool support_rescale_normal; +extern EXPCL_PANDA_DISPLAY ConfigVariableBool copy_texture_inverted; +extern EXPCL_PANDA_DISPLAY ConfigVariableBool window_inverted; +extern EXPCL_PANDA_DISPLAY ConfigVariableBool red_blue_stereo; +extern EXPCL_PANDA_DISPLAY ConfigVariableString red_blue_stereo_colors; +extern EXPCL_PANDA_DISPLAY ConfigVariableBool auto_generate_mipmaps; +extern EXPCL_PANDA_DISPLAY ConfigVariableBool color_scale_via_lighting; +extern EXPCL_PANDA_DISPLAY ConfigVariableBool alpha_scale_via_texture; -extern EXPCL_PANDA ConfigVariableInt win_size; -extern EXPCL_PANDA ConfigVariableInt win_origin; -extern EXPCL_PANDA ConfigVariableBool fullscreen; -extern EXPCL_PANDA ConfigVariableBool undecorated; -extern EXPCL_PANDA ConfigVariableBool cursor_hidden; -extern EXPCL_PANDA ConfigVariableFilename icon_filename; -extern EXPCL_PANDA ConfigVariableFilename cursor_filename; -extern EXPCL_PANDA ConfigVariableEnum z_order; -extern EXPCL_PANDA ConfigVariableString window_title; +extern EXPCL_PANDA_DISPLAY ConfigVariableInt win_size; +extern EXPCL_PANDA_DISPLAY ConfigVariableInt win_origin; +extern EXPCL_PANDA_DISPLAY ConfigVariableBool fullscreen; +extern EXPCL_PANDA_DISPLAY ConfigVariableBool undecorated; +extern EXPCL_PANDA_DISPLAY ConfigVariableBool cursor_hidden; +extern EXPCL_PANDA_DISPLAY ConfigVariableFilename icon_filename; +extern EXPCL_PANDA_DISPLAY ConfigVariableFilename cursor_filename; +extern EXPCL_PANDA_DISPLAY ConfigVariableEnum z_order; +extern EXPCL_PANDA_DISPLAY ConfigVariableString window_title; -extern EXPCL_PANDA ConfigVariableString framebuffer_mode; -extern EXPCL_PANDA ConfigVariableBool framebuffer_hardware; -extern EXPCL_PANDA ConfigVariableBool framebuffer_software; -extern EXPCL_PANDA ConfigVariableBool framebuffer_multisample; -extern EXPCL_PANDA ConfigVariableBool framebuffer_depth; -extern EXPCL_PANDA ConfigVariableBool framebuffer_alpha; -extern EXPCL_PANDA ConfigVariableBool framebuffer_stencil; -extern EXPCL_PANDA ConfigVariableBool framebuffer_stereo; -extern EXPCL_PANDA ConfigVariableInt depth_bits; -extern EXPCL_PANDA ConfigVariableInt color_bits; -extern EXPCL_PANDA ConfigVariableInt alpha_bits; -extern EXPCL_PANDA ConfigVariableInt stencil_bits; -extern EXPCL_PANDA ConfigVariableInt multisamples; +extern EXPCL_PANDA_DISPLAY ConfigVariableString framebuffer_mode; +extern EXPCL_PANDA_DISPLAY ConfigVariableBool framebuffer_hardware; +extern EXPCL_PANDA_DISPLAY ConfigVariableBool framebuffer_software; +extern EXPCL_PANDA_DISPLAY ConfigVariableBool framebuffer_multisample; +extern EXPCL_PANDA_DISPLAY ConfigVariableBool framebuffer_depth; +extern EXPCL_PANDA_DISPLAY ConfigVariableBool framebuffer_alpha; +extern EXPCL_PANDA_DISPLAY ConfigVariableBool framebuffer_stencil; +extern EXPCL_PANDA_DISPLAY ConfigVariableBool framebuffer_stereo; +extern EXPCL_PANDA_DISPLAY ConfigVariableInt depth_bits; +extern EXPCL_PANDA_DISPLAY ConfigVariableInt color_bits; +extern EXPCL_PANDA_DISPLAY ConfigVariableInt alpha_bits; +extern EXPCL_PANDA_DISPLAY ConfigVariableInt stencil_bits; +extern EXPCL_PANDA_DISPLAY ConfigVariableInt multisamples; -extern EXPCL_PANDA ConfigVariableDouble background_color; -extern EXPCL_PANDA ConfigVariableBool sync_video; +extern EXPCL_PANDA_DISPLAY ConfigVariableDouble background_color; +extern EXPCL_PANDA_DISPLAY ConfigVariableBool sync_video; -extern EXPCL_PANDA void init_libdisplay(); +extern EXPCL_PANDA_DISPLAY void init_libdisplay(); #endif /* CONFIG_DISPLAY_H */ diff --git a/panda/src/display/displayInformation.h b/panda/src/display/displayInformation.h index 9795dca013..98c028ed18 100644 --- a/panda/src/display/displayInformation.h +++ b/panda/src/display/displayInformation.h @@ -36,7 +36,7 @@ DisplayMode; // Description : This class contains various display information. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA DisplayInformation { +class EXPCL_PANDA_DISPLAY DisplayInformation { PUBLISHED: diff --git a/panda/src/display/displayRegion.h b/panda/src/display/displayRegion.h index 3ff489c7d5..b8110ef88f 100644 --- a/panda/src/display/displayRegion.h +++ b/panda/src/display/displayRegion.h @@ -58,7 +58,7 @@ class CullTraverser; // glass, usually for layering 2-d interfaces on top of // a 3-d scene. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA DisplayRegion : public ReferenceCount, public DrawableRegion { +class EXPCL_PANDA_DISPLAY DisplayRegion : public ReferenceCount, public DrawableRegion { protected: DisplayRegion(GraphicsOutput *window); DisplayRegion(GraphicsOutput *window, @@ -155,7 +155,7 @@ private: // needs to be cycled every frame, but represents the parameters as // specified by the user, and which probably will not change that // often. - class EXPCL_PANDA CData : public CycleData { + class EXPCL_PANDA_DISPLAY CData : public CycleData { public: CData(); CData(const CData ©); @@ -198,7 +198,7 @@ private: // own cycler because it will certainly change every frame, so we // don't need to lump all the heavy data above in with this // lightweight cycler. - class EXPCL_PANDA CDataCull : public CycleData { + class EXPCL_PANDA_DISPLAY CDataCull : public CycleData { public: CDataCull(); CDataCull(const CDataCull ©); @@ -240,7 +240,7 @@ private: // Description : Encapsulates the data from a DisplayRegion, // pre-fetched for one stage of the pipeline. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA DisplayRegionPipelineReader { +class EXPCL_PANDA_DISPLAY DisplayRegionPipelineReader { public: INLINE DisplayRegionPipelineReader(DisplayRegion *object, Thread *current_thread); private: diff --git a/panda/src/display/displaySearchParameters.h b/panda/src/display/displaySearchParameters.h index f7d9a49269..ec4bc2d98c 100644 --- a/panda/src/display/displaySearchParameters.h +++ b/panda/src/display/displaySearchParameters.h @@ -26,7 +26,7 @@ // Class : DisplaySearchParameters // Description : Parameters used for searching display capabilities. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA DisplaySearchParameters { +class EXPCL_PANDA_DISPLAY DisplaySearchParameters { PUBLISHED: DisplaySearchParameters(); diff --git a/panda/src/display/drawableRegion.h b/panda/src/display/drawableRegion.h index 0f78d5e06b..da5a460dd7 100644 --- a/panda/src/display/drawableRegion.h +++ b/panda/src/display/drawableRegion.h @@ -34,7 +34,7 @@ // to deal with the whole window at once, particularly // for issuing clear commands and capturing screenshots. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA DrawableRegion { +class EXPCL_PANDA_DISPLAY DrawableRegion { public: INLINE DrawableRegion(); INLINE DrawableRegion(const DrawableRegion ©); diff --git a/panda/src/display/frameBufferProperties.h b/panda/src/display/frameBufferProperties.h index a48cf01f79..0b96502aba 100644 --- a/panda/src/display/frameBufferProperties.h +++ b/panda/src/display/frameBufferProperties.h @@ -28,7 +28,7 @@ // might ask to have on a graphics frameBuffer before we // create a GSG. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA FrameBufferProperties { +class EXPCL_PANDA_DISPLAY FrameBufferProperties { private: enum FrameBufferProperty { diff --git a/panda/src/display/graphicsBuffer.h b/panda/src/display/graphicsBuffer.h index 435fc5a4ad..f843587d3d 100644 --- a/panda/src/display/graphicsBuffer.h +++ b/panda/src/display/graphicsBuffer.h @@ -31,7 +31,7 @@ // similar in function to a GraphicsWindow, except that // the output is not visible to the user. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GraphicsBuffer : public GraphicsOutput { +class EXPCL_PANDA_DISPLAY GraphicsBuffer : public GraphicsOutput { protected: GraphicsBuffer(GraphicsPipe *pipe, const string &name, diff --git a/panda/src/display/graphicsDevice.h b/panda/src/display/graphicsDevice.h index 7aa1956967..f43848fc23 100755 --- a/panda/src/display/graphicsDevice.h +++ b/panda/src/display/graphicsDevice.h @@ -34,7 +34,7 @@ class GraphicsPipe; // than one adapters in the machine). // //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GraphicsDevice : public TypedReferenceCount { +class EXPCL_PANDA_DISPLAY GraphicsDevice : public TypedReferenceCount { public: GraphicsDevice(GraphicsPipe *pipe); diff --git a/panda/src/display/graphicsEngine.h b/panda/src/display/graphicsEngine.h index 9b0e1d2ecb..4298df9163 100644 --- a/panda/src/display/graphicsEngine.h +++ b/panda/src/display/graphicsEngine.h @@ -56,7 +56,7 @@ class Texture; // simply calls engine->render_frame() and considers it // done. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GraphicsEngine { +class EXPCL_PANDA_DISPLAY GraphicsEngine { PUBLISHED: GraphicsEngine(Pipeline *pipeline = NULL); ~GraphicsEngine(); diff --git a/panda/src/display/graphicsOutput.h b/panda/src/display/graphicsOutput.h index e5276915c7..5efb875aba 100644 --- a/panda/src/display/graphicsOutput.h +++ b/panda/src/display/graphicsOutput.h @@ -60,7 +60,7 @@ class PNMImage; // TypedWritableReferenceCount instead of // TypedReferenceCount for that convenience. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GraphicsOutput : public TypedWritableReferenceCount, public DrawableRegion { +class EXPCL_PANDA_DISPLAY GraphicsOutput : public TypedWritableReferenceCount, public DrawableRegion { protected: GraphicsOutput(GraphicsPipe *pipe, const string &name, @@ -342,7 +342,7 @@ private: friend class DisplayRegion; }; -EXPCL_PANDA ostream &operator << (ostream &out, GraphicsOutput::FrameMode mode); +EXPCL_PANDA_DISPLAY ostream &operator << (ostream &out, GraphicsOutput::FrameMode mode); #include "graphicsOutput.I" diff --git a/panda/src/display/graphicsPipe.h b/panda/src/display/graphicsPipe.h index 505bec0530..342729fb18 100644 --- a/panda/src/display/graphicsPipe.h +++ b/panda/src/display/graphicsPipe.h @@ -57,7 +57,7 @@ class Texture; // will be used to handle multiple windows from same device. // //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GraphicsPipe : public TypedReferenceCount { +class EXPCL_PANDA_DISPLAY GraphicsPipe : public TypedReferenceCount { protected: GraphicsPipe(); private: diff --git a/panda/src/display/graphicsPipeSelection.h b/panda/src/display/graphicsPipeSelection.h index e491fa97c3..1fb0ccf3aa 100644 --- a/panda/src/display/graphicsPipeSelection.h +++ b/panda/src/display/graphicsPipeSelection.h @@ -37,7 +37,7 @@ class GraphicsWindow; // default interactive GraphicsPipe, and possibly other // types available as well. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GraphicsPipeSelection { +class EXPCL_PANDA_DISPLAY GraphicsPipeSelection { protected: GraphicsPipeSelection(); ~GraphicsPipeSelection(); diff --git a/panda/src/display/graphicsStateGuardian.h b/panda/src/display/graphicsStateGuardian.h index 226a2f9132..3c0b3a6b26 100644 --- a/panda/src/display/graphicsStateGuardian.h +++ b/panda/src/display/graphicsStateGuardian.h @@ -62,7 +62,7 @@ class GraphicsEngine; // There will be one of these objects for each different // graphics context active in the system. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GraphicsStateGuardian : public GraphicsStateGuardianBase { +class EXPCL_PANDA_DISPLAY GraphicsStateGuardian : public GraphicsStateGuardianBase { // // Interfaces all GSGs should have // diff --git a/panda/src/display/graphicsThreadingModel.h b/panda/src/display/graphicsThreadingModel.h index 2f8b505f3e..2de6e5e5e7 100644 --- a/panda/src/display/graphicsThreadingModel.h +++ b/panda/src/display/graphicsThreadingModel.h @@ -26,7 +26,7 @@ // Description : This represents the user's specification of how a // particular frame is handled by the various threads. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GraphicsThreadingModel { +class EXPCL_PANDA_DISPLAY GraphicsThreadingModel { PUBLISHED: GraphicsThreadingModel(const string &model = string()); INLINE GraphicsThreadingModel(const GraphicsThreadingModel ©); diff --git a/panda/src/display/graphicsWindow.h b/panda/src/display/graphicsWindow.h index 51a125f170..3ec9c0b4ec 100644 --- a/panda/src/display/graphicsWindow.h +++ b/panda/src/display/graphicsWindow.h @@ -38,7 +38,7 @@ // graphics device sends its output for interactive // display. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GraphicsWindow : public GraphicsOutput { +class EXPCL_PANDA_DISPLAY GraphicsWindow : public GraphicsOutput { protected: GraphicsWindow(GraphicsPipe *pipe, const string &name, diff --git a/panda/src/display/graphicsWindowInputDevice.cxx b/panda/src/display/graphicsWindowInputDevice.cxx index 1581957e89..685bd6b983 100644 --- a/panda/src/display/graphicsWindowInputDevice.cxx +++ b/panda/src/display/graphicsWindowInputDevice.cxx @@ -21,8 +21,8 @@ #include "mouseButton.h" #include "keyboardButton.h" -#define EXPCL EXPCL_PANDA -#define EXPTP EXPTP_PANDA +#define EXPCL EXPCL_PANDA_DISPLAY +#define EXPTP EXPTP_PANDA_DISPLAY #define TYPE GraphicsWindowInputDevice #define NAME vector_GraphicsWindowInputDevice diff --git a/panda/src/display/graphicsWindowInputDevice.h b/panda/src/display/graphicsWindowInputDevice.h index 78839698a0..ba285f30ab 100644 --- a/panda/src/display/graphicsWindowInputDevice.h +++ b/panda/src/display/graphicsWindowInputDevice.h @@ -36,7 +36,7 @@ // there will be exactly one of these associated with // each window, but other variants are possible. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GraphicsWindowInputDevice { +class EXPCL_PANDA_DISPLAY GraphicsWindowInputDevice { private: GraphicsWindowInputDevice(const string &name, int flags); @@ -95,8 +95,8 @@ private: #include "graphicsWindowInputDevice.I" -#define EXPCL EXPCL_PANDA -#define EXPTP EXPTP_PANDA +#define EXPCL EXPCL_PANDA_DISPLAY +#define EXPTP EXPTP_PANDA_DISPLAY #define TYPE GraphicsWindowInputDevice #define NAME vector_GraphicsWindowInputDevice diff --git a/panda/src/display/lru.h b/panda/src/display/lru.h index 4a8305e389..2c54e61a8e 100644 --- a/panda/src/display/lru.h +++ b/panda/src/display/lru.h @@ -69,7 +69,7 @@ PageTypeStatistics; typedef bool (*LruPageTypeFunction) (LruPage *lru_page); -class EXPCL_PANDA LruPage +class EXPCL_PANDA_DISPLAY LruPage { protected: @@ -150,7 +150,7 @@ public: // is not enough memory available, then the lowest priority pages // will be paged out first until there is enough memory available. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA Lru +class EXPCL_PANDA_DISPLAY Lru { public: diff --git a/panda/src/display/parasiteBuffer.h b/panda/src/display/parasiteBuffer.h index 108cf27c24..0c9db334a4 100644 --- a/panda/src/display/parasiteBuffer.h +++ b/panda/src/display/parasiteBuffer.h @@ -52,7 +52,7 @@ // way to render to a texture on API's that do not // support offscreen rendering. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ParasiteBuffer : public GraphicsOutput { +class EXPCL_PANDA_DISPLAY ParasiteBuffer : public GraphicsOutput { public: ParasiteBuffer(GraphicsOutput *host, const string &name, int x_size, int y_size, int flags); diff --git a/panda/src/display/renderBuffer.h b/panda/src/display/renderBuffer.h index 90fcf87699..38d42b15c7 100644 --- a/panda/src/display/renderBuffer.h +++ b/panda/src/display/renderBuffer.h @@ -31,7 +31,7 @@ class GraphicsStateGuardian; // GraphicsStateGuardian pointer, along with a bitmask // of the layers we're interested in. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA RenderBuffer { +class EXPCL_PANDA_DISPLAY RenderBuffer { public: enum Type { T_aux_rgba_0 = 0x00000001, diff --git a/panda/src/display/standardMunger.h b/panda/src/display/standardMunger.h index ddb8432655..7061442b69 100644 --- a/panda/src/display/standardMunger.h +++ b/panda/src/display/standardMunger.h @@ -35,7 +35,7 @@ // ColorScaleAttrib to the vertices, and checks for // hardware-accelerated animation capabilities. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA StandardMunger : public StateMunger { +class EXPCL_PANDA_DISPLAY StandardMunger : public StateMunger { public: StandardMunger(GraphicsStateGuardianBase *gsg, const RenderState *state, int num_components, NumericType numeric_type, diff --git a/panda/src/display/stencilRenderStates.h b/panda/src/display/stencilRenderStates.h index 8817783320..52e29aeaf5 100644 --- a/panda/src/display/stencilRenderStates.h +++ b/panda/src/display/stencilRenderStates.h @@ -31,7 +31,7 @@ typedef unsigned int StencilType; // each render state. The "set_stencil_render_state" // function can be used in an immediate-mode fashion. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA StencilRenderStates { +class EXPCL_PANDA_DISPLAY StencilRenderStates { PUBLISHED: enum StencilRenderState diff --git a/panda/src/display/windowProperties.h b/panda/src/display/windowProperties.h index 1d2682d6f5..c73045f9d9 100644 --- a/panda/src/display/windowProperties.h +++ b/panda/src/display/windowProperties.h @@ -30,7 +30,7 @@ // it. This also serves to hold the current properties // for a window after it has been opened. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA WindowProperties { +class EXPCL_PANDA_DISPLAY WindowProperties { PUBLISHED: @@ -197,14 +197,14 @@ private: size_t _parent_window; // a HWND or WindowRef or .. what ever it is on X win... }; -EXPCL_PANDA ostream & +EXPCL_PANDA_DISPLAY ostream & operator << (ostream &out, WindowProperties::ZOrder z_order); -EXPCL_PANDA istream & +EXPCL_PANDA_DISPLAY istream & operator >> (istream &in, WindowProperties::ZOrder &z_order); -EXPCL_PANDA ostream & +EXPCL_PANDA_DISPLAY ostream & operator << (ostream &out, WindowProperties::MouseMode mode); -EXPCL_PANDA istream & +EXPCL_PANDA_DISPLAY istream & operator >> (istream &in, WindowProperties::MouseMode &mode); diff --git a/panda/src/egg2pg/eggLoader.cxx b/panda/src/egg2pg/eggLoader.cxx index cad550c2e8..6a40903720 100644 --- a/panda/src/egg2pg/eggLoader.cxx +++ b/panda/src/egg2pg/eggLoader.cxx @@ -95,6 +95,7 @@ #include "bitArray.h" #include "thread.h" + #include #include @@ -135,6 +136,20 @@ LODInstance(EggNode *egg_node) { //////////////////////////////////////////////////////////////////// EggLoader:: EggLoader() { + printf ("testing out scenegraph stuff\n"); + PT(PandaNode) a = new PandaNode("a"); + PT(PandaNode) b = new PandaNode("b"); + PT(PandaNode) c = new PandaNode("c"); + PT(PandaNode) d = new PandaNode("d"); + NodePath npa(a), npb(b), npc(c),npd(d); + npb.reparent_to(npa); + npc.reparent_to(npa); + npd.reparent_to(npa); + Thread *current_thread = Thread::get_current_thread(); + pmap inst_map; + PT(PandaNode) e=a->r_copy_subgraph(inst_map, current_thread); + printf ("abcd copied, num children = %d\n",e->get_num_children()); + // We need to enforce whatever coordinate system the user asked for. _data = new EggData; _data->set_coordinate_system(egg_coordinate_system); diff --git a/panda/src/egg2pg/eggLoader.h b/panda/src/egg2pg/eggLoader.h index 97eece4658..64b4c6f362 100644 --- a/panda/src/egg2pg/eggLoader.h +++ b/panda/src/egg2pg/eggLoader.h @@ -253,6 +253,7 @@ public: bool _error; friend class EggRenderState; + friend class PandaNode; }; #include "eggLoader.I" diff --git a/panda/src/event/asyncTask.h b/panda/src/event/asyncTask.h index b0d5ecc857..91f3854c38 100644 --- a/panda/src/event/asyncTask.h +++ b/panda/src/event/asyncTask.h @@ -43,7 +43,7 @@ class AsyncTaskManager; // class, and override do_task(), to define the // functionality you wish to have the task perform. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA AsyncTask : public TypedReferenceCount, public Namable { +class EXPCL_PANDA_EVENT AsyncTask : public TypedReferenceCount, public Namable { public: INLINE AsyncTask(const string &name); virtual ~AsyncTask(); diff --git a/panda/src/event/asyncTaskManager.h b/panda/src/event/asyncTaskManager.h index 896fa5bfca..d12a4dab67 100644 --- a/panda/src/event/asyncTaskManager.h +++ b/panda/src/event/asyncTaskManager.h @@ -47,7 +47,7 @@ // be replaced at the end of the queue to go around // again. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA AsyncTaskManager : public TypedReferenceCount, public Namable { +class EXPCL_PANDA_EVENT AsyncTaskManager : public TypedReferenceCount, public Namable { PUBLISHED: AsyncTaskManager(const string &name, int num_threads); virtual ~AsyncTaskManager(); diff --git a/panda/src/event/buttonEvent.h b/panda/src/event/buttonEvent.h index 1772be5a85..13974043cd 100644 --- a/panda/src/event/buttonEvent.h +++ b/panda/src/event/buttonEvent.h @@ -54,7 +54,7 @@ class DatagramIterator; // while keystroke events are defined across the entire // Unicode character set. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ButtonEvent { +class EXPCL_PANDA_EVENT ButtonEvent { public: enum Type { // T_down and T_up represent a button changing state diff --git a/panda/src/event/buttonEventList.h b/panda/src/event/buttonEventList.h index de733cf83c..68851adf7c 100644 --- a/panda/src/event/buttonEventList.h +++ b/panda/src/event/buttonEventList.h @@ -38,7 +38,7 @@ class DatagramIterator; // but it may be used anywhere a list of ButtonEvents // is desired. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ButtonEventList : public EventStoreValueBase { +class EXPCL_PANDA_EVENT ButtonEventList : public EventStoreValueBase { public: INLINE ButtonEventList(); INLINE ButtonEventList(const ButtonEventList ©); diff --git a/panda/src/event/config_event.h b/panda/src/event/config_event.h index 18fc5daf79..a75ff62491 100644 --- a/panda/src/event/config_event.h +++ b/panda/src/event/config_event.h @@ -23,6 +23,6 @@ #include "notifyCategoryProxy.h" -NotifyCategoryDecl(event, EXPCL_PANDA, EXPTP_PANDA); +NotifyCategoryDecl(event, EXPCL_PANDA_EVENT, EXPTP_PANDA_EVENT); #endif diff --git a/panda/src/event/event.h b/panda/src/event/event.h index 6276699e9b..d21069655d 100644 --- a/panda/src/event/event.h +++ b/panda/src/event/event.h @@ -37,7 +37,7 @@ class EventReceiver; // makes it too expensive to get its name the Python // code. Now it just copies the Namable interface in. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA Event : public TypedReferenceCount { +class EXPCL_PANDA_EVENT Event : public TypedReferenceCount { PUBLISHED: Event(const string &event_name, EventReceiver *receiver = NULL); Event(const Event ©); diff --git a/panda/src/event/eventHandler.h b/panda/src/event/eventHandler.h index b1aa923a0f..b02d05f600 100644 --- a/panda/src/event/eventHandler.h +++ b/panda/src/event/eventHandler.h @@ -42,7 +42,7 @@ class EventQueue; // language, e.g. via Scheme hooks or the messenger // in Python. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA EventHandler : public TypedObject { +class EXPCL_PANDA_EVENT EventHandler : public TypedObject { public: // Define a function type suitable for receiving events. typedef void EventFunction(const Event *); diff --git a/panda/src/event/eventParameter.h b/panda/src/event/eventParameter.h index 2f97826d44..6782cd2d63 100644 --- a/panda/src/event/eventParameter.h +++ b/panda/src/event/eventParameter.h @@ -39,7 +39,7 @@ // use the EventStoreValue template class, defined // below. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA EventParameter { +class EXPCL_PANDA_EVENT EventParameter { PUBLISHED: INLINE EventParameter(); INLINE EventParameter(const TypedWritableReferenceCount *ptr); @@ -87,7 +87,7 @@ INLINE ostream &operator << (ostream &out, const EventParameter ¶m); // which serves mainly to define the placeholder for the // virtual output function. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA EventStoreValueBase : public TypedWritableReferenceCount { +class EXPCL_PANDA_EVENT EventStoreValueBase : public TypedWritableReferenceCount { public: INLINE EventStoreValueBase(); @@ -119,7 +119,7 @@ private: // type TypedReferenceCount, which is different than // TypedWritableReferenceCount. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA EventStoreTypedRefCount : public EventStoreValueBase { +class EXPCL_PANDA_EVENT EventStoreTypedRefCount : public EventStoreValueBase { PUBLISHED: INLINE EventStoreTypedRefCount(const TypedReferenceCount *value); virtual ~EventStoreTypedRefCount(); @@ -204,10 +204,10 @@ private: static TypeHandle _type_handle; }; -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, EventStoreValue); -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, EventStoreValue); -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, EventStoreValue); -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, EventStoreValue); +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_EVENT, EXPTP_PANDA_EVENT, EventStoreValue); +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_EVENT, EXPTP_PANDA_EVENT, EventStoreValue); +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_EVENT, EXPTP_PANDA_EVENT, EventStoreValue); +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_EVENT, EXPTP_PANDA_EVENT, EventStoreValue); typedef EventStoreValue EventStoreInt; typedef EventStoreValue EventStoreDouble; diff --git a/panda/src/event/eventQueue.h b/panda/src/event/eventQueue.h index f8345a83ab..8deacacc61 100644 --- a/panda/src/event/eventQueue.h +++ b/panda/src/event/eventQueue.h @@ -33,7 +33,7 @@ // be extracted out again by an EventHandler and // processed. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA EventQueue { +class EXPCL_PANDA_EVENT EventQueue { PUBLISHED: EventQueue(); ~EventQueue(); diff --git a/panda/src/event/eventReceiver.h b/panda/src/event/eventReceiver.h index ac0fd334a6..b51d9f6033 100644 --- a/panda/src/event/eventReceiver.h +++ b/panda/src/event/eventReceiver.h @@ -29,7 +29,7 @@ // an event should inherit from this class; each event // may be sent with an optional EventReceiver pointer. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA EventReceiver { +class EXPCL_PANDA_EVENT EventReceiver { public: static TypeHandle get_class_type() { diff --git a/panda/src/event/pt_Event.h b/panda/src/event/pt_Event.h index bb4228604e..89f8560112 100644 --- a/panda/src/event/pt_Event.h +++ b/panda/src/event/pt_Event.h @@ -31,9 +31,9 @@ // can explicitly export the template class. //////////////////////////////////////////////////////////////////// -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, PointerToBase) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, PointerTo) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, ConstPointerTo) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_EVENT, EXPTP_PANDA_EVENT, PointerToBase) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_EVENT, EXPTP_PANDA_EVENT, PointerTo) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_EVENT, EXPTP_PANDA_EVENT, ConstPointerTo) typedef PointerTo PT_Event; typedef ConstPointerTo CPT_Event; diff --git a/panda/src/express/pointerToArrayBase.cxx b/panda/src/express/pointerToArrayBase.cxx index 95e119762e..f2726b945d 100644 --- a/panda/src/express/pointerToArrayBase.cxx +++ b/panda/src/express/pointerToArrayBase.cxx @@ -18,4 +18,4 @@ #include "pointerToArrayBase.h" -EXPCL_PANDA PTASetLevelFunc *pta_set_level = NULL; +EXPCL_PANDAEXPRESS PTASetLevelFunc *pta_set_level = NULL; diff --git a/panda/src/gobj/bufferContext.h b/panda/src/gobj/bufferContext.h index ca020a55a1..3042ccf278 100644 --- a/panda/src/gobj/bufferContext.h +++ b/panda/src/gobj/bufferContext.h @@ -42,7 +42,7 @@ class PreparedGraphicsObjects; // memory utilization, as well as residency of each // object, via PStats. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA BufferContext : public SavedContext, private LinkedListNode { +class EXPCL_PANDA_GOBJ BufferContext : public SavedContext, private LinkedListNode { public: BufferContext(BufferResidencyTracker *residency); virtual ~BufferContext(); diff --git a/panda/src/gobj/bufferContextChain.h b/panda/src/gobj/bufferContextChain.h index c7985f1ae5..4f54f0b99b 100755 --- a/panda/src/gobj/bufferContextChain.h +++ b/panda/src/gobj/bufferContextChain.h @@ -35,7 +35,7 @@ class BufferContext; // The primary purpose of this class is to facilitate // PStats reporting of graphics memory usage. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA BufferContextChain : private LinkedListNode { +class EXPCL_PANDA_GOBJ BufferContextChain : private LinkedListNode { public: INLINE BufferContextChain(); INLINE ~BufferContextChain(); diff --git a/panda/src/gobj/bufferResidencyTracker.h b/panda/src/gobj/bufferResidencyTracker.h index 97ab9616bb..5b12bb9e36 100644 --- a/panda/src/gobj/bufferResidencyTracker.h +++ b/panda/src/gobj/bufferResidencyTracker.h @@ -37,7 +37,7 @@ class BufferContext; // The primary purpose of this class is to facilitate // PStats reporting of video card memory usage. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA BufferResidencyTracker { +class EXPCL_PANDA_GOBJ BufferResidencyTracker { public: BufferResidencyTracker(const string &pgo_name, const string &type_name); diff --git a/panda/src/gobj/config_gobj.cxx b/panda/src/gobj/config_gobj.cxx index 090f592238..5f0e149462 100644 --- a/panda/src/gobj/config_gobj.cxx +++ b/panda/src/gobj/config_gobj.cxx @@ -228,7 +228,7 @@ ConfigVariableEnum textures_square "a square aspect ratio when they are loaded from disk. Set this " "to 'none', 'down', or 'up'. See textures-power-2.")); -extern EXPCL_PANDA ConfigVariableBool textures_header_only; +extern EXPCL_PANDA_GOBJ ConfigVariableBool textures_header_only; ConfigVariableBool textures_header_only ("textures-header-only", false, PRC_DESC("If this is true, texture images will not actually be loaded from " diff --git a/panda/src/gobj/config_gobj.h b/panda/src/gobj/config_gobj.h index 0d5aebd53b..14e408fc20 100644 --- a/panda/src/gobj/config_gobj.h +++ b/panda/src/gobj/config_gobj.h @@ -28,53 +28,53 @@ #include "configVariableFilename.h" #include "configVariableString.h" -NotifyCategoryDecl(gobj, EXPCL_PANDA, EXPTP_PANDA); +NotifyCategoryDecl(gobj, EXPCL_PANDA_GOBJ, EXPTP_PANDA_GOBJ); enum AutoTextureScale { ATS_none, ATS_down, ATS_up }; -EXPCL_PANDA ostream &operator << (ostream &out, AutoTextureScale ats); -EXPCL_PANDA istream &operator >> (istream &in, AutoTextureScale &ats); +EXPCL_PANDA_GOBJ ostream &operator << (ostream &out, AutoTextureScale ats); +EXPCL_PANDA_GOBJ istream &operator >> (istream &in, AutoTextureScale &ats); // Configure variables for gobj package. -extern EXPCL_PANDA ConfigVariableInt max_texture_dimension; -extern EXPCL_PANDA ConfigVariableDouble texture_scale; -extern EXPCL_PANDA ConfigVariableList exclude_texture_scale; +extern EXPCL_PANDA_GOBJ ConfigVariableInt max_texture_dimension; +extern EXPCL_PANDA_GOBJ ConfigVariableDouble texture_scale; +extern EXPCL_PANDA_GOBJ ConfigVariableList exclude_texture_scale; -extern EXPCL_PANDA ConfigVariableBool keep_texture_ram; -extern EXPCL_PANDA ConfigVariableBool preload_textures; -extern EXPCL_PANDA ConfigVariableBool compressed_textures; -extern EXPCL_PANDA ConfigVariableBool vertex_buffers; -extern EXPCL_PANDA ConfigVariableBool vertex_arrays; -extern EXPCL_PANDA ConfigVariableBool display_lists; -extern EXPCL_PANDA ConfigVariableBool hardware_animated_vertices; -extern EXPCL_PANDA ConfigVariableBool hardware_point_sprites; -extern EXPCL_PANDA ConfigVariableBool matrix_palette; -extern EXPCL_PANDA ConfigVariableBool display_list_animation; -extern EXPCL_PANDA ConfigVariableBool connect_triangle_strips; -extern EXPCL_PANDA ConfigVariableBool preserve_triangle_strips; +extern EXPCL_PANDA_GOBJ ConfigVariableBool keep_texture_ram; +extern EXPCL_PANDA_GOBJ ConfigVariableBool preload_textures; +extern EXPCL_PANDA_GOBJ ConfigVariableBool compressed_textures; +extern EXPCL_PANDA_GOBJ ConfigVariableBool vertex_buffers; +extern EXPCL_PANDA_GOBJ ConfigVariableBool vertex_arrays; +extern EXPCL_PANDA_GOBJ ConfigVariableBool display_lists; +extern EXPCL_PANDA_GOBJ ConfigVariableBool hardware_animated_vertices; +extern EXPCL_PANDA_GOBJ ConfigVariableBool hardware_point_sprites; +extern EXPCL_PANDA_GOBJ ConfigVariableBool matrix_palette; +extern EXPCL_PANDA_GOBJ ConfigVariableBool display_list_animation; +extern EXPCL_PANDA_GOBJ ConfigVariableBool connect_triangle_strips; +extern EXPCL_PANDA_GOBJ ConfigVariableBool preserve_triangle_strips; -extern EXPCL_PANDA ConfigVariableEnum textures_power_2; -extern EXPCL_PANDA ConfigVariableEnum textures_square; -extern EXPCL_PANDA ConfigVariableBool textures_header_only; +extern EXPCL_PANDA_GOBJ ConfigVariableEnum textures_power_2; +extern EXPCL_PANDA_GOBJ ConfigVariableEnum textures_square; +extern EXPCL_PANDA_GOBJ ConfigVariableBool textures_header_only; -extern EXPCL_PANDA ConfigVariableInt geom_cache_size; -extern EXPCL_PANDA ConfigVariableInt geom_cache_min_frames; +extern EXPCL_PANDA_GOBJ ConfigVariableInt geom_cache_size; +extern EXPCL_PANDA_GOBJ ConfigVariableInt geom_cache_min_frames; -extern EXPCL_PANDA ConfigVariableDouble default_near; -extern EXPCL_PANDA ConfigVariableDouble default_far; -extern EXPCL_PANDA ConfigVariableDouble default_fov; -extern EXPCL_PANDA ConfigVariableDouble default_iod; -extern EXPCL_PANDA ConfigVariableDouble default_converge; -extern EXPCL_PANDA ConfigVariableDouble default_keystone; +extern EXPCL_PANDA_GOBJ ConfigVariableDouble default_near; +extern EXPCL_PANDA_GOBJ ConfigVariableDouble default_far; +extern EXPCL_PANDA_GOBJ ConfigVariableDouble default_fov; +extern EXPCL_PANDA_GOBJ ConfigVariableDouble default_iod; +extern EXPCL_PANDA_GOBJ ConfigVariableDouble default_converge; +extern EXPCL_PANDA_GOBJ ConfigVariableDouble default_keystone; -extern EXPCL_PANDA ConfigVariableFilename vertex_save_file_directory; -extern EXPCL_PANDA ConfigVariableString vertex_save_file_prefix; -extern EXPCL_PANDA ConfigVariableInt vertex_data_small_size; -extern EXPCL_PANDA ConfigVariableBool vertex_data_threaded_paging; +extern EXPCL_PANDA_GOBJ ConfigVariableFilename vertex_save_file_directory; +extern EXPCL_PANDA_GOBJ ConfigVariableString vertex_save_file_prefix; +extern EXPCL_PANDA_GOBJ ConfigVariableInt vertex_data_small_size; +extern EXPCL_PANDA_GOBJ ConfigVariableBool vertex_data_threaded_paging; #endif diff --git a/panda/src/gobj/geom.h b/panda/src/gobj/geom.h index 7a469457c5..17d598b9ef 100644 --- a/panda/src/gobj/geom.h +++ b/panda/src/gobj/geom.h @@ -59,7 +59,7 @@ class PreparedGraphicsObjects; // and all of them must be rendered at the same time, in // the same graphics state. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA Geom : public CopyOnWriteObject, public GeomEnums { +class EXPCL_PANDA_GOBJ Geom : public CopyOnWriteObject, public GeomEnums { protected: virtual PT(CopyOnWriteObject) make_cow_copy(); @@ -273,7 +273,7 @@ public: private: // This is the data that must be cycled between pipeline stages. - class EXPCL_PANDA CData : public CycleData { + class EXPCL_PANDA_GOBJ CData : public CycleData { public: INLINE CData(); INLINE CData(const CData ©); @@ -372,7 +372,7 @@ private: // Description : Encapsulates the data from a Geom, // pre-fetched for one stage of the pipeline. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GeomPipelineReader : public GeomEnums { +class EXPCL_PANDA_GOBJ GeomPipelineReader : public GeomEnums { public: INLINE GeomPipelineReader(const Geom *object, Thread *current_thread); private: diff --git a/panda/src/gobj/geomCacheEntry.h b/panda/src/gobj/geomCacheEntry.h index 5f55c04a66..9cfff5fc55 100644 --- a/panda/src/gobj/geomCacheEntry.h +++ b/panda/src/gobj/geomCacheEntry.h @@ -35,7 +35,7 @@ class GeomPrimitive; // GeomCacheManager. This is actually the base class of // any number of individual cache types. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GeomCacheEntry : public ReferenceCount { +class EXPCL_PANDA_GOBJ GeomCacheEntry : public ReferenceCount { public: INLINE GeomCacheEntry(); virtual ~GeomCacheEntry(); diff --git a/panda/src/gobj/geomCacheManager.h b/panda/src/gobj/geomCacheManager.h index ceebd7b078..ce886c37e6 100644 --- a/panda/src/gobj/geomCacheManager.h +++ b/panda/src/gobj/geomCacheManager.h @@ -44,7 +44,7 @@ class GeomCacheEntry; // GeomMunger) are reference-counted here in the cache; // most are not. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GeomCacheManager { +class EXPCL_PANDA_GOBJ GeomCacheManager { protected: GeomCacheManager(); ~GeomCacheManager(); diff --git a/panda/src/gobj/geomContext.h b/panda/src/gobj/geomContext.h index fff6d2157b..3d518b448b 100644 --- a/panda/src/gobj/geomContext.h +++ b/panda/src/gobj/geomContext.h @@ -40,7 +40,7 @@ // In the case of OpenGL, for example, a GeomContext // corresponds to a display list identifier. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GeomContext : public SavedContext { +class EXPCL_PANDA_GOBJ GeomContext : public SavedContext { public: INLINE GeomContext(Geom *geom); diff --git a/panda/src/gobj/geomEnums.h b/panda/src/gobj/geomEnums.h index 4c792ad012..a0dc3af6a6 100644 --- a/panda/src/gobj/geomEnums.h +++ b/panda/src/gobj/geomEnums.h @@ -28,7 +28,7 @@ // GeomVertexData, GeomVertexArrayData, GeomPrimitive, // and other related classes. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GeomEnums { +class EXPCL_PANDA_GOBJ GeomEnums { PUBLISHED: // The usage hint describes to the rendering backend how often the @@ -211,8 +211,8 @@ PUBLISHED: }; }; -EXPCL_PANDA ostream &operator << (ostream &out, GeomEnums::NumericType numeric_type); -EXPCL_PANDA ostream &operator << (ostream &out, GeomEnums::Contents contents); +EXPCL_PANDA_GOBJ ostream &operator << (ostream &out, GeomEnums::NumericType numeric_type); +EXPCL_PANDA_GOBJ ostream &operator << (ostream &out, GeomEnums::Contents contents); #endif diff --git a/panda/src/gobj/geomLines.h b/panda/src/gobj/geomLines.h index 000a96aae9..19728a8c29 100644 --- a/panda/src/gobj/geomLines.h +++ b/panda/src/gobj/geomLines.h @@ -26,7 +26,7 @@ // Class : GeomLines // Description : Defines a series of disconnected line segments. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GeomLines : public GeomPrimitive { +class EXPCL_PANDA_GOBJ GeomLines : public GeomPrimitive { PUBLISHED: GeomLines(UsageHint usage_hint); GeomLines(const GeomLines ©); diff --git a/panda/src/gobj/geomLinestrips.h b/panda/src/gobj/geomLinestrips.h index 538d5b20b5..2fc4bc69c3 100644 --- a/panda/src/gobj/geomLinestrips.h +++ b/panda/src/gobj/geomLinestrips.h @@ -26,7 +26,7 @@ // Class : GeomLinestrips // Description : Defines a series of line strips. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GeomLinestrips : public GeomPrimitive { +class EXPCL_PANDA_GOBJ GeomLinestrips : public GeomPrimitive { PUBLISHED: GeomLinestrips(UsageHint usage_hint); GeomLinestrips(const GeomLinestrips ©); diff --git a/panda/src/gobj/geomMunger.h b/panda/src/gobj/geomMunger.h index 76efcc2f6c..ef0e9b406d 100644 --- a/panda/src/gobj/geomMunger.h +++ b/panda/src/gobj/geomMunger.h @@ -58,7 +58,7 @@ class Geom; // perform the same operation will have the same // pointer. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GeomMunger : public TypedReferenceCount, public GeomEnums { +class EXPCL_PANDA_GOBJ GeomMunger : public TypedReferenceCount, public GeomEnums { public: GeomMunger(GraphicsStateGuardianBase *gsg); GeomMunger(const GeomMunger ©); @@ -137,7 +137,7 @@ private: bool _is_registered; typedef pset > Mungers; - class EXPCL_PANDA Registry { + class EXPCL_PANDA_GOBJ Registry { public: Registry(); PT(GeomMunger) register_munger(GeomMunger *munger, Thread *current_thread); diff --git a/panda/src/gobj/geomPoints.h b/panda/src/gobj/geomPoints.h index 5e7292d572..e22797719b 100644 --- a/panda/src/gobj/geomPoints.h +++ b/panda/src/gobj/geomPoints.h @@ -26,7 +26,7 @@ // Class : GeomPoints // Description : Defines a series of disconnected points. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GeomPoints : public GeomPrimitive { +class EXPCL_PANDA_GOBJ GeomPoints : public GeomPrimitive { PUBLISHED: GeomPoints(UsageHint usage_hint); GeomPoints(const GeomPoints ©); diff --git a/panda/src/gobj/geomPrimitive.h b/panda/src/gobj/geomPrimitive.h index 8aa78e845a..a87db33779 100644 --- a/panda/src/gobj/geomPrimitive.h +++ b/panda/src/gobj/geomPrimitive.h @@ -64,7 +64,7 @@ class GeomPrimitivePipelineReader; // renders a strip of (n - 2) connected triangles from // each sequence of n vertices. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GeomPrimitive : public CopyOnWriteObject, public GeomEnums { +class EXPCL_PANDA_GOBJ GeomPrimitive : public CopyOnWriteObject, public GeomEnums { protected: GeomPrimitive(); virtual PT(CopyOnWriteObject) make_cow_copy(); @@ -233,7 +233,7 @@ private: Contexts _contexts; // This is the data that must be cycled between pipeline stages. - class EXPCL_PANDA CData : public CycleData { + class EXPCL_PANDA_GOBJ CData : public CycleData { public: INLINE CData(); INLINE CData(const CData ©); @@ -324,7 +324,7 @@ private: // Description : Encapsulates the data from a GeomPrimitive, // pre-fetched for one stage of the pipeline. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GeomPrimitivePipelineReader : public GeomEnums { +class EXPCL_PANDA_GOBJ GeomPrimitivePipelineReader : public GeomEnums { public: INLINE GeomPrimitivePipelineReader(const GeomPrimitive *object, Thread *current_thread); private: diff --git a/panda/src/gobj/geomTriangles.h b/panda/src/gobj/geomTriangles.h index 5a79899a0e..9d11824c3e 100644 --- a/panda/src/gobj/geomTriangles.h +++ b/panda/src/gobj/geomTriangles.h @@ -26,7 +26,7 @@ // Class : GeomTriangles // Description : Defines a series of disconnected triangles. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GeomTriangles : public GeomPrimitive { +class EXPCL_PANDA_GOBJ GeomTriangles : public GeomPrimitive { PUBLISHED: GeomTriangles(UsageHint usage_hint); GeomTriangles(const GeomTriangles ©); diff --git a/panda/src/gobj/geomTrifans.h b/panda/src/gobj/geomTrifans.h index 69c22f61c7..70e208fc4b 100644 --- a/panda/src/gobj/geomTrifans.h +++ b/panda/src/gobj/geomTrifans.h @@ -26,7 +26,7 @@ // Class : GeomTrifans // Description : Defines a series of triangle fans. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GeomTrifans : public GeomPrimitive { +class EXPCL_PANDA_GOBJ GeomTrifans : public GeomPrimitive { PUBLISHED: GeomTrifans(UsageHint usage_hint); GeomTrifans(const GeomTrifans ©); diff --git a/panda/src/gobj/geomTristrips.h b/panda/src/gobj/geomTristrips.h index bd41ab91db..60efa5b3c1 100644 --- a/panda/src/gobj/geomTristrips.h +++ b/panda/src/gobj/geomTristrips.h @@ -26,7 +26,7 @@ // Class : GeomTristrips // Description : Defines a series of triangle strips. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GeomTristrips : public GeomPrimitive { +class EXPCL_PANDA_GOBJ GeomTristrips : public GeomPrimitive { PUBLISHED: GeomTristrips(UsageHint usage_hint); GeomTristrips(const GeomTristrips ©); diff --git a/panda/src/gobj/geomVertexAnimationSpec.h b/panda/src/gobj/geomVertexAnimationSpec.h index 9d238c7061..97d1f5f34f 100644 --- a/panda/src/gobj/geomVertexAnimationSpec.h +++ b/panda/src/gobj/geomVertexAnimationSpec.h @@ -43,7 +43,7 @@ class DatagramIterator; // way the animation is actually performed; this just // specifies how the vertices are set up to be animated. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GeomVertexAnimationSpec : public GeomEnums { +class EXPCL_PANDA_GOBJ GeomVertexAnimationSpec : public GeomEnums { PUBLISHED: INLINE GeomVertexAnimationSpec(); INLINE GeomVertexAnimationSpec(const GeomVertexAnimationSpec &other); diff --git a/panda/src/gobj/geomVertexArrayData.h b/panda/src/gobj/geomVertexArrayData.h index 2ea57b31db..54fce5351f 100644 --- a/panda/src/gobj/geomVertexArrayData.h +++ b/panda/src/gobj/geomVertexArrayData.h @@ -64,7 +64,7 @@ class SimpleAllocatorBlock; // GeomVertexReader/Writer/Rewriter for high-level tools // to manipulate the actual vertex data. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GeomVertexArrayData : public CopyOnWriteObject, public SimpleLruPage, public GeomEnums { +class EXPCL_PANDA_GOBJ GeomVertexArrayData : public CopyOnWriteObject, public SimpleLruPage, public GeomEnums { private: GeomVertexArrayData(); @@ -145,7 +145,7 @@ private: }; // This is the data that must be cycled between pipeline stages. - class EXPCL_PANDA CData : public CycleData { + class EXPCL_PANDA_GOBJ CData : public CycleData { public: INLINE CData(); INLINE CData(const CData ©); @@ -246,7 +246,7 @@ private: // GeomVertexArrayDataPipelineReader and // GeomVertexArrayDataPipelineWriter classes //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GeomVertexArrayDataHandle : public ReferenceCount, public GeomEnums { +class EXPCL_PANDA_GOBJ GeomVertexArrayDataHandle : public ReferenceCount, public GeomEnums { private: INLINE GeomVertexArrayDataHandle(const GeomVertexArrayData *object, Thread *current_thread, diff --git a/panda/src/gobj/geomVertexArrayFormat.h b/panda/src/gobj/geomVertexArrayFormat.h index 8d5660aab5..e57868ba2c 100644 --- a/panda/src/gobj/geomVertexArrayFormat.h +++ b/panda/src/gobj/geomVertexArrayFormat.h @@ -54,7 +54,7 @@ class BamReader; // data may be piggybacked into the data record simply // by choosing a unique name. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GeomVertexArrayFormat : public TypedWritableReferenceCount, public GeomEnums { +class EXPCL_PANDA_GOBJ GeomVertexArrayFormat : public TypedWritableReferenceCount, public GeomEnums { PUBLISHED: GeomVertexArrayFormat(); GeomVertexArrayFormat(const GeomVertexArrayFormat ©); @@ -143,7 +143,7 @@ private: // This is the global registry of all currently-in-use array formats. typedef pset > ArrayFormats; - class EXPCL_PANDA Registry { + class EXPCL_PANDA_GOBJ Registry { public: Registry(); CPT(GeomVertexArrayFormat) register_format(GeomVertexArrayFormat *format); diff --git a/panda/src/gobj/geomVertexColumn.h b/panda/src/gobj/geomVertexColumn.h index 21cbca5f31..d9e9f1c47b 100644 --- a/panda/src/gobj/geomVertexColumn.h +++ b/panda/src/gobj/geomVertexColumn.h @@ -41,7 +41,7 @@ class GeomVertexWriter; // GeomVertexArrayFormat class maintains a list of these // to completely define a particular array structure. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GeomVertexColumn : public GeomEnums { +class EXPCL_PANDA_GOBJ GeomVertexColumn : public GeomEnums { PUBLISHED: private: INLINE GeomVertexColumn(); diff --git a/panda/src/gobj/geomVertexData.h b/panda/src/gobj/geomVertexData.h index 23a7bca783..fdf4b36eeb 100644 --- a/panda/src/gobj/geomVertexData.h +++ b/panda/src/gobj/geomVertexData.h @@ -76,7 +76,7 @@ class GeomVertexColumn; // GeomVertexWriter, and GeomVertexRewriter objects to // read and write vertex data at a high level. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GeomVertexData : public CopyOnWriteObject, public GeomEnums { +class EXPCL_PANDA_GOBJ GeomVertexData : public CopyOnWriteObject, public GeomEnums { private: GeomVertexData(); protected: @@ -264,7 +264,7 @@ public: private: // This is the data that must be cycled between pipeline stages. - class EXPCL_PANDA CData : public CycleData { + class EXPCL_PANDA_GOBJ CData : public CycleData { public: INLINE CData(); INLINE CData(const CData ©); @@ -365,7 +365,7 @@ private: // GeomVertexDataPipelineReader and // GeomVertexDataPipelineWriter. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GeomVertexDataPipelineBase : public GeomEnums { +class EXPCL_PANDA_GOBJ GeomVertexDataPipelineBase : public GeomEnums { protected: INLINE GeomVertexDataPipelineBase(GeomVertexData *object, Thread *current_thread, @@ -400,7 +400,7 @@ protected: // Description : Encapsulates the data from a GeomVertexData, // pre-fetched for one stage of the pipeline. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GeomVertexDataPipelineReader : public GeomVertexDataPipelineBase { +class EXPCL_PANDA_GOBJ GeomVertexDataPipelineReader : public GeomVertexDataPipelineBase { public: INLINE GeomVertexDataPipelineReader(const GeomVertexData *object, Thread *current_thread); private: @@ -463,7 +463,7 @@ private: // Description : Encapsulates the data from a GeomVertexData, // pre-fetched for one stage of the pipeline. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GeomVertexDataPipelineWriter : public GeomVertexDataPipelineBase { +class EXPCL_PANDA_GOBJ GeomVertexDataPipelineWriter : public GeomVertexDataPipelineBase { public: INLINE GeomVertexDataPipelineWriter(GeomVertexData *object, bool force_to_0, Thread *current_thread); diff --git a/panda/src/gobj/geomVertexFormat.h b/panda/src/gobj/geomVertexFormat.h index 3e763268f6..8e0ca24ed9 100644 --- a/panda/src/gobj/geomVertexFormat.h +++ b/panda/src/gobj/geomVertexFormat.h @@ -62,7 +62,7 @@ class GeomMunger; // standard and/or user-defined columns in your custom // GeomVertexFormat constructions. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GeomVertexFormat : public TypedWritableReferenceCount, public GeomEnums { +class EXPCL_PANDA_GOBJ GeomVertexFormat : public TypedWritableReferenceCount, public GeomEnums { PUBLISHED: GeomVertexFormat(); GeomVertexFormat(const GeomVertexArrayFormat *array_format); @@ -212,7 +212,7 @@ private: // This is the global registry of all currently-in-use formats. typedef pset > Formats; - class EXPCL_PANDA Registry { + class EXPCL_PANDA_GOBJ Registry { public: Registry(); void make_standard_formats(); diff --git a/panda/src/gobj/geomVertexReader.h b/panda/src/gobj/geomVertexReader.h index 9c0b75035e..315ec34de3 100644 --- a/panda/src/gobj/geomVertexReader.h +++ b/panda/src/gobj/geomVertexReader.h @@ -57,7 +57,7 @@ // a GeomVertexRewriter if you are going to create both // of them anyway. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GeomVertexReader : public GeomEnums { +class EXPCL_PANDA_GOBJ GeomVertexReader : public GeomEnums { PUBLISHED: INLINE GeomVertexReader(Thread *current_thread = Thread::get_current_thread()); INLINE GeomVertexReader(const GeomVertexData *vertex_data, diff --git a/panda/src/gobj/geomVertexRewriter.h b/panda/src/gobj/geomVertexRewriter.h index 517b66e202..9a69f29ffc 100644 --- a/panda/src/gobj/geomVertexRewriter.h +++ b/panda/src/gobj/geomVertexRewriter.h @@ -40,7 +40,7 @@ // accidentally dereferencing either array while // recopying. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GeomVertexRewriter : public GeomVertexWriter, public GeomVertexReader { +class EXPCL_PANDA_GOBJ GeomVertexRewriter : public GeomVertexWriter, public GeomVertexReader { PUBLISHED: INLINE GeomVertexRewriter(Thread *current_thread = Thread::get_current_thread()); INLINE GeomVertexRewriter(GeomVertexData *vertex_data, Thread *current_thread = Thread::get_current_thread()); diff --git a/panda/src/gobj/geomVertexWriter.h b/panda/src/gobj/geomVertexWriter.h index 2fac5391dc..fc01152972 100644 --- a/panda/src/gobj/geomVertexWriter.h +++ b/panda/src/gobj/geomVertexWriter.h @@ -70,7 +70,7 @@ // a GeomVertexRewriter if you are going to create both // of them anyway. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GeomVertexWriter : public GeomEnums { +class EXPCL_PANDA_GOBJ GeomVertexWriter : public GeomEnums { PUBLISHED: INLINE GeomVertexWriter(Thread *current_thread = Thread::get_current_thread()); INLINE GeomVertexWriter(GeomVertexData *vertex_data, diff --git a/panda/src/gobj/indexBufferContext.h b/panda/src/gobj/indexBufferContext.h index 298e09bc1b..55e8d26b07 100644 --- a/panda/src/gobj/indexBufferContext.h +++ b/panda/src/gobj/indexBufferContext.h @@ -36,7 +36,7 @@ // allocate a vertex buffer for the array. OpenGL can // create a buffer object. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA IndexBufferContext : public BufferContext { +class EXPCL_PANDA_GOBJ IndexBufferContext : public BufferContext { public: INLINE IndexBufferContext(PreparedGraphicsObjects *pgo, GeomPrimitive *data); diff --git a/panda/src/gobj/internalName.h b/panda/src/gobj/internalName.h index f26edc47e5..47290b9066 100644 --- a/panda/src/gobj/internalName.h +++ b/panda/src/gobj/internalName.h @@ -43,7 +43,7 @@ class FactoryParams; // one or more other names, or by giving it a source // string directly. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA InternalName : public TypedWritableReferenceCount { +class EXPCL_PANDA_GOBJ InternalName : public TypedWritableReferenceCount { private: InternalName(InternalName *parent, const string &basename); diff --git a/panda/src/gobj/lens.h b/panda/src/gobj/lens.h index 01746c677f..838e96b1d7 100644 --- a/panda/src/gobj/lens.h +++ b/panda/src/gobj/lens.h @@ -42,7 +42,7 @@ class BoundingVolume; // also used in other contexts, however; for instance, a // Spotlight is also defined using a lens. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA Lens : public TypedWritableReferenceCount { +class EXPCL_PANDA_GOBJ Lens : public TypedWritableReferenceCount { public: Lens(); Lens(const Lens ©); @@ -299,7 +299,7 @@ private: static TypeHandle _type_handle; }; -EXPCL_PANDA INLINE ostream &operator << (ostream &out, const Lens &lens); +EXPCL_PANDA_GOBJ INLINE ostream &operator << (ostream &out, const Lens &lens); #include "lens.I" diff --git a/panda/src/gobj/material.h b/panda/src/gobj/material.h index a8464f2a75..42003aacda 100644 --- a/panda/src/gobj/material.h +++ b/panda/src/gobj/material.h @@ -33,7 +33,7 @@ class FactoryParams; // lighting. A material is only necessary if lighting // is to be enabled; otherwise, the material isn't used. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA Material : public TypedWritableReferenceCount, public Namable { +class EXPCL_PANDA_GOBJ Material : public TypedWritableReferenceCount, public Namable { PUBLISHED: INLINE Material(const string &name = ""); INLINE Material(const Material ©); diff --git a/panda/src/gobj/materialPool.h b/panda/src/gobj/materialPool.h index 5855546c04..1424a2c2c6 100644 --- a/panda/src/gobj/materialPool.h +++ b/panda/src/gobj/materialPool.h @@ -43,7 +43,7 @@ // supplied; in either case, it will have the same // value. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA MaterialPool { +class EXPCL_PANDA_GOBJ MaterialPool { PUBLISHED: INLINE static Material *get_material(Material *temp); INLINE static int garbage_collect(); diff --git a/panda/src/gobj/matrixLens.h b/panda/src/gobj/matrixLens.h index d192d1c4e6..9365b6be1e 100644 --- a/panda/src/gobj/matrixLens.h +++ b/panda/src/gobj/matrixLens.h @@ -32,7 +32,7 @@ // explicit projection matrix, but not mess around with // fov's or focal lengths or any of that nonsense. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA MatrixLens : public Lens { +class EXPCL_PANDA_GOBJ MatrixLens : public Lens { PUBLISHED: INLINE MatrixLens(); diff --git a/panda/src/gobj/occlusionQueryContext.h b/panda/src/gobj/occlusionQueryContext.h index bce2360e76..05fe1eeb20 100644 --- a/panda/src/gobj/occlusionQueryContext.h +++ b/panda/src/gobj/occlusionQueryContext.h @@ -29,7 +29,7 @@ // this records the number of fragments (pixels) that // passed the depth test between the bracketing calls. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA OcclusionQueryContext : public QueryContext { +class EXPCL_PANDA_GOBJ OcclusionQueryContext : public QueryContext { public: INLINE OcclusionQueryContext(); diff --git a/panda/src/gobj/orthographicLens.h b/panda/src/gobj/orthographicLens.h index 52bbc90b2f..eb20a09dd1 100644 --- a/panda/src/gobj/orthographicLens.h +++ b/panda/src/gobj/orthographicLens.h @@ -35,7 +35,7 @@ // projection onto its imaginary film of the specified // size, hanging in space. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA OrthographicLens : public Lens { +class EXPCL_PANDA_GOBJ OrthographicLens : public Lens { PUBLISHED: INLINE OrthographicLens(); diff --git a/panda/src/gobj/perspectiveLens.h b/panda/src/gobj/perspectiveLens.h index efe8bccb37..9ddab950c8 100644 --- a/panda/src/gobj/perspectiveLens.h +++ b/panda/src/gobj/perspectiveLens.h @@ -28,7 +28,7 @@ // Class : PerspectiveLens // Description : A perspective-type lens: a normal camera. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PerspectiveLens : public Lens { +class EXPCL_PANDA_GOBJ PerspectiveLens : public Lens { PUBLISHED: INLINE PerspectiveLens(); diff --git a/panda/src/gobj/preparedGraphicsObjects.h b/panda/src/gobj/preparedGraphicsObjects.h index 6f406c72ce..4543a98cbf 100644 --- a/panda/src/gobj/preparedGraphicsObjects.h +++ b/panda/src/gobj/preparedGraphicsObjects.h @@ -58,7 +58,7 @@ class GraphicsStateGuardianBase; // in a separate object rather than as a part of the // GraphicsStateGuardian. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PreparedGraphicsObjects : public ReferenceCount { +class EXPCL_PANDA_GOBJ PreparedGraphicsObjects : public ReferenceCount { public: PreparedGraphicsObjects(); ~PreparedGraphicsObjects(); diff --git a/panda/src/gobj/queryContext.h b/panda/src/gobj/queryContext.h index fb5ae7a7d4..b6a04f2611 100644 --- a/panda/src/gobj/queryContext.h +++ b/panda/src/gobj/queryContext.h @@ -39,7 +39,7 @@ class PreparedGraphicsObjects; // QueryContext as long as you are interested in the // answer. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA QueryContext : public TypedReferenceCount { +class EXPCL_PANDA_GOBJ QueryContext : public TypedReferenceCount { public: INLINE QueryContext(); virtual ~QueryContext(); diff --git a/panda/src/gobj/savedContext.h b/panda/src/gobj/savedContext.h index a2956bf9e1..5bba0161aa 100644 --- a/panda/src/gobj/savedContext.h +++ b/panda/src/gobj/savedContext.h @@ -32,7 +32,7 @@ // common to all of these objects, but there might be // one day. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA SavedContext : public TypedObject { +class EXPCL_PANDA_GOBJ SavedContext : public TypedObject { public: INLINE SavedContext(); diff --git a/panda/src/gobj/shaderContext.h b/panda/src/gobj/shaderContext.h index 5b1dae2e59..275da70334 100755 --- a/panda/src/gobj/shaderContext.h +++ b/panda/src/gobj/shaderContext.h @@ -36,7 +36,7 @@ // details are in the subclasses. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ShaderContext: public SavedContext { +class EXPCL_PANDA_GOBJ ShaderContext: public SavedContext { public: INLINE ShaderContext(ShaderExpansion *se); diff --git a/panda/src/gobj/shaderExpansion.h b/panda/src/gobj/shaderExpansion.h index 4ef4cf7aaf..a0bc97d8cb 100644 --- a/panda/src/gobj/shaderExpansion.h +++ b/panda/src/gobj/shaderExpansion.h @@ -44,7 +44,7 @@ typedef struct _CGparameter *CGparameter; // objects. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ShaderExpansion: public TypedReferenceCount { +class EXPCL_PANDA_GOBJ ShaderExpansion: public TypedReferenceCount { PUBLISHED: diff --git a/panda/src/gobj/simpleAllocator.h b/panda/src/gobj/simpleAllocator.h index e1353cb3f8..6841492076 100644 --- a/panda/src/gobj/simpleAllocator.h +++ b/panda/src/gobj/simpleAllocator.h @@ -34,7 +34,7 @@ class SimpleAllocatorBlock; // simple first-fit algorithm to find the next available // space. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA SimpleAllocator : public LinkedListNode { +class EXPCL_PANDA_GOBJ SimpleAllocator : public LinkedListNode { PUBLISHED: INLINE SimpleAllocator(size_t max_size, Mutex &lock); virtual ~SimpleAllocator(); @@ -96,7 +96,7 @@ protected: // Description : A single block as returned from // SimpleAllocator::alloc(). //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA SimpleAllocatorBlock : public LinkedListNode { +class EXPCL_PANDA_GOBJ SimpleAllocatorBlock : public LinkedListNode { protected: INLINE SimpleAllocatorBlock(SimpleAllocator *alloc, size_t start, size_t size); diff --git a/panda/src/gobj/simpleLru.h b/panda/src/gobj/simpleLru.h index fc0bc5c56a..5d5b4aa7cb 100644 --- a/panda/src/gobj/simpleLru.h +++ b/panda/src/gobj/simpleLru.h @@ -31,7 +31,7 @@ class SimpleLruPage; // Class : SimpleLru // Description : An implementation of a very simple LRU algorithm. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA SimpleLru : public LinkedListNode, public Namable { +class EXPCL_PANDA_GOBJ SimpleLru : public LinkedListNode, public Namable { PUBLISHED: SimpleLru(const string &name, size_t max_size); ~SimpleLru(); @@ -64,7 +64,7 @@ private: // chain. To use this class, inherit from it and // override evict_lru(). //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA SimpleLruPage : public LinkedListNode { +class EXPCL_PANDA_GOBJ SimpleLruPage : public LinkedListNode { PUBLISHED: INLINE SimpleLruPage(size_t lru_size); INLINE SimpleLruPage(const SimpleLruPage ©); diff --git a/panda/src/gobj/sliderTable.h b/panda/src/gobj/sliderTable.h index 1f371e1b89..4a91923f99 100644 --- a/panda/src/gobj/sliderTable.h +++ b/panda/src/gobj/sliderTable.h @@ -43,7 +43,7 @@ // CPU, since GPU's don't support morphs at this point // in time. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA SliderTable : public TypedWritableReferenceCount { +class EXPCL_PANDA_GOBJ SliderTable : public TypedWritableReferenceCount { PUBLISHED: SliderTable(); SliderTable(const SliderTable ©); @@ -92,7 +92,7 @@ private: static SparseArray _empty_array; // This is the data that must be cycled between pipeline stages. - class EXPCL_PANDA CData : public CycleData { + class EXPCL_PANDA_GOBJ CData : public CycleData { public: INLINE CData(); INLINE CData(const CData ©); diff --git a/panda/src/gobj/texture.h b/panda/src/gobj/texture.h index 41df34a77b..21b5f86520 100644 --- a/panda/src/gobj/texture.h +++ b/panda/src/gobj/texture.h @@ -57,7 +57,7 @@ class BamCacheRecord; // memory (actually, to the graphics API), and the // system RAM image is automatically freed. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA Texture : public TypedWritableReferenceCount, public Namable { +class EXPCL_PANDA_GOBJ Texture : public TypedWritableReferenceCount, public Namable { PUBLISHED: enum TextureType { TT_1d_texture, @@ -570,17 +570,17 @@ private: friend class TexturePool; }; -EXPCL_PANDA ostream &operator << (ostream &out, Texture::TextureType tt); -EXPCL_PANDA ostream &operator << (ostream &out, Texture::ComponentType ct); -EXPCL_PANDA ostream &operator << (ostream &out, Texture::Format f); +EXPCL_PANDA_GOBJ ostream &operator << (ostream &out, Texture::TextureType tt); +EXPCL_PANDA_GOBJ ostream &operator << (ostream &out, Texture::ComponentType ct); +EXPCL_PANDA_GOBJ ostream &operator << (ostream &out, Texture::Format f); -EXPCL_PANDA ostream &operator << (ostream &out, Texture::FilterType ft); -EXPCL_PANDA istream &operator >> (istream &in, Texture::FilterType &ft); +EXPCL_PANDA_GOBJ ostream &operator << (ostream &out, Texture::FilterType ft); +EXPCL_PANDA_GOBJ istream &operator >> (istream &in, Texture::FilterType &ft); -EXPCL_PANDA ostream &operator << (ostream &out, Texture::WrapMode wm); -EXPCL_PANDA istream &operator >> (istream &in, Texture::WrapMode &wm); +EXPCL_PANDA_GOBJ ostream &operator << (ostream &out, Texture::WrapMode wm); +EXPCL_PANDA_GOBJ istream &operator >> (istream &in, Texture::WrapMode &wm); -EXPCL_PANDA ostream &operator << (ostream &out, Texture::CompressionMode cm); +EXPCL_PANDA_GOBJ ostream &operator << (ostream &out, Texture::CompressionMode cm); #include "texture.I" diff --git a/panda/src/gobj/textureContext.h b/panda/src/gobj/textureContext.h index 3bd40dc875..f942984a2f 100644 --- a/panda/src/gobj/textureContext.h +++ b/panda/src/gobj/textureContext.h @@ -38,7 +38,7 @@ // texture and store it here. The texture stores all of // these handles internally. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA TextureContext : public BufferContext { +class EXPCL_PANDA_GOBJ TextureContext : public BufferContext { public: INLINE TextureContext(PreparedGraphicsObjects *pgo, Texture *tex); diff --git a/panda/src/gobj/texturePool.h b/panda/src/gobj/texturePool.h index 505d29a982..c4fc295d7d 100644 --- a/panda/src/gobj/texturePool.h +++ b/panda/src/gobj/texturePool.h @@ -36,7 +36,7 @@ class TexturePoolFilter; // the same textures don't waste texture memory // unnecessarily. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA TexturePool { +class EXPCL_PANDA_GOBJ TexturePool { PUBLISHED: // These functions take string parameters instead of Filenames // because that's somewhat more convenient to the scripting diff --git a/panda/src/gobj/texturePoolFilter.h b/panda/src/gobj/texturePoolFilter.h index ebf17b2df3..d1caf726c2 100644 --- a/panda/src/gobj/texturePoolFilter.h +++ b/panda/src/gobj/texturePoolFilter.h @@ -46,7 +46,7 @@ // that filters for which this might be a problem should // call tex->set_keep_ram_image(true). //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA TexturePoolFilter : public TypedObject { +class EXPCL_PANDA_GOBJ TexturePoolFilter : public TypedObject { public: virtual ~TexturePoolFilter(); diff --git a/panda/src/gobj/textureStage.h b/panda/src/gobj/textureStage.h index a66268ae09..5006cdea0a 100644 --- a/panda/src/gobj/textureStage.h +++ b/panda/src/gobj/textureStage.h @@ -39,7 +39,7 @@ class FactoryParams; // and then issuing the appropriate rendering calls to // activate them. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA TextureStage : public TypedWritableReferenceCount { +class EXPCL_PANDA_GOBJ TextureStage : public TypedWritableReferenceCount { PUBLISHED: TextureStage(const string &name); INLINE TextureStage(TextureStage ©); @@ -238,10 +238,10 @@ private: INLINE ostream &operator << (ostream &out, const TextureStage &ts); -EXPCL_PANDA ostream &operator << (ostream &out, TextureStage::Mode mode); -EXPCL_PANDA ostream &operator << (ostream &out, TextureStage::CombineMode cm); -EXPCL_PANDA ostream &operator << (ostream &out, TextureStage::CombineSource cs); -EXPCL_PANDA ostream &operator << (ostream &out, TextureStage::CombineOperand co); +EXPCL_PANDA_GOBJ ostream &operator << (ostream &out, TextureStage::Mode mode); +EXPCL_PANDA_GOBJ ostream &operator << (ostream &out, TextureStage::CombineMode cm); +EXPCL_PANDA_GOBJ ostream &operator << (ostream &out, TextureStage::CombineSource cs); +EXPCL_PANDA_GOBJ ostream &operator << (ostream &out, TextureStage::CombineOperand co); #include "textureStage.I" diff --git a/panda/src/gobj/transformBlend.h b/panda/src/gobj/transformBlend.h index cc8b049cb4..505d9c64c5 100644 --- a/panda/src/gobj/transformBlend.h +++ b/panda/src/gobj/transformBlend.h @@ -37,7 +37,7 @@ // combination of VertexTransform pointers and blend // amounts. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA TransformBlend { +class EXPCL_PANDA_GOBJ TransformBlend { PUBLISHED: INLINE TransformBlend(); INLINE TransformBlend(const VertexTransform *transform0, float weight0); @@ -100,7 +100,7 @@ private: // This is the data that must be cycled between pipeline stages; it // is just a local cache. - class EXPCL_PANDA CData : public CycleData { + class EXPCL_PANDA_GOBJ CData : public CycleData { public: INLINE CData(); INLINE CData(const CData ©); diff --git a/panda/src/gobj/transformBlendTable.h b/panda/src/gobj/transformBlendTable.h index b19892d60e..24b64ffd2f 100644 --- a/panda/src/gobj/transformBlendTable.h +++ b/panda/src/gobj/transformBlendTable.h @@ -51,7 +51,7 @@ class FactoryParams; // TransformTable for one set up to compute its // dynamic vertices on the graphics card. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA TransformBlendTable : public CopyOnWriteObject { +class EXPCL_PANDA_GOBJ TransformBlendTable : public CopyOnWriteObject { protected: virtual PT(CopyOnWriteObject) make_cow_copy(); @@ -110,7 +110,7 @@ private: // Even though we don't store the actual blend table data in a // CycleData structure, we do need to keep a local cache of the // relevant modified stamps there, so it can be updated per-thread. - class EXPCL_PANDA CData : public CycleData { + class EXPCL_PANDA_GOBJ CData : public CycleData { public: INLINE CData(); INLINE CData(const CData ©); diff --git a/panda/src/gobj/transformTable.h b/panda/src/gobj/transformTable.h index fcc7cd1a9f..ed3c4264b6 100644 --- a/panda/src/gobj/transformTable.h +++ b/panda/src/gobj/transformTable.h @@ -43,7 +43,7 @@ class FactoryParams; // See TransformBlendTable for one set up to compute // its dynamic vertices on the CPU. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA TransformTable : public TypedWritableReferenceCount { +class EXPCL_PANDA_GOBJ TransformTable : public TypedWritableReferenceCount { PUBLISHED: TransformTable(); TransformTable(const TransformTable ©); @@ -75,7 +75,7 @@ private: Transforms _transforms; // This is the data that must be cycled between pipeline stages. - class EXPCL_PANDA CData : public CycleData { + class EXPCL_PANDA_GOBJ CData : public CycleData { public: INLINE CData(); INLINE CData(const CData ©); diff --git a/panda/src/gobj/userVertexSlider.h b/panda/src/gobj/userVertexSlider.h index 7f4c46a149..c7bfe5901c 100644 --- a/panda/src/gobj/userVertexSlider.h +++ b/panda/src/gobj/userVertexSlider.h @@ -35,7 +35,7 @@ class FactoryParams; // valie he likes. This is rarely used except for // testing. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA UserVertexSlider : public VertexSlider { +class EXPCL_PANDA_GOBJ UserVertexSlider : public VertexSlider { PUBLISHED: UserVertexSlider(const string &name); UserVertexSlider(const InternalName *name); @@ -45,7 +45,7 @@ PUBLISHED: private: // This is the data that must be cycled between pipeline stages. - class EXPCL_PANDA CData : public CycleData { + class EXPCL_PANDA_GOBJ CData : public CycleData { public: INLINE CData(); INLINE CData(const CData ©); diff --git a/panda/src/gobj/userVertexTransform.h b/panda/src/gobj/userVertexTransform.h index 6c0f682f7e..143b8cf51f 100644 --- a/panda/src/gobj/userVertexTransform.h +++ b/panda/src/gobj/userVertexTransform.h @@ -35,7 +35,7 @@ class FactoryParams; // matrix he likes. This is rarely used except for // testing. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA UserVertexTransform : public VertexTransform { +class EXPCL_PANDA_GOBJ UserVertexTransform : public VertexTransform { PUBLISHED: UserVertexTransform(const string &name); @@ -50,7 +50,7 @@ private: string _name; // This is the data that must be cycled between pipeline stages. - class EXPCL_PANDA CData : public CycleData { + class EXPCL_PANDA_GOBJ CData : public CycleData { public: INLINE CData(); INLINE CData(const CData ©); diff --git a/panda/src/gobj/vertexBufferContext.h b/panda/src/gobj/vertexBufferContext.h index 6e846e7833..2d60705a63 100644 --- a/panda/src/gobj/vertexBufferContext.h +++ b/panda/src/gobj/vertexBufferContext.h @@ -36,7 +36,7 @@ // allocate a vertex buffer for the array. OpenGL can // create a buffer object. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA VertexBufferContext : public BufferContext { +class EXPCL_PANDA_GOBJ VertexBufferContext : public BufferContext { public: INLINE VertexBufferContext(PreparedGraphicsObjects *pgo, GeomVertexArrayData *data); diff --git a/panda/src/gobj/vertexDataBlock.h b/panda/src/gobj/vertexDataBlock.h index 6841cd5a6e..3fdf289081 100644 --- a/panda/src/gobj/vertexDataBlock.h +++ b/panda/src/gobj/vertexDataBlock.h @@ -31,7 +31,7 @@ class VertexDataBlock; // Description : A block of bytes that stores the actual raw vertex // data referenced by a GeomVertexArrayData object. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA VertexDataBlock : public SimpleAllocatorBlock, public ReferenceCount { +class EXPCL_PANDA_GOBJ VertexDataBlock : public SimpleAllocatorBlock, public ReferenceCount { protected: INLINE VertexDataBlock(VertexDataPage *page, size_t start, size_t size); diff --git a/panda/src/gobj/vertexDataBook.h b/panda/src/gobj/vertexDataBook.h index 5f6fe76e03..c41759a0bc 100644 --- a/panda/src/gobj/vertexDataBook.h +++ b/panda/src/gobj/vertexDataBook.h @@ -33,7 +33,7 @@ class VertexDataBlock; // Description : A collection of VertexDataPages, which can be used to // allocate new VertexDataBlock objects. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA VertexDataBook { +class EXPCL_PANDA_GOBJ VertexDataBook { PUBLISHED: VertexDataBook(size_t block_size); ~VertexDataBook(); diff --git a/panda/src/gobj/vertexDataBuffer.h b/panda/src/gobj/vertexDataBuffer.h index d118abea86..5426301370 100644 --- a/panda/src/gobj/vertexDataBuffer.h +++ b/panda/src/gobj/vertexDataBuffer.h @@ -60,7 +60,7 @@ // pages, where they may be written to disk as a block // when necessary. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA VertexDataBuffer { +class EXPCL_PANDA_GOBJ VertexDataBuffer { public: INLINE VertexDataBuffer(); INLINE VertexDataBuffer(size_t size); diff --git a/panda/src/gobj/vertexDataPage.h b/panda/src/gobj/vertexDataPage.h index b285c51d24..a26352e703 100644 --- a/panda/src/gobj/vertexDataPage.h +++ b/panda/src/gobj/vertexDataPage.h @@ -40,7 +40,7 @@ class VertexDataBlock; // in the form of in-memory compression or to an on-disk // cache file, if necessary. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA VertexDataPage : public SimpleAllocator, public SimpleLruPage { +class EXPCL_PANDA_GOBJ VertexDataPage : public SimpleAllocator, public SimpleLruPage { public: VertexDataPage(size_t book_size); VertexDataPage(VertexDataBook *book, size_t page_size, size_t block_size); diff --git a/panda/src/gobj/vertexDataSaveFile.h b/panda/src/gobj/vertexDataSaveFile.h index b0fd3802f3..acbc25ef52 100644 --- a/panda/src/gobj/vertexDataSaveFile.h +++ b/panda/src/gobj/vertexDataSaveFile.h @@ -38,7 +38,7 @@ class VertexDataSaveBlock; // vertex data arrays are written into one large flat // file. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA VertexDataSaveFile : public SimpleAllocator { +class EXPCL_PANDA_GOBJ VertexDataSaveFile : public SimpleAllocator { public: VertexDataSaveFile(const Filename &directory, const string &prefix, size_t max_size); @@ -76,7 +76,7 @@ private: // Class : VertexDataSaveBlock // Description : A block of bytes on the save file. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA VertexDataSaveBlock : public SimpleAllocatorBlock, public ReferenceCount { +class EXPCL_PANDA_GOBJ VertexDataSaveBlock : public SimpleAllocatorBlock, public ReferenceCount { protected: INLINE VertexDataSaveBlock(VertexDataSaveFile *file, size_t start, size_t size); diff --git a/panda/src/gobj/vertexSlider.h b/panda/src/gobj/vertexSlider.h index f6a1ed12b1..652a56195b 100644 --- a/panda/src/gobj/vertexSlider.h +++ b/panda/src/gobj/vertexSlider.h @@ -42,7 +42,7 @@ class SliderTable; // 4x4 transform matrix, but the VertexSlider only keeps // a single float value. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA VertexSlider : public TypedWritableReferenceCount { +class EXPCL_PANDA_GOBJ VertexSlider : public TypedWritableReferenceCount { PUBLISHED: VertexSlider(const InternalName *name); virtual ~VertexSlider(); @@ -66,7 +66,7 @@ private: Tables _tables; // This is the data that must be cycled between pipeline stages. - class EXPCL_PANDA CData : public CycleData { + class EXPCL_PANDA_GOBJ CData : public CycleData { public: INLINE CData(); INLINE CData(const CData ©); diff --git a/panda/src/gobj/vertexTransform.h b/panda/src/gobj/vertexTransform.h index 48048b0784..7023976419 100644 --- a/panda/src/gobj/vertexTransform.h +++ b/panda/src/gobj/vertexTransform.h @@ -40,7 +40,7 @@ class TransformTable; // vertices. Derived classes will define how the // transform is actually computed. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA VertexTransform : public TypedWritableReferenceCount { +class EXPCL_PANDA_GOBJ VertexTransform : public TypedWritableReferenceCount { PUBLISHED: VertexTransform(); virtual ~VertexTransform(); @@ -65,7 +65,7 @@ private: Palettes _tables; // This is the data that must be cycled between pipeline stages. - class EXPCL_PANDA CData : public CycleData { + class EXPCL_PANDA_GOBJ CData : public CycleData { public: INLINE CData(); INLINE CData(const CData ©); diff --git a/panda/src/gobj/videoTexture.h b/panda/src/gobj/videoTexture.h index 6c00dbb9af..1fad737dae 100644 --- a/panda/src/gobj/videoTexture.h +++ b/panda/src/gobj/videoTexture.h @@ -32,7 +32,7 @@ // etc. using the AnimInterface controls, similar to an // animated character. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA VideoTexture : public Texture, public AnimInterface { +class EXPCL_PANDA_GOBJ VideoTexture : public Texture, public AnimInterface { protected: VideoTexture(const string &name); VideoTexture(const VideoTexture ©); diff --git a/panda/src/grutil/cardMaker.h b/panda/src/grutil/cardMaker.h index 1ecad731a4..99fb33199a 100644 --- a/panda/src/grutil/cardMaker.h +++ b/panda/src/grutil/cardMaker.h @@ -32,7 +32,7 @@ // rectangular polygons, particularly useful for showing // textures etc. in the 2-d scene graph. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CardMaker : public Namable { +class EXPCL_PANDA_GRUTIL CardMaker : public Namable { PUBLISHED: INLINE CardMaker(const string &name); INLINE ~CardMaker(); diff --git a/panda/src/grutil/config_grutil.h b/panda/src/grutil/config_grutil.h index 5a3cda2f96..c00ed5ea0e 100644 --- a/panda/src/grutil/config_grutil.h +++ b/panda/src/grutil/config_grutil.h @@ -25,7 +25,7 @@ #include "configVariableString.h" #include "configVariableInt.h" -NotifyCategoryDecl(grutil, EXPCL_PANDA, EXPTP_PANDA); +NotifyCategoryDecl(grutil, EXPCL_PANDA_GRUTIL, EXPTP_PANDA_GRUTIL); extern ConfigVariableDouble frame_rate_meter_update_interval; extern ConfigVariableString frame_rate_meter_text_pattern; @@ -33,7 +33,7 @@ extern ConfigVariableInt frame_rate_meter_layer_sort; extern ConfigVariableDouble frame_rate_meter_scale; extern ConfigVariableDouble frame_rate_meter_side_margins; -extern EXPCL_PANDA void init_libgrutil(); +extern EXPCL_PANDA_GRUTIL void init_libgrutil(); #endif diff --git a/panda/src/grutil/ffmpegTexture.h b/panda/src/grutil/ffmpegTexture.h index 7439593308..8e6b443247 100644 --- a/panda/src/grutil/ffmpegTexture.h +++ b/panda/src/grutil/ffmpegTexture.h @@ -34,7 +34,7 @@ // with its source taken from an .avi file or from a // camera input. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA FFMpegTexture : public VideoTexture { +class EXPCL_PANDA_GRUTIL FFMpegTexture : public VideoTexture { PUBLISHED: FFMpegTexture(const string &name = string()); protected: diff --git a/panda/src/grutil/fisheyeMaker.h b/panda/src/grutil/fisheyeMaker.h index 8cfc5822c7..e5a6416d1e 100644 --- a/panda/src/grutil/fisheyeMaker.h +++ b/panda/src/grutil/fisheyeMaker.h @@ -40,7 +40,7 @@ class GeomVertexWriter; // This class is particularly suited for converting cube // maps to sphere maps. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA FisheyeMaker : public Namable { +class EXPCL_PANDA_GRUTIL FisheyeMaker : public Namable { PUBLISHED: INLINE FisheyeMaker(const string &name); INLINE ~FisheyeMaker(); diff --git a/panda/src/grutil/frameRateMeter.h b/panda/src/grutil/frameRateMeter.h index 5ded2b5115..fef51721b2 100644 --- a/panda/src/grutil/frameRateMeter.h +++ b/panda/src/grutil/frameRateMeter.h @@ -42,7 +42,7 @@ class ClockObject; // done, it creates a DisplayRegion for itself and renders // itself in the upper-right-hand corner. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA FrameRateMeter : public TextNode { +class EXPCL_PANDA_GRUTIL FrameRateMeter : public TextNode { PUBLISHED: FrameRateMeter(const string &name); virtual ~FrameRateMeter(); diff --git a/panda/src/grutil/heightfieldTesselator.h b/panda/src/grutil/heightfieldTesselator.h index 422e384e83..2f773b15a3 100644 --- a/panda/src/grutil/heightfieldTesselator.h +++ b/panda/src/grutil/heightfieldTesselator.h @@ -69,7 +69,7 @@ // //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA HeightfieldTesselator : public Namable { +class EXPCL_PANDA_GRUTIL HeightfieldTesselator : public Namable { PUBLISHED: INLINE HeightfieldTesselator(const string &name); INLINE ~HeightfieldTesselator(); diff --git a/panda/src/grutil/lineSegs.h b/panda/src/grutil/lineSegs.h index 4b543fa100..8dd3b3d994 100644 --- a/panda/src/grutil/lineSegs.h +++ b/panda/src/grutil/lineSegs.h @@ -37,7 +37,7 @@ // smartest it could possibly be; it's intended // primarily as a visualization and editing tool. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA LineSegs : public Namable { +class EXPCL_PANDA_GRUTIL LineSegs : public Namable { PUBLISHED: LineSegs(const string &name = "lines"); ~LineSegs(); diff --git a/panda/src/grutil/movieTexture.h b/panda/src/grutil/movieTexture.h index 7439593308..8e6b443247 100644 --- a/panda/src/grutil/movieTexture.h +++ b/panda/src/grutil/movieTexture.h @@ -34,7 +34,7 @@ // with its source taken from an .avi file or from a // camera input. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA FFMpegTexture : public VideoTexture { +class EXPCL_PANDA_GRUTIL FFMpegTexture : public VideoTexture { PUBLISHED: FFMpegTexture(const string &name = string()); protected: diff --git a/panda/src/grutil/multitexReducer.h b/panda/src/grutil/multitexReducer.h index b3195e38dd..fe0a98619c 100644 --- a/panda/src/grutil/multitexReducer.h +++ b/panda/src/grutil/multitexReducer.h @@ -53,7 +53,7 @@ class TransformState; // flattened. It is, however, useful for "baking in" a // particular multitexture effect. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA MultitexReducer { +class EXPCL_PANDA_GRUTIL MultitexReducer { PUBLISHED: MultitexReducer(); ~MultitexReducer(); diff --git a/panda/src/grutil/nodeVertexTransform.h b/panda/src/grutil/nodeVertexTransform.h index 32c7f81e10..43e28abbbb 100644 --- a/panda/src/grutil/nodeVertexTransform.h +++ b/panda/src/grutil/nodeVertexTransform.h @@ -33,7 +33,7 @@ class FactoryParams; // NodeVertexTransforms that represent a list of // composed matrices. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA NodeVertexTransform : public VertexTransform { +class EXPCL_PANDA_GRUTIL NodeVertexTransform : public VertexTransform { PUBLISHED: NodeVertexTransform(const PandaNode *node, const VertexTransform *prev = NULL); diff --git a/panda/src/grutil/openCVTexture.h b/panda/src/grutil/openCVTexture.h index 4fc89503af..1b303438dd 100644 --- a/panda/src/grutil/openCVTexture.h +++ b/panda/src/grutil/openCVTexture.h @@ -35,7 +35,7 @@ // with its source taken from an .avi file or from a // camera input. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA OpenCVTexture : public VideoTexture { +class EXPCL_PANDA_GRUTIL OpenCVTexture : public VideoTexture { PUBLISHED: OpenCVTexture(const string &name = string()); protected: diff --git a/panda/src/grutil/pipeOcclusionCullTraverser.h b/panda/src/grutil/pipeOcclusionCullTraverser.h index 4b4f4ab2bd..eca9c1133c 100644 --- a/panda/src/grutil/pipeOcclusionCullTraverser.h +++ b/panda/src/grutil/pipeOcclusionCullTraverser.h @@ -48,7 +48,7 @@ class GraphicsStateGuardian; // other classes in display. So we put it in grutil // instead, for lack of any better ideas. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PipeOcclusionCullTraverser : public CullTraverser, +class EXPCL_PANDA_GRUTIL PipeOcclusionCullTraverser : public CullTraverser, public CullHandler { PUBLISHED: PipeOcclusionCullTraverser(GraphicsOutput *host); diff --git a/panda/src/grutil/rigidBodyCombiner.h b/panda/src/grutil/rigidBodyCombiner.h index 7b4952e48f..69e41cb4d3 100644 --- a/panda/src/grutil/rigidBodyCombiner.h +++ b/panda/src/grutil/rigidBodyCombiner.h @@ -53,7 +53,7 @@ class NodePath; // RenderEffects such as Billboards are not supported // below this node. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA RigidBodyCombiner : public PandaNode { +class EXPCL_PANDA_GRUTIL RigidBodyCombiner : public PandaNode { PUBLISHED: RigidBodyCombiner(const string &name); protected: diff --git a/panda/src/gsgbase/graphicsStateGuardianBase.h b/panda/src/gsgbase/graphicsStateGuardianBase.h index e7242a6668..0fa3cd6343 100644 --- a/panda/src/gsgbase/graphicsStateGuardianBase.h +++ b/panda/src/gsgbase/graphicsStateGuardianBase.h @@ -110,7 +110,7 @@ class Lens; // TypedWritableReferenceCount instead of // TypedReferenceCount for that convenience. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GraphicsStateGuardianBase : public TypedWritableReferenceCount { +class EXPCL_PANDA_GSGBASE GraphicsStateGuardianBase : public TypedWritableReferenceCount { PUBLISHED: virtual bool prefers_triangle_strips() const=0; virtual int get_max_vertices_per_array() const=0; diff --git a/panda/src/helix/HelixClient.h b/panda/src/helix/HelixClient.h index bf6187cdc2..31eebf826c 100644 --- a/panda/src/helix/HelixClient.h +++ b/panda/src/helix/HelixClient.h @@ -44,7 +44,7 @@ // loading the Helix Client Engine, creating players on // the Helix engine, and initializing the media playback. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA HelixClient { +class EXPCL_PANDA_HELIX HelixClient { public: static TypeHandle get_class_type() { return _type_handle; diff --git a/panda/src/helix/config_helix.h b/panda/src/helix/config_helix.h index 9d4ce58219..e1e0a8eac3 100644 --- a/panda/src/helix/config_helix.h +++ b/panda/src/helix/config_helix.h @@ -22,7 +22,7 @@ #include "pandabase.h" #include "notifyCategoryProxy.h" -NotifyCategoryDecl(helix, EXPCL_PANDA, EXPTP_PANDA); +NotifyCategoryDecl(helix, EXPCL_PANDA_HELIX, EXPTP_PANDA_HELIX); #endif diff --git a/panda/src/lerp/config_lerp.h b/panda/src/lerp/config_lerp.h index 4f3351fb1c..0c47f4ce7c 100644 --- a/panda/src/lerp/config_lerp.h +++ b/panda/src/lerp/config_lerp.h @@ -23,6 +23,6 @@ #include "dconfig.h" #include "notifyCategoryProxy.h" -NotifyCategoryDecl(lerp, EXPCL_PANDA, EXPTP_PANDA); +NotifyCategoryDecl(lerp, EXPCL_PANDA_LERP, EXPTP_PANDA_LERP); #endif /* __CONFIG_LERP_H__ */ diff --git a/panda/src/lerp/lerp.h b/panda/src/lerp/lerp.h index 9db132a724..34d6ad547d 100644 --- a/panda/src/lerp/lerp.h +++ b/panda/src/lerp/lerp.h @@ -27,7 +27,7 @@ #include "typedReferenceCount.h" #include "eventHandler.h" -class EXPCL_PANDA Lerp : public TypedReferenceCount { +class EXPCL_PANDA_LERP Lerp : public TypedReferenceCount { private: PT(LerpBlendType) _blend; PT(LerpFunctor) _func; @@ -73,7 +73,7 @@ private: static TypeHandle _type_handle; }; -class EXPCL_PANDA AutonomousLerp : public TypedReferenceCount { +class EXPCL_PANDA_LERP AutonomousLerp : public TypedReferenceCount { private: PT(LerpBlendType) _blend; PT(LerpFunctor) _func; diff --git a/panda/src/lerp/lerpblend.h b/panda/src/lerp/lerpblend.h index ec7f768dab..11d67617cf 100644 --- a/panda/src/lerp/lerpblend.h +++ b/panda/src/lerp/lerpblend.h @@ -22,7 +22,7 @@ #include "pandabase.h" #include "typedReferenceCount.h" -class EXPCL_PANDA LerpBlendType : public TypedReferenceCount { +class EXPCL_PANDA_LERP LerpBlendType : public TypedReferenceCount { PUBLISHED: LerpBlendType() {} virtual ~LerpBlendType(); @@ -52,7 +52,7 @@ private: static TypeHandle _type_handle; }; -class EXPCL_PANDA EaseInBlendType : public LerpBlendType { +class EXPCL_PANDA_LERP EaseInBlendType : public LerpBlendType { PUBLISHED: EaseInBlendType() {} virtual ~EaseInBlendType(); @@ -82,7 +82,7 @@ private: static TypeHandle _type_handle; }; -class EXPCL_PANDA EaseOutBlendType : public LerpBlendType { +class EXPCL_PANDA_LERP EaseOutBlendType : public LerpBlendType { PUBLISHED: EaseOutBlendType() {} virtual ~EaseOutBlendType(); @@ -112,7 +112,7 @@ private: static TypeHandle _type_handle; }; -class EXPCL_PANDA EaseInOutBlendType : public LerpBlendType { +class EXPCL_PANDA_LERP EaseInOutBlendType : public LerpBlendType { PUBLISHED: EaseInOutBlendType() {} virtual ~EaseInOutBlendType(); @@ -141,7 +141,7 @@ private: static TypeHandle _type_handle; }; -class EXPCL_PANDA NoBlendType : public LerpBlendType { +class EXPCL_PANDA_LERP NoBlendType : public LerpBlendType { PUBLISHED: NoBlendType() {} virtual ~NoBlendType(); diff --git a/panda/src/lerp/lerpfunctor.h b/panda/src/lerp/lerpfunctor.h index 6959b5c77d..db10958cfa 100644 --- a/panda/src/lerp/lerpfunctor.h +++ b/panda/src/lerp/lerpfunctor.h @@ -22,7 +22,7 @@ #include "pandabase.h" #include "typedReferenceCount.h" -class EXPCL_PANDA LerpFunctor : public TypedReferenceCount { +class EXPCL_PANDA_LERP LerpFunctor : public TypedReferenceCount { public: LerpFunctor() {} LerpFunctor(const LerpFunctor&); @@ -143,29 +143,29 @@ TypeHandle SimpleQueryLerpFunctor::_type_handle; #include "luse.h" -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, SimpleLerpFunctor) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, SimpleLerpFunctor) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, SimpleLerpFunctor) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, SimpleLerpFunctor) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, SimpleLerpFunctor) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, SimpleLerpFunctor) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, SimpleLerpFunctor) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, SimpleLerpFunctor) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, SimpleLerpFunctor) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, SimpleLerpFunctor) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, SimpleLerpFunctor) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_LERP, EXPTP_PANDA_LERP, SimpleLerpFunctor) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_LERP, EXPTP_PANDA_LERP, SimpleLerpFunctor) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_LERP, EXPTP_PANDA_LERP, SimpleLerpFunctor) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_LERP, EXPTP_PANDA_LERP, SimpleLerpFunctor) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_LERP, EXPTP_PANDA_LERP, SimpleLerpFunctor) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_LERP, EXPTP_PANDA_LERP, SimpleLerpFunctor) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_LERP, EXPTP_PANDA_LERP, SimpleLerpFunctor) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_LERP, EXPTP_PANDA_LERP, SimpleLerpFunctor) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_LERP, EXPTP_PANDA_LERP, SimpleLerpFunctor) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_LERP, EXPTP_PANDA_LERP, SimpleLerpFunctor) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_LERP, EXPTP_PANDA_LERP, SimpleLerpFunctor) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, SimpleQueryLerpFunctor) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, SimpleQueryLerpFunctor) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, SimpleQueryLerpFunctor) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, SimpleQueryLerpFunctor) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, SimpleQueryLerpFunctor) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, SimpleQueryLerpFunctor) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, SimpleQueryLerpFunctor) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, SimpleQueryLerpFunctor) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, SimpleQueryLerpFunctor) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, SimpleQueryLerpFunctor) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, SimpleQueryLerpFunctor) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_LERP, EXPTP_PANDA_LERP, SimpleQueryLerpFunctor) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_LERP, EXPTP_PANDA_LERP, SimpleQueryLerpFunctor) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_LERP, EXPTP_PANDA_LERP, SimpleQueryLerpFunctor) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_LERP, EXPTP_PANDA_LERP, SimpleQueryLerpFunctor) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_LERP, EXPTP_PANDA_LERP, SimpleQueryLerpFunctor) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_LERP, EXPTP_PANDA_LERP, SimpleQueryLerpFunctor) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_LERP, EXPTP_PANDA_LERP, SimpleQueryLerpFunctor) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_LERP, EXPTP_PANDA_LERP, SimpleQueryLerpFunctor) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_LERP, EXPTP_PANDA_LERP, SimpleQueryLerpFunctor) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_LERP, EXPTP_PANDA_LERP, SimpleQueryLerpFunctor) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_LERP, EXPTP_PANDA_LERP, SimpleQueryLerpFunctor) typedef SimpleLerpFunctor IntLerpFunctor; typedef SimpleLerpFunctor FloatLerpFunctor; @@ -194,7 +194,7 @@ typedef SimpleQueryLerpFunctor LVector4fQueryLerpFunctor; #include "pset.h" #include "pointerTo.h" -class EXPCL_PANDA MultiLerpFunctor : public LerpFunctor { +class EXPCL_PANDA_LERP MultiLerpFunctor : public LerpFunctor { private: typedef phash_set< PT(LerpFunctor) > Functors; Functors _funcs; diff --git a/panda/src/linmath/compose_matrix.h b/panda/src/linmath/compose_matrix.h index 27cdc188a4..0a8923f9ff 100644 --- a/panda/src/linmath/compose_matrix.h +++ b/panda/src/linmath/compose_matrix.h @@ -48,8 +48,8 @@ // the array-accepting forms of compose_matrix() and // decompose_matrix(). static const int num_matrix_components = 12; -EXPCL_PANDA extern const char * const matrix_component_letters; -EXPCL_PANDA extern const double matrix_component_defaults[num_matrix_components]; +EXPCL_PANDA_LINMATH extern const char * const matrix_component_letters; +EXPCL_PANDA_LINMATH extern const double matrix_component_defaults[num_matrix_components]; #include "fltnames.h" #include "compose_matrix_src.h" diff --git a/panda/src/linmath/compose_matrix_src.h b/panda/src/linmath/compose_matrix_src.h index b1288b8e52..6c6d745fde 100644 --- a/panda/src/linmath/compose_matrix_src.h +++ b/panda/src/linmath/compose_matrix_src.h @@ -94,7 +94,7 @@ decompose_matrix(const FLOATNAME(LMatrix4) &mat, // use. New code should not call these functions directly; use the // unqualified functions, above, instead. -EXPCL_PANDA void +EXPCL_PANDA_LINMATH void compose_matrix_old_hpr(FLOATNAME(LMatrix3) &mat, const FLOATNAME(LVecBase3) &scale, const FLOATNAME(LVecBase3) &shear, @@ -113,7 +113,7 @@ INLINE_LINMATH void compose_matrix_old_hpr(FLOATNAME(LMatrix4) &mat, const FLOATTYPE components[num_matrix_components], CoordinateSystem cs = CS_default); -EXPCL_PANDA bool +EXPCL_PANDA_LINMATH bool decompose_matrix_old_hpr(const FLOATNAME(LMatrix3) &mat, FLOATNAME(LVecBase3) &scale, FLOATNAME(LVecBase3) &shear, @@ -133,7 +133,7 @@ decompose_matrix_old_hpr(const FLOATNAME(LMatrix4) &mat, FLOATTYPE components[nu CoordinateSystem CS = CS_default); -EXPCL_PANDA void +EXPCL_PANDA_LINMATH void compose_matrix_new_hpr(FLOATNAME(LMatrix3) &mat, const FLOATNAME(LVecBase3) &scale, const FLOATNAME(LVecBase3) &shear, @@ -152,7 +152,7 @@ INLINE_LINMATH void compose_matrix_new_hpr(FLOATNAME(LMatrix4) &mat, const FLOATTYPE components[num_matrix_components], CoordinateSystem cs = CS_default); -EXPCL_PANDA bool +EXPCL_PANDA_LINMATH bool decompose_matrix_new_hpr(const FLOATNAME(LMatrix3) &mat, FLOATNAME(LVecBase3) &scale, FLOATNAME(LVecBase3) &shear, @@ -172,9 +172,9 @@ decompose_matrix_new_hpr(const FLOATNAME(LMatrix4) &mat, FLOATTYPE components[nu CoordinateSystem CS = CS_default); -EXPCL_PANDA FLOATNAME(LVecBase3) +EXPCL_PANDA_LINMATH FLOATNAME(LVecBase3) old_to_new_hpr(const FLOATNAME(LVecBase3) &old_hpr); -EXPCL_PANDA FLOATNAME(LVecBase3) +EXPCL_PANDA_LINMATH FLOATNAME(LVecBase3) new_to_old_hpr(const FLOATNAME(LVecBase3) &new_hpr); END_PUBLISH diff --git a/panda/src/linmath/config_linmath.h b/panda/src/linmath/config_linmath.h index b060e54a7a..504b1d45bb 100644 --- a/panda/src/linmath/config_linmath.h +++ b/panda/src/linmath/config_linmath.h @@ -23,11 +23,11 @@ #include "notifyCategoryProxy.h" #include "configVariableBool.h" -NotifyCategoryDecl(linmath, EXPCL_PANDA, EXPTP_PANDA); +NotifyCategoryDecl(linmath, EXPCL_PANDA_LINMATH, EXPTP_PANDA_LINMATH); -extern EXPCL_PANDA ConfigVariableBool paranoid_hpr_quat; -extern EXPCL_PANDA ConfigVariableBool temp_hpr_fix; +extern EXPCL_PANDA_LINMATH ConfigVariableBool paranoid_hpr_quat; +extern EXPCL_PANDA_LINMATH ConfigVariableBool temp_hpr_fix; -extern EXPCL_PANDA void init_liblinmath(); +extern EXPCL_PANDA_LINMATH void init_liblinmath(); #endif diff --git a/panda/src/linmath/coordinateSystem.h b/panda/src/linmath/coordinateSystem.h index c80b073ec7..0125e13663 100644 --- a/panda/src/linmath/coordinateSystem.h +++ b/panda/src/linmath/coordinateSystem.h @@ -43,17 +43,17 @@ enum CoordinateSystem { CS_invalid, }; -EXPCL_PANDA CoordinateSystem get_default_coordinate_system(); +EXPCL_PANDA_LINMATH CoordinateSystem get_default_coordinate_system(); END_PUBLISH -EXPCL_PANDA CoordinateSystem parse_coordinate_system_string(const string &str); -EXPCL_PANDA bool is_right_handed(CoordinateSystem cs = CS_default); +EXPCL_PANDA_LINMATH CoordinateSystem parse_coordinate_system_string(const string &str); +EXPCL_PANDA_LINMATH bool is_right_handed(CoordinateSystem cs = CS_default); #define IS_LEFT_HANDED_COORDSYSTEM(cs) ((cs==CS_zup_left) || (cs==CS_yup_left)) -EXPCL_PANDA ostream &operator << (ostream &out, CoordinateSystem cs); -EXPCL_PANDA istream &operator >> (istream &in, CoordinateSystem &cs); +EXPCL_PANDA_LINMATH ostream &operator << (ostream &out, CoordinateSystem cs); +EXPCL_PANDA_LINMATH istream &operator >> (istream &in, CoordinateSystem &cs); #endif diff --git a/panda/src/linmath/lmatrix3_src.h b/panda/src/linmath/lmatrix3_src.h index c9d23893ee..65f78c6782 100644 --- a/panda/src/linmath/lmatrix3_src.h +++ b/panda/src/linmath/lmatrix3_src.h @@ -24,7 +24,7 @@ // (rotation, scale, translation) in 2-d, e.g. for a // texture matrix. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA FLOATNAME(LMatrix3) { +class EXPCL_PANDA_LINMATH FLOATNAME(LMatrix3) { public: typedef const FLOATTYPE *iterator; typedef const FLOATTYPE *const_iterator; diff --git a/panda/src/linmath/lmatrix4_src.h b/panda/src/linmath/lmatrix4_src.h index f9c61e6584..5d5c8615f1 100644 --- a/panda/src/linmath/lmatrix4_src.h +++ b/panda/src/linmath/lmatrix4_src.h @@ -21,7 +21,7 @@ // Class : LMatrix4 // Description : This is a 4-by-4 transform matrix. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA FLOATNAME(LMatrix4) { +class EXPCL_PANDA_LINMATH FLOATNAME(LMatrix4) { public: typedef const FLOATTYPE *iterator; typedef const FLOATTYPE *const_iterator; diff --git a/panda/src/linmath/lorientation_src.h b/panda/src/linmath/lorientation_src.h index 382da757e0..05d86ed1d8 100644 --- a/panda/src/linmath/lorientation_src.h +++ b/panda/src/linmath/lorientation_src.h @@ -22,7 +22,7 @@ class FLOATNAME(LRotation); // Class : LOrientation // Description : This is a unit quaternion representing an orientation. //////////////////////////////////////////////////////////////////////// -class EXPCL_PANDA FLOATNAME(LOrientation) : public FLOATNAME(LQuaternion) { +class EXPCL_PANDA_LINMATH FLOATNAME(LOrientation) : public FLOATNAME(LQuaternion) { PUBLISHED: INLINE_LINMATH FLOATNAME(LOrientation)(); INLINE_LINMATH FLOATNAME(LOrientation)(const FLOATNAME(LQuaternion)&); diff --git a/panda/src/linmath/lpoint2_src.h b/panda/src/linmath/lpoint2_src.h index 2caf89d183..dcbba2974f 100644 --- a/panda/src/linmath/lpoint2_src.h +++ b/panda/src/linmath/lpoint2_src.h @@ -21,7 +21,7 @@ // Class : LPoint2 // Description : This is a two-component point in space. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA FLOATNAME(LPoint2) : public FLOATNAME(LVecBase2) { +class EXPCL_PANDA_LINMATH FLOATNAME(LPoint2) : public FLOATNAME(LVecBase2) { PUBLISHED: INLINE_LINMATH FLOATNAME(LPoint2)(); INLINE_LINMATH FLOATNAME(LPoint2)(const FLOATNAME(LVecBase2) ©); diff --git a/panda/src/linmath/lpoint3_src.h b/panda/src/linmath/lpoint3_src.h index 28dc5391b7..e833446943 100644 --- a/panda/src/linmath/lpoint3_src.h +++ b/panda/src/linmath/lpoint3_src.h @@ -26,7 +26,7 @@ // vector, while addition of a vector and a point yields // a point. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA FLOATNAME(LPoint3) : public FLOATNAME(LVecBase3) { +class EXPCL_PANDA_LINMATH FLOATNAME(LPoint3) : public FLOATNAME(LVecBase3) { PUBLISHED: INLINE_LINMATH FLOATNAME(LPoint3)(); INLINE_LINMATH FLOATNAME(LPoint3)(const FLOATNAME(LVecBase3) ©); diff --git a/panda/src/linmath/lpoint4_src.h b/panda/src/linmath/lpoint4_src.h index 69eb7eab3e..c4b6a64036 100644 --- a/panda/src/linmath/lpoint4_src.h +++ b/panda/src/linmath/lpoint4_src.h @@ -20,7 +20,7 @@ // Class : LPoint4 // Description : This is a four-component point in space. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA FLOATNAME(LPoint4) : public FLOATNAME(LVecBase4) { +class EXPCL_PANDA_LINMATH FLOATNAME(LPoint4) : public FLOATNAME(LVecBase4) { PUBLISHED: INLINE_LINMATH FLOATNAME(LPoint4)(); INLINE_LINMATH FLOATNAME(LPoint4)(const FLOATNAME(LVecBase4) ©); diff --git a/panda/src/linmath/lquaternion_src.h b/panda/src/linmath/lquaternion_src.h index 7c2b34d484..33c7506547 100644 --- a/panda/src/linmath/lquaternion_src.h +++ b/panda/src/linmath/lquaternion_src.h @@ -20,7 +20,7 @@ // Class : FLOATNAME(LQuaternion) // Description : This is the base quaternion class //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA FLOATNAME(LQuaternion) : public FLOATNAME(LVecBase4) { +class EXPCL_PANDA_LINMATH FLOATNAME(LQuaternion) : public FLOATNAME(LVecBase4) { PUBLISHED: INLINE_LINMATH FLOATNAME(LQuaternion)(); INLINE_LINMATH FLOATNAME(LQuaternion)(const FLOATNAME(LVecBase4) ©); diff --git a/panda/src/linmath/lrotation_src.h b/panda/src/linmath/lrotation_src.h index a5ac5efe99..11feb9acde 100644 --- a/panda/src/linmath/lrotation_src.h +++ b/panda/src/linmath/lrotation_src.h @@ -20,7 +20,7 @@ // Class : LRotation // Description : This is a unit quaternion representing a rotation. //////////////////////////////////////////////////////////////////////// -class EXPCL_PANDA FLOATNAME(LRotation) : public FLOATNAME(LQuaternion) { +class EXPCL_PANDA_LINMATH FLOATNAME(LRotation) : public FLOATNAME(LQuaternion) { PUBLISHED: INLINE_LINMATH FLOATNAME(LRotation)(); INLINE_LINMATH FLOATNAME(LRotation)(const FLOATNAME(LQuaternion) &); diff --git a/panda/src/linmath/lvecBase2_src.h b/panda/src/linmath/lvecBase2_src.h index 1700ace82e..97c957e250 100644 --- a/panda/src/linmath/lvecBase2_src.h +++ b/panda/src/linmath/lvecBase2_src.h @@ -24,7 +24,7 @@ // Description : This is the base class for all two-component // vectors and points. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA FLOATNAME(LVecBase2) { +class EXPCL_PANDA_LINMATH FLOATNAME(LVecBase2) { PUBLISHED: typedef const FLOATTYPE *iterator; typedef const FLOATTYPE *const_iterator; diff --git a/panda/src/linmath/lvecBase3_src.h b/panda/src/linmath/lvecBase3_src.h index b61c467361..80a380af7a 100644 --- a/panda/src/linmath/lvecBase3_src.h +++ b/panda/src/linmath/lvecBase3_src.h @@ -21,7 +21,7 @@ // Description : This is the base class for all three-component // vectors and points. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA FLOATNAME(LVecBase3) { +class EXPCL_PANDA_LINMATH FLOATNAME(LVecBase3) { PUBLISHED: typedef const FLOATTYPE *iterator; typedef const FLOATTYPE *const_iterator; diff --git a/panda/src/linmath/lvecBase4_src.h b/panda/src/linmath/lvecBase4_src.h index c1881623c1..eaef65c4fd 100644 --- a/panda/src/linmath/lvecBase4_src.h +++ b/panda/src/linmath/lvecBase4_src.h @@ -21,7 +21,7 @@ // Description : This is the base class for all three-component // vectors and points. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA FLOATNAME(LVecBase4) { +class EXPCL_PANDA_LINMATH FLOATNAME(LVecBase4) { PUBLISHED: typedef const FLOATTYPE *iterator; typedef const FLOATTYPE *const_iterator; diff --git a/panda/src/linmath/lvector2_src.h b/panda/src/linmath/lvector2_src.h index a3eed66b88..162e529df9 100644 --- a/panda/src/linmath/lvector2_src.h +++ b/panda/src/linmath/lvector2_src.h @@ -20,7 +20,7 @@ // Class : LVector2 // Description : This is a two-component vector offset. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA FLOATNAME(LVector2) : public FLOATNAME(LVecBase2) { +class EXPCL_PANDA_LINMATH FLOATNAME(LVector2) : public FLOATNAME(LVecBase2) { PUBLISHED: INLINE_LINMATH FLOATNAME(LVector2)(); INLINE_LINMATH FLOATNAME(LVector2)(const FLOATNAME(LVecBase2) ©); diff --git a/panda/src/linmath/lvector3_src.h b/panda/src/linmath/lvector3_src.h index 0321e29d02..e0a2b79bb6 100644 --- a/panda/src/linmath/lvector3_src.h +++ b/panda/src/linmath/lvector3_src.h @@ -26,7 +26,7 @@ // vector, while addition of a vector and a point yields // a point. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA FLOATNAME(LVector3) : public FLOATNAME(LVecBase3) { +class EXPCL_PANDA_LINMATH FLOATNAME(LVector3) : public FLOATNAME(LVecBase3) { PUBLISHED: INLINE_LINMATH FLOATNAME(LVector3)(); INLINE_LINMATH FLOATNAME(LVector3)(const FLOATNAME(LVecBase3) ©); diff --git a/panda/src/linmath/lvector4_src.h b/panda/src/linmath/lvector4_src.h index 89f7ad7e13..aee1a35261 100644 --- a/panda/src/linmath/lvector4_src.h +++ b/panda/src/linmath/lvector4_src.h @@ -20,7 +20,7 @@ // Class : LVector4 // Description : This is a four-component vector distance. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA FLOATNAME(LVector4) : public FLOATNAME(LVecBase4) { +class EXPCL_PANDA_LINMATH FLOATNAME(LVector4) : public FLOATNAME(LVecBase4) { PUBLISHED: INLINE_LINMATH FLOATNAME(LVector4)(); INLINE_LINMATH FLOATNAME(LVector4)(const FLOATNAME(LVecBase4) ©); diff --git a/panda/src/linmath/mathNumbers.h b/panda/src/linmath/mathNumbers.h index 160e7d556e..48176e3019 100644 --- a/panda/src/linmath/mathNumbers.h +++ b/panda/src/linmath/mathNumbers.h @@ -20,7 +20,7 @@ #include "pandabase.h" -class EXPCL_PANDA MathNumbers { +class EXPCL_PANDA_LINMATH MathNumbers { PUBLISHED: static const float pi_f; static const float rad_2_deg_f; diff --git a/panda/src/linmath/vector_Colorf.cxx b/panda/src/linmath/vector_Colorf.cxx index 854cd5263a..8d32a6e79b 100644 --- a/panda/src/linmath/vector_Colorf.cxx +++ b/panda/src/linmath/vector_Colorf.cxx @@ -18,8 +18,8 @@ #include "vector_Colorf.h" -#define EXPCL EXPCL_PANDA -#define EXPTP EXPTP_PANDA +#define EXPCL EXPCL_PANDA_LINMATH +#define EXPTP EXPTP_PANDA_LINMATH #define TYPE Colorf #define NAME vector_Colorf diff --git a/panda/src/linmath/vector_Colorf.h b/panda/src/linmath/vector_Colorf.h index 9102f2c5ec..d7f55b91bb 100644 --- a/panda/src/linmath/vector_Colorf.h +++ b/panda/src/linmath/vector_Colorf.h @@ -32,8 +32,8 @@ // rather than defining the vector again. //////////////////////////////////////////////////////////////////// -#define EXPCL EXPCL_PANDA -#define EXPTP EXPTP_PANDA +#define EXPCL EXPCL_PANDA_LINMATH +#define EXPTP EXPTP_PANDA_LINMATH #define TYPE Colorf #define NAME vector_Colorf diff --git a/panda/src/linmath/vector_LPoint2f.cxx b/panda/src/linmath/vector_LPoint2f.cxx index 523eba41bb..3ff78775cd 100644 --- a/panda/src/linmath/vector_LPoint2f.cxx +++ b/panda/src/linmath/vector_LPoint2f.cxx @@ -18,8 +18,8 @@ #include "vector_LPoint2f.h" -#define EXPCL EXPCL_PANDA -#define EXPTP EXPTP_PANDA +#define EXPCL EXPCL_PANDA_LINMATH +#define EXPTP EXPTP_PANDA_LINMATH #define TYPE LPoint2f #define NAME vector_LPoint2f diff --git a/panda/src/linmath/vector_LPoint2f.h b/panda/src/linmath/vector_LPoint2f.h index 0d4bcf4354..935ad0c6bf 100644 --- a/panda/src/linmath/vector_LPoint2f.h +++ b/panda/src/linmath/vector_LPoint2f.h @@ -32,8 +32,8 @@ // rather than defining the vector again. //////////////////////////////////////////////////////////////////// -#define EXPCL EXPCL_PANDA -#define EXPTP EXPTP_PANDA +#define EXPCL EXPCL_PANDA_LINMATH +#define EXPTP EXPTP_PANDA_LINMATH #define TYPE LPoint2f #define NAME vector_LPoint2f diff --git a/panda/src/linmath/vector_LVecBase3f.cxx b/panda/src/linmath/vector_LVecBase3f.cxx index c62d4f0fb1..50fd6816f7 100644 --- a/panda/src/linmath/vector_LVecBase3f.cxx +++ b/panda/src/linmath/vector_LVecBase3f.cxx @@ -18,8 +18,8 @@ #include "vector_LVecBase3f.h" -#define EXPCL EXPCL_PANDA -#define EXPTP EXPTP_PANDA +#define EXPCL EXPCL_PANDA_LINMATH +#define EXPTP EXPTP_PANDA_LINMATH #define TYPE LVecBase3f #define NAME vector_LVecBase3f diff --git a/panda/src/linmath/vector_LVecBase3f.h b/panda/src/linmath/vector_LVecBase3f.h index 8e33a18c10..5d21450f15 100644 --- a/panda/src/linmath/vector_LVecBase3f.h +++ b/panda/src/linmath/vector_LVecBase3f.h @@ -32,8 +32,8 @@ // rather than defining the vector again. //////////////////////////////////////////////////////////////////// -#define EXPCL EXPCL_PANDA -#define EXPTP EXPTP_PANDA +#define EXPCL EXPCL_PANDA_LINMATH +#define EXPTP EXPTP_PANDA_LINMATH #define TYPE LVecBase3f #define NAME vector_LVecBase3f diff --git a/panda/src/linmath/vector_Normalf.cxx b/panda/src/linmath/vector_Normalf.cxx index 329a1e071d..27d82b3782 100644 --- a/panda/src/linmath/vector_Normalf.cxx +++ b/panda/src/linmath/vector_Normalf.cxx @@ -18,8 +18,8 @@ #include "vector_Normalf.h" -#define EXPCL EXPCL_PANDA -#define EXPTP EXPTP_PANDA +#define EXPCL EXPCL_PANDA_LINMATH +#define EXPTP EXPTP_PANDA_LINMATH #define TYPE Normalf #define NAME vector_Normalf diff --git a/panda/src/linmath/vector_Normalf.h b/panda/src/linmath/vector_Normalf.h index f305f60fdf..2ede1b30d5 100644 --- a/panda/src/linmath/vector_Normalf.h +++ b/panda/src/linmath/vector_Normalf.h @@ -32,8 +32,8 @@ // rather than defining the vector again. //////////////////////////////////////////////////////////////////// -#define EXPCL EXPCL_PANDA -#define EXPTP EXPTP_PANDA +#define EXPCL EXPCL_PANDA_LINMATH +#define EXPTP EXPTP_PANDA_LINMATH #define TYPE Normalf #define NAME vector_Normalf diff --git a/panda/src/linmath/vector_Vertexf.cxx b/panda/src/linmath/vector_Vertexf.cxx index 1311626cae..d8b08f145d 100644 --- a/panda/src/linmath/vector_Vertexf.cxx +++ b/panda/src/linmath/vector_Vertexf.cxx @@ -18,8 +18,8 @@ #include "vector_Vertexf.h" -#define EXPCL EXPCL_PANDA -#define EXPTP EXPTP_PANDA +#define EXPCL EXPCL_PANDA_LINMATH +#define EXPTP EXPTP_PANDA_LINMATH #define TYPE Vertexf #define NAME vector_Vertexf diff --git a/panda/src/linmath/vector_Vertexf.h b/panda/src/linmath/vector_Vertexf.h index 49355dac35..b1859c15a3 100644 --- a/panda/src/linmath/vector_Vertexf.h +++ b/panda/src/linmath/vector_Vertexf.h @@ -32,8 +32,8 @@ // rather than defining the vector again. //////////////////////////////////////////////////////////////////// -#define EXPCL EXPCL_PANDA -#define EXPTP EXPTP_PANDA +#define EXPCL EXPCL_PANDA_LINMATH +#define EXPTP EXPTP_PANDA_LINMATH #define TYPE Vertexf #define NAME vector_Vertexf diff --git a/panda/src/mathutil/boundingBox.h b/panda/src/mathutil/boundingBox.h index 11860f3517..9cf42e6104 100644 --- a/panda/src/mathutil/boundingBox.h +++ b/panda/src/mathutil/boundingBox.h @@ -32,7 +32,7 @@ // This box is always axis-aligned. If you need a more // general bounding box, try BoundingHexahedron. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA BoundingBox : public FiniteBoundingVolume { +class EXPCL_PANDA_MATHUTIL BoundingBox : public FiniteBoundingVolume { PUBLISHED: INLINE_MATHUTIL BoundingBox(); INLINE_MATHUTIL BoundingBox(const LPoint3f &min, const LPoint3f &max); diff --git a/panda/src/mathutil/boundingHexahedron.h b/panda/src/mathutil/boundingHexahedron.h index 5efa4c7faa..425e0df5a1 100644 --- a/panda/src/mathutil/boundingHexahedron.h +++ b/panda/src/mathutil/boundingHexahedron.h @@ -37,7 +37,7 @@ // axis-aligned bounding box, you may be better off with // the simpler BoundingBox class. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA BoundingHexahedron : public FiniteBoundingVolume { +class EXPCL_PANDA_MATHUTIL BoundingHexahedron : public FiniteBoundingVolume { public: INLINE_MATHUTIL BoundingHexahedron(); diff --git a/panda/src/mathutil/boundingLine.h b/panda/src/mathutil/boundingLine.h index ce8f48006c..f128dd664b 100644 --- a/panda/src/mathutil/boundingLine.h +++ b/panda/src/mathutil/boundingLine.h @@ -34,7 +34,7 @@ // constructor. These are not endpoints, they are two // arbitrary points on the line. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA BoundingLine : public GeometricBoundingVolume { +class EXPCL_PANDA_MATHUTIL BoundingLine : public GeometricBoundingVolume { public: INLINE_MATHUTIL BoundingLine(); diff --git a/panda/src/mathutil/boundingPlane.h b/panda/src/mathutil/boundingPlane.h index 0f8984b723..f765e0c46a 100644 --- a/panda/src/mathutil/boundingPlane.h +++ b/panda/src/mathutil/boundingPlane.h @@ -32,7 +32,7 @@ // the part in front of the normal, which is "outside" // the bounding volume. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA BoundingPlane : public GeometricBoundingVolume { +class EXPCL_PANDA_MATHUTIL BoundingPlane : public GeometricBoundingVolume { PUBLISHED: INLINE_MATHUTIL BoundingPlane(); INLINE_MATHUTIL BoundingPlane(const Planef &plane); diff --git a/panda/src/mathutil/boundingSphere.h b/panda/src/mathutil/boundingSphere.h index e7ea6482ca..424dd4cb02 100644 --- a/panda/src/mathutil/boundingSphere.h +++ b/panda/src/mathutil/boundingSphere.h @@ -29,7 +29,7 @@ // center and a radius. It is always a sphere, and // never an ellipsoid or other quadric. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA BoundingSphere : public FiniteBoundingVolume { +class EXPCL_PANDA_MATHUTIL BoundingSphere : public FiniteBoundingVolume { PUBLISHED: INLINE_MATHUTIL BoundingSphere(); INLINE_MATHUTIL BoundingSphere(const LPoint3f ¢er, float radius); diff --git a/panda/src/mathutil/boundingVolume.h b/panda/src/mathutil/boundingVolume.h index ee1adf3155..dd42758969 100644 --- a/panda/src/mathutil/boundingVolume.h +++ b/panda/src/mathutil/boundingVolume.h @@ -44,7 +44,7 @@ class BoundingPlane; // is simply an abstract interface for bounds of any // sort. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA BoundingVolume : public TypedReferenceCount { +class EXPCL_PANDA_MATHUTIL BoundingVolume : public TypedReferenceCount { public: INLINE_MATHUTIL BoundingVolume(); @@ -195,7 +195,7 @@ INLINE_MATHUTIL ostream &operator << (ostream &out, const BoundingVolume &bound) #include "boundingVolume.I" -EXPCL_PANDA ostream &operator << (ostream &out, BoundingVolume::BoundsType type); -EXPCL_PANDA istream &operator >> (istream &in, BoundingVolume::BoundsType &type); +EXPCL_PANDA_MATHUTIL ostream &operator << (ostream &out, BoundingVolume::BoundsType type); +EXPCL_PANDA_MATHUTIL istream &operator >> (istream &in, BoundingVolume::BoundsType &type); #endif diff --git a/panda/src/mathutil/config_mathutil.h b/panda/src/mathutil/config_mathutil.h index 1139f3e06b..3ea85f7be9 100644 --- a/panda/src/mathutil/config_mathutil.h +++ b/panda/src/mathutil/config_mathutil.h @@ -25,13 +25,13 @@ #include "configVariableEnum.h" #include "boundingVolume.h" -NotifyCategoryDecl(mathutil, EXPCL_PANDA, EXPTP_PANDA); +NotifyCategoryDecl(mathutil, EXPCL_PANDA_MATHUTIL, EXPTP_PANDA_MATHUTIL); extern ConfigVariableDouble fft_offset; extern ConfigVariableDouble fft_factor; extern ConfigVariableDouble fft_exponent; extern ConfigVariableDouble fft_error_threshold; -extern EXPCL_PANDA ConfigVariableEnum bounds_type; +extern EXPCL_PANDA_MATHUTIL ConfigVariableEnum bounds_type; #endif diff --git a/panda/src/mathutil/fftCompressor.h b/panda/src/mathutil/fftCompressor.h index e05081481e..03cb2eea3d 100644 --- a/panda/src/mathutil/fftCompressor.h +++ b/panda/src/mathutil/fftCompressor.h @@ -45,7 +45,7 @@ class DatagramIterator; // without it, it will fall back on lossless output of // the original data. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA FFTCompressor { +class EXPCL_PANDA_MATHUTIL FFTCompressor { public: FFTCompressor(); diff --git a/panda/src/mathutil/finiteBoundingVolume.h b/panda/src/mathutil/finiteBoundingVolume.h index 33c0031044..95acd842d2 100644 --- a/panda/src/mathutil/finiteBoundingVolume.h +++ b/panda/src/mathutil/finiteBoundingVolume.h @@ -30,7 +30,7 @@ // known to be finite. It is possible to query this // kind of volume for its minimum and maximum extents. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA FiniteBoundingVolume : public GeometricBoundingVolume { +class EXPCL_PANDA_MATHUTIL FiniteBoundingVolume : public GeometricBoundingVolume { PUBLISHED: virtual LPoint3f get_min() const=0; virtual LPoint3f get_max() const=0; diff --git a/panda/src/mathutil/frustum_src.h b/panda/src/mathutil/frustum_src.h index 803457c022..62eb148861 100644 --- a/panda/src/mathutil/frustum_src.h +++ b/panda/src/mathutil/frustum_src.h @@ -20,7 +20,7 @@ // Class : Frustum // Description : //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA FLOATNAME(Frustum) { +class EXPCL_PANDA_MATHUTIL FLOATNAME(Frustum) { PUBLISHED: INLINE_MATHUTIL FLOATNAME(Frustum)(); diff --git a/panda/src/mathutil/geometricBoundingVolume.h b/panda/src/mathutil/geometricBoundingVolume.h index 25ff6db6de..58e09db587 100644 --- a/panda/src/mathutil/geometricBoundingVolume.h +++ b/panda/src/mathutil/geometricBoundingVolume.h @@ -32,7 +32,7 @@ // of bounding volumes that actually enclose points in // 3-d space, such as BSP's and bounding spheres. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GeometricBoundingVolume : public BoundingVolume { +class EXPCL_PANDA_MATHUTIL GeometricBoundingVolume : public BoundingVolume { public: INLINE_MATHUTIL GeometricBoundingVolume(); diff --git a/panda/src/mathutil/linmath_events.h b/panda/src/mathutil/linmath_events.h index fd086b2c76..0657137924 100644 --- a/panda/src/mathutil/linmath_events.h +++ b/panda/src/mathutil/linmath_events.h @@ -36,9 +36,9 @@ //////////////////////////////////////////////////////////////////// -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, EventStoreValue); -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, EventStoreValue); -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, EventStoreValue); +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_MATHUTIL, EXPTP_PANDA_MATHUTIL, EventStoreValue); +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_MATHUTIL, EXPTP_PANDA_MATHUTIL, EventStoreValue); +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_MATHUTIL, EXPTP_PANDA_MATHUTIL, EventStoreValue); typedef EventStoreValue EventStoreVec2; typedef EventStoreValue EventStoreVec3; diff --git a/panda/src/mathutil/look_at_src.h b/panda/src/mathutil/look_at_src.h index 0ffe16620d..483d7ba132 100644 --- a/panda/src/mathutil/look_at_src.h +++ b/panda/src/mathutil/look_at_src.h @@ -31,11 +31,11 @@ BEGIN_PUBLISH -EXPCL_PANDA void +EXPCL_PANDA_MATHUTIL void heads_up(FLOATNAME(LMatrix3) &mat, const FLOATNAME(LVector3) &fwd, const FLOATNAME(LVector3) &up = FLOATNAME(LVector3)::up(), CoordinateSystem cs = CS_default); -EXPCL_PANDA void +EXPCL_PANDA_MATHUTIL void look_at(FLOATNAME(LMatrix3) &mat, const FLOATNAME(LVector3) &fwd, const FLOATNAME(LVector3) &up = FLOATNAME(LVector3)::up(), CoordinateSystem cs = CS_default); diff --git a/panda/src/mathutil/mersenne.h b/panda/src/mathutil/mersenne.h index c9a3ba0766..1a3e8620ac 100644 --- a/panda/src/mathutil/mersenne.h +++ b/panda/src/mathutil/mersenne.h @@ -64,7 +64,7 @@ #include "pandabase.h" -class EXPCL_PANDA Mersenne { +class EXPCL_PANDA_MATHUTIL Mersenne { PUBLISHED: Mersenne(unsigned long seed); unsigned long get_uint31(); diff --git a/panda/src/mathutil/omniBoundingVolume.h b/panda/src/mathutil/omniBoundingVolume.h index 4359754c44..a1dff65d8c 100644 --- a/panda/src/mathutil/omniBoundingVolume.h +++ b/panda/src/mathutil/omniBoundingVolume.h @@ -28,7 +28,7 @@ // Description : This is a special kind of GeometricBoundingVolume // that fills all of space. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA OmniBoundingVolume : public GeometricBoundingVolume { +class EXPCL_PANDA_MATHUTIL OmniBoundingVolume : public GeometricBoundingVolume { PUBLISHED: INLINE_MATHUTIL OmniBoundingVolume(); diff --git a/panda/src/mathutil/perlinNoise.h b/panda/src/mathutil/perlinNoise.h index 960d70c543..5cfccaee1c 100644 --- a/panda/src/mathutil/perlinNoise.h +++ b/panda/src/mathutil/perlinNoise.h @@ -32,7 +32,7 @@ // implementation. The base class just collects the // common functionality. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PerlinNoise { +class EXPCL_PANDA_MATHUTIL PerlinNoise { protected: PerlinNoise(int table_size, unsigned long seed); PerlinNoise(const PerlinNoise ©); diff --git a/panda/src/mathutil/perlinNoise2.h b/panda/src/mathutil/perlinNoise2.h index 67826b6e46..f3aad80cb9 100644 --- a/panda/src/mathutil/perlinNoise2.h +++ b/panda/src/mathutil/perlinNoise2.h @@ -29,7 +29,7 @@ // reference implementation at // http://mrl.nyu.edu/~perlin/noise/ . //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PerlinNoise2 : public PerlinNoise { +class EXPCL_PANDA_MATHUTIL PerlinNoise2 : public PerlinNoise { PUBLISHED: INLINE PerlinNoise2(); INLINE PerlinNoise2(double sx, double sy, diff --git a/panda/src/mathutil/perlinNoise3.h b/panda/src/mathutil/perlinNoise3.h index 7dff97ecbb..3da422fa2e 100644 --- a/panda/src/mathutil/perlinNoise3.h +++ b/panda/src/mathutil/perlinNoise3.h @@ -29,7 +29,7 @@ // reference implementation at // http://mrl.nyu.edu/~perlin/noise/ . //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PerlinNoise3 : public PerlinNoise { +class EXPCL_PANDA_MATHUTIL PerlinNoise3 : public PerlinNoise { PUBLISHED: INLINE PerlinNoise3(); INLINE PerlinNoise3(double sx, double sy, double sz, diff --git a/panda/src/mathutil/plane_src.h b/panda/src/mathutil/plane_src.h index 7741ea85b0..639fd8e343 100644 --- a/panda/src/mathutil/plane_src.h +++ b/panda/src/mathutil/plane_src.h @@ -21,7 +21,7 @@ // Description : An abstract mathematical description of a plane. A // plane is defined by the equation Ax + By + Cz + D = 0. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA FLOATNAME(Plane) : public FLOATNAME(LVecBase4) { +class EXPCL_PANDA_MATHUTIL FLOATNAME(Plane) : public FLOATNAME(LVecBase4) { PUBLISHED: INLINE_MATHUTIL FLOATNAME(Plane)(); INLINE_MATHUTIL FLOATNAME(Plane)(const FLOATNAME(LVecBase4) ©); diff --git a/panda/src/mathutil/randomizer.h b/panda/src/mathutil/randomizer.h index 36e59b83d6..f4dfaaa81d 100644 --- a/panda/src/mathutil/randomizer.h +++ b/panda/src/mathutil/randomizer.h @@ -26,7 +26,7 @@ // Class : Randomizer // Description : A handy class to return random numbers. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA Randomizer { +class EXPCL_PANDA_MATHUTIL Randomizer { public: INLINE Randomizer(unsigned long seed = 0); INLINE Randomizer(const Randomizer ©); diff --git a/panda/src/mathutil/rotate_to.h b/panda/src/mathutil/rotate_to.h index d49cfd5d1a..57ea93f44f 100644 --- a/panda/src/mathutil/rotate_to.h +++ b/panda/src/mathutil/rotate_to.h @@ -36,11 +36,11 @@ BEGIN_PUBLISH -EXPCL_PANDA void rotate_to(LMatrix3f &mat, const LVector3f &a, const LVector3f &b); -EXPCL_PANDA void rotate_to(LMatrix3d &mat, const LVector3d &a, const LVector3d &b); +EXPCL_PANDA_MATHUTIL void rotate_to(LMatrix3f &mat, const LVector3f &a, const LVector3f &b); +EXPCL_PANDA_MATHUTIL void rotate_to(LMatrix3d &mat, const LVector3d &a, const LVector3d &b); -EXPCL_PANDA void rotate_to(LMatrix4f &mat, const LVector3f &a, const LVector3f &b); -EXPCL_PANDA void rotate_to(LMatrix4d &mat, const LVector3d &a, const LVector3d &b); +EXPCL_PANDA_MATHUTIL void rotate_to(LMatrix4f &mat, const LVector3f &a, const LVector3f &b); +EXPCL_PANDA_MATHUTIL void rotate_to(LMatrix4d &mat, const LVector3d &a, const LVector3d &b); END_PUBLISH diff --git a/panda/src/mathutil/stackedPerlinNoise2.h b/panda/src/mathutil/stackedPerlinNoise2.h index 0e18330931..995c0d0451 100644 --- a/panda/src/mathutil/stackedPerlinNoise2.h +++ b/panda/src/mathutil/stackedPerlinNoise2.h @@ -29,7 +29,7 @@ // more high-frequency noise functions added to a // lower-frequency base noise function. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA StackedPerlinNoise2 { +class EXPCL_PANDA_MATHUTIL StackedPerlinNoise2 { PUBLISHED: INLINE StackedPerlinNoise2(); StackedPerlinNoise2(double sx, double sy, int num_levels = 2, diff --git a/panda/src/mathutil/stackedPerlinNoise3.h b/panda/src/mathutil/stackedPerlinNoise3.h index 582e8e783f..edbdb1f987 100644 --- a/panda/src/mathutil/stackedPerlinNoise3.h +++ b/panda/src/mathutil/stackedPerlinNoise3.h @@ -29,7 +29,7 @@ // more high-frequency noise functions added to a // lower-frequency base noise function. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA StackedPerlinNoise3 { +class EXPCL_PANDA_MATHUTIL StackedPerlinNoise3 { PUBLISHED: INLINE StackedPerlinNoise3(); StackedPerlinNoise3(double sx, double sy, double sz, int num_levels = 3, diff --git a/panda/src/mathutil/triangulator.h b/panda/src/mathutil/triangulator.h index 7ced954a0c..13fbe724e6 100644 --- a/panda/src/mathutil/triangulator.h +++ b/panda/src/mathutil/triangulator.h @@ -39,7 +39,7 @@ // convert your polygon into a plane if you have 3-d // points. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA Triangulator { +class EXPCL_PANDA_MATHUTIL Triangulator { PUBLISHED: Triangulator(); diff --git a/panda/src/movies/config_movies.h b/panda/src/movies/config_movies.h index d97af2be9f..b46deb0785 100644 --- a/panda/src/movies/config_movies.h +++ b/panda/src/movies/config_movies.h @@ -25,9 +25,9 @@ #include "configVariableDouble.h" #include "dconfig.h" -ConfigureDecl(config_movies, EXPCL_PANDA, EXPTP_PANDA); -NotifyCategoryDecl(movies, EXPCL_PANDA, EXPTP_PANDA); +ConfigureDecl(config_movies, EXPCL_PANDA_MOVIES, EXPTP_PANDA_MOVIES); +NotifyCategoryDecl(movies, EXPCL_PANDA_MOVIES, EXPTP_PANDA_MOVIES); -extern EXPCL_PANDA void init_libmovies(); +extern EXPCL_PANDA_MOVIES void init_libmovies(); #endif /* __CONFIG_MOVIES_H__ */ diff --git a/panda/src/movies/movie.h b/panda/src/movies/movie.h index d994b5d125..6b07cf6b33 100644 --- a/panda/src/movies/movie.h +++ b/panda/src/movies/movie.h @@ -32,7 +32,7 @@ // an AVI file, or an internet TV station. It could // also be an MP3 file paired with a dummy video stream. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA Movie : public TypedWritableReferenceCount, public Namable{ +class EXPCL_PANDA_MOVIES Movie : public TypedWritableReferenceCount, public Namable{ PUBLISHED: Movie(const string &name, double len); diff --git a/panda/src/movies/movieAudio.h b/panda/src/movies/movieAudio.h index 53ae8576c9..dabc0be991 100644 --- a/panda/src/movies/movieAudio.h +++ b/panda/src/movies/movieAudio.h @@ -28,7 +28,7 @@ // Class : MovieAudio // Description : A stream that generates a sequence of audio samples. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA MovieAudio : public TypedWritableReferenceCount, public Namable { +class EXPCL_PANDA_MOVIES MovieAudio : public TypedWritableReferenceCount, public Namable { PUBLISHED: MovieAudio(const string &name, double len); diff --git a/panda/src/movies/movieVideo.h b/panda/src/movies/movieVideo.h index 28e5e940da..df85ded8bc 100644 --- a/panda/src/movies/movieVideo.h +++ b/panda/src/movies/movieVideo.h @@ -27,7 +27,7 @@ // Class : MovieVideo // Description : A stream that generates a series of images. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA MovieVideo : public TypedWritableReferenceCount, public Namable { +class EXPCL_PANDA_MOVIES MovieVideo : public TypedWritableReferenceCount, public Namable { PUBLISHED: MovieVideo(const string &name, double len); diff --git a/panda/src/nativenet/buffered_datagramconnection.h b/panda/src/nativenet/buffered_datagramconnection.h index 773d4faca0..f34025fbb0 100755 --- a/panda/src/nativenet/buffered_datagramconnection.h +++ b/panda/src/nativenet/buffered_datagramconnection.h @@ -28,7 +28,7 @@ // 3. Socket is open and writable.. ( Fully powered up )... // /////////////////////////////////////////////////////////////// -class EXPCL_PANDA Buffered_DatagramConnection : public Socket_TCP +class EXPCL_PANDA_NATIVENET Buffered_DatagramConnection : public Socket_TCP { private: struct AddressQueue : private pvector // this is used to do a round robin for addres to connect to .. diff --git a/panda/src/nativenet/config_nativenet.h b/panda/src/nativenet/config_nativenet.h index d12b2c1edc..43ffb55b93 100644 --- a/panda/src/nativenet/config_nativenet.h +++ b/panda/src/nativenet/config_nativenet.h @@ -24,9 +24,9 @@ // Configure variables for nativenet package. -NotifyCategoryDecl(nativenet, EXPCL_PANDA, EXPTP_PANDA); +NotifyCategoryDecl(nativenet, EXPCL_PANDA_NATIVENET, EXPTP_PANDA_NATIVENET); -extern EXPCL_PANDA void init_libnativenet(); +extern EXPCL_PANDA_NATIVENET void init_libnativenet(); #endif diff --git a/panda/src/nativenet/membuffer.h b/panda/src/nativenet/membuffer.h index 0cb4ea677f..0d37a57e3e 100755 --- a/panda/src/nativenet/membuffer.h +++ b/panda/src/nativenet/membuffer.h @@ -14,7 +14,7 @@ // // //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA MemBuffer +class EXPCL_PANDA_NATIVENET MemBuffer { public: inline MemBuffer(void); diff --git a/panda/src/nativenet/ringbuffer.h b/panda/src/nativenet/ringbuffer.h index a8639413df..d4666e7f1c 100755 --- a/panda/src/nativenet/ringbuffer.h +++ b/panda/src/nativenet/ringbuffer.h @@ -16,7 +16,7 @@ // //////////////////////////////////////////////////////////////////// #include "membuffer.h" -class EXPCL_PANDA RingBuffer : protected MemBuffer +class EXPCL_PANDA_NATIVENET RingBuffer : protected MemBuffer { protected: size_t _StartPos; diff --git a/panda/src/nativenet/socket_address.h b/panda/src/nativenet/socket_address.h index 02ee91e65a..7b957cc0cb 100755 --- a/panda/src/nativenet/socket_address.h +++ b/panda/src/nativenet/socket_address.h @@ -12,7 +12,7 @@ // communication layer // ////////////////////////////// -class EXPCL_PANDA Socket_Address +class EXPCL_PANDA_NATIVENET Socket_Address { public: typedef struct sockaddr_in AddressType; diff --git a/panda/src/nativenet/socket_ip.h b/panda/src/nativenet/socket_ip.h index 2593bffa3a..fcdf1e2ee7 100755 --- a/panda/src/nativenet/socket_ip.h +++ b/panda/src/nativenet/socket_ip.h @@ -31,7 +31,7 @@ class Socket_UDP_Outgoing; // socket_fdset // ///////////////////////////////////////////////////////////////////// -class EXPCL_PANDA Socket_IP : public TypedObject { +class EXPCL_PANDA_NATIVENET Socket_IP : public TypedObject { public: PUBLISHED: diff --git a/panda/src/nativenet/socket_tcp.h b/panda/src/nativenet/socket_tcp.h index 710ea6ae63..a0e535e927 100755 --- a/panda/src/nativenet/socket_tcp.h +++ b/panda/src/nativenet/socket_tcp.h @@ -12,7 +12,7 @@ // platform differences from machine to machine // ///////////////////////////////////////////////////////////////////// -class EXPCL_PANDA Socket_TCP : public Socket_IP +class EXPCL_PANDA_NATIVENET Socket_TCP : public Socket_IP { public: PUBLISHED: diff --git a/panda/src/nativenet/socket_tcp_listen.h b/panda/src/nativenet/socket_tcp_listen.h index 293be0cbba..5b9f48ab32 100755 --- a/panda/src/nativenet/socket_tcp_listen.h +++ b/panda/src/nativenet/socket_tcp_listen.h @@ -8,7 +8,7 @@ // Class : Socket_TCP_Listen // Description : Base functionality for a TCP rendezvous socket ///////////////////////////////////////////////////////////////////// -class EXPCL_PANDA Socket_TCP_Listen : public Socket_IP +class EXPCL_PANDA_NATIVENET Socket_TCP_Listen : public Socket_IP { public: PUBLISHED: diff --git a/panda/src/nativenet/socket_tcp_ssl.h b/panda/src/nativenet/socket_tcp_ssl.h index 323c5dda5e..b462dcd469 100755 --- a/panda/src/nativenet/socket_tcp_ssl.h +++ b/panda/src/nativenet/socket_tcp_ssl.h @@ -21,7 +21,7 @@ // ///////////////////////////////////////////////////////////////////// -extern EXPCL_PANDA SSL_CTX *global_ssl_ctx; +extern EXPCL_PANDA_NATIVENET SSL_CTX *global_ssl_ctx; struct SSlStartup @@ -47,7 +47,7 @@ struct SSlStartup }; -class EXPCL_PANDA Socket_TCP_SSL : public Socket_IP +class EXPCL_PANDA_NATIVENET Socket_TCP_SSL : public Socket_IP { public: diff --git a/panda/src/nativenet/socket_udp.h b/panda/src/nativenet/socket_udp.h index 7ad2edb5ba..db02d85b56 100644 --- a/panda/src/nativenet/socket_udp.h +++ b/panda/src/nativenet/socket_udp.h @@ -29,7 +29,7 @@ // Socket_UDP_Outgoing, to avoid the problems of // multiple inheritance. ///////////////////////////////////////////////////////////////////// -class EXPCL_PANDA Socket_UDP : public Socket_UDP_Incoming +class EXPCL_PANDA_NATIVENET Socket_UDP : public Socket_UDP_Incoming { public: PUBLISHED: diff --git a/panda/src/nativenet/socket_udp_incoming.h b/panda/src/nativenet/socket_udp_incoming.h index 61919c5662..c915e6a875 100755 --- a/panda/src/nativenet/socket_udp_incoming.h +++ b/panda/src/nativenet/socket_udp_incoming.h @@ -11,7 +11,7 @@ // // ///////////////////////////////////////////////////////////////////// -class EXPCL_PANDA Socket_UDP_Incoming : public Socket_IP +class EXPCL_PANDA_NATIVENET Socket_UDP_Incoming : public Socket_IP { PUBLISHED: inline Socket_UDP_Incoming() { } diff --git a/panda/src/nativenet/socket_udp_outgoing.h b/panda/src/nativenet/socket_udp_outgoing.h index 6c267b8b9f..75fba03eb8 100755 --- a/panda/src/nativenet/socket_udp_outgoing.h +++ b/panda/src/nativenet/socket_udp_outgoing.h @@ -8,7 +8,7 @@ // // ///////////////////////////////////////////////////////////////////// -class EXPCL_PANDA Socket_UDP_Outgoing : public Socket_IP +class EXPCL_PANDA_NATIVENET Socket_UDP_Outgoing : public Socket_IP { public: PUBLISHED: diff --git a/panda/src/net/config_net.h b/panda/src/net/config_net.h index 0af338305d..8d2a45fcc9 100644 --- a/panda/src/net/config_net.h +++ b/panda/src/net/config_net.h @@ -26,14 +26,14 @@ // Configure variables for net package. -NotifyCategoryDecl(net, EXPCL_PANDA, EXPTP_PANDA); +NotifyCategoryDecl(net, EXPCL_PANDA_NET, EXPTP_PANDA_NET); extern int get_net_max_write_queue(); extern int get_net_max_response_queue(); extern bool get_net_error_abort(); extern double get_max_poll_cycle(); -extern EXPCL_PANDA void init_libnet(); +extern EXPCL_PANDA_NET void init_libnet(); #endif diff --git a/panda/src/net/connection.h b/panda/src/net/connection.h index ca167b4b41..b281558e6f 100644 --- a/panda/src/net/connection.h +++ b/panda/src/net/connection.h @@ -33,7 +33,7 @@ class NetDatagram; // Description : Represents a single TCP or UDP socket for input or // output. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA Connection : public ReferenceCount { +class EXPCL_PANDA_NET Connection : public ReferenceCount { PUBLISHED: Connection(ConnectionManager *manager, Socket_IP *socket); ~Connection(); diff --git a/panda/src/net/connectionListener.h b/panda/src/net/connectionListener.h index a1259c181e..9163afdff1 100644 --- a/panda/src/net/connectionListener.h +++ b/panda/src/net/connectionListener.h @@ -36,7 +36,7 @@ class NetAddress; // what to do with the established connection. See // QueuedConnectionListener. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ConnectionListener : public ConnectionReader { +class EXPCL_PANDA_NET ConnectionListener : public ConnectionReader { PUBLISHED: ConnectionListener(ConnectionManager *manager, int num_threads); diff --git a/panda/src/net/connectionManager.h b/panda/src/net/connectionManager.h index 5c784130c7..b71d50ffa6 100644 --- a/panda/src/net/connectionManager.h +++ b/panda/src/net/connectionManager.h @@ -47,7 +47,7 @@ class ConnectionWriter; // events (or derive your own class to handle these // events properly). //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ConnectionManager { +class EXPCL_PANDA_NET ConnectionManager { PUBLISHED: ConnectionManager(); virtual ~ConnectionManager(); diff --git a/panda/src/net/connectionReader.h b/panda/src/net/connectionReader.h index 21c0d6e80c..175a5801d9 100644 --- a/panda/src/net/connectionReader.h +++ b/panda/src/net/connectionReader.h @@ -56,7 +56,7 @@ class Socket_IP; // it to accept connections on a rendezvous socket // rather than read datagrams. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ConnectionReader { +class EXPCL_PANDA_NET ConnectionReader { PUBLISHED: // The implementation here used to involve NSPR's multi-wait // interface, but that got too complicated to manage. It turns out diff --git a/panda/src/net/connectionWriter.h b/panda/src/net/connectionWriter.h index e7f77b1c91..fa5f9a64d7 100644 --- a/panda/src/net/connectionWriter.h +++ b/panda/src/net/connectionWriter.h @@ -39,7 +39,7 @@ class NetAddress; // sockets. The number of threads is specified at // construction time and cannot be changed. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ConnectionWriter { +class EXPCL_PANDA_NET ConnectionWriter { PUBLISHED: ConnectionWriter(ConnectionManager *manager, int num_threads); ~ConnectionWriter(); diff --git a/panda/src/net/datagramQueue.h b/panda/src/net/datagramQueue.h index 47f0271b62..b218df6f19 100644 --- a/panda/src/net/datagramQueue.h +++ b/panda/src/net/datagramQueue.h @@ -32,7 +32,7 @@ // by ConnectionWriter for queuing up datagrams for // its various threads to write to sockets. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA DatagramQueue { +class EXPCL_PANDA_NET DatagramQueue { public: DatagramQueue(); ~DatagramQueue(); diff --git a/panda/src/net/datagramTCPHeader.h b/panda/src/net/datagramTCPHeader.h index 35fbb2c340..e29c67cf01 100644 --- a/panda/src/net/datagramTCPHeader.h +++ b/panda/src/net/datagramTCPHeader.h @@ -39,7 +39,7 @@ class NetDatagram; // DatagramUDPHeader, except it does not include a // checksum, since this is unnecessary on UDP. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA DatagramTCPHeader { +class EXPCL_PANDA_NET DatagramTCPHeader { public: DatagramTCPHeader(const NetDatagram &datagram, int header_size); DatagramTCPHeader(const void *data, int header_size); diff --git a/panda/src/net/datagramUDPHeader.h b/panda/src/net/datagramUDPHeader.h index eeccef0db4..422605eaa7 100644 --- a/panda/src/net/datagramUDPHeader.h +++ b/panda/src/net/datagramUDPHeader.h @@ -38,7 +38,7 @@ class NetDatagram; // automatically handles converting its data to and from // the network byte ordering. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA DatagramUDPHeader { +class EXPCL_PANDA_NET DatagramUDPHeader { public: DatagramUDPHeader(const NetDatagram &datagram); DatagramUDPHeader(const void *data); diff --git a/panda/src/net/netAddress.h b/panda/src/net/netAddress.h index d97e0e2231..c3ab70a7fb 100644 --- a/panda/src/net/netAddress.h +++ b/panda/src/net/netAddress.h @@ -28,7 +28,7 @@ // Description : Represents a network address to which UDP packets may // be sent or to which a TCP socket may be bound. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA NetAddress { +class EXPCL_PANDA_NET NetAddress { PUBLISHED: NetAddress(); NetAddress(const Socket_Address &addr); diff --git a/panda/src/net/netDatagram.h b/panda/src/net/netDatagram.h index f493cf85e4..0adf9945ad 100644 --- a/panda/src/net/netDatagram.h +++ b/panda/src/net/netDatagram.h @@ -44,7 +44,7 @@ static const int maximum_udp_datagram = 1024; // only in that it knows which Connection and/or // NetAddress it is to be sent to or was received from. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA NetDatagram : public Datagram { +class EXPCL_PANDA_NET NetDatagram : public Datagram { PUBLISHED: NetDatagram(); NetDatagram(const void *data, size_t size); diff --git a/panda/src/net/queuedConnectionListener.h b/panda/src/net/queuedConnectionListener.h index f65ff0b47d..721dff4d75 100644 --- a/panda/src/net/queuedConnectionListener.h +++ b/panda/src/net/queuedConnectionListener.h @@ -28,7 +28,7 @@ #include "pdeque.h" -class EXPCL_PANDA ConnectionListenerData { +class EXPCL_PANDA_NET ConnectionListenerData { public: // We need these methods to make VC++ happy when we try to // instantiate the template, below. They don't do anything useful. @@ -41,7 +41,7 @@ public: PT(Connection) _new_connection; }; -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, QueuedReturn); +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_NET, EXPTP_PANDA_NET, QueuedReturn); //////////////////////////////////////////////////////////////////// // Class : QueuedConnectionListener @@ -49,7 +49,7 @@ EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, QueuedReturn { PUBLISHED: QueuedConnectionListener(ConnectionManager *manager, int num_threads); diff --git a/panda/src/net/queuedConnectionManager.h b/panda/src/net/queuedConnectionManager.h index 1128d978dc..5bafeb0846 100644 --- a/panda/src/net/queuedConnectionManager.h +++ b/panda/src/net/queuedConnectionManager.h @@ -25,7 +25,7 @@ #include "queuedReturn.h" #include "pdeque.h" -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, QueuedReturn< PT(Connection) >); +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_NET, EXPTP_PANDA_NET, QueuedReturn< PT(Connection) >); //////////////////////////////////////////////////////////////////// // Class : QueuedConnectionManager @@ -40,7 +40,7 @@ EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, QueuedReturn< PT(Connection) >); // close_connection() on that connection to free up its // resources. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA QueuedConnectionManager : public ConnectionManager, +class EXPCL_PANDA_NET QueuedConnectionManager : public ConnectionManager, public QueuedReturn< PT(Connection) > { PUBLISHED: QueuedConnectionManager(); diff --git a/panda/src/net/queuedConnectionReader.h b/panda/src/net/queuedConnectionReader.h index 713001027b..b0e3b9fe36 100644 --- a/panda/src/net/queuedConnectionReader.h +++ b/panda/src/net/queuedConnectionReader.h @@ -27,7 +27,7 @@ #include "pmutex.h" #include "pdeque.h" -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, QueuedReturn); +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_NET, EXPTP_PANDA_NET, QueuedReturn); //////////////////////////////////////////////////////////////////// // Class : QueuedConnectionReader @@ -38,7 +38,7 @@ EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, QueuedReturn); // threading and is willing to poll for datagrams at its // convenience. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA QueuedConnectionReader : public ConnectionReader, +class EXPCL_PANDA_NET QueuedConnectionReader : public ConnectionReader, public QueuedReturn { PUBLISHED: QueuedConnectionReader(ConnectionManager *manager, int num_threads); diff --git a/panda/src/net/recentConnectionReader.h b/panda/src/net/recentConnectionReader.h index a620693e92..8f2c0df28d 100644 --- a/panda/src/net/recentConnectionReader.h +++ b/panda/src/net/recentConnectionReader.h @@ -37,7 +37,7 @@ // // This class will always create one thread for itself. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA RecentConnectionReader : public ConnectionReader { +class EXPCL_PANDA_NET RecentConnectionReader : public ConnectionReader { PUBLISHED: RecentConnectionReader(ConnectionManager *manager); virtual ~RecentConnectionReader(); diff --git a/panda/src/pandabase/libpandabase.in b/panda/src/pandabase/libpandabase.in index 004d56dacf..b4508eb042 100644 --- a/panda/src/pandabase/libpandabase.in +++ b/panda/src/pandabase/libpandabase.in @@ -6,24 +6,24 @@ 0 22 1 15 EXPCL_FRAMEWORK 0 0 0 0 0 -2 11 EXPCL_PANDA 0 0 0 0 0 -3 13 EXPCL_PANDADX 0 0 0 0 0 -4 14 EXPCL_PANDAEGG 0 0 0 0 0 -5 18 EXPCL_PANDAEXPRESS 0 0 0 0 0 -6 13 EXPCL_PANDAGL 0 0 0 0 0 -7 15 EXPCL_PANDAGLUT 0 0 0 0 0 -8 18 EXPCL_PANDAPHYSICS 0 0 0 0 0 -9 14 EXPCL_PANDARIB 0 0 0 0 0 +2 11 EXPCL_PANDA_PANDABASE 0 0 0 0 0 +3 13 EXPCL_PANDA_PANDABASEDX 0 0 0 0 0 +4 14 EXPCL_PANDA_PANDABASEEGG 0 0 0 0 0 +5 18 EXPCL_PANDA_PANDABASEEXPRESS 0 0 0 0 0 +6 13 EXPCL_PANDA_PANDABASEGL 0 0 0 0 0 +7 15 EXPCL_PANDA_PANDABASEGLUT 0 0 0 0 0 +8 18 EXPCL_PANDA_PANDABASEPHYSICS 0 0 0 0 0 +9 14 EXPCL_PANDA_PANDABASERIB 0 0 0 0 0 10 12 EXPCL_SHADER 0 0 0 0 0 11 15 EXPTP_FRAMEWORK 0 0 0 0 0 -12 11 EXPTP_PANDA 0 0 0 0 0 -13 13 EXPTP_PANDADX 0 0 0 0 0 -14 14 EXPTP_PANDAEGG 0 0 0 0 0 -15 18 EXPTP_PANDAEXPRESS 0 0 0 0 0 -16 13 EXPTP_PANDAGL 0 0 0 0 0 -17 15 EXPTP_PANDAGLUT 0 0 0 0 0 -18 18 EXPTP_PANDAPHYSICS 0 0 0 0 0 -19 14 EXPTP_PANDARIB 0 0 0 0 0 +12 11 EXPTP_PANDA_PANDABASE 0 0 0 0 0 +13 13 EXPTP_PANDA_PANDABASEDX 0 0 0 0 0 +14 14 EXPTP_PANDA_PANDABASEEGG 0 0 0 0 0 +15 18 EXPTP_PANDA_PANDABASEEXPRESS 0 0 0 0 0 +16 13 EXPTP_PANDA_PANDABASEGL 0 0 0 0 0 +17 15 EXPTP_PANDA_PANDABASEGLUT 0 0 0 0 0 +18 18 EXPTP_PANDA_PANDABASEPHYSICS 0 0 0 0 0 +19 14 EXPTP_PANDA_PANDABASERIB 0 0 0 0 0 20 12 EXPTP_SHADER 0 0 0 0 0 21 11 PANDABASE_H 0 0 0 0 0 22 14 PANDASYMBOLS_H 0 0 0 0 0 diff --git a/panda/src/pandabase/pandasymbols.h b/panda/src/pandabase/pandasymbols.h index 3d1bcf9b66..c9a40ca12a 100644 --- a/panda/src/pandabase/pandasymbols.h +++ b/panda/src/pandabase/pandasymbols.h @@ -291,3 +291,109 @@ #define INLINE_AUDIO INLINE #endif + + +#if defined(DIRECTORY_DLLS) + +#else + +#define EXPCL_PANDA_PGRAPH EXPCL_PANDA +#define EXPTP_PANDA_PGRAPH EXPTP_PANDA + +#define EXPCL_PANDA_RECORDER EXPCL_PANDA +#define EXPTP_PANDA_RECORDER EXPTP_PANDA + +#define EXPCL_PANDA_PIPELINE EXPCL_PANDA +#define EXPTP_PANDA_PIPELINE EXPTP_PANDA + +#define EXPCL_PANDA_VRPN EXPCL_PANDA +#define EXPTP_PANDA_VRPN EXPTP_PANDA + +#define EXPCL_PANDA_GRUTIL EXPCL_PANDA +#define EXPTP_PANDA_GRUTIL EXPTP_PANDA + +#define EXPCL_PANDA_CHAN EXPCL_PANDA +#define EXPTP_PANDA_CHAN EXPTP_PANDA + +#define EXPCL_PANDA_CHAR EXPCL_PANDA +#define EXPTP_PANDA_CHAR EXPTP_PANDA + +#define EXPCL_PANDA_PSTATCLIENT EXPCL_PANDA +#define EXPTP_PANDA_PSTATCLIENT EXPTP_PANDA + +#define EXPCL_PANDA_COLLIDE EXPCL_PANDA +#define EXPTP_PANDA_COLLIDE EXPTP_PANDA + +#define EXPCL_PANDA_CULL EXPCL_PANDA +#define EXPTP_PANDA_CULL EXPTP_PANDA + +#define EXPCL_PANDA_DEVICE EXPCL_PANDA +#define EXPTP_PANDA_DEVICE EXPTP_PANDA + +#define EXPCL_PANDA_DGRAPH EXPCL_PANDA +#define EXPTP_PANDA_DGRAPH EXPTP_PANDA + +#define EXPCL_PANDA_DISPLAY EXPCL_PANDA +#define EXPTP_PANDA_DISPLAY EXPTP_PANDA + +#define EXPCL_PANDA_EVENT EXPCL_PANDA +#define EXPTP_PANDA_EVENT EXPTP_PANDA + +#define EXPCL_PANDA_GOBJ EXPCL_PANDA +#define EXPTP_PANDA_GOBJ EXPTP_PANDA + +#define EXPCL_PANDA_GSGBASE EXPCL_PANDA +#define EXPTP_PANDA_GSGBASE EXPTP_PANDA + +#define EXPCL_PANDA_LINMATH EXPCL_PANDA +#define EXPTP_PANDA_LINMATH EXPTP_PANDA + +#define EXPCL_PANDA_MATHUTIL EXPCL_PANDA +#define EXPTP_PANDA_MATHUTIL EXPTP_PANDA + +#define EXPCL_PANDA_MOVIES EXPCL_PANDA +#define EXPTP_PANDA_MOVIES EXPTP_PANDA + +#define EXPCL_PANDA_NET EXPCL_PANDA +#define EXPTP_PANDA_NET EXPTP_PANDA + +#define EXPCL_PANDA_NATIVENET EXPCL_PANDA +#define EXPTP_PANDA_NATIVENET EXPTP_PANDA + +#define EXPCL_PANDA_PARAMETRICS EXPCL_PANDA +#define EXPTP_PANDA_PARAMETRICS EXPTP_PANDA + +#define EXPCL_PANDA_PNMIMAGETYPES EXPCL_PANDA +#define EXPTP_PANDA_PNMIMAGETYPES EXPTP_PANDA + +#define EXPCL_PANDA_PNMIMAGE EXPCL_PANDA +#define EXPTP_PANDA_PNMIMAGE EXPTP_PANDA + +#define EXPCL_PANDA_PNMTEXT EXPCL_PANDA +#define EXPTP_PANDA_PNMTEXT EXPTP_PANDA + +#define EXPCL_PANDA_TEXT EXPCL_PANDA +#define EXPTP_PANDA_TEXT EXPTP_PANDA + +#define EXPCL_PANDA_TFORM EXPCL_PANDA +#define EXPTP_PANDA_TFORM EXPTP_PANDA + +#define EXPCL_PANDA_LERP EXPCL_PANDA +#define EXPTP_PANDA_LERP EXPTP_PANDA + +#define EXPCL_PANDA_PUTIL EXPCL_PANDA +#define EXPTP_PANDA_PUTIL EXPTP_PANDA + +#define EXPCL_PANDA_AUDIO EXPCL_PANDA +#define EXPTP_PANDA_AUDIO EXPTP_PANDA + +#define EXPCL_PANDA_PGUI EXPCL_PANDA +#define EXPTP_PANDA_PGUI EXPTP_PANDA + +#define EXPCL_PANDA_PANDABASE EXPCL_PANDA +#define EXPTP_PANDA_PANDABASE EXPTP_PANDA + +#define EXPCL_PANDA_HELIX EXPCL_PANDA +#define EXPTP_PANDA_HELIX EXPTP_PANDA + +#endif diff --git a/panda/src/parametrics/config_parametrics.h b/panda/src/parametrics/config_parametrics.h index 4385d20ae9..7403892797 100644 --- a/panda/src/parametrics/config_parametrics.h +++ b/panda/src/parametrics/config_parametrics.h @@ -22,6 +22,6 @@ #include "pandabase.h" #include "notifyCategoryProxy.h" -NotifyCategoryDecl(parametrics, EXPCL_PANDA, EXPTP_PANDA); +NotifyCategoryDecl(parametrics, EXPCL_PANDA_PARAMETRICS, EXPTP_PANDA_PARAMETRICS); #endif diff --git a/panda/src/parametrics/cubicCurveseg.h b/panda/src/parametrics/cubicCurveseg.h index 03b98f48fe..1baf95f886 100644 --- a/panda/src/parametrics/cubicCurveseg.h +++ b/panda/src/parametrics/cubicCurveseg.h @@ -59,7 +59,7 @@ // basis vectors are not retained; this might be handled // in a subclass (for instance, HermiteCurve). //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CubicCurveseg : public ParametricCurve { +class EXPCL_PANDA_PARAMETRICS CubicCurveseg : public ParametricCurve { PUBLISHED: virtual bool get_point(float t, LVecBase3f &point) const; virtual bool get_tangent(float t, LVecBase3f &tangent) const; diff --git a/panda/src/parametrics/nurbsBasisVector.h b/panda/src/parametrics/nurbsBasisVector.h index ed4046e0ab..6788efbd85 100644 --- a/panda/src/parametrics/nurbsBasisVector.h +++ b/panda/src/parametrics/nurbsBasisVector.h @@ -38,7 +38,7 @@ class NurbsVertex; // of NURBS curves, and will probably eventually replace // the whole ParametricCurve class hierarchy. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA NurbsBasisVector { +class EXPCL_PANDA_PARAMETRICS NurbsBasisVector { public: INLINE NurbsBasisVector(); INLINE ~NurbsBasisVector(); diff --git a/panda/src/parametrics/nurbsCurve.h b/panda/src/parametrics/nurbsCurve.h index 5406f51459..fd7cf85d00 100644 --- a/panda/src/parametrics/nurbsCurve.h +++ b/panda/src/parametrics/nurbsCurve.h @@ -48,7 +48,7 @@ // performs most of the NURBS curve functions. This // class then becomes vestigial. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA NurbsCurve : public PiecewiseCurve, public NurbsCurveInterface { +class EXPCL_PANDA_PARAMETRICS NurbsCurve : public PiecewiseCurve, public NurbsCurveInterface { PUBLISHED: NurbsCurve(); NurbsCurve(const ParametricCurve &pc); diff --git a/panda/src/parametrics/nurbsCurveEvaluator.h b/panda/src/parametrics/nurbsCurveEvaluator.h index 0435014fba..b5215b05c7 100644 --- a/panda/src/parametrics/nurbsCurveEvaluator.h +++ b/panda/src/parametrics/nurbsCurveEvaluator.h @@ -44,7 +44,7 @@ // of NURBS curves, and will probably eventually replace // the whole ParametricCurve class hierarchy. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA NurbsCurveEvaluator : public ReferenceCount { +class EXPCL_PANDA_PARAMETRICS NurbsCurveEvaluator : public ReferenceCount { PUBLISHED: NurbsCurveEvaluator(); ~NurbsCurveEvaluator(); diff --git a/panda/src/parametrics/nurbsCurveInterface.h b/panda/src/parametrics/nurbsCurveInterface.h index c041ce708b..bc2bb26c0a 100644 --- a/panda/src/parametrics/nurbsCurveInterface.h +++ b/panda/src/parametrics/nurbsCurveInterface.h @@ -35,7 +35,7 @@ class ParametricCurve; // The NurbsCurve class inherits both from this and from // ParametricCurve. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA NurbsCurveInterface { +class EXPCL_PANDA_PARAMETRICS NurbsCurveInterface { PUBLISHED: virtual ~NurbsCurveInterface(); virtual void set_order(int order)=0; diff --git a/panda/src/parametrics/nurbsCurveResult.h b/panda/src/parametrics/nurbsCurveResult.h index e3a741aa4a..fdb68e52ca 100644 --- a/panda/src/parametrics/nurbsCurveResult.h +++ b/panda/src/parametrics/nurbsCurveResult.h @@ -39,7 +39,7 @@ class NurbsVertex; // of NURBS curves, and will probably eventually replace // the whole ParametricCurve class hierarchy. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA NurbsCurveResult : public ReferenceCount { +class EXPCL_PANDA_PARAMETRICS NurbsCurveResult : public ReferenceCount { public: NurbsCurveResult(const NurbsBasisVector &basis, const LVecBase4f vecs[], const NurbsVertex *verts, diff --git a/panda/src/parametrics/nurbsSurfaceEvaluator.h b/panda/src/parametrics/nurbsSurfaceEvaluator.h index d377b18cc7..7627c73bfb 100644 --- a/panda/src/parametrics/nurbsSurfaceEvaluator.h +++ b/panda/src/parametrics/nurbsSurfaceEvaluator.h @@ -38,7 +38,7 @@ // defined by a NodePath), as well as an optional knot // vector. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA NurbsSurfaceEvaluator : public ReferenceCount { +class EXPCL_PANDA_PARAMETRICS NurbsSurfaceEvaluator : public ReferenceCount { PUBLISHED: NurbsSurfaceEvaluator(); ~NurbsSurfaceEvaluator(); diff --git a/panda/src/parametrics/nurbsSurfaceResult.h b/panda/src/parametrics/nurbsSurfaceResult.h index 37bee04db1..ee1c7b3393 100644 --- a/panda/src/parametrics/nurbsSurfaceResult.h +++ b/panda/src/parametrics/nurbsSurfaceResult.h @@ -32,7 +32,7 @@ class NurbsVertex; // It can return the point and/or normal to the surface // at any point. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA NurbsSurfaceResult : public ReferenceCount { +class EXPCL_PANDA_PARAMETRICS NurbsSurfaceResult : public ReferenceCount { public: NurbsSurfaceResult(const NurbsBasisVector &u_basis, const NurbsBasisVector &v_basis, diff --git a/panda/src/parametrics/nurbsVertex.h b/panda/src/parametrics/nurbsVertex.h index 798c325924..25a8341e6f 100644 --- a/panda/src/parametrics/nurbsVertex.h +++ b/panda/src/parametrics/nurbsVertex.h @@ -37,7 +37,7 @@ // of NURBS curves, and will probably eventually replace // the whole ParametricCurve class hierarchy. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA NurbsVertex { +class EXPCL_PANDA_PARAMETRICS NurbsVertex { public: INLINE NurbsVertex(); INLINE NurbsVertex(const NurbsVertex ©); diff --git a/panda/src/parametrics/parametricCurve.h b/panda/src/parametrics/parametricCurve.h index 8045adaff3..40556d58ec 100644 --- a/panda/src/parametrics/parametricCurve.h +++ b/panda/src/parametrics/parametricCurve.h @@ -61,7 +61,7 @@ class NurbsCurveInterface; // This encapsulates all curves in 3-d space defined // for a single parameter t in the range [0,get_max_t()]. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ParametricCurve : public PandaNode { +class EXPCL_PANDA_PARAMETRICS ParametricCurve : public PandaNode { PUBLISHED: ParametricCurve(); virtual ~ParametricCurve(); diff --git a/panda/src/parametrics/parametricCurveCollection.h b/panda/src/parametrics/parametricCurveCollection.h index b59accae25..75ad3fcaa4 100644 --- a/panda/src/parametrics/parametricCurveCollection.h +++ b/panda/src/parametrics/parametricCurveCollection.h @@ -42,7 +42,7 @@ class ParametricCurveDrawer; // return a single transformation matrix for a given // unit of time. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ParametricCurveCollection : public ReferenceCount { +class EXPCL_PANDA_PARAMETRICS ParametricCurveCollection : public ReferenceCount { PUBLISHED: ParametricCurveCollection(); INLINE ~ParametricCurveCollection(); diff --git a/panda/src/parametrics/piecewiseCurve.h b/panda/src/parametrics/piecewiseCurve.h index c82a377e9a..f523f9dd74 100644 --- a/panda/src/parametrics/piecewiseCurve.h +++ b/panda/src/parametrics/piecewiseCurve.h @@ -31,7 +31,7 @@ // length of each curve segment in parametric space is // definable. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PiecewiseCurve : public ParametricCurve { +class EXPCL_PANDA_PARAMETRICS PiecewiseCurve : public ParametricCurve { PUBLISHED: PiecewiseCurve(); ~PiecewiseCurve(); diff --git a/panda/src/parametrics/ropeNode.h b/panda/src/parametrics/ropeNode.h index 638ce2aa4a..208fb8fd8a 100644 --- a/panda/src/parametrics/ropeNode.h +++ b/panda/src/parametrics/ropeNode.h @@ -39,7 +39,7 @@ class GeomVertexData; // of NURBS curves, and will probably eventually replace // the whole ParametricCurve class hierarchy. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA RopeNode : public PandaNode { +class EXPCL_PANDA_PARAMETRICS RopeNode : public PandaNode { PUBLISHED: RopeNode(const string &name); @@ -197,7 +197,7 @@ private: private: // This is the data that must be cycled between pipeline stages. - class EXPCL_PANDA CData : public CycleData { + class EXPCL_PANDA_PARAMETRICS CData : public CycleData { public: INLINE CData(); INLINE CData(const CData ©); diff --git a/panda/src/parametrics/sheetNode.h b/panda/src/parametrics/sheetNode.h index 0af8e3e3af..063c6257dd 100644 --- a/panda/src/parametrics/sheetNode.h +++ b/panda/src/parametrics/sheetNode.h @@ -37,7 +37,7 @@ // eventually replace the whole ParametricSurface class // hierarchy. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA SheetNode : public PandaNode { +class EXPCL_PANDA_PARAMETRICS SheetNode : public PandaNode { PUBLISHED: SheetNode(const string &name); @@ -79,7 +79,7 @@ private: private: // This is the data that must be cycled between pipeline stages. - class EXPCL_PANDA CData : public CycleData { + class EXPCL_PANDA_PARAMETRICS CData : public CycleData { public: INLINE CData(); INLINE CData(const CData ©); diff --git a/panda/src/pgraph/accumulatedAttribs.h b/panda/src/pgraph/accumulatedAttribs.h index 04bd225e9b..1c02137e33 100644 --- a/panda/src/pgraph/accumulatedAttribs.h +++ b/panda/src/pgraph/accumulatedAttribs.h @@ -34,7 +34,7 @@ class PandaNode; // encountered on each node that might eventually be // applied to the vertices at the leaves. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA AccumulatedAttribs { +class EXPCL_PANDA_PGRAPH AccumulatedAttribs { public: INLINE AccumulatedAttribs(); INLINE AccumulatedAttribs(const AccumulatedAttribs ©); diff --git a/panda/src/pgraph/alphaTestAttrib.h b/panda/src/pgraph/alphaTestAttrib.h index 484f4c30a0..7171bdf9ef 100644 --- a/panda/src/pgraph/alphaTestAttrib.h +++ b/panda/src/pgraph/alphaTestAttrib.h @@ -29,7 +29,7 @@ class FactoryParams; // Description : Enables or disables writing of pixel to framebuffer // based on its alpha value relative to a reference alpha value //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA AlphaTestAttrib : public RenderAttrib { +class EXPCL_PANDA_PGRAPH AlphaTestAttrib : public RenderAttrib { private: INLINE AlphaTestAttrib(PandaCompareFunc mode = M_always, float reference_alpha = 1.0f); diff --git a/panda/src/pgraph/ambientLight.h b/panda/src/pgraph/ambientLight.h index a591becaa6..efdc14c9e9 100644 --- a/panda/src/pgraph/ambientLight.h +++ b/panda/src/pgraph/ambientLight.h @@ -30,7 +30,7 @@ // be part of the scene graph, since it has no meaningful // position. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA AmbientLight : public LightNode { +class EXPCL_PANDA_PGRAPH AmbientLight : public LightNode { PUBLISHED: AmbientLight(const string &name); diff --git a/panda/src/pgraph/antialiasAttrib.h b/panda/src/pgraph/antialiasAttrib.h index 451dca42a1..9af6357b3b 100644 --- a/panda/src/pgraph/antialiasAttrib.h +++ b/panda/src/pgraph/antialiasAttrib.h @@ -30,7 +30,7 @@ class FactoryParams; // Description : Specifies whether or how to enable antialiasing, if // supported by the backend renderer. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA AntialiasAttrib : public RenderAttrib { +class EXPCL_PANDA_PGRAPH AntialiasAttrib : public RenderAttrib { PUBLISHED: enum Mode { M_none = 0x0000, diff --git a/panda/src/pgraph/attribNodeRegistry.h b/panda/src/pgraph/attribNodeRegistry.h index 3f0ab27f9b..4e2ca1f27f 100644 --- a/panda/src/pgraph/attribNodeRegistry.h +++ b/panda/src/pgraph/attribNodeRegistry.h @@ -39,7 +39,7 @@ // node type), the identified node is used instead of // the node referenced within the bam file itself. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA AttribNodeRegistry { +class EXPCL_PANDA_PGRAPH AttribNodeRegistry { protected: AttribNodeRegistry(); diff --git a/panda/src/pgraph/attribSlots.h b/panda/src/pgraph/attribSlots.h index e96d293cbb..8829e9e2cf 100644 --- a/panda/src/pgraph/attribSlots.h +++ b/panda/src/pgraph/attribSlots.h @@ -56,7 +56,7 @@ // render attributes, one per attrib type. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA AttribSlots +class EXPCL_PANDA_PGRAPH AttribSlots { public: CPT(AlphaTestAttrib) _alpha_test; diff --git a/panda/src/pgraph/audioVolumeAttrib.h b/panda/src/pgraph/audioVolumeAttrib.h index 83739ffc22..80ac48296f 100755 --- a/panda/src/pgraph/audioVolumeAttrib.h +++ b/panda/src/pgraph/audioVolumeAttrib.h @@ -31,7 +31,7 @@ class FactoryParams; // Description : Applies a scale to audio volume for positional sounds // in the scene graph. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA AudioVolumeAttrib : public RenderAttrib { +class EXPCL_PANDA_PGRAPH AudioVolumeAttrib : public RenderAttrib { protected: AudioVolumeAttrib(bool off, float volume); INLINE AudioVolumeAttrib(const AudioVolumeAttrib ©); diff --git a/panda/src/pgraph/auxSceneData.h b/panda/src/pgraph/auxSceneData.h index d4aa3b7f2e..c49f8f81c5 100644 --- a/panda/src/pgraph/auxSceneData.h +++ b/panda/src/pgraph/auxSceneData.h @@ -36,7 +36,7 @@ // what point it is in the fade, separately for each // instance and for each camera. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA AuxSceneData : public TypedReferenceCount { +class EXPCL_PANDA_PGRAPH AuxSceneData : public TypedReferenceCount { protected: INLINE AuxSceneData(double duration = 0.0); diff --git a/panda/src/pgraph/bamFile.h b/panda/src/pgraph/bamFile.h index f282948316..fc40eef85d 100644 --- a/panda/src/pgraph/bamFile.h +++ b/panda/src/pgraph/bamFile.h @@ -46,7 +46,7 @@ class Filename; // ending in ".boo" to differentiate them from the more // common scene graph files. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA BamFile { +class EXPCL_PANDA_PGRAPH BamFile { PUBLISHED: BamFile(); ~BamFile(); diff --git a/panda/src/pgraph/billboardEffect.h b/panda/src/pgraph/billboardEffect.h index ab0cebc16c..d112100f80 100644 --- a/panda/src/pgraph/billboardEffect.h +++ b/panda/src/pgraph/billboardEffect.h @@ -31,7 +31,7 @@ // automatically rotate to face the camera, or any other // arbitrary node. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA BillboardEffect : public RenderEffect { +class EXPCL_PANDA_PGRAPH BillboardEffect : public RenderEffect { private: INLINE BillboardEffect(); diff --git a/panda/src/pgraph/camera.h b/panda/src/pgraph/camera.h index df6e9bc999..dfe9bdf9b5 100644 --- a/panda/src/pgraph/camera.h +++ b/panda/src/pgraph/camera.h @@ -38,7 +38,7 @@ class DisplayRegion; // graph to represent a point of view for rendering a // scene. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA Camera : public LensNode { +class EXPCL_PANDA_PGRAPH Camera : public LensNode { PUBLISHED: Camera(const string &name); Camera(const Camera ©); diff --git a/panda/src/pgraph/clipPlaneAttrib.h b/panda/src/pgraph/clipPlaneAttrib.h index 8b7033f078..63bef8e7ad 100644 --- a/panda/src/pgraph/clipPlaneAttrib.h +++ b/panda/src/pgraph/clipPlaneAttrib.h @@ -35,7 +35,7 @@ // can either add planes or remove planes from the total // set of clipping planes in effect. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ClipPlaneAttrib : public RenderAttrib { +class EXPCL_PANDA_PGRAPH ClipPlaneAttrib : public RenderAttrib { private: INLINE ClipPlaneAttrib(); INLINE ClipPlaneAttrib(const ClipPlaneAttrib ©); diff --git a/panda/src/pgraph/colorAttrib.h b/panda/src/pgraph/colorAttrib.h index 0462067227..35fe75f7c5 100644 --- a/panda/src/pgraph/colorAttrib.h +++ b/panda/src/pgraph/colorAttrib.h @@ -31,7 +31,7 @@ class FactoryParams; // Description : Indicates what color should be applied to renderable // geometry. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ColorAttrib : public RenderAttrib { +class EXPCL_PANDA_PGRAPH ColorAttrib : public RenderAttrib { PUBLISHED: enum Type { T_vertex, T_flat, T_off diff --git a/panda/src/pgraph/colorBlendAttrib.h b/panda/src/pgraph/colorBlendAttrib.h index 855955ce08..c839cdef8e 100644 --- a/panda/src/pgraph/colorBlendAttrib.h +++ b/panda/src/pgraph/colorBlendAttrib.h @@ -31,7 +31,7 @@ class FactoryParams; // buffer, for special effects. This overrides // transparency if transparency is also specified. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ColorBlendAttrib : public RenderAttrib { +class EXPCL_PANDA_PGRAPH ColorBlendAttrib : public RenderAttrib { PUBLISHED: enum Mode { M_none, // Blending is disabled diff --git a/panda/src/pgraph/colorScaleAttrib.h b/panda/src/pgraph/colorScaleAttrib.h index fd1f14da45..c788dec8da 100644 --- a/panda/src/pgraph/colorScaleAttrib.h +++ b/panda/src/pgraph/colorScaleAttrib.h @@ -31,7 +31,7 @@ class FactoryParams; // Description : Applies a scale to colors in the scene graph and on // vertices. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ColorScaleAttrib : public RenderAttrib { +class EXPCL_PANDA_PGRAPH ColorScaleAttrib : public RenderAttrib { protected: ColorScaleAttrib(bool off, const LVecBase4f &scale); INLINE ColorScaleAttrib(const ColorScaleAttrib ©); diff --git a/panda/src/pgraph/colorWriteAttrib.h b/panda/src/pgraph/colorWriteAttrib.h index 809201afda..54f0eca8d6 100644 --- a/panda/src/pgraph/colorWriteAttrib.h +++ b/panda/src/pgraph/colorWriteAttrib.h @@ -32,7 +32,7 @@ class FactoryParams; // in which it is important to write to the depth buffer // without affecting the color buffer. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ColorWriteAttrib : public RenderAttrib { +class EXPCL_PANDA_PGRAPH ColorWriteAttrib : public RenderAttrib { PUBLISHED: enum Channels { // By coincidence, these bits are the same as those for diff --git a/panda/src/pgraph/compassEffect.h b/panda/src/pgraph/compassEffect.h index f6d19b2589..2ffd70be57 100644 --- a/panda/src/pgraph/compassEffect.h +++ b/panda/src/pgraph/compassEffect.h @@ -56,7 +56,7 @@ // may need to explicitly set a large (or infinite) // bounding volume on the effect node. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CompassEffect : public RenderEffect { +class EXPCL_PANDA_PGRAPH CompassEffect : public RenderEffect { private: INLINE CompassEffect(); diff --git a/panda/src/pgraph/config_pgraph.h b/panda/src/pgraph/config_pgraph.h index c628762806..95373bdbf7 100644 --- a/panda/src/pgraph/config_pgraph.h +++ b/panda/src/pgraph/config_pgraph.h @@ -30,10 +30,10 @@ class DSearchPath; -ConfigureDecl(config_pgraph, EXPCL_PANDA, EXPTP_PANDA); -NotifyCategoryDecl(pgraph, EXPCL_PANDA, EXPTP_PANDA); -NotifyCategoryDecl(loader, EXPCL_PANDA, EXPTP_PANDA); -NotifyCategoryDecl(portal, EXPCL_PANDA, EXPTP_PANDA); +ConfigureDecl(config_pgraph, EXPCL_PANDA_PGRAPH, EXPTP_PANDA_PGRAPH); +NotifyCategoryDecl(pgraph, EXPCL_PANDA_PGRAPH, EXPTP_PANDA_PGRAPH); +NotifyCategoryDecl(loader, EXPCL_PANDA_PGRAPH, EXPTP_PANDA_PGRAPH); +NotifyCategoryDecl(portal, EXPCL_PANDA_PGRAPH, EXPTP_PANDA_PGRAPH); extern ConfigVariableBool fake_view_frustum_cull; extern ConfigVariableBool clip_plane_cull; @@ -70,10 +70,10 @@ extern ConfigVariableBool m_dual_flash; extern ConfigVariableList load_file_type; extern ConfigVariableString default_model_extension; -extern EXPCL_PANDA ConfigVariableBool allow_incomplete_render; +extern EXPCL_PANDA_PGRAPH ConfigVariableBool allow_incomplete_render; extern ConfigVariableEnum default_lod_type; -extern EXPCL_PANDA void init_libpgraph(); +extern EXPCL_PANDA_PGRAPH void init_libpgraph(); #endif diff --git a/panda/src/pgraph/cullBin.h b/panda/src/pgraph/cullBin.h index 52c6bd3f9a..d7f571c38c 100644 --- a/panda/src/pgraph/cullBin.h +++ b/panda/src/pgraph/cullBin.h @@ -45,7 +45,7 @@ class GeomNode; // CullBinStateSorted and CullBinBackToFront provide the // actual implementation. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CullBin : public TypedReferenceCount, public CullBinEnums { +class EXPCL_PANDA_PGRAPH CullBin : public TypedReferenceCount, public CullBinEnums { protected: INLINE CullBin(const CullBin ©); public: diff --git a/panda/src/pgraph/cullBinAttrib.h b/panda/src/pgraph/cullBinAttrib.h index da810a3dd0..8af1760c20 100644 --- a/panda/src/pgraph/cullBinAttrib.h +++ b/panda/src/pgraph/cullBinAttrib.h @@ -31,7 +31,7 @@ class FactoryParams; // bins must be created separately via the // CullBinManager interface. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CullBinAttrib : public RenderAttrib { +class EXPCL_PANDA_PGRAPH CullBinAttrib : public RenderAttrib { private: INLINE CullBinAttrib(); diff --git a/panda/src/pgraph/cullBinEnums.h b/panda/src/pgraph/cullBinEnums.h index 0ddfd879b1..5fe2daa751 100644 --- a/panda/src/pgraph/cullBinEnums.h +++ b/panda/src/pgraph/cullBinEnums.h @@ -26,7 +26,7 @@ // Description : Provides scoping for the enumerated type shared by // CullBin and CullBinManager. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CullBinEnums { +class EXPCL_PANDA_PGRAPH CullBinEnums { PUBLISHED: enum BinType { BT_invalid, diff --git a/panda/src/pgraph/cullBinManager.h b/panda/src/pgraph/cullBinManager.h index 0cc0a56a54..f3d23152a5 100644 --- a/panda/src/pgraph/cullBinManager.h +++ b/panda/src/pgraph/cullBinManager.h @@ -36,7 +36,7 @@ class GraphicsStateGuardianBase; // Description : This is a global object that maintains the collection // of named CullBins in the world. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CullBinManager : public CullBinEnums { +class EXPCL_PANDA_PGRAPH CullBinManager : public CullBinEnums { protected: CullBinManager(); ~CullBinManager(); @@ -91,7 +91,7 @@ private: void setup_initial_bins(); static BinType parse_bin_type(const string &bin_type); - class EXPCL_PANDA BinDefinition { + class EXPCL_PANDA_PGRAPH BinDefinition { public: bool _in_use; string _name; @@ -124,7 +124,7 @@ private: friend class SortBins; }; -EXPCL_PANDA ostream & +EXPCL_PANDA_PGRAPH ostream & operator << (ostream &out, CullBinManager::BinType bin_type); #include "cullBinManager.I" diff --git a/panda/src/pgraph/cullFaceAttrib.h b/panda/src/pgraph/cullFaceAttrib.h index ff8935920a..266bbc08cb 100644 --- a/panda/src/pgraph/cullFaceAttrib.h +++ b/panda/src/pgraph/cullFaceAttrib.h @@ -30,7 +30,7 @@ class FactoryParams; // Description : Indicates which faces should be culled based on their // vertex ordering. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CullFaceAttrib : public RenderAttrib { +class EXPCL_PANDA_PGRAPH CullFaceAttrib : public RenderAttrib { PUBLISHED: enum Mode { M_cull_none, // Cull no polygons diff --git a/panda/src/pgraph/cullHandler.h b/panda/src/pgraph/cullHandler.h index 4115d340eb..71549c8e61 100644 --- a/panda/src/pgraph/cullHandler.h +++ b/panda/src/pgraph/cullHandler.h @@ -32,7 +32,7 @@ class CullTraverser; // By itself, it's not a particularly useful class; to // use it, derive from it and redefine record_object(). //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CullHandler { +class EXPCL_PANDA_PGRAPH CullHandler { public: virtual ~CullHandler(); diff --git a/panda/src/pgraph/cullPlanes.h b/panda/src/pgraph/cullPlanes.h index 07e4e5b095..00f64be4bd 100644 --- a/panda/src/pgraph/cullPlanes.h +++ b/panda/src/pgraph/cullPlanes.h @@ -44,7 +44,7 @@ // The bounding volumes in this object are transformed // for each level of the scene graph. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CullPlanes : public ReferenceCount { +class EXPCL_PANDA_PGRAPH CullPlanes : public ReferenceCount { protected: INLINE CullPlanes(); INLINE CullPlanes(const CullPlanes ©); diff --git a/panda/src/pgraph/cullResult.h b/panda/src/pgraph/cullResult.h index b98648921e..738114872c 100644 --- a/panda/src/pgraph/cullResult.h +++ b/panda/src/pgraph/cullResult.h @@ -49,7 +49,7 @@ class SceneSetup; // cull traversal around to make next frame's traversal // of the same scene a little easier. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CullResult : public ReferenceCount { +class EXPCL_PANDA_PGRAPH CullResult : public ReferenceCount { public: INLINE CullResult(GraphicsStateGuardianBase *gsg, const PStatCollector &draw_region_pcollector); diff --git a/panda/src/pgraph/cullTraverser.h b/panda/src/pgraph/cullTraverser.h index 2e4ff73866..270664f695 100644 --- a/panda/src/pgraph/cullTraverser.h +++ b/panda/src/pgraph/cullTraverser.h @@ -48,7 +48,7 @@ class NodePath; // Each renderable Geom encountered is passed along with // its associated RenderState to the CullHandler object. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CullTraverser : public TypedReferenceCount { +class EXPCL_PANDA_PGRAPH CullTraverser : public TypedReferenceCount { PUBLISHED: CullTraverser(); CullTraverser(const CullTraverser ©); diff --git a/panda/src/pgraph/cullTraverserData.h b/panda/src/pgraph/cullTraverserData.h index d82dd791e6..f1b76db1c8 100644 --- a/panda/src/pgraph/cullTraverserData.h +++ b/panda/src/pgraph/cullTraverserData.h @@ -45,7 +45,7 @@ class PandaNode; // abstract out some of the cull behavior (like // view-frustum culling). //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CullTraverserData { +class EXPCL_PANDA_PGRAPH CullTraverserData { public: INLINE CullTraverserData(const NodePath &start, const TransformState *net_transform, diff --git a/panda/src/pgraph/cullableObject.h b/panda/src/pgraph/cullableObject.h index af540e047f..67e3734ffa 100644 --- a/panda/src/pgraph/cullableObject.h +++ b/panda/src/pgraph/cullableObject.h @@ -42,7 +42,7 @@ class CullTraverser; // a number of Geoms to be drawn together, with a number // of Geoms decalled onto them. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CullableObject { +class EXPCL_PANDA_PGRAPH CullableObject { public: INLINE CullableObject(CullableObject *next = NULL); INLINE CullableObject(const Geom *geom, const RenderState *state, diff --git a/panda/src/pgraph/decalEffect.h b/panda/src/pgraph/decalEffect.h index 3847f657f9..89a931d60a 100644 --- a/panda/src/pgraph/decalEffect.h +++ b/panda/src/pgraph/decalEffect.h @@ -31,7 +31,7 @@ class FactoryParams; // of this GeomNode are coplanar and should be drawn as // decals (eliminating Z-fighting). //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA DecalEffect : public RenderEffect { +class EXPCL_PANDA_PGRAPH DecalEffect : public RenderEffect { private: INLINE DecalEffect(); diff --git a/panda/src/pgraph/depthOffsetAttrib.h b/panda/src/pgraph/depthOffsetAttrib.h index c3b084ab70..52a632f921 100644 --- a/panda/src/pgraph/depthOffsetAttrib.h +++ b/panda/src/pgraph/depthOffsetAttrib.h @@ -54,7 +54,7 @@ class FactoryParams; // probably not exceed 16 or drop below 0 for maximum // portability. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA DepthOffsetAttrib : public RenderAttrib { +class EXPCL_PANDA_PGRAPH DepthOffsetAttrib : public RenderAttrib { private: INLINE DepthOffsetAttrib(int offset); diff --git a/panda/src/pgraph/depthTestAttrib.h b/panda/src/pgraph/depthTestAttrib.h index c1b5aa0461..691e1302e1 100644 --- a/panda/src/pgraph/depthTestAttrib.h +++ b/panda/src/pgraph/depthTestAttrib.h @@ -29,7 +29,7 @@ class FactoryParams; // Class : DepthTestAttrib // Description : Enables or disables writing to the depth buffer. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA DepthTestAttrib : public RenderAttrib { +class EXPCL_PANDA_PGRAPH DepthTestAttrib : public RenderAttrib { private: INLINE DepthTestAttrib(PandaCompareFunc mode = M_less); diff --git a/panda/src/pgraph/depthWriteAttrib.h b/panda/src/pgraph/depthWriteAttrib.h index 8f32fb954d..359e6db37a 100644 --- a/panda/src/pgraph/depthWriteAttrib.h +++ b/panda/src/pgraph/depthWriteAttrib.h @@ -29,7 +29,7 @@ class FactoryParams; // Class : DepthWriteAttrib // Description : Enables or disables writing to the depth buffer. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA DepthWriteAttrib : public RenderAttrib { +class EXPCL_PANDA_PGRAPH DepthWriteAttrib : public RenderAttrib { PUBLISHED: enum Mode { M_off, diff --git a/panda/src/pgraph/directionalLight.h b/panda/src/pgraph/directionalLight.h index be652ec044..deaf7a92da 100644 --- a/panda/src/pgraph/directionalLight.h +++ b/panda/src/pgraph/directionalLight.h @@ -28,7 +28,7 @@ // Description : A light shining from infinitely far away in a // particular direction, like sunlight. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA DirectionalLight : public LightNode { +class EXPCL_PANDA_PGRAPH DirectionalLight : public LightNode { PUBLISHED: DirectionalLight(const string &name); @@ -62,7 +62,7 @@ public: private: // This is the data that must be cycled between pipeline stages. - class EXPCL_PANDA CData : public CycleData { + class EXPCL_PANDA_PGRAPH CData : public CycleData { public: INLINE CData(); INLINE CData(const CData ©); diff --git a/panda/src/pgraph/drawMaskAttrib.h b/panda/src/pgraph/drawMaskAttrib.h index d335274726..7c3849e90e 100644 --- a/panda/src/pgraph/drawMaskAttrib.h +++ b/panda/src/pgraph/drawMaskAttrib.h @@ -41,7 +41,7 @@ class FactoryParams; // determine from examining the static hierarchy of the // graph. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA DrawMaskAttrib : public RenderAttrib { +class EXPCL_PANDA_PGRAPH DrawMaskAttrib : public RenderAttrib { protected: INLINE DrawMaskAttrib(DrawMask new_mask, DrawMask bits_to_change); INLINE DrawMaskAttrib(const DrawMaskAttrib ©); diff --git a/panda/src/pgraph/eventStorePandaNode.h b/panda/src/pgraph/eventStorePandaNode.h index b1c718d1b8..33fc8ce3ae 100644 --- a/panda/src/pgraph/eventStorePandaNode.h +++ b/panda/src/pgraph/eventStorePandaNode.h @@ -28,7 +28,7 @@ // Description : A class object for storing specifically objects of // type PandaNode. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA EventStorePandaNode : public EventStoreValueBase { +class EXPCL_PANDA_PGRAPH EventStorePandaNode : public EventStoreValueBase { PUBLISHED: INLINE EventStorePandaNode(const PandaNode *value); virtual ~EventStorePandaNode(); diff --git a/panda/src/pgraph/fadeLodNode.h b/panda/src/pgraph/fadeLodNode.h index 9d048d8344..445219e4dc 100755 --- a/panda/src/pgraph/fadeLodNode.h +++ b/panda/src/pgraph/fadeLodNode.h @@ -27,7 +27,7 @@ // Class : FadeLODNode // Description : A Level-of-Detail node with alpha based switching. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA FadeLODNode : public LODNode { +class EXPCL_PANDA_PGRAPH FadeLODNode : public LODNode { PUBLISHED: FadeLODNode(const string &name); diff --git a/panda/src/pgraph/fadeLodNodeData.h b/panda/src/pgraph/fadeLodNodeData.h index 214be8d722..2413123110 100644 --- a/panda/src/pgraph/fadeLodNodeData.h +++ b/panda/src/pgraph/fadeLodNodeData.h @@ -28,7 +28,7 @@ // Description : This is the data that is associated with a particular // instance of the FadeLODNode for the scene graph. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA FadeLODNodeData : public AuxSceneData { +class EXPCL_PANDA_PGRAPH FadeLODNodeData : public AuxSceneData { public: bool _fade_mode; float _fade_start; diff --git a/panda/src/pgraph/fog.h b/panda/src/pgraph/fog.h index 81ffe3cc38..5fbe37a5c2 100644 --- a/panda/src/pgraph/fog.h +++ b/panda/src/pgraph/fog.h @@ -47,7 +47,7 @@ class TransformState; // generate traditonal camera-relative fog, as if it // were parented to the camera. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA Fog : public PandaNode { +class EXPCL_PANDA_PGRAPH Fog : public PandaNode { PUBLISHED: Fog(const string &name); @@ -136,7 +136,7 @@ private: static TypeHandle _type_handle; }; -EXPCL_PANDA ostream &operator << (ostream &out, Fog::Mode mode); +EXPCL_PANDA_PGRAPH ostream &operator << (ostream &out, Fog::Mode mode); INLINE ostream &operator << (ostream &out, const Fog &fog) { fog.output(out); diff --git a/panda/src/pgraph/fogAttrib.h b/panda/src/pgraph/fogAttrib.h index b0d94e11a8..b9873098ad 100644 --- a/panda/src/pgraph/fogAttrib.h +++ b/panda/src/pgraph/fogAttrib.h @@ -28,7 +28,7 @@ // Class : FogAttrib // Description : Applies a Fog to the geometry at and below this node. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA FogAttrib : public RenderAttrib { +class EXPCL_PANDA_PGRAPH FogAttrib : public RenderAttrib { private: INLINE FogAttrib(); diff --git a/panda/src/pgraph/geomNode.h b/panda/src/pgraph/geomNode.h index 440a65b8ec..29141893f7 100644 --- a/panda/src/pgraph/geomNode.h +++ b/panda/src/pgraph/geomNode.h @@ -38,7 +38,7 @@ class GraphicsStateGuardianBase; // the scene graph; almost all visible objects will be // contained in a GeomNode somewhere. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GeomNode : public PandaNode { +class EXPCL_PANDA_PGRAPH GeomNode : public PandaNode { PUBLISHED: GeomNode(const string &name); @@ -119,7 +119,7 @@ private: INLINE int get_name_count(const NameCount &name_count, const InternalName *name); // This is the data that must be cycled between pipeline stages. - class EXPCL_PANDA CData : public CycleData { + class EXPCL_PANDA_PGRAPH CData : public CycleData { public: INLINE CData(); CData(const CData ©); @@ -151,7 +151,7 @@ public: // PandaNode::get_children(); use this to walk through the list of // geoms faster than walking through the geoms directly from the // node. - class EXPCL_PANDA Geoms { + class EXPCL_PANDA_PGRAPH Geoms { public: INLINE Geoms(); INLINE Geoms(const CData *cdata); diff --git a/panda/src/pgraph/geomTransformer.h b/panda/src/pgraph/geomTransformer.h index 1c3f242a73..de3acb454f 100644 --- a/panda/src/pgraph/geomTransformer.h +++ b/panda/src/pgraph/geomTransformer.h @@ -46,7 +46,7 @@ class GeomMunger; // amounts will still share the same arrays as each // other (but different from the original arrays). //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GeomTransformer { +class EXPCL_PANDA_PGRAPH GeomTransformer { public: GeomTransformer(); GeomTransformer(const GeomTransformer ©); diff --git a/panda/src/pgraph/internalNameCollection.h b/panda/src/pgraph/internalNameCollection.h index e6e5eae796..81f9cf3359 100644 --- a/panda/src/pgraph/internalNameCollection.h +++ b/panda/src/pgraph/internalNameCollection.h @@ -27,7 +27,7 @@ // Class : InternalNameCollection // Description : //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA InternalNameCollection { +class EXPCL_PANDA_PGRAPH InternalNameCollection { PUBLISHED: InternalNameCollection(); InternalNameCollection(const InternalNameCollection ©); diff --git a/panda/src/pgraph/lensNode.h b/panda/src/pgraph/lensNode.h index 47319f0cf6..232890608f 100644 --- a/panda/src/pgraph/lensNode.h +++ b/panda/src/pgraph/lensNode.h @@ -32,7 +32,7 @@ // kinds of nodes also contain a lens (for instance, a // Spotlight). //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA LensNode : public PandaNode { +class EXPCL_PANDA_PGRAPH LensNode : public PandaNode { PUBLISHED: LensNode(const string &name); diff --git a/panda/src/pgraph/light.h b/panda/src/pgraph/light.h index c7fe4177ee..3da5af49b3 100644 --- a/panda/src/pgraph/light.h +++ b/panda/src/pgraph/light.h @@ -43,7 +43,7 @@ class GraphicsStateGuardianBase; // arbitrary point to define the coordinate system of // effect. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA Light : virtual public ReferenceCount { +class EXPCL_PANDA_PGRAPH Light : virtual public ReferenceCount { // We inherit from ReferenceCount instead of TypedReferenceCount so // that LightNode does not inherit from TypedObject twice. Note // that we also inherit virtually from ReferenceCount for the same @@ -100,7 +100,7 @@ private: static UpdateSeq _sort_seq; // This is the data that must be cycled between pipeline stages. - class EXPCL_PANDA CData : public CycleData { + class EXPCL_PANDA_PGRAPH CData : public CycleData { public: INLINE CData(); INLINE CData(const CData ©); diff --git a/panda/src/pgraph/lightAttrib.h b/panda/src/pgraph/lightAttrib.h index eb9789405b..734582833b 100644 --- a/panda/src/pgraph/lightAttrib.h +++ b/panda/src/pgraph/lightAttrib.h @@ -34,7 +34,7 @@ // A LightAttrib can either add lights or remove lights // from the total set of "on" lights. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA LightAttrib : public RenderAttrib { +class EXPCL_PANDA_PGRAPH LightAttrib : public RenderAttrib { protected: INLINE LightAttrib(); INLINE LightAttrib(const LightAttrib ©); diff --git a/panda/src/pgraph/lightLensNode.h b/panda/src/pgraph/lightLensNode.h index 1165a9021a..4711391c66 100644 --- a/panda/src/pgraph/lightLensNode.h +++ b/panda/src/pgraph/lightLensNode.h @@ -28,7 +28,7 @@ // Class : LightLensNode // Description : A derivative of Light and of LensNode. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA LightLensNode : public Light, public LensNode { +class EXPCL_PANDA_PGRAPH LightLensNode : public Light, public LensNode { PUBLISHED: LightLensNode(const string &name); diff --git a/panda/src/pgraph/lightNode.h b/panda/src/pgraph/lightNode.h index 4bd0f3bcfa..2576451225 100644 --- a/panda/src/pgraph/lightNode.h +++ b/panda/src/pgraph/lightNode.h @@ -30,7 +30,7 @@ // Light except Spotlight (which must inherit from // LensNode instead) inherit from this class. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA LightNode : public Light, public PandaNode { +class EXPCL_PANDA_PGRAPH LightNode : public Light, public PandaNode { PUBLISHED: LightNode(const string &name); diff --git a/panda/src/pgraph/loader.h b/panda/src/pgraph/loader.h index a79740fb73..0b55d38101 100644 --- a/panda/src/pgraph/loader.h +++ b/panda/src/pgraph/loader.h @@ -48,7 +48,7 @@ class LoaderFileType; // loading interface may be used, but it loads // synchronously. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA Loader : public AsyncTaskManager { +class EXPCL_PANDA_PGRAPH Loader : public AsyncTaskManager { private: class ConsiderFile { public: @@ -57,7 +57,7 @@ private: }; PUBLISHED: - class EXPCL_PANDA Results { + class EXPCL_PANDA_PGRAPH Results { PUBLISHED: INLINE Results(); INLINE Results(const Results ©); diff --git a/panda/src/pgraph/loaderFileType.h b/panda/src/pgraph/loaderFileType.h index a5bc12ebcf..74fe1dad7f 100644 --- a/panda/src/pgraph/loaderFileType.h +++ b/panda/src/pgraph/loaderFileType.h @@ -37,7 +37,7 @@ class BamCacheRecord; // loader that's available should define a corresponding // LoaderFileType object and register itself. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA LoaderFileType : public TypedObject { +class EXPCL_PANDA_PGRAPH LoaderFileType : public TypedObject { protected: LoaderFileType(); diff --git a/panda/src/pgraph/loaderFileTypeBam.h b/panda/src/pgraph/loaderFileTypeBam.h index 2af7ea3352..e751411cc2 100644 --- a/panda/src/pgraph/loaderFileTypeBam.h +++ b/panda/src/pgraph/loaderFileTypeBam.h @@ -27,7 +27,7 @@ // Class : LoaderFileTypeBam // Description : This defines the Loader interface to read Bam files. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA LoaderFileTypeBam : public LoaderFileType { +class EXPCL_PANDA_PGRAPH LoaderFileTypeBam : public LoaderFileType { public: LoaderFileTypeBam(); diff --git a/panda/src/pgraph/loaderFileTypeRegistry.h b/panda/src/pgraph/loaderFileTypeRegistry.h index 41a6b4ddf9..bd4488d5d1 100644 --- a/panda/src/pgraph/loaderFileTypeRegistry.h +++ b/panda/src/pgraph/loaderFileTypeRegistry.h @@ -32,7 +32,7 @@ class Filename; // Description : This class maintains the set of all known // LoaderFileTypes in the universe. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA LoaderFileTypeRegistry { +class EXPCL_PANDA_PGRAPH LoaderFileTypeRegistry { protected: LoaderFileTypeRegistry(); diff --git a/panda/src/pgraph/loaderOptions.h b/panda/src/pgraph/loaderOptions.h index 3507baa018..4c25c5ffa8 100644 --- a/panda/src/pgraph/loaderOptions.h +++ b/panda/src/pgraph/loaderOptions.h @@ -26,7 +26,7 @@ // Description : Specifies parameters that may be passed to the // loader. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA LoaderOptions { +class EXPCL_PANDA_PGRAPH LoaderOptions { PUBLISHED: // At the moment, we only have this one set of flags. Maybe one day // there will be more options. diff --git a/panda/src/pgraph/lodNode.h b/panda/src/pgraph/lodNode.h index aa75fe37a1..f58af5bd9d 100644 --- a/panda/src/pgraph/lodNode.h +++ b/panda/src/pgraph/lodNode.h @@ -32,7 +32,7 @@ // from the camera and the table indicated in the // associated LOD object. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA LODNode : public PandaNode { +class EXPCL_PANDA_PGRAPH LODNode : public PandaNode { PUBLISHED: INLINE LODNode(const string &name); @@ -151,7 +151,7 @@ protected: typedef pvector SwitchVector; private: - class EXPCL_PANDA CData : public CycleData { + class EXPCL_PANDA_PGRAPH CData : public CycleData { public: INLINE CData(); INLINE CData(const CData ©); diff --git a/panda/src/pgraph/lodNodeType.h b/panda/src/pgraph/lodNodeType.h index 2ba8f2d203..1cdd9a520e 100644 --- a/panda/src/pgraph/lodNodeType.h +++ b/panda/src/pgraph/lodNodeType.h @@ -30,8 +30,8 @@ enum LODNodeType { END_PUBLISH -EXPCL_PANDA ostream &operator << (ostream &out, LODNodeType lnt); -EXPCL_PANDA istream &operator >> (istream &in, LODNodeType &cs); +EXPCL_PANDA_PGRAPH ostream &operator << (ostream &out, LODNodeType lnt); +EXPCL_PANDA_PGRAPH istream &operator >> (istream &in, LODNodeType &cs); #endif diff --git a/panda/src/pgraph/materialAttrib.h b/panda/src/pgraph/materialAttrib.h index 5e226059ce..eb2e2ff618 100644 --- a/panda/src/pgraph/materialAttrib.h +++ b/panda/src/pgraph/materialAttrib.h @@ -31,7 +31,7 @@ // control lighting effects, and isn't necessary (or // useful) in the absence of lighting. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA MaterialAttrib : public RenderAttrib { +class EXPCL_PANDA_PGRAPH MaterialAttrib : public RenderAttrib { private: INLINE MaterialAttrib(); diff --git a/panda/src/pgraph/materialCollection.h b/panda/src/pgraph/materialCollection.h index d552df0279..23693804eb 100644 --- a/panda/src/pgraph/materialCollection.h +++ b/panda/src/pgraph/materialCollection.h @@ -27,7 +27,7 @@ // Class : MaterialCollection // Description : //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA MaterialCollection { +class EXPCL_PANDA_PGRAPH MaterialCollection { PUBLISHED: MaterialCollection(); MaterialCollection(const MaterialCollection ©); diff --git a/panda/src/pgraph/modelFlattenRequest.h b/panda/src/pgraph/modelFlattenRequest.h index 1cb2e835cf..82cc7b1fd5 100644 --- a/panda/src/pgraph/modelFlattenRequest.h +++ b/panda/src/pgraph/modelFlattenRequest.h @@ -34,7 +34,7 @@ // original model; and when the result is done it may be // retrieved from this object. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ModelFlattenRequest : public AsyncTask { +class EXPCL_PANDA_PGRAPH ModelFlattenRequest : public AsyncTask { PUBLISHED: INLINE ModelFlattenRequest(PandaNode *orig); diff --git a/panda/src/pgraph/modelLoadRequest.h b/panda/src/pgraph/modelLoadRequest.h index 1b74ce0411..77e5f1552a 100644 --- a/panda/src/pgraph/modelLoadRequest.h +++ b/panda/src/pgraph/modelLoadRequest.h @@ -34,7 +34,7 @@ // and add it to the loader via load_async(), to begin // an asynchronous load. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ModelLoadRequest : public AsyncTask { +class EXPCL_PANDA_PGRAPH ModelLoadRequest : public AsyncTask { PUBLISHED: INLINE ModelLoadRequest(const Filename &filename, const LoaderOptions &options); diff --git a/panda/src/pgraph/modelNode.h b/panda/src/pgraph/modelNode.h index eee5e1bc59..8b3c52fdef 100644 --- a/panda/src/pgraph/modelNode.h +++ b/panda/src/pgraph/modelNode.h @@ -35,7 +35,7 @@ // ModelNodes are created in response to a { 1 } // flag within an egg file. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ModelNode : public PandaNode { +class EXPCL_PANDA_PGRAPH ModelNode : public PandaNode { PUBLISHED: INLINE ModelNode(const string &name); diff --git a/panda/src/pgraph/modelPool.h b/panda/src/pgraph/modelPool.h index a36790079a..d30bf9002f 100644 --- a/panda/src/pgraph/modelPool.h +++ b/panda/src/pgraph/modelPool.h @@ -49,7 +49,7 @@ // loading, and can automatically consult the ModelPool, // according to the supplied LoaderOptions. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ModelPool { +class EXPCL_PANDA_PGRAPH ModelPool { PUBLISHED: INLINE static bool has_model(const string &filename); INLINE static bool verify_model(const string &filename); diff --git a/panda/src/pgraph/modelRoot.h b/panda/src/pgraph/modelRoot.h index 7377f62f4c..5961978d90 100644 --- a/panda/src/pgraph/modelRoot.h +++ b/panda/src/pgraph/modelRoot.h @@ -32,7 +32,7 @@ // special information, but can be used as a flag to // indicate the presence of a loaded model file. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ModelRoot : public ModelNode { +class EXPCL_PANDA_PGRAPH ModelRoot : public ModelNode { PUBLISHED: INLINE ModelRoot(const string &name); diff --git a/panda/src/pgraph/nodePath.h b/panda/src/pgraph/nodePath.h index b2ec017288..792f9432a5 100644 --- a/panda/src/pgraph/nodePath.h +++ b/panda/src/pgraph/nodePath.h @@ -151,7 +151,7 @@ class ShaderInput; // the NodePath will automatically be updated to reflect // the changes. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA NodePath { +class EXPCL_PANDA_PGRAPH NodePath { PUBLISHED: // This enumeration is returned by get_error_type() for an empty // NodePath to report the reason it's empty. diff --git a/panda/src/pgraph/nodePathCollection.h b/panda/src/pgraph/nodePathCollection.h index 8e0b04e0a0..9f061cb4f1 100644 --- a/panda/src/pgraph/nodePathCollection.h +++ b/panda/src/pgraph/nodePathCollection.h @@ -30,7 +30,7 @@ // multiple NodePaths (for instance, // NodePaths::get_children). //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA NodePathCollection { +class EXPCL_PANDA_PGRAPH NodePathCollection { PUBLISHED: NodePathCollection(); NodePathCollection(const NodePathCollection ©); diff --git a/panda/src/pgraph/nodePathComponent.h b/panda/src/pgraph/nodePathComponent.h index 68a1ee8ef6..1ec3da4f1d 100644 --- a/panda/src/pgraph/nodePathComponent.h +++ b/panda/src/pgraph/nodePathComponent.h @@ -49,7 +49,7 @@ // to allow the nodes to keep these up to date as the // scene graph is manipulated. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA NodePathComponent : public ReferenceCount { +class EXPCL_PANDA_PGRAPH NodePathComponent : public ReferenceCount { private: NodePathComponent(PandaNode *node, NodePathComponent *next, int pipeline_stage, Thread *current_thread); @@ -84,7 +84,7 @@ private: int _key; // This is the data that must be cycled between pipeline stages. - class EXPCL_PANDA CData : public CycleData { + class EXPCL_PANDA_PGRAPH CData : public CycleData { public: INLINE CData(); CData(const CData ©); diff --git a/panda/src/pgraph/nodePathLerps.h b/panda/src/pgraph/nodePathLerps.h index ab4054bd65..14832516e1 100644 --- a/panda/src/pgraph/nodePathLerps.h +++ b/panda/src/pgraph/nodePathLerps.h @@ -28,7 +28,7 @@ // Class : PosLerpFunctor // Description : Class for Lerping between positions in space //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PosLerpFunctor : public LPoint3fLerpFunctor { +class EXPCL_PANDA_PGRAPH PosLerpFunctor : public LPoint3fLerpFunctor { private: NodePath _node_path; bool _is_wrt; @@ -82,7 +82,7 @@ private: // Class : HprLerpFunctor // Description : Class for Lerping between orientations in space //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA HprLerpFunctor : public LVecBase3fLerpFunctor { +class EXPCL_PANDA_PGRAPH HprLerpFunctor : public LVecBase3fLerpFunctor { private: NodePath _node_path; bool _is_wrt; @@ -136,7 +136,7 @@ private: // Class : ScaleLerpFunctor // Description : Class for Lerping between scales //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ScaleLerpFunctor : public LVecBase3fLerpFunctor { +class EXPCL_PANDA_PGRAPH ScaleLerpFunctor : public LVecBase3fLerpFunctor { private: NodePath _node_path; bool _is_wrt; @@ -188,7 +188,7 @@ private: // Class : ColorLerpFunctor // Description : Class for Lerping between colors //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ColorLerpFunctor : public LVecBase4fLerpFunctor { +class EXPCL_PANDA_PGRAPH ColorLerpFunctor : public LVecBase4fLerpFunctor { private: NodePath _node_path; bool _is_wrt; @@ -240,7 +240,7 @@ private: // Description : Class for Lerping between positions and orientations // in space //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PosHprLerpFunctor : public LerpFunctor { +class EXPCL_PANDA_PGRAPH PosHprLerpFunctor : public LerpFunctor { private: NodePath _node_path; LPoint3f _pstart; @@ -312,7 +312,7 @@ private: // Description : Class for Lerping between orientation // and scale //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA HprScaleLerpFunctor : public LerpFunctor { +class EXPCL_PANDA_PGRAPH HprScaleLerpFunctor : public LerpFunctor { private: NodePath _node_path; LVecBase3f _hstart; @@ -389,7 +389,7 @@ private: // Description : Class for Lerping between position, orientation, // and scale //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PosHprScaleLerpFunctor : public LerpFunctor { +class EXPCL_PANDA_PGRAPH PosHprScaleLerpFunctor : public LerpFunctor { private: NodePath _node_path; LPoint3f _pstart; @@ -473,7 +473,7 @@ private: // Class : ColorScaleLerpFunctor // Description : Class for Lerping between color scales //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ColorScaleLerpFunctor : public LVecBase4fLerpFunctor { +class EXPCL_PANDA_PGRAPH ColorScaleLerpFunctor : public LVecBase4fLerpFunctor { private: NodePath _node_path; bool _is_wrt; diff --git a/panda/src/pgraph/pandaNode.cxx b/panda/src/pgraph/pandaNode.cxx index cc77d7df24..83437fdb18 100644 --- a/panda/src/pgraph/pandaNode.cxx +++ b/panda/src/pgraph/pandaNode.cxx @@ -33,7 +33,7 @@ #include "reMutexHolder.h" // This category is just temporary for debugging convenience. -NotifyCategoryDecl(drawmask, EXPCL_PANDA, EXPTP_PANDA); +NotifyCategoryDecl(drawmask, EXPCL_PANDA_PGRAPH, EXPTP_PANDA_PGRAPH); NotifyCategoryDef(drawmask, ""); PandaNodeChain PandaNode::_dirty_prev_transforms; @@ -568,7 +568,8 @@ is_renderable() const { // will impede normal use of the PandaNode. //////////////////////////////////////////////////////////////////// PT(PandaNode) PandaNode:: -copy_subgraph(Thread *current_thread) const { +copy_subgraph(Thread *current_thread) const +{ InstanceMap inst_map; return r_copy_subgraph(inst_map, current_thread); } diff --git a/panda/src/pgraph/pandaNode.h b/panda/src/pgraph/pandaNode.h index 1082e2e22f..aa277a63cc 100644 --- a/panda/src/pgraph/pandaNode.h +++ b/panda/src/pgraph/pandaNode.h @@ -71,7 +71,7 @@ class GeomTransformer; // is the base class of all specialized nodes, and also // serves as a generic node with no special properties. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PandaNode : public TypedWritable, public Namable, +class EXPCL_PANDA_PGRAPH PandaNode : public TypedWritable, public Namable, public LinkedListNode, virtual public ReferenceCount { PUBLISHED: @@ -309,7 +309,7 @@ protected: // This is a base class of CData, defined below. It contains just // the protected (not private) part of CData that will be needed by // derived classes to implement compute_internal_bounds(). - class EXPCL_PANDA BoundsData : public CycleData { + class EXPCL_PANDA_PGRAPH BoundsData : public CycleData { protected: INLINE BoundsData(); INLINE BoundsData(const BoundsData ©); @@ -377,7 +377,7 @@ private: public: // This must be declared public so that VC6 will allow the nested // CData class to access it. - class EXPCL_PANDA DownConnection { + class EXPCL_PANDA_PGRAPH DownConnection { public: INLINE DownConnection(PandaNode *child, int sort); INLINE bool operator < (const DownConnection &other) const; @@ -396,7 +396,7 @@ public: private: typedef CopyOnWriteObj1< ov_multiset, TypeHandle > Down; - class EXPCL_PANDA UpConnection { + class EXPCL_PANDA_PGRAPH UpConnection { public: INLINE UpConnection(PandaNode *child); INLINE bool operator < (const UpConnection &other) const; @@ -435,7 +435,7 @@ private: // This is the data that must be cycled between pipeline stages. - class EXPCL_PANDA CData : public BoundsData { + class EXPCL_PANDA_PGRAPH CData : public BoundsData { public: CData(); CData(const CData ©); @@ -597,7 +597,7 @@ public: // saved out ahead of time, rather than having to reacquire the lock // with each iteration, or to keep the lock held for the entire // pass. - class EXPCL_PANDA Children { + class EXPCL_PANDA_PGRAPH Children { public: INLINE Children(); INLINE Children(const CData *cdata); @@ -613,7 +613,7 @@ public: }; // Similarly for stashed children. - class EXPCL_PANDA Stashed { + class EXPCL_PANDA_PGRAPH Stashed { public: INLINE Stashed(); INLINE Stashed(const CData *cdata); @@ -629,7 +629,7 @@ public: }; // This class is returned from get_parents(). - class EXPCL_PANDA Parents { + class EXPCL_PANDA_PGRAPH Parents { public: INLINE Parents(); INLINE Parents(const CData *cdata); @@ -687,6 +687,7 @@ private: friend class NodePathComponent; friend class WorkingNodePath; friend class PandaNodePipelineReader; + friend class EggLoader; }; //////////////////////////////////////////////////////////////////// @@ -694,7 +695,7 @@ private: // Description : Encapsulates the data from a PandaNode, // pre-fetched for one stage of the pipeline. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PandaNodePipelineReader { +class EXPCL_PANDA_PGRAPH PandaNodePipelineReader { public: INLINE PandaNodePipelineReader(const PandaNode *object, Thread *current_thread); INLINE PandaNodePipelineReader(const PandaNodePipelineReader ©); @@ -764,6 +765,7 @@ public: private: static TypeHandle _type_handle; + }; INLINE ostream &operator << (ostream &out, const PandaNode &node) { diff --git a/panda/src/pgraph/pandaNodeChain.h b/panda/src/pgraph/pandaNodeChain.h index 3b015a6dc7..4505483821 100644 --- a/panda/src/pgraph/pandaNodeChain.h +++ b/panda/src/pgraph/pandaNodeChain.h @@ -32,7 +32,7 @@ class PandaNode; // _prev_transform is different from their _transform // (in pipeline stage 0). //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PandaNodeChain : private LinkedListNode { +class EXPCL_PANDA_PGRAPH PandaNodeChain : private LinkedListNode { public: INLINE PandaNodeChain(); INLINE ~PandaNodeChain(); diff --git a/panda/src/pgraph/planeNode.h b/panda/src/pgraph/planeNode.h index ecc58fc602..78dbae31cd 100644 --- a/panda/src/pgraph/planeNode.h +++ b/panda/src/pgraph/planeNode.h @@ -40,7 +40,7 @@ // purposes as well; whenever a plane is needed to be // defined in some coordinate space in the world. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PlaneNode : public PandaNode { +class EXPCL_PANDA_PGRAPH PlaneNode : public PandaNode { PUBLISHED: PlaneNode(const string &name, const Planef &plane = Planef()); @@ -89,7 +89,7 @@ private: static UpdateSeq _sort_seq; // This is the data that must be cycled between pipeline stages. - class EXPCL_PANDA CData : public CycleData { + class EXPCL_PANDA_PGRAPH CData : public CycleData { public: INLINE CData(); INLINE CData(const CData ©); diff --git a/panda/src/pgraph/pointLight.h b/panda/src/pgraph/pointLight.h index a270a37c23..8847017b88 100644 --- a/panda/src/pgraph/pointLight.h +++ b/panda/src/pgraph/pointLight.h @@ -28,7 +28,7 @@ // Description : A light originating from a single point in space, and // shining in all directions. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PointLight : public LightNode { +class EXPCL_PANDA_PGRAPH PointLight : public LightNode { PUBLISHED: PointLight(const string &name); @@ -62,7 +62,7 @@ public: private: // This is the data that must be cycled between pipeline stages. - class EXPCL_PANDA CData : public CycleData { + class EXPCL_PANDA_PGRAPH CData : public CycleData { public: INLINE CData(); INLINE CData(const CData ©); diff --git a/panda/src/pgraph/polylightEffect.h b/panda/src/pgraph/polylightEffect.h index 986f0820af..b26a911379 100755 --- a/panda/src/pgraph/polylightEffect.h +++ b/panda/src/pgraph/polylightEffect.h @@ -40,7 +40,7 @@ // PolylightNode is a cheap way to get lighting effects // specially for night scenes //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PolylightEffect : public RenderEffect { +class EXPCL_PANDA_PGRAPH PolylightEffect : public RenderEffect { PUBLISHED: enum ContribType { CT_proximal, diff --git a/panda/src/pgraph/polylightNode.h b/panda/src/pgraph/polylightNode.h index 5e7c496ddc..74acf9629b 100755 --- a/panda/src/pgraph/polylightNode.h +++ b/panda/src/pgraph/polylightNode.h @@ -32,7 +32,7 @@ // Class : PolylightNode // Description : A PolylightNode //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PolylightNode : public PandaNode{ +class EXPCL_PANDA_PGRAPH PolylightNode : public PandaNode{ //private: diff --git a/panda/src/pgraph/portalClipper.h b/panda/src/pgraph/portalClipper.h index a88bbbae21..be059637ef 100755 --- a/panda/src/pgraph/portalClipper.h +++ b/panda/src/pgraph/portalClipper.h @@ -57,7 +57,7 @@ class NodePath; // Each renderable Geom encountered is passed along with // its associated RenderState to the CullHandler object. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PortalClipper : public TypedObject { +class EXPCL_PANDA_PGRAPH PortalClipper : public TypedObject { public: PortalClipper(GeometricBoundingVolume *frustum, SceneSetup *scene_setup); ~PortalClipper(); diff --git a/panda/src/pgraph/portalNode.h b/panda/src/pgraph/portalNode.h index dc58e7b360..841d00359e 100755 --- a/panda/src/pgraph/portalNode.h +++ b/panda/src/pgraph/portalNode.h @@ -41,7 +41,7 @@ // now. It also holds a PT(PandaNode) Cell that // this portal is connected to //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PortalNode : public PandaNode { +class EXPCL_PANDA_PGRAPH PortalNode : public PandaNode { PUBLISHED: PortalNode(const string &name); PortalNode(const string &name, LPoint3f pos, float scale=10.0); diff --git a/panda/src/pgraph/renderAttrib.h b/panda/src/pgraph/renderAttrib.h index 888a4121d6..b36c765f6d 100644 --- a/panda/src/pgraph/renderAttrib.h +++ b/panda/src/pgraph/renderAttrib.h @@ -58,7 +58,7 @@ class CullTraverserData; // wish to change its properties; instead, create a new // one. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA RenderAttrib : public TypedWritableReferenceCount { +class EXPCL_PANDA_PGRAPH RenderAttrib : public TypedWritableReferenceCount { protected: RenderAttrib(); private: diff --git a/panda/src/pgraph/renderEffect.h b/panda/src/pgraph/renderEffect.h index 40cd542cf8..c747701250 100644 --- a/panda/src/pgraph/renderEffect.h +++ b/panda/src/pgraph/renderEffect.h @@ -57,7 +57,7 @@ class PandaNode; // wish to change its properties; instead, create a new // one. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA RenderEffect : public TypedWritableReferenceCount { +class EXPCL_PANDA_PGRAPH RenderEffect : public TypedWritableReferenceCount { protected: RenderEffect(); private: diff --git a/panda/src/pgraph/renderEffects.h b/panda/src/pgraph/renderEffects.h index 9f5a277d01..6869ca3230 100644 --- a/panda/src/pgraph/renderEffects.h +++ b/panda/src/pgraph/renderEffects.h @@ -47,7 +47,7 @@ class FactoryParams; // instead of modifying a RenderEffects object, create a // new one. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA RenderEffects : public TypedWritableReferenceCount { +class EXPCL_PANDA_PGRAPH RenderEffects : public TypedWritableReferenceCount { protected: RenderEffects(); diff --git a/panda/src/pgraph/renderModeAttrib.h b/panda/src/pgraph/renderModeAttrib.h index b6181ab6ec..2b0220b099 100644 --- a/panda/src/pgraph/renderModeAttrib.h +++ b/panda/src/pgraph/renderModeAttrib.h @@ -30,7 +30,7 @@ class FactoryParams; // Class : RenderModeAttrib // Description : Specifies how polygons are to be drawn. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA RenderModeAttrib : public RenderAttrib { +class EXPCL_PANDA_PGRAPH RenderModeAttrib : public RenderAttrib { PUBLISHED: enum Mode { M_unchanged, diff --git a/panda/src/pgraph/renderState.h b/panda/src/pgraph/renderState.h index 9b1e047181..2e2fa1c76a 100644 --- a/panda/src/pgraph/renderState.h +++ b/panda/src/pgraph/renderState.h @@ -61,7 +61,7 @@ class AudioVolumeAttrib; // instead of modifying a RenderState object, create a // new one. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA RenderState : public NodeCachedReferenceCount { +class EXPCL_PANDA_PGRAPH RenderState : public NodeCachedReferenceCount { protected: RenderState(); diff --git a/panda/src/pgraph/rescaleNormalAttrib.h b/panda/src/pgraph/rescaleNormalAttrib.h index de66b534a9..e387730581 100644 --- a/panda/src/pgraph/rescaleNormalAttrib.h +++ b/panda/src/pgraph/rescaleNormalAttrib.h @@ -29,7 +29,7 @@ class FactoryParams; // Class : RescaleNormalAttrib // Description : Specifies how polygons are to be drawn. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA RescaleNormalAttrib : public RenderAttrib { +class EXPCL_PANDA_PGRAPH RescaleNormalAttrib : public RenderAttrib { PUBLISHED: enum Mode { // No adjustments are made to normals. @@ -94,8 +94,8 @@ private: static TypeHandle _type_handle; }; -EXPCL_PANDA ostream &operator << (ostream &out, RescaleNormalAttrib::Mode mode); -EXPCL_PANDA istream &operator >> (istream &in, RescaleNormalAttrib::Mode &mode); +EXPCL_PANDA_PGRAPH ostream &operator << (ostream &out, RescaleNormalAttrib::Mode mode); +EXPCL_PANDA_PGRAPH istream &operator >> (istream &in, RescaleNormalAttrib::Mode &mode); #include "rescaleNormalAttrib.I" diff --git a/panda/src/pgraph/sceneGraphAnalyzer.h b/panda/src/pgraph/sceneGraphAnalyzer.h index 8d88d937f5..b69f9b6791 100644 --- a/panda/src/pgraph/sceneGraphAnalyzer.h +++ b/panda/src/pgraph/sceneGraphAnalyzer.h @@ -37,7 +37,7 @@ class Texture; // Description : A handy class that can scrub over a scene graph and // collect interesting statistics on it. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA SceneGraphAnalyzer { +class EXPCL_PANDA_PGRAPH SceneGraphAnalyzer { PUBLISHED: SceneGraphAnalyzer(); ~SceneGraphAnalyzer(); diff --git a/panda/src/pgraph/sceneGraphReducer.h b/panda/src/pgraph/sceneGraphReducer.h index 6946a0d557..2177d58371 100644 --- a/panda/src/pgraph/sceneGraphReducer.h +++ b/panda/src/pgraph/sceneGraphReducer.h @@ -44,7 +44,7 @@ class PandaNode; // flattening behavior, but normally the default // behavior is sufficient. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA SceneGraphReducer { +class EXPCL_PANDA_PGRAPH SceneGraphReducer { PUBLISHED: INLINE SceneGraphReducer(GraphicsStateGuardianBase *gsg = NULL); INLINE ~SceneGraphReducer(); diff --git a/panda/src/pgraph/sceneSetup.h b/panda/src/pgraph/sceneSetup.h index 0f3d14ed96..89d82e7b9f 100644 --- a/panda/src/pgraph/sceneSetup.h +++ b/panda/src/pgraph/sceneSetup.h @@ -34,7 +34,7 @@ // other general setup information for rendering a // particular scene. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA SceneSetup : public ReferenceCount { +class EXPCL_PANDA_PGRAPH SceneSetup : public ReferenceCount { public: INLINE SceneSetup(); diff --git a/panda/src/pgraph/selectiveChildNode.h b/panda/src/pgraph/selectiveChildNode.h index aa4a45c27a..531eb34e4f 100644 --- a/panda/src/pgraph/selectiveChildNode.h +++ b/panda/src/pgraph/selectiveChildNode.h @@ -28,7 +28,7 @@ // Description : A base class for nodes like LODNode and SequenceNode // that select only one visible child at a time. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA SelectiveChildNode : public PandaNode { +class EXPCL_PANDA_PGRAPH SelectiveChildNode : public PandaNode { PUBLISHED: INLINE SelectiveChildNode(const string &name); diff --git a/panda/src/pgraph/sequenceNode.h b/panda/src/pgraph/sequenceNode.h index 581249f539..58f97d828e 100644 --- a/panda/src/pgraph/sequenceNode.h +++ b/panda/src/pgraph/sequenceNode.h @@ -30,7 +30,7 @@ // Description : A node that automatically cycles through rendering // each one of its children according to its frame rate. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA SequenceNode : public SelectiveChildNode, public AnimInterface { +class EXPCL_PANDA_PGRAPH SequenceNode : public SelectiveChildNode, public AnimInterface { PUBLISHED: INLINE SequenceNode(const string &name); diff --git a/panda/src/pgraph/shadeModelAttrib.h b/panda/src/pgraph/shadeModelAttrib.h index a0f1d0f9eb..026fb20eb2 100644 --- a/panda/src/pgraph/shadeModelAttrib.h +++ b/panda/src/pgraph/shadeModelAttrib.h @@ -30,7 +30,7 @@ class FactoryParams; // Description : Specifies whether flat shading (per-polygon) or // smooth shading (per-vertex) is in effect. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ShadeModelAttrib : public RenderAttrib { +class EXPCL_PANDA_PGRAPH ShadeModelAttrib : public RenderAttrib { PUBLISHED: enum Mode { M_flat, diff --git a/panda/src/pgraph/shader.h b/panda/src/pgraph/shader.h index 3eb324a410..293bcb291c 100644 --- a/panda/src/pgraph/shader.h +++ b/panda/src/pgraph/shader.h @@ -32,7 +32,7 @@ class RenderState; // Description : //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA Shader: public TypedWritableReferenceCount { +class EXPCL_PANDA_PGRAPH Shader: public TypedWritableReferenceCount { PUBLISHED: static CPT(Shader) load(const Filename &file, int preprocessor=0); static CPT(Shader) load(const string &file, int preprocessor=0); diff --git a/panda/src/pgraph/shaderAttrib.h b/panda/src/pgraph/shaderAttrib.h index 310fa2f0c4..7f0c089298 100755 --- a/panda/src/pgraph/shaderAttrib.h +++ b/panda/src/pgraph/shaderAttrib.h @@ -30,7 +30,7 @@ // Description : //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ShaderAttrib: public RenderAttrib { +class EXPCL_PANDA_PGRAPH ShaderAttrib: public RenderAttrib { private: INLINE ShaderAttrib(); diff --git a/panda/src/pgraph/shaderInput.h b/panda/src/pgraph/shaderInput.h index 580a0e2adc..dc256eb824 100644 --- a/panda/src/pgraph/shaderInput.h +++ b/panda/src/pgraph/shaderInput.h @@ -33,7 +33,7 @@ // to a shader. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ShaderInput: public TypedWritableReferenceCount { +class EXPCL_PANDA_PGRAPH ShaderInput: public TypedWritableReferenceCount { public: INLINE ~ShaderInput(); diff --git a/panda/src/pgraph/shaderPool.h b/panda/src/pgraph/shaderPool.h index d500f230f6..5b95f01549 100644 --- a/panda/src/pgraph/shaderPool.h +++ b/panda/src/pgraph/shaderPool.h @@ -32,7 +32,7 @@ // TexturePool in that it unifies references to the same // filename. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ShaderPool { +class EXPCL_PANDA_PGRAPH ShaderPool { PUBLISHED: // These functions take string parameters instead of Filenames // because that's somewhat more convenient to the scripting diff --git a/panda/src/pgraph/showBoundsEffect.h b/panda/src/pgraph/showBoundsEffect.h index 3c9549e674..31e4c0077f 100644 --- a/panda/src/pgraph/showBoundsEffect.h +++ b/panda/src/pgraph/showBoundsEffect.h @@ -32,7 +32,7 @@ class FactoryParams; // used only during development to help identify // bounding volume issues. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ShowBoundsEffect : public RenderEffect { +class EXPCL_PANDA_PGRAPH ShowBoundsEffect : public RenderEffect { private: INLINE ShowBoundsEffect(); diff --git a/panda/src/pgraph/spotlight.h b/panda/src/pgraph/spotlight.h index 53d4586d8c..7b381f1410 100644 --- a/panda/src/pgraph/spotlight.h +++ b/panda/src/pgraph/spotlight.h @@ -39,7 +39,7 @@ class Texture; // SpotLight, because "spotlight" is a single English // word, instead of two words. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA Spotlight : public LightLensNode { +class EXPCL_PANDA_PGRAPH Spotlight : public LightLensNode { PUBLISHED: Spotlight(const string &name); @@ -82,7 +82,7 @@ private: private: // This is the data that must be cycled between pipeline stages. - class EXPCL_PANDA CData : public CycleData { + class EXPCL_PANDA_PGRAPH CData : public CycleData { public: INLINE CData(); INLINE CData(const CData ©); diff --git a/panda/src/pgraph/stateMunger.h b/panda/src/pgraph/stateMunger.h index 16759bc4f6..e24b14b359 100644 --- a/panda/src/pgraph/stateMunger.h +++ b/panda/src/pgraph/stateMunger.h @@ -31,7 +31,7 @@ // can't be declared in the base class, since it doesn't // really know about RenderState. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA StateMunger : public GeomMunger { +class EXPCL_PANDA_PGRAPH StateMunger : public GeomMunger { public: INLINE StateMunger(GraphicsStateGuardianBase *gsg); virtual ~StateMunger(); diff --git a/panda/src/pgraph/stencilAttrib.h b/panda/src/pgraph/stencilAttrib.h index d68b468823..9f1f8f1fc8 100644 --- a/panda/src/pgraph/stencilAttrib.h +++ b/panda/src/pgraph/stencilAttrib.h @@ -33,7 +33,7 @@ class FactoryParams; // supported, call the function GraphicsStateGuardian:: // get_supports_two_sided_stencil. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA StencilAttrib : public RenderAttrib { +class EXPCL_PANDA_PGRAPH StencilAttrib : public RenderAttrib { private: StencilAttrib(); diff --git a/panda/src/pgraph/switchNode.h b/panda/src/pgraph/switchNode.h index 756676c1d7..11f1aa0cf8 100644 --- a/panda/src/pgraph/switchNode.h +++ b/panda/src/pgraph/switchNode.h @@ -28,7 +28,7 @@ // Description : A node that renders only one of its children, // according to the user's indication. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA SwitchNode : public SelectiveChildNode { +class EXPCL_PANDA_PGRAPH SwitchNode : public SelectiveChildNode { PUBLISHED: INLINE SwitchNode(const string &name); @@ -47,7 +47,7 @@ PUBLISHED: virtual int get_visible_child() const; private: - class EXPCL_PANDA CData : public CycleData { + class EXPCL_PANDA_PGRAPH CData : public CycleData { public: INLINE CData(); INLINE CData(const CData ©); diff --git a/panda/src/pgraph/texGenAttrib.h b/panda/src/pgraph/texGenAttrib.h index 010be32c6a..2d5cd8e38e 100755 --- a/panda/src/pgraph/texGenAttrib.h +++ b/panda/src/pgraph/texGenAttrib.h @@ -37,7 +37,7 @@ // as well as other special effects such as projective // texturing. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA TexGenAttrib : public RenderAttrib { +class EXPCL_PANDA_PGRAPH TexGenAttrib : public RenderAttrib { PUBLISHED: // We inherit the definition of our Mode enumerated type from // RenderAttrib. Normally, Mode would be defined here, but we diff --git a/panda/src/pgraph/texMatrixAttrib.h b/panda/src/pgraph/texMatrixAttrib.h index ebd491cee0..f5668d62dc 100644 --- a/panda/src/pgraph/texMatrixAttrib.h +++ b/panda/src/pgraph/texMatrixAttrib.h @@ -34,7 +34,7 @@ class FactoryParams; // Description : Applies a transform matrix to UV's before they are // rendered. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA TexMatrixAttrib : public RenderAttrib { +class EXPCL_PANDA_PGRAPH TexMatrixAttrib : public RenderAttrib { protected: INLINE TexMatrixAttrib(); INLINE TexMatrixAttrib(const TexMatrixAttrib ©); diff --git a/panda/src/pgraph/texProjectorEffect.h b/panda/src/pgraph/texProjectorEffect.h index a436229ca6..c9bb31320d 100644 --- a/panda/src/pgraph/texProjectorEffect.h +++ b/panda/src/pgraph/texProjectorEffect.h @@ -60,7 +60,7 @@ class LensNode; // texture onto the walls, for instance to apply a // flashlight effect or an image-based shadow. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA TexProjectorEffect : public RenderEffect { +class EXPCL_PANDA_PGRAPH TexProjectorEffect : public RenderEffect { protected: INLINE TexProjectorEffect(); INLINE TexProjectorEffect(const TexProjectorEffect ©); diff --git a/panda/src/pgraph/textureAttrib.h b/panda/src/pgraph/textureAttrib.h index b5a8c6c346..01fb9c31af 100644 --- a/panda/src/pgraph/textureAttrib.h +++ b/panda/src/pgraph/textureAttrib.h @@ -35,7 +35,7 @@ // primary texture. Also see TextureAttrib2 for the // secondary texture. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA TextureAttrib : public RenderAttrib { +class EXPCL_PANDA_PGRAPH TextureAttrib : public RenderAttrib { protected: INLINE TextureAttrib(); INLINE TextureAttrib(const TextureAttrib ©); diff --git a/panda/src/pgraph/textureCollection.h b/panda/src/pgraph/textureCollection.h index 9823649c2c..78d18ca612 100644 --- a/panda/src/pgraph/textureCollection.h +++ b/panda/src/pgraph/textureCollection.h @@ -27,7 +27,7 @@ // Class : TextureCollection // Description : //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA TextureCollection { +class EXPCL_PANDA_PGRAPH TextureCollection { PUBLISHED: TextureCollection(); TextureCollection(const TextureCollection ©); diff --git a/panda/src/pgraph/textureStageCollection.h b/panda/src/pgraph/textureStageCollection.h index 79b205b8ad..9f66cfdfd2 100644 --- a/panda/src/pgraph/textureStageCollection.h +++ b/panda/src/pgraph/textureStageCollection.h @@ -27,7 +27,7 @@ // Class : TextureStageCollection // Description : //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA TextureStageCollection { +class EXPCL_PANDA_PGRAPH TextureStageCollection { PUBLISHED: TextureStageCollection(); TextureStageCollection(const TextureStageCollection ©); diff --git a/panda/src/pgraph/transformState.h b/panda/src/pgraph/transformState.h index 080ed246e6..f18c1661b5 100644 --- a/panda/src/pgraph/transformState.h +++ b/panda/src/pgraph/transformState.h @@ -59,7 +59,7 @@ class FactoryParams; // instead of modifying a TransformState object, create a // new one. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA TransformState : public NodeCachedReferenceCount { +class EXPCL_PANDA_PGRAPH TransformState : public NodeCachedReferenceCount { protected: TransformState(); diff --git a/panda/src/pgraph/transparencyAttrib.h b/panda/src/pgraph/transparencyAttrib.h index 4a15169da5..2da4817104 100644 --- a/panda/src/pgraph/transparencyAttrib.h +++ b/panda/src/pgraph/transparencyAttrib.h @@ -37,7 +37,7 @@ class FactoryParams; // partially transparent (and it has alpha components // less than 1). //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA TransparencyAttrib : public RenderAttrib { +class EXPCL_PANDA_PGRAPH TransparencyAttrib : public RenderAttrib { PUBLISHED: enum Mode { // The first two should be specifically 0 and 1, for historical diff --git a/panda/src/pgraph/weakNodePath.h b/panda/src/pgraph/weakNodePath.h index b6c5077275..98b02a095d 100644 --- a/panda/src/pgraph/weakNodePath.h +++ b/panda/src/pgraph/weakNodePath.h @@ -38,7 +38,7 @@ // is, get_node_path() will return the associated // NodePath. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA WeakNodePath { +class EXPCL_PANDA_PGRAPH WeakNodePath { public: INLINE WeakNodePath(const NodePath &node_path); INLINE WeakNodePath(const WeakNodePath ©); diff --git a/panda/src/pgraph/workingNodePath.h b/panda/src/pgraph/workingNodePath.h index 83d0269c4b..5e57679083 100644 --- a/panda/src/pgraph/workingNodePath.h +++ b/panda/src/pgraph/workingNodePath.h @@ -46,7 +46,7 @@ // return a new NodePath representing the complete // generated chain. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA WorkingNodePath { +class EXPCL_PANDA_PGRAPH WorkingNodePath { public: INLINE WorkingNodePath(const NodePath &start); INLINE WorkingNodePath(const WorkingNodePath ©); diff --git a/panda/src/pgui/config_pgui.h b/panda/src/pgui/config_pgui.h index 585a6758aa..0641a64101 100644 --- a/panda/src/pgui/config_pgui.h +++ b/panda/src/pgui/config_pgui.h @@ -23,12 +23,12 @@ #include "notifyCategoryProxy.h" #include "configVariableDouble.h" -NotifyCategoryDecl(pgui, EXPCL_PANDA, EXPTP_PANDA); +NotifyCategoryDecl(pgui, EXPCL_PANDA_PGUI, EXPTP_PANDA_PGUI); // Configure variables for pgui package. extern ConfigVariableDouble scroll_initial_delay; extern ConfigVariableDouble scroll_continued_delay; -extern EXPCL_PANDA void init_libpgui(); +extern EXPCL_PANDA_PGUI void init_libpgui(); #endif diff --git a/panda/src/pgui/pgButton.h b/panda/src/pgui/pgButton.h index 07e5dda20f..9df08fa4df 100644 --- a/panda/src/pgui/pgButton.h +++ b/panda/src/pgui/pgButton.h @@ -33,7 +33,7 @@ // It keeps track of its own state, and handles mouse // events sensibly. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PGButton : public PGItem { +class EXPCL_PANDA_PGUI PGButton : public PGItem { PUBLISHED: PGButton(const string &name); virtual ~PGButton(); diff --git a/panda/src/pgui/pgButtonNotify.h b/panda/src/pgui/pgButtonNotify.h index 00915e6aae..791fac223b 100644 --- a/panda/src/pgui/pgButtonNotify.h +++ b/panda/src/pgui/pgButtonNotify.h @@ -30,7 +30,7 @@ class PGButton; // notify messages when a slider bar moves or otherwise // is reconfigured. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PGButtonNotify : public PGItemNotify { +class EXPCL_PANDA_PGUI PGButtonNotify : public PGItemNotify { public: INLINE PGButtonNotify(); diff --git a/panda/src/pgui/pgCullTraverser.h b/panda/src/pgui/pgCullTraverser.h index 8df33ea8e6..9bef5ff423 100644 --- a/panda/src/pgui/pgCullTraverser.h +++ b/panda/src/pgui/pgCullTraverser.h @@ -33,7 +33,7 @@ // that PGItems can know how to register their regions // with the current MouseWatcherGroup. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PGCullTraverser : public CullTraverser { +class EXPCL_PANDA_PGUI PGCullTraverser : public CullTraverser { public: INLINE PGCullTraverser(PGTop *top, CullTraverser *trav); diff --git a/panda/src/pgui/pgEntry.h b/panda/src/pgui/pgEntry.h index 148a0dc72e..bcf90cd75f 100644 --- a/panda/src/pgui/pgEntry.h +++ b/panda/src/pgui/pgEntry.h @@ -43,7 +43,7 @@ // encoding method is specified by the associated // TextNode. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PGEntry : public PGItem { +class EXPCL_PANDA_PGUI PGEntry : public PGItem { PUBLISHED: PGEntry(const string &name); virtual ~PGEntry(); diff --git a/panda/src/pgui/pgFrameStyle.h b/panda/src/pgui/pgFrameStyle.h index acc1b40b5e..671f26d3af 100644 --- a/panda/src/pgui/pgFrameStyle.h +++ b/panda/src/pgui/pgFrameStyle.h @@ -32,7 +32,7 @@ class NodePath; // Class : PGFrameStyle // Description : //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PGFrameStyle { +class EXPCL_PANDA_PGUI PGFrameStyle { PUBLISHED: INLINE PGFrameStyle(); INLINE PGFrameStyle(const PGFrameStyle ©); diff --git a/panda/src/pgui/pgItem.h b/panda/src/pgui/pgItem.h index 708130811a..a839c8b82a 100644 --- a/panda/src/pgui/pgItem.h +++ b/panda/src/pgui/pgItem.h @@ -53,7 +53,7 @@ class ClipPlaneAttrib; // somewhere beneath a PGTop node in order for this // behavior to work. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PGItem : public PandaNode { +class EXPCL_PANDA_PGUI PGItem : public PandaNode { PUBLISHED: PGItem(const string &name); virtual ~PGItem(); diff --git a/panda/src/pgui/pgItemNotify.h b/panda/src/pgui/pgItemNotify.h index 2b3445bac3..f8a4eb804d 100644 --- a/panda/src/pgui/pgItemNotify.h +++ b/panda/src/pgui/pgItemNotify.h @@ -31,7 +31,7 @@ class MouseWatcherParameter; // specialized messages when PGItems change in certain // ways. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PGItemNotify { +class EXPCL_PANDA_PGUI PGItemNotify { public: INLINE PGItemNotify(); virtual ~PGItemNotify(); diff --git a/panda/src/pgui/pgMouseWatcherBackground.h b/panda/src/pgui/pgMouseWatcherBackground.h index 7bf9184598..e75ba98536 100644 --- a/panda/src/pgui/pgMouseWatcherBackground.h +++ b/panda/src/pgui/pgMouseWatcherBackground.h @@ -30,7 +30,7 @@ // just quietly listens for keypresses and sends them to // all the PGItems with background focus. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PGMouseWatcherBackground : public MouseWatcherRegion { +class EXPCL_PANDA_PGUI PGMouseWatcherBackground : public MouseWatcherRegion { PUBLISHED: PGMouseWatcherBackground(); virtual ~PGMouseWatcherBackground(); diff --git a/panda/src/pgui/pgMouseWatcherGroup.h b/panda/src/pgui/pgMouseWatcherGroup.h index 21f4b3e373..23e1a98dcd 100644 --- a/panda/src/pgui/pgMouseWatcherGroup.h +++ b/panda/src/pgui/pgMouseWatcherGroup.h @@ -34,7 +34,7 @@ class PGTop; // MouseWatcherGroup, but this causes problems with // circular reference counts. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PGMouseWatcherGroup : public MouseWatcherGroup { +class EXPCL_PANDA_PGUI PGMouseWatcherGroup : public MouseWatcherGroup { public: INLINE PGMouseWatcherGroup(PGTop *top); virtual ~PGMouseWatcherGroup(); diff --git a/panda/src/pgui/pgMouseWatcherParameter.h b/panda/src/pgui/pgMouseWatcherParameter.h index acd9d4715e..c1bea950b3 100644 --- a/panda/src/pgui/pgMouseWatcherParameter.h +++ b/panda/src/pgui/pgMouseWatcherParameter.h @@ -32,7 +32,7 @@ // TypedWritableReferenceCount so we can attach this thing to an // event. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PGMouseWatcherParameter : public TypedWritableReferenceCount, public MouseWatcherParameter { +class EXPCL_PANDA_PGUI PGMouseWatcherParameter : public TypedWritableReferenceCount, public MouseWatcherParameter { // For now, this must inherit from TypedWritableReferenceCount on // the left, because MSVC++ wants to make that base class be the one // at the front of the structure, not MouseWatcherParameter for some diff --git a/panda/src/pgui/pgMouseWatcherRegion.h b/panda/src/pgui/pgMouseWatcherRegion.h index f2518ee661..18b89daa70 100644 --- a/panda/src/pgui/pgMouseWatcherRegion.h +++ b/panda/src/pgui/pgMouseWatcherRegion.h @@ -32,7 +32,7 @@ class PGItem; // system. Each PGItem corresponds to exactly one // PGMouseWatcherRegion. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PGMouseWatcherRegion : public MouseWatcherRegion { +class EXPCL_PANDA_PGUI PGMouseWatcherRegion : public MouseWatcherRegion { public: PGMouseWatcherRegion(PGItem *item); virtual ~PGMouseWatcherRegion(); diff --git a/panda/src/pgui/pgScrollFrame.h b/panda/src/pgui/pgScrollFrame.h index 409bc47f9c..7fc3505a0a 100644 --- a/panda/src/pgui/pgScrollFrame.h +++ b/panda/src/pgui/pgScrollFrame.h @@ -40,7 +40,7 @@ // bars, and restricts the virtual transform to // translate only (no scale or rotate). //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PGScrollFrame : public PGVirtualFrame, public PGSliderBarNotify { +class EXPCL_PANDA_PGUI PGScrollFrame : public PGVirtualFrame, public PGSliderBarNotify { PUBLISHED: PGScrollFrame(const string &name = ""); virtual ~PGScrollFrame(); diff --git a/panda/src/pgui/pgSliderBar.h b/panda/src/pgui/pgSliderBar.h index 987ba06271..063af72c06 100755 --- a/panda/src/pgui/pgSliderBar.h +++ b/panda/src/pgui/pgSliderBar.h @@ -35,7 +35,7 @@ // This is used as an implementation for both // DirectSlider and for DirectScrollBar. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PGSliderBar : public PGItem, public PGButtonNotify { +class EXPCL_PANDA_PGUI PGSliderBar : public PGItem, public PGButtonNotify { PUBLISHED: PGSliderBar(const string &name = ""); virtual ~PGSliderBar(); diff --git a/panda/src/pgui/pgSliderBarNotify.h b/panda/src/pgui/pgSliderBarNotify.h index 23e4698115..4f44477f9e 100644 --- a/panda/src/pgui/pgSliderBarNotify.h +++ b/panda/src/pgui/pgSliderBarNotify.h @@ -30,7 +30,7 @@ class PGSliderBar; // notify messages when a slider bar moves or otherwise // is reconfigured. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PGSliderBarNotify : public PGItemNotify { +class EXPCL_PANDA_PGUI PGSliderBarNotify : public PGItemNotify { public: INLINE PGSliderBarNotify(); diff --git a/panda/src/pgui/pgTop.h b/panda/src/pgui/pgTop.h index 18c050c4d6..cbc680cd70 100644 --- a/panda/src/pgui/pgTop.h +++ b/panda/src/pgui/pgTop.h @@ -44,7 +44,7 @@ class PGMouseWatcherGroup; // depth-first, left-to-right order, appropriate for 2-d // objects. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PGTop : public PandaNode { +class EXPCL_PANDA_PGUI PGTop : public PandaNode { PUBLISHED: PGTop(const string &name); virtual ~PGTop(); diff --git a/panda/src/pgui/pgVirtualFrame.h b/panda/src/pgui/pgVirtualFrame.h index d3c2a433f7..30c4da0269 100644 --- a/panda/src/pgui/pgVirtualFrame.h +++ b/panda/src/pgui/pgVirtualFrame.h @@ -51,7 +51,7 @@ class TransformState; // that handles the traditional scrolling canvas, with // scroll bars. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PGVirtualFrame : public PGItem { +class EXPCL_PANDA_PGUI PGVirtualFrame : public PGItem { PUBLISHED: PGVirtualFrame(const string &name = ""); virtual ~PGVirtualFrame(); diff --git a/panda/src/pgui/pgWaitBar.h b/panda/src/pgui/pgWaitBar.h index 87bb2d9166..63becf8be5 100644 --- a/panda/src/pgui/pgWaitBar.h +++ b/panda/src/pgui/pgWaitBar.h @@ -30,7 +30,7 @@ // a slow process gradually completing, like a // traditional "wait, loading" bar. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PGWaitBar : public PGItem { +class EXPCL_PANDA_PGUI PGWaitBar : public PGItem { PUBLISHED: PGWaitBar(const string &name = ""); virtual ~PGWaitBar(); diff --git a/panda/src/pipeline/blockerSimple.h b/panda/src/pipeline/blockerSimple.h index 56ea319ec0..1e644aa7fc 100644 --- a/panda/src/pipeline/blockerSimple.h +++ b/panda/src/pipeline/blockerSimple.h @@ -33,7 +33,7 @@ // synchronization primitive that one or more threads // might be blocked on. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA BlockerSimple { +class EXPCL_PANDA_PIPELINE BlockerSimple { protected: INLINE BlockerSimple(); INLINE ~BlockerSimple(); diff --git a/panda/src/pipeline/conditionVar.h b/panda/src/pipeline/conditionVar.h index 7fac4e5d6d..fc506b3f81 100644 --- a/panda/src/pipeline/conditionVar.h +++ b/panda/src/pipeline/conditionVar.h @@ -46,9 +46,9 @@ // the definition of DEBUG_THREADS. //////////////////////////////////////////////////////////////////// #ifdef DEBUG_THREADS -class EXPCL_PANDA ConditionVar : public ConditionVarDebug +class EXPCL_PANDA_PIPELINE ConditionVar : public ConditionVarDebug #else -class EXPCL_PANDA ConditionVar : public ConditionVarDirect +class EXPCL_PANDA_PIPELINE ConditionVar : public ConditionVarDirect #endif // DEBUG_THREADS { PUBLISHED: diff --git a/panda/src/pipeline/conditionVarDebug.h b/panda/src/pipeline/conditionVarDebug.h index f09dfee22a..f388c9ee3d 100644 --- a/panda/src/pipeline/conditionVarDebug.h +++ b/panda/src/pipeline/conditionVarDebug.h @@ -37,7 +37,7 @@ // mutex, and several condition variables may share the // same mutex. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ConditionVarDebug { +class EXPCL_PANDA_PIPELINE ConditionVarDebug { public: ConditionVarDebug(MutexDebug &mutex); virtual ~ConditionVarDebug(); diff --git a/panda/src/pipeline/conditionVarDirect.h b/panda/src/pipeline/conditionVarDirect.h index cdbf4be24f..cc06a7c843 100644 --- a/panda/src/pipeline/conditionVarDirect.h +++ b/panda/src/pipeline/conditionVarDirect.h @@ -37,7 +37,7 @@ // mutex, and several condition variables may share the // same mutex. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ConditionVarDirect { +class EXPCL_PANDA_PIPELINE ConditionVarDirect { public: INLINE ConditionVarDirect(MutexDirect &mutex); INLINE ~ConditionVarDirect(); diff --git a/panda/src/pipeline/conditionVarDummyImpl.h b/panda/src/pipeline/conditionVarDummyImpl.h index bde3c3f735..53e5e2a440 100644 --- a/panda/src/pipeline/conditionVarDummyImpl.h +++ b/panda/src/pipeline/conditionVarDummyImpl.h @@ -33,7 +33,7 @@ class MutexDummyImpl; // single-threaded applications that don't need any // synchronization control. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ConditionVarDummyImpl { +class EXPCL_PANDA_PIPELINE ConditionVarDummyImpl { public: INLINE ConditionVarDummyImpl(MutexDummyImpl &mutex); INLINE ~ConditionVarDummyImpl(); diff --git a/panda/src/pipeline/conditionVarFull.h b/panda/src/pipeline/conditionVarFull.h index be82947cfd..35067c661d 100644 --- a/panda/src/pipeline/conditionVarFull.h +++ b/panda/src/pipeline/conditionVarFull.h @@ -52,9 +52,9 @@ // depending on the definition of DEBUG_THREADS. //////////////////////////////////////////////////////////////////// #ifdef DEBUG_THREADS -class EXPCL_PANDA ConditionVarFull : public ConditionVarFullDebug +class EXPCL_PANDA_PIPELINE ConditionVarFull : public ConditionVarFullDebug #else -class EXPCL_PANDA ConditionVarFull : public ConditionVarFullDirect +class EXPCL_PANDA_PIPELINE ConditionVarFull : public ConditionVarFullDirect #endif // DEBUG_THREADS { PUBLISHED: diff --git a/panda/src/pipeline/conditionVarFullDebug.h b/panda/src/pipeline/conditionVarFullDebug.h index 160f4957e9..b5980ff5ee 100644 --- a/panda/src/pipeline/conditionVarFullDebug.h +++ b/panda/src/pipeline/conditionVarFullDebug.h @@ -37,7 +37,7 @@ // mutex, and several condition variables may share the // same mutex. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ConditionVarFullDebug { +class EXPCL_PANDA_PIPELINE ConditionVarFullDebug { public: ConditionVarFullDebug(MutexDebug &mutex); virtual ~ConditionVarFullDebug(); diff --git a/panda/src/pipeline/conditionVarFullDirect.h b/panda/src/pipeline/conditionVarFullDirect.h index cf158cb218..0e69d09be1 100644 --- a/panda/src/pipeline/conditionVarFullDirect.h +++ b/panda/src/pipeline/conditionVarFullDirect.h @@ -37,7 +37,7 @@ // mutex, and several condition variables may share the // same mutex. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ConditionVarFullDirect { +class EXPCL_PANDA_PIPELINE ConditionVarFullDirect { public: INLINE ConditionVarFullDirect(MutexDirect &mutex); INLINE ~ConditionVarFullDirect(); diff --git a/panda/src/pipeline/conditionVarFullWin32Impl.h b/panda/src/pipeline/conditionVarFullWin32Impl.h index 777b7f7dff..e3b837bc3a 100644 --- a/panda/src/pipeline/conditionVarFullWin32Impl.h +++ b/panda/src/pipeline/conditionVarFullWin32Impl.h @@ -49,7 +49,7 @@ class MutexWin32Impl; // was called. But we figure it's good enough for our // purposes. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ConditionVarFullWin32Impl { +class EXPCL_PANDA_PIPELINE ConditionVarFullWin32Impl { public: INLINE ConditionVarFullWin32Impl(MutexWin32Impl &mutex); INLINE ~ConditionVarFullWin32Impl(); diff --git a/panda/src/pipeline/conditionVarPosixImpl.h b/panda/src/pipeline/conditionVarPosixImpl.h index 5daedf239a..eeb2cfdc87 100644 --- a/panda/src/pipeline/conditionVarPosixImpl.h +++ b/panda/src/pipeline/conditionVarPosixImpl.h @@ -35,7 +35,7 @@ class MutexPosixImpl; // Class : ConditionVarPosixImpl // Description : Uses Posix threads to implement a conditionVar. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ConditionVarPosixImpl { +class EXPCL_PANDA_PIPELINE ConditionVarPosixImpl { public: INLINE ConditionVarPosixImpl(MutexPosixImpl &mutex); INLINE ~ConditionVarPosixImpl(); diff --git a/panda/src/pipeline/conditionVarSimpleImpl.h b/panda/src/pipeline/conditionVarSimpleImpl.h index ecc53bcba2..d48d4a3ffd 100644 --- a/panda/src/pipeline/conditionVarSimpleImpl.h +++ b/panda/src/pipeline/conditionVarSimpleImpl.h @@ -32,7 +32,7 @@ // Description : Implements a simple condition variable using // simulated user-space threads. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ConditionVarSimpleImpl : public BlockerSimple { +class EXPCL_PANDA_PIPELINE ConditionVarSimpleImpl : public BlockerSimple { public: INLINE ConditionVarSimpleImpl(MutexTrueImpl &mutex); INLINE ~ConditionVarSimpleImpl(); diff --git a/panda/src/pipeline/conditionVarSpinlockImpl.h b/panda/src/pipeline/conditionVarSpinlockImpl.h index 67a3432140..8dc8b7062b 100644 --- a/panda/src/pipeline/conditionVarSpinlockImpl.h +++ b/panda/src/pipeline/conditionVarSpinlockImpl.h @@ -39,7 +39,7 @@ class MutexSpinlockImpl; // machine, and you are confident that you have at least // as many CPU's as you have threads. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ConditionVarSpinlockImpl { +class EXPCL_PANDA_PIPELINE ConditionVarSpinlockImpl { public: INLINE ConditionVarSpinlockImpl(MutexSpinlockImpl &mutex); INLINE ~ConditionVarSpinlockImpl(); diff --git a/panda/src/pipeline/conditionVarWin32Impl.h b/panda/src/pipeline/conditionVarWin32Impl.h index cd1f3678e3..8abb90e913 100644 --- a/panda/src/pipeline/conditionVarWin32Impl.h +++ b/panda/src/pipeline/conditionVarWin32Impl.h @@ -43,7 +43,7 @@ class MutexWin32Impl; // simpler than that full implementation, so we can // avoid the overhead required to support broadcast. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ConditionVarWin32Impl { +class EXPCL_PANDA_PIPELINE ConditionVarWin32Impl { public: INLINE ConditionVarWin32Impl(MutexWin32Impl &mutex); INLINE ~ConditionVarWin32Impl(); diff --git a/panda/src/pipeline/config_pipeline.h b/panda/src/pipeline/config_pipeline.h index 26bccdf8b6..8f5fb47363 100644 --- a/panda/src/pipeline/config_pipeline.h +++ b/panda/src/pipeline/config_pipeline.h @@ -25,14 +25,14 @@ #include "configVariableInt.h" #include "configVariableBool.h" -ConfigureDecl(config_pipeline, EXPCL_PANDA, EXPTP_PANDA); -NotifyCategoryDecl(pipeline, EXPCL_PANDA, EXPTP_PANDA); -NotifyCategoryDecl(thread, EXPCL_PANDA, EXPTP_PANDA); +ConfigureDecl(config_pipeline, EXPCL_PANDA_PIPELINE, EXPTP_PANDA_PIPELINE); +NotifyCategoryDecl(pipeline, EXPCL_PANDA_PIPELINE, EXPTP_PANDA_PIPELINE); +NotifyCategoryDecl(thread, EXPCL_PANDA_PIPELINE, EXPTP_PANDA_PIPELINE); extern ConfigVariableBool support_threads; extern ConfigVariableInt thread_stack_size; -extern EXPCL_PANDA void init_libpipeline(); +extern EXPCL_PANDA_PIPELINE void init_libpipeline(); #endif // CONFIG_PIPELINE_H diff --git a/panda/src/pipeline/cycleData.h b/panda/src/pipeline/cycleData.h index f009cf8b02..5d293600d0 100644 --- a/panda/src/pipeline/cycleData.h +++ b/panda/src/pipeline/cycleData.h @@ -44,14 +44,14 @@ class DatagramIterator; // since we want to make a distinction between references within the // cycler, and references outside the cycler // (e.g. GeomPipelineReader), we make it a NodeReferenceCount. -class EXPCL_PANDA CycleData : public NodeReferenceCount +class EXPCL_PANDA_PIPELINE CycleData : public NodeReferenceCount #else // !DO_PIPELINING // If we are *not* compiling in pipelining support, the CycleData // object is stored directly within its containing classes, and hence // should not be a ReferenceCount object. -class EXPCL_PANDA CycleData +class EXPCL_PANDA_PIPELINE CycleData #endif // DO_PIPELINING { diff --git a/panda/src/pipeline/cyclerHolder.h b/panda/src/pipeline/cyclerHolder.h index b8d03e7d94..44710f341a 100644 --- a/panda/src/pipeline/cyclerHolder.h +++ b/panda/src/pipeline/cyclerHolder.h @@ -29,7 +29,7 @@ // PipelineCyclerBase object. This is similar to a // MutexHolder. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CyclerHolder { +class EXPCL_PANDA_PIPELINE CyclerHolder { public: INLINE CyclerHolder(PipelineCyclerBase &cycler); INLINE ~CyclerHolder(); diff --git a/panda/src/pipeline/externalThread.h b/panda/src/pipeline/externalThread.h index 5aba1c31d2..87a6337136 100644 --- a/panda/src/pipeline/externalThread.h +++ b/panda/src/pipeline/externalThread.h @@ -28,7 +28,7 @@ // instance of these in the world, and it is returned by // Thread::get_external_thread(). //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ExternalThread : public Thread { +class EXPCL_PANDA_PIPELINE ExternalThread : public Thread { private: ExternalThread(); ExternalThread(const string &name, const string &sync_name); diff --git a/panda/src/pipeline/mainThread.h b/panda/src/pipeline/mainThread.h index f11c65f688..5d6a3517d1 100644 --- a/panda/src/pipeline/mainThread.h +++ b/panda/src/pipeline/mainThread.h @@ -28,7 +28,7 @@ // instance of these in the world, and it is returned by // Thread::get_main_thread(). //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA MainThread : public Thread { +class EXPCL_PANDA_PIPELINE MainThread : public Thread { private: MainThread(); virtual void thread_main(); diff --git a/panda/src/pipeline/mutexDebug.h b/panda/src/pipeline/mutexDebug.h index 4fc722e08e..72974be667 100644 --- a/panda/src/pipeline/mutexDebug.h +++ b/panda/src/pipeline/mutexDebug.h @@ -32,7 +32,7 @@ // by doing everything by hand. This does allow fancy // things like deadlock detection, however. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA MutexDebug { +class EXPCL_PANDA_PIPELINE MutexDebug { protected: MutexDebug(const string &name, bool allow_recursion); virtual ~MutexDebug(); diff --git a/panda/src/pipeline/mutexDirect.h b/panda/src/pipeline/mutexDirect.h index 4a709a43e7..3ac4915e8d 100644 --- a/panda/src/pipeline/mutexDirect.h +++ b/panda/src/pipeline/mutexDirect.h @@ -33,7 +33,7 @@ class Thread; // direct calls to the underlying implementation layer. // It doesn't perform any debugging operations. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA MutexDirect { +class EXPCL_PANDA_PIPELINE MutexDirect { protected: INLINE MutexDirect(); INLINE ~MutexDirect(); diff --git a/panda/src/pipeline/mutexHolder.h b/panda/src/pipeline/mutexHolder.h index a2678fbd1f..0cadcbd80c 100644 --- a/panda/src/pipeline/mutexHolder.h +++ b/panda/src/pipeline/mutexHolder.h @@ -30,7 +30,7 @@ // release() automatically when a block exits (for // instance, on return). //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA MutexHolder { +class EXPCL_PANDA_PIPELINE MutexHolder { public: INLINE MutexHolder(const Mutex &mutex); INLINE MutexHolder(Mutex *&mutex); diff --git a/panda/src/pipeline/mutexSimpleImpl.h b/panda/src/pipeline/mutexSimpleImpl.h index cc1225d34b..6c701c2bb4 100644 --- a/panda/src/pipeline/mutexSimpleImpl.h +++ b/panda/src/pipeline/mutexSimpleImpl.h @@ -45,7 +45,7 @@ // MutexTrueImpl, for code after pipeline to use--which // maps to this class, MutexSimpleImpl). //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA MutexSimpleImpl : public BlockerSimple { +class EXPCL_PANDA_PIPELINE MutexSimpleImpl : public BlockerSimple { public: INLINE MutexSimpleImpl(); INLINE ~MutexSimpleImpl(); diff --git a/panda/src/pipeline/pipeline.h b/panda/src/pipeline/pipeline.h index eb888b82d7..43f55c9f63 100644 --- a/panda/src/pipeline/pipeline.h +++ b/panda/src/pipeline/pipeline.h @@ -42,7 +42,7 @@ struct PipelineCyclerTrueImpl; // pipeline. Other specialty pipelines may be created // as needed. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA Pipeline : public PipelineCyclerLinks, public Namable { +class EXPCL_PANDA_PIPELINE Pipeline : public PipelineCyclerLinks, public Namable { public: Pipeline(const string &name, int num_stages); ~Pipeline(); diff --git a/panda/src/pipeline/pipelineCyclerDummyImpl.h b/panda/src/pipeline/pipelineCyclerDummyImpl.h index a1cf876447..6dd05aa213 100644 --- a/panda/src/pipeline/pipelineCyclerDummyImpl.h +++ b/panda/src/pipeline/pipelineCyclerDummyImpl.h @@ -45,7 +45,7 @@ // mainly to be consistent with // PipelineCyclerTrivialImpl. //////////////////////////////////////////////////////////////////// -struct EXPCL_PANDA PipelineCyclerDummyImpl { +struct EXPCL_PANDA_PIPELINE PipelineCyclerDummyImpl { public: INLINE PipelineCyclerDummyImpl(CycleData *initial_data, Pipeline *pipeline = NULL); INLINE PipelineCyclerDummyImpl(const PipelineCyclerDummyImpl ©); diff --git a/panda/src/pipeline/pipelineCyclerLinks.h b/panda/src/pipeline/pipelineCyclerLinks.h index 7f88959421..94a51f24d5 100644 --- a/panda/src/pipeline/pipelineCyclerLinks.h +++ b/panda/src/pipeline/pipelineCyclerLinks.h @@ -36,7 +36,7 @@ // so the Pipeline object itself can be the root of the // linked list. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PipelineCyclerLinks { +class EXPCL_PANDA_PIPELINE PipelineCyclerLinks { protected: #ifdef THREADED_PIPELINE INLINE PipelineCyclerLinks(); diff --git a/panda/src/pipeline/pipelineCyclerTrivialImpl.h b/panda/src/pipeline/pipelineCyclerTrivialImpl.h index 586a2bd38c..d112fcc52c 100644 --- a/panda/src/pipeline/pipelineCyclerTrivialImpl.h +++ b/panda/src/pipeline/pipelineCyclerTrivialImpl.h @@ -48,7 +48,7 @@ class Pipeline; // object, so that the inherited struct's data is likely // to be placed by the compiler at the "this" pointer. //////////////////////////////////////////////////////////////////// -struct EXPCL_PANDA PipelineCyclerTrivialImpl { +struct EXPCL_PANDA_PIPELINE PipelineCyclerTrivialImpl { public: INLINE PipelineCyclerTrivialImpl(CycleData *initial_data, Pipeline *pipeline = NULL); private: diff --git a/panda/src/pipeline/pipelineCyclerTrueImpl.h b/panda/src/pipeline/pipelineCyclerTrueImpl.h index 5a55fa8e0b..87daf307ea 100644 --- a/panda/src/pipeline/pipelineCyclerTrueImpl.h +++ b/panda/src/pipeline/pipelineCyclerTrueImpl.h @@ -49,7 +49,7 @@ class Pipeline; // mainly to be consistent with // PipelineCyclerTrivialImpl. //////////////////////////////////////////////////////////////////// -struct EXPCL_PANDA PipelineCyclerTrueImpl : public PipelineCyclerLinks { +struct EXPCL_PANDA_PIPELINE PipelineCyclerTrueImpl : public PipelineCyclerLinks { private: PipelineCyclerTrueImpl(); public: diff --git a/panda/src/pipeline/pmutex.h b/panda/src/pipeline/pmutex.h index df9f770e13..128c8e71a3 100644 --- a/panda/src/pipeline/pmutex.h +++ b/panda/src/pipeline/pmutex.h @@ -43,9 +43,9 @@ // definition of DEBUG_THREADS. //////////////////////////////////////////////////////////////////// #ifdef DEBUG_THREADS -class EXPCL_PANDA Mutex : public MutexDebug +class EXPCL_PANDA_PIPELINE Mutex : public MutexDebug #else -class EXPCL_PANDA Mutex : public MutexDirect +class EXPCL_PANDA_PIPELINE Mutex : public MutexDirect #endif // DEBUG_THREADS { PUBLISHED: diff --git a/panda/src/pipeline/pythonThread.h b/panda/src/pipeline/pythonThread.h index 752446b93a..5c5c3b33c2 100644 --- a/panda/src/pipeline/pythonThread.h +++ b/panda/src/pipeline/pythonThread.h @@ -37,7 +37,7 @@ // a Panda thread from the Python level. It will spawn // a thread that executes an arbitrary Python functor. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PythonThread : public Thread { +class EXPCL_PANDA_PIPELINE PythonThread : public Thread { PUBLISHED: PythonThread(PyObject *function, PyObject *args, const string &name, const string &sync_name); diff --git a/panda/src/pipeline/reMutex.h b/panda/src/pipeline/reMutex.h index 481abe6644..7b20b2fba9 100644 --- a/panda/src/pipeline/reMutex.h +++ b/panda/src/pipeline/reMutex.h @@ -35,9 +35,9 @@ // definition of DEBUG_THREADS. //////////////////////////////////////////////////////////////////// #ifdef DEBUG_THREADS -class EXPCL_PANDA ReMutex : public MutexDebug +class EXPCL_PANDA_PIPELINE ReMutex : public MutexDebug #else -class EXPCL_PANDA ReMutex : public ReMutexDirect +class EXPCL_PANDA_PIPELINE ReMutex : public ReMutexDirect #endif // DEBUG_THREADS { PUBLISHED: diff --git a/panda/src/pipeline/reMutexDirect.h b/panda/src/pipeline/reMutexDirect.h index 79b8b03659..9d2357beca 100644 --- a/panda/src/pipeline/reMutexDirect.h +++ b/panda/src/pipeline/reMutexDirect.h @@ -31,7 +31,7 @@ class Thread; // direct calls to the underlying implementation layer. // It doesn't perform any debugging operations. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ReMutexDirect { +class EXPCL_PANDA_PIPELINE ReMutexDirect { protected: INLINE ReMutexDirect(); INLINE ~ReMutexDirect(); diff --git a/panda/src/pipeline/reMutexHolder.h b/panda/src/pipeline/reMutexHolder.h index 73ee094db4..461d8a8e11 100644 --- a/panda/src/pipeline/reMutexHolder.h +++ b/panda/src/pipeline/reMutexHolder.h @@ -28,7 +28,7 @@ class Thread; // Class : ReMutexHolder // Description : Similar to MutexHolder, but for a reentrant mutex. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ReMutexHolder { +class EXPCL_PANDA_PIPELINE ReMutexHolder { public: INLINE ReMutexHolder(const ReMutex &mutex); INLINE ReMutexHolder(const ReMutex &mutex, Thread *current_thread); diff --git a/panda/src/pipeline/reMutexSimpleImpl.h b/panda/src/pipeline/reMutexSimpleImpl.h index a1fd8c46c9..258ad5562f 100644 --- a/panda/src/pipeline/reMutexSimpleImpl.h +++ b/panda/src/pipeline/reMutexSimpleImpl.h @@ -33,7 +33,7 @@ // simulated threads case, for recursive mutexes. See // MutexSimpleImple. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ReMutexSimpleImpl : public BlockerSimple { +class EXPCL_PANDA_PIPELINE ReMutexSimpleImpl : public BlockerSimple { public: INLINE ReMutexSimpleImpl(); INLINE ~ReMutexSimpleImpl(); diff --git a/panda/src/pipeline/thread.h b/panda/src/pipeline/thread.h index 2e27be163d..8636a38d2c 100644 --- a/panda/src/pipeline/thread.h +++ b/panda/src/pipeline/thread.h @@ -43,7 +43,7 @@ class MutexDebug; // will automatically be destructed if no other pointers // are referencing it. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA Thread : public TypedReferenceCount { +class EXPCL_PANDA_PIPELINE Thread : public TypedReferenceCount { protected: INLINE Thread(const string &name, const string &sync_name); @@ -94,7 +94,7 @@ PUBLISHED: public: // This class allows integration with PStats, particularly in the // SIMPLE_THREADS case. - class EXPCL_PANDA PStatsCallback { + class EXPCL_PANDA_PIPELINE PStatsCallback { public: virtual ~PStatsCallback(); virtual void deactivate_hook(Thread *thread); diff --git a/panda/src/pipeline/threadDummyImpl.h b/panda/src/pipeline/threadDummyImpl.h index 02bf0f42fb..4bc50937e3 100644 --- a/panda/src/pipeline/threadDummyImpl.h +++ b/panda/src/pipeline/threadDummyImpl.h @@ -40,7 +40,7 @@ class Thread; // applications. This simply fails whenever you try to // start a thread. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ThreadDummyImpl { +class EXPCL_PANDA_PIPELINE ThreadDummyImpl { public: INLINE ThreadDummyImpl(Thread *parent_obj); INLINE ~ThreadDummyImpl(); diff --git a/panda/src/pipeline/threadPosixImpl.h b/panda/src/pipeline/threadPosixImpl.h index 8dd9ac823e..0e69426cb4 100644 --- a/panda/src/pipeline/threadPosixImpl.h +++ b/panda/src/pipeline/threadPosixImpl.h @@ -36,7 +36,7 @@ class Thread; // Class : ThreadPosixImpl // Description : Uses Posix threads to implement a thread. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ThreadPosixImpl { +class EXPCL_PANDA_PIPELINE ThreadPosixImpl { public: INLINE ThreadPosixImpl(Thread *parent_obj); ~ThreadPosixImpl(); diff --git a/panda/src/pipeline/threadSimpleImpl.h b/panda/src/pipeline/threadSimpleImpl.h index 54faab5381..9c36488cc7 100644 --- a/panda/src/pipeline/threadSimpleImpl.h +++ b/panda/src/pipeline/threadSimpleImpl.h @@ -62,7 +62,7 @@ class MutexSimpleImpl; // Thread::consider_yield() occasionally, or it will // starve the rest of the running threads. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ThreadSimpleImpl { +class EXPCL_PANDA_PIPELINE ThreadSimpleImpl { public: ThreadSimpleImpl(Thread *parent_obj); ~ThreadSimpleImpl(); diff --git a/panda/src/pipeline/threadSimpleManager.h b/panda/src/pipeline/threadSimpleManager.h index 2d191237e1..8777e26021 100644 --- a/panda/src/pipeline/threadSimpleManager.h +++ b/panda/src/pipeline/threadSimpleManager.h @@ -56,7 +56,7 @@ class BlockerSimple; // Generally, you shouldn't be calling these methods // directly. Call the interfaces on Thread instead. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ThreadSimpleManager { +class EXPCL_PANDA_PIPELINE ThreadSimpleManager { private: ThreadSimpleManager(); diff --git a/panda/src/pipeline/threadWin32Impl.h b/panda/src/pipeline/threadWin32Impl.h index c70967f92a..f14dd1cb83 100644 --- a/panda/src/pipeline/threadWin32Impl.h +++ b/panda/src/pipeline/threadWin32Impl.h @@ -35,7 +35,7 @@ class Thread; // Class : ThreadWin32Impl // Description : Uses native Windows calls to implement a thread. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ThreadWin32Impl { +class EXPCL_PANDA_PIPELINE ThreadWin32Impl { public: INLINE ThreadWin32Impl(Thread *parent_obj); ~ThreadWin32Impl(); diff --git a/panda/src/pnmimage/config_pnmimage.h b/panda/src/pnmimage/config_pnmimage.h index aeba99f630..a410c35d22 100644 --- a/panda/src/pnmimage/config_pnmimage.h +++ b/panda/src/pnmimage/config_pnmimage.h @@ -22,8 +22,8 @@ #include "pandabase.h" #include "notifyCategoryProxy.h" -NotifyCategoryDecl(pnmimage, EXPCL_PANDA, EXPTP_PANDA); +NotifyCategoryDecl(pnmimage, EXPCL_PANDA_PNMIMAGE, EXPTP_PANDA_PNMIMAGE); -extern EXPCL_PANDA void init_libpnmimage(); +extern EXPCL_PANDA_PNMIMAGE void init_libpnmimage(); #endif diff --git a/panda/src/pnmimage/pnmBrush.cxx b/panda/src/pnmimage/pnmBrush.cxx index edd12fc5e1..a0d0f1153a 100644 --- a/panda/src/pnmimage/pnmBrush.cxx +++ b/panda/src/pnmimage/pnmBrush.cxx @@ -21,7 +21,7 @@ #include "cmath.h" // A PNMTransparentBrush doesn't draw or fill anything. -class EXPCL_PANDA PNMTransparentBrush : public PNMBrush { +class EXPCL_PANDA_PNMIMAGE PNMTransparentBrush : public PNMBrush { public: PNMTransparentBrush() : PNMBrush(0.0, 0.0) { } @@ -34,7 +34,7 @@ public: }; // A PNMPixelBrush is a family of brushes that draw one pixel at a time. -class EXPCL_PANDA PNMPixelBrush : public PNMBrush { +class EXPCL_PANDA_PNMIMAGE PNMPixelBrush : public PNMBrush { protected: PNMPixelBrush(const Colord &color) : PNMBrush(0.5, 0.5), _rgb(color[0], color[1], color[2]), _a(color[3]) { } @@ -44,7 +44,7 @@ protected: }; // Arbitrarily sets the pixel to a particular color, with no antialiasing. -class EXPCL_PANDA PNMSetPixelBrush : public PNMPixelBrush { +class EXPCL_PANDA_PNMIMAGE PNMSetPixelBrush : public PNMPixelBrush { public: PNMSetPixelBrush(const Colord &color) : PNMPixelBrush(color) { } @@ -77,7 +77,7 @@ public: }; // Blends the pixel in to the existing background. -class EXPCL_PANDA PNMBlendPixelBrush : public PNMPixelBrush { +class EXPCL_PANDA_PNMIMAGE PNMBlendPixelBrush : public PNMPixelBrush { public: PNMBlendPixelBrush(const Colord &color) : PNMPixelBrush(color) { } @@ -101,7 +101,7 @@ public: }; // Darkens the pixel in the existing background. -class EXPCL_PANDA PNMDarkenPixelBrush : public PNMPixelBrush { +class EXPCL_PANDA_PNMIMAGE PNMDarkenPixelBrush : public PNMPixelBrush { public: PNMDarkenPixelBrush(const Colord &color) : PNMPixelBrush(color) { } @@ -146,7 +146,7 @@ public: }; // Lightens the pixel in the existing background. -class EXPCL_PANDA PNMLightenPixelBrush : public PNMPixelBrush { +class EXPCL_PANDA_PNMIMAGE PNMLightenPixelBrush : public PNMPixelBrush { public: PNMLightenPixelBrush(const Colord &color) : PNMPixelBrush(color) { } @@ -191,7 +191,7 @@ public: }; // A PNMImageBrush is a family of brushes that draw an image at a time. -class EXPCL_PANDA PNMImageBrush : public PNMBrush { +class EXPCL_PANDA_PNMIMAGE PNMImageBrush : public PNMBrush { protected: PNMImageBrush(const PNMImage &image, double xc, double yc) : PNMBrush(xc, yc), @@ -227,7 +227,7 @@ protected: }; // Sets the pixels from the rectangular image, with no antialiasing. -class EXPCL_PANDA PNMSetImageBrush : public PNMImageBrush { +class EXPCL_PANDA_PNMIMAGE PNMSetImageBrush : public PNMImageBrush { public: PNMSetImageBrush(const PNMImage &image, double xc, double yc) : PNMImageBrush(image, xc, yc) { } @@ -245,7 +245,7 @@ public: }; // Blends the pixels in using alpha. -class EXPCL_PANDA PNMBlendImageBrush : public PNMImageBrush { +class EXPCL_PANDA_PNMIMAGE PNMBlendImageBrush : public PNMImageBrush { public: PNMBlendImageBrush(const PNMImage &image, double xc, double yc) : PNMImageBrush(image, xc, yc) { } @@ -261,7 +261,7 @@ public: }; // Darkens the pixels -class EXPCL_PANDA PNMDarkenImageBrush : public PNMImageBrush { +class EXPCL_PANDA_PNMIMAGE PNMDarkenImageBrush : public PNMImageBrush { public: PNMDarkenImageBrush(const PNMImage &image, double xc, double yc) : PNMImageBrush(image, xc, yc) { } @@ -277,7 +277,7 @@ public: }; // Lightens the pixels -class EXPCL_PANDA PNMLightenImageBrush : public PNMImageBrush { +class EXPCL_PANDA_PNMIMAGE PNMLightenImageBrush : public PNMImageBrush { public: PNMLightenImageBrush(const PNMImage &image, double xc, double yc) : PNMImageBrush(image, xc, yc) { } diff --git a/panda/src/pnmimage/pnmBrush.h b/panda/src/pnmimage/pnmBrush.h index 542a5f83bb..1321193b81 100644 --- a/panda/src/pnmimage/pnmBrush.h +++ b/panda/src/pnmimage/pnmBrush.h @@ -42,7 +42,7 @@ class PNMImage; // over the border; when it is used to fill the // interior, it is tiled through the interior. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PNMBrush : public ReferenceCount { +class EXPCL_PANDA_PNMIMAGE PNMBrush : public ReferenceCount { protected: INLINE PNMBrush(double xc, double yc); diff --git a/panda/src/pnmimage/pnmFileType.h b/panda/src/pnmimage/pnmFileType.h index 2925a3c260..efac728ea9 100644 --- a/panda/src/pnmimage/pnmFileType.h +++ b/panda/src/pnmimage/pnmFileType.h @@ -36,7 +36,7 @@ class FactoryParams; // represent particular image file types that PNMImage // supports. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PNMFileType : public TypedWritable { +class EXPCL_PANDA_PNMIMAGE PNMFileType : public TypedWritable { protected: PNMFileType(); diff --git a/panda/src/pnmimage/pnmFileTypeRegistry.h b/panda/src/pnmimage/pnmFileTypeRegistry.h index caf1291524..f664e19b76 100644 --- a/panda/src/pnmimage/pnmFileTypeRegistry.h +++ b/panda/src/pnmimage/pnmFileTypeRegistry.h @@ -32,7 +32,7 @@ class PNMFileType; // Description : This class maintains the set of all known // PNMFileTypes in the universe. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PNMFileTypeRegistry { +class EXPCL_PANDA_PNMIMAGE PNMFileTypeRegistry { protected: PNMFileTypeRegistry(); diff --git a/panda/src/pnmimage/pnmImage.h b/panda/src/pnmimage/pnmImage.h index 4252dc43a4..05e69545d5 100644 --- a/panda/src/pnmimage/pnmImage.h +++ b/panda/src/pnmimage/pnmImage.h @@ -57,7 +57,7 @@ class PNMFileType; // Files can be specified by filename, or by an iostream // pointer. The filename "-" refers to stdin or stdout. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PNMImage : public PNMImageHeader { +class EXPCL_PANDA_PNMIMAGE PNMImage : public PNMImageHeader { PUBLISHED: INLINE PNMImage(); PNMImage(const Filename &filename, PNMFileType *type = NULL); diff --git a/panda/src/pnmimage/pnmImageHeader.h b/panda/src/pnmimage/pnmImageHeader.h index 5a5a4802a7..2530787038 100644 --- a/panda/src/pnmimage/pnmImageHeader.h +++ b/panda/src/pnmimage/pnmImageHeader.h @@ -43,7 +43,7 @@ class PNMWriter; // the sort of information you typically read from the // image file's header. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PNMImageHeader { +class EXPCL_PANDA_PNMIMAGE PNMImageHeader { PUBLISHED: INLINE PNMImageHeader(); INLINE PNMImageHeader(const PNMImageHeader ©); diff --git a/panda/src/pnmimage/pnmPainter.h b/panda/src/pnmimage/pnmPainter.h index 185e288b0a..5f30fde016 100644 --- a/panda/src/pnmimage/pnmPainter.h +++ b/panda/src/pnmimage/pnmPainter.h @@ -34,7 +34,7 @@ class PNMImage; // destruct during the lifetime of the PNMPainter // object. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PNMPainter { +class EXPCL_PANDA_PNMIMAGE PNMPainter { PUBLISHED: PNMPainter(PNMImage &image, int xo = 0, int yo = 0); INLINE ~PNMPainter(); diff --git a/panda/src/pnmimage/pnmReader.h b/panda/src/pnmimage/pnmReader.h index c0fbb4d5f1..f83272b6ca 100644 --- a/panda/src/pnmimage/pnmReader.h +++ b/panda/src/pnmimage/pnmReader.h @@ -32,7 +32,7 @@ // define a class that inherits from PNMReader to read // it. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PNMReader : public PNMImageHeader { +class EXPCL_PANDA_PNMIMAGE PNMReader : public PNMImageHeader { protected: INLINE PNMReader(PNMFileType *type, istream *file, bool owns_file); diff --git a/panda/src/pnmimage/pnmWriter.h b/panda/src/pnmimage/pnmWriter.h index a0115f586e..09e5c8555e 100644 --- a/panda/src/pnmimage/pnmWriter.h +++ b/panda/src/pnmimage/pnmWriter.h @@ -31,7 +31,7 @@ // must define a class that inherits from PNMWriter to // write it. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PNMWriter : public PNMImageHeader { +class EXPCL_PANDA_PNMIMAGE PNMWriter : public PNMImageHeader { protected: INLINE PNMWriter(PNMFileType *type, ostream *file, bool owns_file); diff --git a/panda/src/pnmimage/pnmbitio.cxx b/panda/src/pnmimage/pnmbitio.cxx index ec3ba8ea88..aa294b3853 100644 --- a/panda/src/pnmimage/pnmbitio.cxx +++ b/panda/src/pnmimage/pnmbitio.cxx @@ -45,7 +45,7 @@ struct bitstream * Returns 0 on error. */ -EXPCL_PANDA struct bitstream * +EXPCL_PANDA_PNMIMAGE struct bitstream * pm_bitinit(istream *f, char *mode) { struct bitstream *ans = (struct bitstream *)0; @@ -65,7 +65,7 @@ pm_bitinit(istream *f, char *mode) return ans; } -EXPCL_PANDA struct bitstream * +EXPCL_PANDA_PNMIMAGE struct bitstream * pm_bitinit(ostream *f, char *mode) { struct bitstream *ans = (struct bitstream *)0; @@ -95,7 +95,7 @@ pm_bitinit(ostream *f, char *mode) * Returns the number of bytes written, -1 on error. */ -EXPCL_PANDA int +EXPCL_PANDA_PNMIMAGE int pm_bitfini(struct bitstream *b) { int nbyte = 0; @@ -142,7 +142,7 @@ pm_bitfini(struct bitstream *b) * Returns the number of bytes read, -1 on error. */ -EXPCL_PANDA int +EXPCL_PANDA_PNMIMAGE int pm_bitread(struct bitstream *b, unsigned long nbits, unsigned long *val) { int nbyte = 0; @@ -178,7 +178,7 @@ pm_bitread(struct bitstream *b, unsigned long nbits, unsigned long *val) * Returns the number of bytes written, -1 on error. */ -EXPCL_PANDA int +EXPCL_PANDA_PNMIMAGE int pm_bitwrite(struct bitstream *b, unsigned long nbits, unsigned long val) { int nbyte = 0; diff --git a/panda/src/pnmimage/pnmbitio.h b/panda/src/pnmimage/pnmbitio.h index 3ce1168cd0..98907a1c24 100644 --- a/panda/src/pnmimage/pnmbitio.h +++ b/panda/src/pnmimage/pnmbitio.h @@ -30,8 +30,8 @@ typedef struct bitstream *BITSTREAM; * Returns 0 on error. */ -extern EXPCL_PANDA BITSTREAM pm_bitinit(istream *f, char *mode); -extern EXPCL_PANDA BITSTREAM pm_bitinit(ostream *f, char *mode); +extern EXPCL_PANDA_PNMIMAGE BITSTREAM pm_bitinit(istream *f, char *mode); +extern EXPCL_PANDA_PNMIMAGE BITSTREAM pm_bitinit(ostream *f, char *mode); /* * pm_bitfini() - deallocate the given BITSTREAM. @@ -43,7 +43,7 @@ extern EXPCL_PANDA BITSTREAM pm_bitinit(ostream *f, char *mode); * Returns the number of bytes written, -1 on error. */ -extern EXPCL_PANDA int pm_bitfini(BITSTREAM b); +extern EXPCL_PANDA_PNMIMAGE int pm_bitfini(BITSTREAM b); /* * pm_bitread() - read the next nbits into *val from the given file. @@ -51,7 +51,7 @@ extern EXPCL_PANDA int pm_bitfini(BITSTREAM b); * Returns the number of bytes read, -1 on error. */ -extern EXPCL_PANDA int pm_bitread(BITSTREAM b, unsigned long nbits, unsigned long *val); +extern EXPCL_PANDA_PNMIMAGE int pm_bitread(BITSTREAM b, unsigned long nbits, unsigned long *val); /* * pm_bitwrite() - write the low nbits of val to the given file. @@ -61,6 +61,6 @@ extern EXPCL_PANDA int pm_bitread(BITSTREAM b, unsigned long nbits, unsigned lon * Returns the number of bytes written, -1 on error. */ -extern EXPCL_PANDA int pm_bitwrite(BITSTREAM b, unsigned long nbits, unsigned long val); +extern EXPCL_PANDA_PNMIMAGE int pm_bitwrite(BITSTREAM b, unsigned long nbits, unsigned long val); #endif /* _BITIO_H_ */ diff --git a/panda/src/pnmimage/pnmimage_base.h b/panda/src/pnmimage/pnmimage_base.h index ce6f6c3da4..53255fb5d0 100644 --- a/panda/src/pnmimage/pnmimage_base.h +++ b/panda/src/pnmimage/pnmimage_base.h @@ -75,23 +75,23 @@ typedef gray xelval; // pnm defines these functions, and it's easier to emulate them than // to rewrite the code that calls them. -EXPCL_PANDA void pm_message(const char *format, ...); -EXPCL_PANDA void pm_error(const char *format, ...); // doesn't return. +EXPCL_PANDA_PNMIMAGE void pm_message(const char *format, ...); +EXPCL_PANDA_PNMIMAGE void pm_error(const char *format, ...); // doesn't return. -EXPCL_PANDA int pm_maxvaltobits(int maxval); -EXPCL_PANDA int pm_bitstomaxval(int bits); +EXPCL_PANDA_PNMIMAGE int pm_maxvaltobits(int maxval); +EXPCL_PANDA_PNMIMAGE int pm_bitstomaxval(int bits); -EXPCL_PANDA char *pm_allocrow(int cols, int size); -EXPCL_PANDA void pm_freerow(char *itrow); +EXPCL_PANDA_PNMIMAGE char *pm_allocrow(int cols, int size); +EXPCL_PANDA_PNMIMAGE void pm_freerow(char *itrow); -EXPCL_PANDA int pm_readbigshort(istream *in, short *sP); -EXPCL_PANDA int pm_writebigshort(ostream *out, short s); -EXPCL_PANDA int pm_readbiglong(istream *in, long *lP); -EXPCL_PANDA int pm_writebiglong(ostream *out, long l); -EXPCL_PANDA int pm_readlittleshort(istream *in, short *sP); -EXPCL_PANDA int pm_writelittleshort(ostream *out, short s); -EXPCL_PANDA int pm_readlittlelong(istream *in, long *lP); -EXPCL_PANDA int pm_writelittlelong(ostream *out, long l); +EXPCL_PANDA_PNMIMAGE int pm_readbigshort(istream *in, short *sP); +EXPCL_PANDA_PNMIMAGE int pm_writebigshort(ostream *out, short s); +EXPCL_PANDA_PNMIMAGE int pm_readbiglong(istream *in, long *lP); +EXPCL_PANDA_PNMIMAGE int pm_writebiglong(ostream *out, long l); +EXPCL_PANDA_PNMIMAGE int pm_readlittleshort(istream *in, short *sP); +EXPCL_PANDA_PNMIMAGE int pm_writelittleshort(ostream *out, short s); +EXPCL_PANDA_PNMIMAGE int pm_readlittlelong(istream *in, long *lP); +EXPCL_PANDA_PNMIMAGE int pm_writelittlelong(ostream *out, long l); // These ratios are used to compute the brightness of a colored pixel; they diff --git a/panda/src/pnmimage/ppmcmap.h b/panda/src/pnmimage/ppmcmap.h index cca3d854ce..f8b9966818 100644 --- a/panda/src/pnmimage/ppmcmap.h +++ b/panda/src/pnmimage/ppmcmap.h @@ -23,12 +23,12 @@ struct colorhist_list_item colorhist_list next; }; -EXPCL_PANDA colorhist_vector ppm_computecolorhist( pixel** pixels, int cols, int rows, int maxcolors, int* colorsP ); +EXPCL_PANDA_PNMIMAGE colorhist_vector ppm_computecolorhist( pixel** pixels, int cols, int rows, int maxcolors, int* colorsP ); /* Returns a colorhist *colorsP long (with space allocated for maxcolors. */ void ppm_addtocolorhist ( colorhist_vector chv, int* colorsP, int maxcolors, pixel* colorP, int value, int position ); -EXPCL_PANDA void ppm_freecolorhist( colorhist_vector chv ); +EXPCL_PANDA_PNMIMAGE void ppm_freecolorhist( colorhist_vector chv ); /* Color hash table stuff. */ @@ -37,11 +37,11 @@ typedef colorhist_list* colorhash_table; colorhash_table ppm_computecolorhash ( pixel** pixels, int cols, int rows, int maxcolors, int* colorsP ); -EXPCL_PANDA int +EXPCL_PANDA_PNMIMAGE int ppm_lookupcolor( colorhash_table cht, pixel* colorP ); colorhist_vector ppm_colorhashtocolorhist ( colorhash_table cht, int maxcolors ); -EXPCL_PANDA colorhash_table ppm_colorhisttocolorhash( colorhist_vector chv, int colors ); +EXPCL_PANDA_PNMIMAGE colorhash_table ppm_colorhisttocolorhash( colorhist_vector chv, int colors ); int ppm_addtocolorhash ( colorhash_table cht, pixel* colorP, int value ); /* Returns -1 on failure. */ diff --git a/panda/src/pnmimagetypes/config_pnmimagetypes.h b/panda/src/pnmimagetypes/config_pnmimagetypes.h index fdf431c9c0..c4b9ed96a9 100644 --- a/panda/src/pnmimagetypes/config_pnmimagetypes.h +++ b/panda/src/pnmimagetypes/config_pnmimagetypes.h @@ -27,24 +27,24 @@ #include "configVariableEnum.h" #include "sgi.h" -NotifyCategoryDecl(pnmimage_sgi, EXPCL_PANDA, EXPTP_PANDA); -NotifyCategoryDecl(pnmimage_alias, EXPCL_PANDA, EXPTP_PANDA); -NotifyCategoryDecl(pnmimage_tiff, EXPCL_PANDA, EXPTP_PANDA); -NotifyCategoryDecl(pnmimage_tga, EXPCL_PANDA, EXPTP_PANDA); -NotifyCategoryDecl(pnmimage_img, EXPCL_PANDA, EXPTP_PANDA); -NotifyCategoryDecl(pnmimage_soft, EXPCL_PANDA, EXPTP_PANDA); -NotifyCategoryDecl(pnmimage_bmp, EXPCL_PANDA, EXPTP_PANDA); -NotifyCategoryDecl(pnmimage_jpg, EXPCL_PANDA, EXPTP_PANDA); -NotifyCategoryDecl(pnmimage_png, EXPCL_PANDA, EXPTP_PANDA); -NotifyCategoryDecl(pnmimage_pnm, EXPCL_PANDA, EXPTP_PANDA); +NotifyCategoryDecl(pnmimage_sgi, EXPCL_PANDA_PNMIMAGETYPES, EXPTP_PANDA_PNMIMAGETYPES); +NotifyCategoryDecl(pnmimage_alias, EXPCL_PANDA_PNMIMAGETYPES, EXPTP_PANDA_PNMIMAGETYPES); +NotifyCategoryDecl(pnmimage_tiff, EXPCL_PANDA_PNMIMAGETYPES, EXPTP_PANDA_PNMIMAGETYPES); +NotifyCategoryDecl(pnmimage_tga, EXPCL_PANDA_PNMIMAGETYPES, EXPTP_PANDA_PNMIMAGETYPES); +NotifyCategoryDecl(pnmimage_img, EXPCL_PANDA_PNMIMAGETYPES, EXPTP_PANDA_PNMIMAGETYPES); +NotifyCategoryDecl(pnmimage_soft, EXPCL_PANDA_PNMIMAGETYPES, EXPTP_PANDA_PNMIMAGETYPES); +NotifyCategoryDecl(pnmimage_bmp, EXPCL_PANDA_PNMIMAGETYPES, EXPTP_PANDA_PNMIMAGETYPES); +NotifyCategoryDecl(pnmimage_jpg, EXPCL_PANDA_PNMIMAGETYPES, EXPTP_PANDA_PNMIMAGETYPES); +NotifyCategoryDecl(pnmimage_png, EXPCL_PANDA_PNMIMAGETYPES, EXPTP_PANDA_PNMIMAGETYPES); +NotifyCategoryDecl(pnmimage_pnm, EXPCL_PANDA_PNMIMAGETYPES, EXPTP_PANDA_PNMIMAGETYPES); enum SGIStorageType { SST_rle = STORAGE_RLE, SST_verbatim = STORAGE_VERBATIM, }; -EXPCL_PANDA ostream &operator << (ostream &out, SGIStorageType sst); -EXPCL_PANDA istream &operator >> (istream &in, SGIStorageType &sst); +EXPCL_PANDA_PNMIMAGETYPES ostream &operator << (ostream &out, SGIStorageType sst); +EXPCL_PANDA_PNMIMAGETYPES istream &operator >> (istream &in, SGIStorageType &sst); extern ConfigVariableEnum sgi_storage_type; extern ConfigVariableString sgi_imagename; @@ -62,12 +62,12 @@ enum IMGHeaderType { IHT_long, }; -EXPCL_PANDA ostream &operator << (ostream &out, IMGHeaderType iht); -EXPCL_PANDA istream &operator >> (istream &in, IMGHeaderType &iht); +EXPCL_PANDA_PNMIMAGETYPES ostream &operator << (ostream &out, IMGHeaderType iht); +EXPCL_PANDA_PNMIMAGETYPES istream &operator >> (istream &in, IMGHeaderType &iht); extern ConfigVariableEnum img_header_type; extern ConfigVariableInt img_size; -extern EXPCL_PANDA void init_libpnmimagetypes(); +extern EXPCL_PANDA_PNMIMAGETYPES void init_libpnmimagetypes(); #endif diff --git a/panda/src/pnmimagetypes/pnmFileTypeAlias.h b/panda/src/pnmimagetypes/pnmFileTypeAlias.h index 584117d229..7e268e7145 100644 --- a/panda/src/pnmimagetypes/pnmFileTypeAlias.h +++ b/panda/src/pnmimagetypes/pnmFileTypeAlias.h @@ -29,7 +29,7 @@ // Class : PNMFileTypeAlias // Description : For reading and Alias native image files. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PNMFileTypeAlias : public PNMFileType { +class EXPCL_PANDA_PNMIMAGETYPES PNMFileTypeAlias : public PNMFileType { public: PNMFileTypeAlias(); diff --git a/panda/src/pnmimagetypes/pnmFileTypeBMP.h b/panda/src/pnmimagetypes/pnmFileTypeBMP.h index cced67a011..488e1a13d2 100644 --- a/panda/src/pnmimagetypes/pnmFileTypeBMP.h +++ b/panda/src/pnmimagetypes/pnmFileTypeBMP.h @@ -29,7 +29,7 @@ // Class : PNMFileTypeBMP // Description : For reading and writing Windows BMP files. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PNMFileTypeBMP : public PNMFileType { +class EXPCL_PANDA_PNMIMAGETYPES PNMFileTypeBMP : public PNMFileType { public: PNMFileTypeBMP(); diff --git a/panda/src/pnmimagetypes/pnmFileTypeIMG.h b/panda/src/pnmimagetypes/pnmFileTypeIMG.h index 705bef292b..b868795200 100644 --- a/panda/src/pnmimagetypes/pnmFileTypeIMG.h +++ b/panda/src/pnmimagetypes/pnmFileTypeIMG.h @@ -29,7 +29,7 @@ // Class : PNMFileTypeIMG // Description : For reading and writing headerless R,G,B files. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PNMFileTypeIMG : public PNMFileType { +class EXPCL_PANDA_PNMIMAGETYPES PNMFileTypeIMG : public PNMFileType { public: PNMFileTypeIMG(); diff --git a/panda/src/pnmimagetypes/pnmFileTypeJPG.h b/panda/src/pnmimagetypes/pnmFileTypeJPG.h index 42038e7f5d..9f9e7fc40a 100644 --- a/panda/src/pnmimagetypes/pnmFileTypeJPG.h +++ b/panda/src/pnmimagetypes/pnmFileTypeJPG.h @@ -50,7 +50,7 @@ extern "C" { // Class : PNMFileTypeJPG // Description : For reading and writing Jpeg files. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PNMFileTypeJPG : public PNMFileType { +class EXPCL_PANDA_PNMIMAGETYPES PNMFileTypeJPG : public PNMFileType { public: PNMFileTypeJPG(); diff --git a/panda/src/pnmimagetypes/pnmFileTypePNG.h b/panda/src/pnmimagetypes/pnmFileTypePNG.h index 64b81d7cec..d4624267b8 100755 --- a/panda/src/pnmimagetypes/pnmFileTypePNG.h +++ b/panda/src/pnmimagetypes/pnmFileTypePNG.h @@ -33,7 +33,7 @@ // Class : PNMFileTypePNG // Description : For reading and writing PNG files. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PNMFileTypePNG : public PNMFileType { +class EXPCL_PANDA_PNMIMAGETYPES PNMFileTypePNG : public PNMFileType { public: PNMFileTypePNG(); diff --git a/panda/src/pnmimagetypes/pnmFileTypePNM.h b/panda/src/pnmimagetypes/pnmFileTypePNM.h index ab0b449b70..5bb6df121a 100644 --- a/panda/src/pnmimagetypes/pnmFileTypePNM.h +++ b/panda/src/pnmimagetypes/pnmFileTypePNM.h @@ -30,7 +30,7 @@ // Description : For reading and writing basic PNM files--*.pbm, // *.ppm, *.pnm. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PNMFileTypePNM : public PNMFileType { +class EXPCL_PANDA_PNMIMAGETYPES PNMFileTypePNM : public PNMFileType { public: PNMFileTypePNM(); diff --git a/panda/src/pnmimagetypes/pnmFileTypeSGI.h b/panda/src/pnmimagetypes/pnmFileTypeSGI.h index d5cc5e4e6c..7f0b0bc651 100644 --- a/panda/src/pnmimagetypes/pnmFileTypeSGI.h +++ b/panda/src/pnmimagetypes/pnmFileTypeSGI.h @@ -29,7 +29,7 @@ // Class : PNMFileTypeSGI // Description : For reading and writing SGI RGB files. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PNMFileTypeSGI : public PNMFileType { +class EXPCL_PANDA_PNMIMAGETYPES PNMFileTypeSGI : public PNMFileType { public: PNMFileTypeSGI(); diff --git a/panda/src/pnmimagetypes/pnmFileTypeSoftImage.h b/panda/src/pnmimagetypes/pnmFileTypeSoftImage.h index 94f28ee7db..215fa692b1 100644 --- a/panda/src/pnmimagetypes/pnmFileTypeSoftImage.h +++ b/panda/src/pnmimagetypes/pnmFileTypeSoftImage.h @@ -29,7 +29,7 @@ // Class : PNMFileTypeSoftImage // Description : For reading and SoftImage native image files. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PNMFileTypeSoftImage : public PNMFileType { +class EXPCL_PANDA_PNMIMAGETYPES PNMFileTypeSoftImage : public PNMFileType { public: PNMFileTypeSoftImage(); diff --git a/panda/src/pnmimagetypes/pnmFileTypeTGA.h b/panda/src/pnmimagetypes/pnmFileTypeTGA.h index 8a5c760862..9370b40aad 100644 --- a/panda/src/pnmimagetypes/pnmFileTypeTGA.h +++ b/panda/src/pnmimagetypes/pnmFileTypeTGA.h @@ -37,7 +37,7 @@ struct ImageHeader; // Class : PNMFileTypeTGA // Description : For reading and writing Targa image files. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PNMFileTypeTGA : public PNMFileType { +class EXPCL_PANDA_PNMIMAGETYPES PNMFileTypeTGA : public PNMFileType { public: PNMFileTypeTGA(); diff --git a/panda/src/pnmimagetypes/pnmFileTypeTIFF.h b/panda/src/pnmimagetypes/pnmFileTypeTIFF.h index d44556c6fe..e54786b3cd 100644 --- a/panda/src/pnmimagetypes/pnmFileTypeTIFF.h +++ b/panda/src/pnmimagetypes/pnmFileTypeTIFF.h @@ -36,7 +36,7 @@ // Class : PNMFileTypeTIFF // Description : For reading and writing TIFF files. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PNMFileTypeTIFF : public PNMFileType { +class EXPCL_PANDA_PNMIMAGETYPES PNMFileTypeTIFF : public PNMFileType { public: PNMFileTypeTIFF(); diff --git a/panda/src/pnmtext/config_pnmtext.h b/panda/src/pnmtext/config_pnmtext.h index 3a3555a564..4d906f1fec 100644 --- a/panda/src/pnmtext/config_pnmtext.h +++ b/panda/src/pnmtext/config_pnmtext.h @@ -26,13 +26,13 @@ class DSearchPath; -NotifyCategoryDecl(pnmtext, EXPCL_PANDA, EXPTP_PANDA); +NotifyCategoryDecl(pnmtext, EXPCL_PANDA_PNMTEXT, EXPTP_PANDA_PNMTEXT); extern ConfigVariableDouble text_point_size; extern ConfigVariableDouble text_pixels_per_unit; extern ConfigVariableDouble text_scale_factor; extern ConfigVariableBool text_native_antialias; -extern EXPCL_PANDA void init_libpnmtext(); +extern EXPCL_PANDA_PNMTEXT void init_libpnmtext(); #endif diff --git a/panda/src/pnmtext/freetypeFont.h b/panda/src/pnmtext/freetypeFont.h index 210b2375dc..1850366419 100644 --- a/panda/src/pnmtext/freetypeFont.h +++ b/panda/src/pnmtext/freetypeFont.h @@ -41,7 +41,7 @@ // fonts; this class abstracts out that common wrapper // around FreeType. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA FreetypeFont : public Namable { +class EXPCL_PANDA_PNMTEXT FreetypeFont : public Namable { protected: FreetypeFont(); diff --git a/panda/src/pnmtext/pnmTextGlyph.h b/panda/src/pnmtext/pnmTextGlyph.h index 427a43e6d1..2f250b36d8 100644 --- a/panda/src/pnmtext/pnmTextGlyph.h +++ b/panda/src/pnmtext/pnmTextGlyph.h @@ -28,7 +28,7 @@ // Class : PNMTextGlyph // Description : A single glyph in a PNMTextMaker. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PNMTextGlyph { +class EXPCL_PANDA_PNMTEXT PNMTextGlyph { public: PNMTextGlyph(double advance); ~PNMTextGlyph(); diff --git a/panda/src/pnmtext/pnmTextMaker.h b/panda/src/pnmtext/pnmTextMaker.h index a970b7380e..8fe64164ff 100644 --- a/panda/src/pnmtext/pnmTextMaker.h +++ b/panda/src/pnmtext/pnmTextMaker.h @@ -40,7 +40,7 @@ class PNMTextGlyph; // to be rendered onscreen via the Panda render // traversal. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PNMTextMaker : public FreetypeFont { +class EXPCL_PANDA_PNMTEXT PNMTextMaker : public FreetypeFont { PUBLISHED: PNMTextMaker(const Filename &font_filename, int face_index); PNMTextMaker(const char *font_data, int data_length, int face_index); diff --git a/panda/src/pstatclient/config_pstats.h b/panda/src/pstatclient/config_pstats.h index 67033d1ae1..753b324647 100644 --- a/panda/src/pstatclient/config_pstats.h +++ b/panda/src/pstatclient/config_pstats.h @@ -30,24 +30,24 @@ // Configure variables for pstats package. -ConfigureDecl(config_pstats, EXPCL_PANDA, EXPTP_PANDA); -NotifyCategoryDecl(pstats, EXPCL_PANDA, EXPTP_PANDA); +ConfigureDecl(config_pstats, EXPCL_PANDA_PSTATCLIENT, EXPTP_PANDA_PSTATCLIENT); +NotifyCategoryDecl(pstats, EXPCL_PANDA_PSTATCLIENT, EXPTP_PANDA_PSTATCLIENT); -extern EXPCL_PANDA ConfigVariableString pstats_name; -extern EXPCL_PANDA ConfigVariableDouble pstats_max_rate; -extern EXPCL_PANDA ConfigVariableBool pstats_threaded_write; -extern EXPCL_PANDA ConfigVariableDouble pstats_tcp_ratio; +extern EXPCL_PANDA_PSTATCLIENT ConfigVariableString pstats_name; +extern EXPCL_PANDA_PSTATCLIENT ConfigVariableDouble pstats_max_rate; +extern EXPCL_PANDA_PSTATCLIENT ConfigVariableBool pstats_threaded_write; +extern EXPCL_PANDA_PSTATCLIENT ConfigVariableDouble pstats_tcp_ratio; -extern EXPCL_PANDA ConfigVariableString pstats_host; -extern EXPCL_PANDA ConfigVariableInt pstats_port; -extern EXPCL_PANDA ConfigVariableDouble pstats_target_frame_rate; +extern EXPCL_PANDA_PSTATCLIENT ConfigVariableString pstats_host; +extern EXPCL_PANDA_PSTATCLIENT ConfigVariableInt pstats_port; +extern EXPCL_PANDA_PSTATCLIENT ConfigVariableDouble pstats_target_frame_rate; -extern EXPCL_PANDA ConfigVariableBool pstats_scroll_mode; -extern EXPCL_PANDA ConfigVariableDouble pstats_history; -extern EXPCL_PANDA ConfigVariableDouble pstats_average_time; +extern EXPCL_PANDA_PSTATCLIENT ConfigVariableBool pstats_scroll_mode; +extern EXPCL_PANDA_PSTATCLIENT ConfigVariableDouble pstats_history; +extern EXPCL_PANDA_PSTATCLIENT ConfigVariableDouble pstats_average_time; -extern EXPCL_PANDA ConfigVariableBool pstats_mem_other; +extern EXPCL_PANDA_PSTATCLIENT ConfigVariableBool pstats_mem_other; -extern EXPCL_PANDA void init_libpstatclient(); +extern EXPCL_PANDA_PSTATCLIENT void init_libpstatclient(); #endif diff --git a/panda/src/pstatclient/pStatClient.h b/panda/src/pstatclient/pStatClient.h index fcc44582e6..c7879bf40b 100644 --- a/panda/src/pstatclient/pStatClient.h +++ b/panda/src/pstatclient/pStatClient.h @@ -58,7 +58,7 @@ class PStatThread; // stub class. //////////////////////////////////////////////////////////////////// #ifdef DO_PSTATS -class EXPCL_PANDA PStatClient : public ConnectionManager, public Thread::PStatsCallback { +class EXPCL_PANDA_PSTATCLIENT PStatClient : public ConnectionManager, public Thread::PStatsCallback { public: PStatClient(); ~PStatClient(); @@ -257,7 +257,7 @@ private: #else // DO_PSTATS -class EXPCL_PANDA PStatClient { +class EXPCL_PANDA_PSTATCLIENT PStatClient { public: PStatClient() { } ~PStatClient() { } diff --git a/panda/src/pstatclient/pStatClientControlMessage.h b/panda/src/pstatclient/pStatClientControlMessage.h index e1644b45cb..380a105fbb 100644 --- a/panda/src/pstatclient/pStatClientControlMessage.h +++ b/panda/src/pstatclient/pStatClientControlMessage.h @@ -34,7 +34,7 @@ class PStatClientVersion; // server on the TCP socket to establish critical // control information. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PStatClientControlMessage { +class EXPCL_PANDA_PSTATCLIENT PStatClientControlMessage { public: PStatClientControlMessage(); diff --git a/panda/src/pstatclient/pStatClientImpl.h b/panda/src/pstatclient/pStatClientImpl.h index 38388ff8d1..24dd7cb0b6 100644 --- a/panda/src/pstatclient/pStatClientImpl.h +++ b/panda/src/pstatclient/pStatClientImpl.h @@ -56,7 +56,7 @@ class PStatThread; // This class doesn't exist at all unless DO_PSTATS is // defined. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PStatClientImpl : public ConnectionManager { +class EXPCL_PANDA_PSTATCLIENT PStatClientImpl : public ConnectionManager { public: PStatClientImpl(PStatClient *client); ~PStatClientImpl(); diff --git a/panda/src/pstatclient/pStatClientVersion.h b/panda/src/pstatclient/pStatClientVersion.h index b65ad49b0e..0c382897de 100644 --- a/panda/src/pstatclient/pStatClientVersion.h +++ b/panda/src/pstatclient/pStatClientVersion.h @@ -30,7 +30,7 @@ // Normally this will be the same as // get_current_pstat_major/minor_version(). //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PStatClientVersion : public ReferenceCount { +class EXPCL_PANDA_PSTATCLIENT PStatClientVersion : public ReferenceCount { public: PStatClientVersion(); diff --git a/panda/src/pstatclient/pStatCollector.h b/panda/src/pstatclient/pStatCollector.h index 2161d15ac1..9173708b4f 100644 --- a/panda/src/pstatclient/pStatCollector.h +++ b/panda/src/pstatclient/pStatCollector.h @@ -50,7 +50,7 @@ class Thread; // to add_level(). It may also be completely removed // via clear_level(). //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PStatCollector { +class EXPCL_PANDA_PSTATCLIENT PStatCollector { #ifdef DO_PSTATS private: diff --git a/panda/src/pstatclient/pStatCollectorDef.h b/panda/src/pstatclient/pStatCollectorDef.h index d986c31a74..a7b694c4f1 100644 --- a/panda/src/pstatclient/pStatCollectorDef.h +++ b/panda/src/pstatclient/pStatCollectorDef.h @@ -31,7 +31,7 @@ class PStatClientVersion; // Description : Defines the details about the Collectors: the name, // the suggested color, etc. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PStatCollectorDef { +class EXPCL_PANDA_PSTATCLIENT PStatCollectorDef { public: PStatCollectorDef(); PStatCollectorDef(int index, const string &name); diff --git a/panda/src/pstatclient/pStatCollectorForward.h b/panda/src/pstatclient/pStatCollectorForward.h index 6d5c31422a..f096b30da7 100644 --- a/panda/src/pstatclient/pStatCollectorForward.h +++ b/panda/src/pstatclient/pStatCollectorForward.h @@ -30,7 +30,7 @@ // before the pstats module may access the // PStatCollector. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PStatCollectorForward : public PStatCollectorForwardBase { +class EXPCL_PANDA_PSTATCLIENT PStatCollectorForward : public PStatCollectorForwardBase { PUBLISHED: INLINE PStatCollectorForward(const PStatCollector &col); diff --git a/panda/src/pstatclient/pStatFrameData.h b/panda/src/pstatclient/pStatFrameData.h index e726233ab4..f602d12c4c 100644 --- a/panda/src/pstatclient/pStatFrameData.h +++ b/panda/src/pstatclient/pStatFrameData.h @@ -37,7 +37,7 @@ class PStatClient; // well as a table of level values, associated with a // number of collectors within a single frame. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PStatFrameData { +class EXPCL_PANDA_PSTATCLIENT PStatFrameData { public: INLINE bool is_time_empty() const; INLINE bool is_level_empty() const; diff --git a/panda/src/pstatclient/pStatProperties.h b/panda/src/pstatclient/pStatProperties.h index 519c9c3017..23758410ab 100644 --- a/panda/src/pstatclient/pStatProperties.h +++ b/panda/src/pstatclient/pStatProperties.h @@ -25,8 +25,8 @@ class PStatClient; class PStatCollectorDef; -EXPCL_PANDA int get_current_pstat_major_version(); -EXPCL_PANDA int get_current_pstat_minor_version(); +EXPCL_PANDA_PSTATCLIENT int get_current_pstat_major_version(); +EXPCL_PANDA_PSTATCLIENT int get_current_pstat_minor_version(); #ifdef DO_PSTATS void initialize_collector_def(const PStatClient *client, PStatCollectorDef *def); diff --git a/panda/src/pstatclient/pStatServerControlMessage.h b/panda/src/pstatclient/pStatServerControlMessage.h index fe89cae10c..4641dc943a 100644 --- a/panda/src/pstatclient/pStatServerControlMessage.h +++ b/panda/src/pstatclient/pStatServerControlMessage.h @@ -31,7 +31,7 @@ class Datagram; // client on the TCP socket to establish critical // control information. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PStatServerControlMessage { +class EXPCL_PANDA_PSTATCLIENT PStatServerControlMessage { public: PStatServerControlMessage(); diff --git a/panda/src/pstatclient/pStatThread.h b/panda/src/pstatclient/pStatThread.h index 80c9426afa..acab83dbf8 100644 --- a/panda/src/pstatclient/pStatThread.h +++ b/panda/src/pstatclient/pStatThread.h @@ -31,7 +31,7 @@ class Thread; // of execution to PStats. It corresponds one-to-one // with Panda's Thread instance. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PStatThread { +class EXPCL_PANDA_PSTATCLIENT PStatThread { private: INLINE PStatThread(); INLINE PStatThread(PStatClient *client, int index); diff --git a/panda/src/pstatclient/pStatTimer.h b/panda/src/pstatclient/pStatTimer.h index 95b8f2c85d..3b2e397e36 100644 --- a/panda/src/pstatclient/pStatTimer.h +++ b/panda/src/pstatclient/pStatTimer.h @@ -35,7 +35,7 @@ class Thread; // of scope (for instance, at the end of the function), // it will automatically stop the Collector. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA PStatTimer { +class EXPCL_PANDA_PSTATCLIENT PStatTimer { public: #ifdef DO_PSTATS INLINE PStatTimer(PStatCollector &collector); diff --git a/panda/src/putil/animInterface.h b/panda/src/putil/animInterface.h index bba78e225d..fb54b41b2d 100644 --- a/panda/src/putil/animInterface.h +++ b/panda/src/putil/animInterface.h @@ -40,7 +40,7 @@ class DatagramIterator; // base class for AnimControl and other, similar // classes. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA AnimInterface { +class EXPCL_PANDA_PUTIL AnimInterface { protected: AnimInterface(); AnimInterface(const AnimInterface ©); @@ -89,7 +89,7 @@ private: int _num_frames; // This is the data that must be cycled between pipeline stages. - class EXPCL_PANDA CData : public CycleData { + class EXPCL_PANDA_PUTIL CData : public CycleData { public: CData(); CData(const CData ©); diff --git a/panda/src/putil/bamCache.h b/panda/src/putil/bamCache.h index fbee1fb152..edd3cbd8e0 100644 --- a/panda/src/putil/bamCache.h +++ b/panda/src/putil/bamCache.h @@ -44,7 +44,7 @@ class BamCacheIndex; // low-level os-provided file locks (which work poorly // with C++ iostreams). //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA BamCache { +class EXPCL_PANDA_PUTIL BamCache { PUBLISHED: BamCache(); ~BamCache(); diff --git a/panda/src/putil/bamCacheIndex.h b/panda/src/putil/bamCacheIndex.h index 41b3f92906..0370e4d6d7 100644 --- a/panda/src/putil/bamCacheIndex.h +++ b/panda/src/putil/bamCacheIndex.h @@ -38,7 +38,7 @@ // For the most part, this class is used only by the // BamCache class. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA BamCacheIndex : public TypedWritable, public LinkedListNode { +class EXPCL_PANDA_PUTIL BamCacheIndex : public TypedWritable, public LinkedListNode { private: INLINE BamCacheIndex(); ~BamCacheIndex(); diff --git a/panda/src/putil/bamCacheRecord.h b/panda/src/putil/bamCacheRecord.h index a3b7fed870..39d4dfb970 100644 --- a/panda/src/putil/bamCacheRecord.h +++ b/panda/src/putil/bamCacheRecord.h @@ -39,7 +39,7 @@ class BamCacheRecord; // contains information needed to test the validity of // the cache. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA BamCacheRecord : public TypedWritableReferenceCount, +class EXPCL_PANDA_PUTIL BamCacheRecord : public TypedWritableReferenceCount, public LinkedListNode { private: BamCacheRecord(); diff --git a/panda/src/putil/bamEndian.h b/panda/src/putil/bamEndian.h index 77a27a9ab8..3c6e0e26c7 100644 --- a/panda/src/putil/bamEndian.h +++ b/panda/src/putil/bamEndian.h @@ -36,7 +36,7 @@ enum BamEndian { #endif }; -EXPCL_PANDA ostream &operator << (ostream &out, BamEndian be); -EXPCL_PANDA istream &operator >> (istream &in, BamEndian &be); +EXPCL_PANDA_PUTIL ostream &operator << (ostream &out, BamEndian be); +EXPCL_PANDA_PUTIL istream &operator >> (istream &in, BamEndian &be); #endif diff --git a/panda/src/putil/bamReader.h b/panda/src/putil/bamReader.h index 44bb0fb8fd..20a1a78b09 100644 --- a/panda/src/putil/bamReader.h +++ b/panda/src/putil/bamReader.h @@ -86,7 +86,7 @@ // See also BamFile, which defines a higher-level // interface to read and write Bam files on disk. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA BamReader { +class EXPCL_PANDA_PUTIL BamReader { public: typedef Factory WritableFactory; static BamReader *const Null; diff --git a/panda/src/putil/bamReaderParam.h b/panda/src/putil/bamReaderParam.h index 1c33c14268..807fa38f21 100644 --- a/panda/src/putil/bamReaderParam.h +++ b/panda/src/putil/bamReaderParam.h @@ -31,7 +31,7 @@ class DatagramIterator; // Description : The parameters that are passed through the Factory to // any object constructing itself from a Bam file. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA BamReaderParam : public FactoryParam { +class EXPCL_PANDA_PUTIL BamReaderParam : public FactoryParam { public: INLINE const DatagramIterator &get_iterator(); INLINE BamReader *get_manager(); diff --git a/panda/src/putil/bamTextureMode.h b/panda/src/putil/bamTextureMode.h index a71289afa7..4e0de8b2fe 100644 --- a/panda/src/putil/bamTextureMode.h +++ b/panda/src/putil/bamTextureMode.h @@ -30,7 +30,7 @@ enum BamTextureMode { BTM_basename, BTM_rawdata }; -EXPCL_PANDA ostream &operator << (ostream &out, BamTextureMode btm); -EXPCL_PANDA istream &operator >> (istream &in, BamTextureMode &btm); +EXPCL_PANDA_PUTIL ostream &operator << (ostream &out, BamTextureMode btm); +EXPCL_PANDA_PUTIL istream &operator >> (istream &in, BamTextureMode &btm); #endif diff --git a/panda/src/putil/bamWriter.h b/panda/src/putil/bamWriter.h index f068649717..5b527a2b37 100644 --- a/panda/src/putil/bamWriter.h +++ b/panda/src/putil/bamWriter.h @@ -75,7 +75,7 @@ // See also BamFile, which defines a higher-level // interface to read and write Bam files on disk. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA BamWriter { +class EXPCL_PANDA_PUTIL BamWriter { public: BamWriter(DatagramSink *sink, const Filename &name = ""); ~BamWriter(); diff --git a/panda/src/putil/bitArray.h b/panda/src/putil/bitArray.h index 5eff24e79e..4043201660 100755 --- a/panda/src/putil/bitArray.h +++ b/panda/src/putil/bitArray.h @@ -43,7 +43,7 @@ class DatagramIterator; // contain an infinite number of bits. You can use it // very much as you would use a BitMask. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA BitArray { +class EXPCL_PANDA_PUTIL BitArray { public: typedef BitMaskNative MaskType; typedef MaskType::WordType WordType; diff --git a/panda/src/putil/bitMask.h b/panda/src/putil/bitMask.h index 6a95e6db20..303fc210e6 100644 --- a/panda/src/putil/bitMask.h +++ b/panda/src/putil/bitMask.h @@ -146,7 +146,7 @@ INLINE PN_uint32 flood_bits_down(PN_uint32 x); INLINE PN_uint64 flood_bits_down(PN_uint64 x); // This table precomputes the number of on bits in each 16-bit word. -extern EXPCL_PANDA unsigned char num_bits_on[65536]; +extern EXPCL_PANDA_PUTIL unsigned char num_bits_on[65536]; #include "bitMask.I" @@ -159,7 +159,7 @@ INLINE ostream &operator << (ostream &out, const BitMask &bitmask) // We need to define this temporary macro so we can pass a parameter // containing a comma through the macro. #define BITMASK32_DEF BitMask -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, BITMASK32_DEF); +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, BITMASK32_DEF); typedef BitMask BitMask32; typedef BitMask BitMask64; diff --git a/panda/src/putil/buttonHandle.h b/panda/src/putil/buttonHandle.h index 5cb6466558..55ed699890 100644 --- a/panda/src/putil/buttonHandle.h +++ b/panda/src/putil/buttonHandle.h @@ -29,7 +29,7 @@ // device, including keyboard buttons and mouse buttons // (but see KeyboardButton and MouseButton). //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ButtonHandle { +class EXPCL_PANDA_PUTIL ButtonHandle { PUBLISHED: INLINE ButtonHandle(); INLINE ButtonHandle(int index); diff --git a/panda/src/putil/buttonRegistry.h b/panda/src/putil/buttonRegistry.h index 2723017bab..d9702a9b96 100644 --- a/panda/src/putil/buttonRegistry.h +++ b/panda/src/putil/buttonRegistry.h @@ -33,9 +33,9 @@ // one ButtonRegistry class during the lifetime of the // application. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ButtonRegistry { +class EXPCL_PANDA_PUTIL ButtonRegistry { protected: - class EXPCL_PANDA RegistryNode { + class EXPCL_PANDA_PUTIL RegistryNode { public: INLINE RegistryNode(ButtonHandle handle, ButtonHandle alias, const string &name); diff --git a/panda/src/putil/cachedTypedWritableReferenceCount.h b/panda/src/putil/cachedTypedWritableReferenceCount.h index 9817a3679f..570b8029ad 100644 --- a/panda/src/putil/cachedTypedWritableReferenceCount.h +++ b/panda/src/putil/cachedTypedWritableReferenceCount.h @@ -41,7 +41,7 @@ // reference count: calling cache_ref() and // cache_unref() automatically calls ref() and unref(). //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CachedTypedWritableReferenceCount : public TypedWritableReferenceCount { +class EXPCL_PANDA_PUTIL CachedTypedWritableReferenceCount : public TypedWritableReferenceCount { protected: INLINE CachedTypedWritableReferenceCount(); INLINE CachedTypedWritableReferenceCount(const CachedTypedWritableReferenceCount ©); diff --git a/panda/src/putil/clockObject.h b/panda/src/putil/clockObject.h index b8e70f3fe4..dc52651775 100644 --- a/panda/src/putil/clockObject.h +++ b/panda/src/putil/clockObject.h @@ -30,7 +30,7 @@ #include "pipelineCycler.h" #include "thread.h" -class EXPCL_PANDA TimeVal { +class EXPCL_PANDA_PUTIL TimeVal { PUBLISHED: INLINE TimeVal(); INLINE ulong get_sec() const; @@ -63,7 +63,7 @@ PUBLISHED: // up to tick every frame so that its get_frame_time() // will return the time for the current frame. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ClockObject { +class EXPCL_PANDA_PUTIL ClockObject { PUBLISHED: enum Mode { M_normal, @@ -142,7 +142,7 @@ private: Ticks _ticks; // This is the data that needs to be cycled each frame. - class EXPCL_PANDA CData : public CycleData { + class EXPCL_PANDA_PUTIL CData : public CycleData { public: CData(); INLINE CData(const CData ©); @@ -177,9 +177,9 @@ private: static TypeHandle _type_handle; }; -EXPCL_PANDA ostream & +EXPCL_PANDA_PUTIL ostream & operator << (ostream &out, ClockObject::Mode mode); -EXPCL_PANDA istream & +EXPCL_PANDA_PUTIL istream & operator >> (istream &in, ClockObject::Mode &mode); #include "clockObject.I" diff --git a/panda/src/putil/config_util.h b/panda/src/putil/config_util.h index cbc7e81f1d..42054aa708 100644 --- a/panda/src/putil/config_util.h +++ b/panda/src/putil/config_util.h @@ -30,29 +30,29 @@ class DSearchPath; -ConfigureDecl(config_util, EXPCL_PANDA, EXPTP_PANDA); -NotifyCategoryDecl(util, EXPCL_PANDA, EXPTP_PANDA); -NotifyCategoryDecl(bam, EXPCL_PANDA, EXPTP_PANDA); +ConfigureDecl(config_util, EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL); +NotifyCategoryDecl(util, EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL); +NotifyCategoryDecl(bam, EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL); // Actually, we can't determine this config variable the normal way, // because we must be able to access it at static init time. Instead // of declaring it a global constant, we'll make it a member of // MemoryUsage. -//extern EXPCL_PANDA const bool track_memory_usage; +//extern EXPCL_PANDA_PUTIL const bool track_memory_usage; -extern EXPCL_PANDA ConfigVariableEnum bam_endian; -extern EXPCL_PANDA ConfigVariableEnum bam_texture_mode; +extern EXPCL_PANDA_PUTIL ConfigVariableEnum bam_endian; +extern EXPCL_PANDA_PUTIL ConfigVariableEnum bam_texture_mode; -extern EXPCL_PANDA ConfigVariableSearchPath model_path; -extern EXPCL_PANDA ConfigVariableSearchPath texture_path; -extern EXPCL_PANDA ConfigVariableSearchPath sound_path; +extern EXPCL_PANDA_PUTIL ConfigVariableSearchPath model_path; +extern EXPCL_PANDA_PUTIL ConfigVariableSearchPath texture_path; +extern EXPCL_PANDA_PUTIL ConfigVariableSearchPath sound_path; // The above variables are also shadowed by these functions, so that // they can easily be accessed in the interpreter (e.g. Python). BEGIN_PUBLISH -EXPCL_PANDA ConfigVariableSearchPath &get_model_path(); -EXPCL_PANDA ConfigVariableSearchPath &get_texture_path(); -EXPCL_PANDA ConfigVariableSearchPath &get_sound_path(); +EXPCL_PANDA_PUTIL ConfigVariableSearchPath &get_model_path(); +EXPCL_PANDA_PUTIL ConfigVariableSearchPath &get_texture_path(); +EXPCL_PANDA_PUTIL ConfigVariableSearchPath &get_sound_path(); END_PUBLISH extern ConfigVariableDouble clock_frame_rate; @@ -61,6 +61,6 @@ extern ConfigVariableDouble max_dt; extern ConfigVariableDouble sleep_precision; extern ConfigVariableDouble average_frame_rate_interval; -extern EXPCL_PANDA void init_libputil(); +extern EXPCL_PANDA_PUTIL void init_libputil(); #endif /* __CONFIG_UTIL_H__ */ diff --git a/panda/src/putil/configurable.h b/panda/src/putil/configurable.h index 1cda4d6adf..dab96100ad 100644 --- a/panda/src/putil/configurable.h +++ b/panda/src/putil/configurable.h @@ -37,7 +37,7 @@ // frame. We can cache the configuration info by // by using the "dirty" flag. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA Configurable : public TypedObject { +class EXPCL_PANDA_PUTIL Configurable : public TypedObject { public: Configurable( void ) { make_dirty(); } diff --git a/panda/src/putil/copyOnWriteObject.h b/panda/src/putil/copyOnWriteObject.h index 74c72bfc55..075f15a17f 100644 --- a/panda/src/putil/copyOnWriteObject.h +++ b/panda/src/putil/copyOnWriteObject.h @@ -32,7 +32,7 @@ // but also can be used with a CopyOnWritePointer to // provide get_read_pointer() and get_write_pointer(). //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CopyOnWriteObject : public CachedTypedWritableReferenceCount { +class EXPCL_PANDA_PUTIL CopyOnWriteObject : public CachedTypedWritableReferenceCount { public: INLINE CopyOnWriteObject(); INLINE CopyOnWriteObject(const CopyOnWriteObject ©); diff --git a/panda/src/putil/copyOnWritePointer.h b/panda/src/putil/copyOnWritePointer.h index 39a794e853..7500933250 100644 --- a/panda/src/putil/copyOnWritePointer.h +++ b/panda/src/putil/copyOnWritePointer.h @@ -45,7 +45,7 @@ // which all refer to the same shared object. They will // negotiate with each other properly. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA CopyOnWritePointer { +class EXPCL_PANDA_PUTIL CopyOnWritePointer { public: INLINE CopyOnWritePointer(CopyOnWriteObject *object = NULL); INLINE CopyOnWritePointer(const CopyOnWritePointer ©); diff --git a/panda/src/putil/datagramInputFile.h b/panda/src/putil/datagramInputFile.h index 920550f045..201a90c5fe 100644 --- a/panda/src/putil/datagramInputFile.h +++ b/panda/src/putil/datagramInputFile.h @@ -31,7 +31,7 @@ // consists of an arbitrary header followed by a number // of datagrams. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA DatagramInputFile : public DatagramGenerator { +class EXPCL_PANDA_PUTIL DatagramInputFile : public DatagramGenerator { public: INLINE DatagramInputFile(); diff --git a/panda/src/putil/datagramOutputFile.h b/panda/src/putil/datagramOutputFile.h index f3c28468a7..ef9269883b 100644 --- a/panda/src/putil/datagramOutputFile.h +++ b/panda/src/putil/datagramOutputFile.h @@ -30,7 +30,7 @@ // consists of an arbitrary header followed by a number // of datagrams. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA DatagramOutputFile : public DatagramSink { +class EXPCL_PANDA_PUTIL DatagramOutputFile : public DatagramSink { public: INLINE DatagramOutputFile(); diff --git a/panda/src/putil/factoryBase.h b/panda/src/putil/factoryBase.h index c02ce8d15e..7be1956cb0 100644 --- a/panda/src/putil/factoryBase.h +++ b/panda/src/putil/factoryBase.h @@ -42,7 +42,7 @@ // FactoryBase is the main definition of the thin // template class Factory. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA FactoryBase { +class EXPCL_PANDA_PUTIL FactoryBase { public: typedef TypedObject *BaseCreateFunc(const FactoryParams ¶ms); diff --git a/panda/src/putil/factoryParam.h b/panda/src/putil/factoryParam.h index 4edcd43a2e..4e00311541 100644 --- a/panda/src/putil/factoryParam.h +++ b/panda/src/putil/factoryParam.h @@ -35,7 +35,7 @@ // parameters of various types that derive from // FactoryParam (and do contain data). //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA FactoryParam : public TypedReferenceCount { +class EXPCL_PANDA_PUTIL FactoryParam : public TypedReferenceCount { public: INLINE FactoryParam(); INLINE FactoryParam(const FactoryParam &other); diff --git a/panda/src/putil/factoryParams.h b/panda/src/putil/factoryParams.h index d00131de88..95372a9e2c 100644 --- a/panda/src/putil/factoryParams.h +++ b/panda/src/putil/factoryParams.h @@ -41,7 +41,7 @@ // will be up to the individual CreateFuncs to interpret // this meaningfully. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA FactoryParams { +class EXPCL_PANDA_PUTIL FactoryParams { public: FactoryParams(); ~FactoryParams(); diff --git a/panda/src/putil/globalPointerRegistry.h b/panda/src/putil/globalPointerRegistry.h index 594ac87983..7ff8025ff7 100644 --- a/panda/src/putil/globalPointerRegistry.h +++ b/panda/src/putil/globalPointerRegistry.h @@ -63,7 +63,7 @@ // foo to guarantee that they share the same static // data. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GlobalPointerRegistry { +class EXPCL_PANDA_PUTIL GlobalPointerRegistry { public: INLINE static void *get_pointer(TypeHandle type); INLINE static void store_pointer(TypeHandle type, void *ptr); diff --git a/panda/src/putil/ioPtaDatagramFloat.h b/panda/src/putil/ioPtaDatagramFloat.h index 3f9e605a70..5c3e6e8a29 100644 --- a/panda/src/putil/ioPtaDatagramFloat.h +++ b/panda/src/putil/ioPtaDatagramFloat.h @@ -37,7 +37,7 @@ class DatagramIterator; // place to scope these static methods which should be // called directly. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA IoPtaDatagramFloat { +class EXPCL_PANDA_PUTIL IoPtaDatagramFloat { public: static void write_datagram(BamWriter *manager, Datagram &dest, CPTA_float array); static PTA_float read_datagram(BamReader *manager, DatagramIterator &source); diff --git a/panda/src/putil/ioPtaDatagramInt.h b/panda/src/putil/ioPtaDatagramInt.h index 654d84e7c1..8b33e58868 100644 --- a/panda/src/putil/ioPtaDatagramInt.h +++ b/panda/src/putil/ioPtaDatagramInt.h @@ -36,7 +36,7 @@ class DatagramIterator; // constructed; it's just a convenient place to scope // these static methods which should be called directly. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA IoPtaDatagramInt { +class EXPCL_PANDA_PUTIL IoPtaDatagramInt { public: static void write_datagram(BamWriter *manager, Datagram &dest, CPTA_int array); static PTA_int read_datagram(BamReader *manager, DatagramIterator &source); diff --git a/panda/src/putil/ioPtaDatagramShort.h b/panda/src/putil/ioPtaDatagramShort.h index 0b1f976026..3391d66e73 100644 --- a/panda/src/putil/ioPtaDatagramShort.h +++ b/panda/src/putil/ioPtaDatagramShort.h @@ -37,7 +37,7 @@ class DatagramIterator; // place to scope these static methods which should be // called directly. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA IoPtaDatagramShort { +class EXPCL_PANDA_PUTIL IoPtaDatagramShort { public: static void write_datagram(BamWriter *manager, Datagram &dest, CPTA_ushort array); static PTA_ushort read_datagram(BamReader *manager, DatagramIterator &source); diff --git a/panda/src/putil/keyboardButton.h b/panda/src/putil/keyboardButton.h index c36ef3b41d..cea993ebb8 100644 --- a/panda/src/putil/keyboardButton.h +++ b/panda/src/putil/keyboardButton.h @@ -29,7 +29,7 @@ // grouping all of these handy functions that return // buttons which map to standard keyboard keys. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA KeyboardButton { +class EXPCL_PANDA_PUTIL KeyboardButton { PUBLISHED: static ButtonHandle ascii_key(char ascii_equivalent); static ButtonHandle ascii_key(const string &ascii_equivalent); diff --git a/panda/src/putil/lineStream.h b/panda/src/putil/lineStream.h index 2d0ff4dd29..93d109bfd2 100644 --- a/panda/src/putil/lineStream.h +++ b/panda/src/putil/lineStream.h @@ -37,7 +37,7 @@ // More text can still be written to it and continuously // extracted. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA LineStream : public ostream { +class EXPCL_PANDA_PUTIL LineStream : public ostream { PUBLISHED: INLINE LineStream(); diff --git a/panda/src/putil/lineStreamBuf.h b/panda/src/putil/lineStreamBuf.h index 176a794416..0c7ec87507 100644 --- a/panda/src/putil/lineStreamBuf.h +++ b/panda/src/putil/lineStreamBuf.h @@ -30,7 +30,7 @@ // continuously extracted as a sequence of lines of // text. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA LineStreamBuf : public streambuf { +class EXPCL_PANDA_PUTIL LineStreamBuf : public streambuf { public: LineStreamBuf(); virtual ~LineStreamBuf(); diff --git a/panda/src/putil/linkedListNode.h b/panda/src/putil/linkedListNode.h index 4f298de99a..41f61581bf 100644 --- a/panda/src/putil/linkedListNode.h +++ b/panda/src/putil/linkedListNode.h @@ -36,7 +36,7 @@ // derived classes are responsible for protecting any // calls into it within mutexes, if necessary. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA LinkedListNode { +class EXPCL_PANDA_PUTIL LinkedListNode { protected: INLINE LinkedListNode(); INLINE LinkedListNode(bool); diff --git a/panda/src/putil/load_prc_file.cxx b/panda/src/putil/load_prc_file.cxx index 4aad022511..e04fc37ca4 100644 --- a/panda/src/putil/load_prc_file.cxx +++ b/panda/src/putil/load_prc_file.cxx @@ -90,7 +90,7 @@ load_prc_file(const string &filename) { // is meaningful to you. The name is only used when the // set of loaded prc files is listed. //////////////////////////////////////////////////////////////////// -EXPCL_PANDA ConfigPage * +EXPCL_PANDA_PUTIL ConfigPage * load_prc_file_data(const string &name, const string &data) { istringstream strm(data); diff --git a/panda/src/putil/load_prc_file.h b/panda/src/putil/load_prc_file.h index 36dc98901f..585dc54078 100644 --- a/panda/src/putil/load_prc_file.h +++ b/panda/src/putil/load_prc_file.h @@ -43,7 +43,7 @@ BEGIN_PUBLISH // defined in express), and the model path (which is in // putil). //////////////////////////////////////////////////////////////////// -EXPCL_PANDA ConfigPage * +EXPCL_PANDA_PUTIL ConfigPage * load_prc_file(const string &filename); //////////////////////////////////////////////////////////////////// @@ -58,7 +58,7 @@ load_prc_file(const string &filename); // is meaningful to you. The name is only used when the // set of loaded prc files is listed. //////////////////////////////////////////////////////////////////// -EXPCL_PANDA ConfigPage * +EXPCL_PANDA_PUTIL ConfigPage * load_prc_file_data(const string &name, const string &data); //////////////////////////////////////////////////////////////////// @@ -72,7 +72,7 @@ load_prc_file_data(const string &name, const string &data); // pointer is no longer valid and should not be used // again. //////////////////////////////////////////////////////////////////// -EXPCL_PANDA bool +EXPCL_PANDA_PUTIL bool unload_prc_file(ConfigPage *page); #ifdef HAVE_OPENSSL @@ -83,7 +83,7 @@ unload_prc_file(ConfigPage *page); // state as reported by // ConfigVariableManager::write_prc_variables(). //////////////////////////////////////////////////////////////////// -EXPCL_PANDA void +EXPCL_PANDA_PUTIL void hash_prc_variables(HashVal &hash); #endif // HAVE_OPENSSL diff --git a/panda/src/putil/modifierButtons.h b/panda/src/putil/modifierButtons.h index 7c9bcc15e6..bf848cdc7e 100644 --- a/panda/src/putil/modifierButtons.h +++ b/panda/src/putil/modifierButtons.h @@ -30,7 +30,7 @@ // individual buttons and tracks whether each button is // known to be down or up. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ModifierButtons { +class EXPCL_PANDA_PUTIL ModifierButtons { PUBLISHED: ModifierButtons(); ModifierButtons(const ModifierButtons ©); diff --git a/panda/src/putil/mouseButton.h b/panda/src/putil/mouseButton.h index 9579b2dde0..2c5c049b23 100644 --- a/panda/src/putil/mouseButton.h +++ b/panda/src/putil/mouseButton.h @@ -29,7 +29,7 @@ // grouping all of these handy functions that return // buttons which map to standard mouse buttons. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA MouseButton { +class EXPCL_PANDA_PUTIL MouseButton { PUBLISHED: static ButtonHandle button(int button_number); static ButtonHandle one(); diff --git a/panda/src/putil/mouseData.h b/panda/src/putil/mouseData.h index 8cb5173766..996be20e43 100644 --- a/panda/src/putil/mouseData.h +++ b/panda/src/putil/mouseData.h @@ -29,7 +29,7 @@ // pointer input device, such as the mouse in the // GraphicsWindow. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA MouseData { +class EXPCL_PANDA_PUTIL MouseData { PUBLISHED: INLINE MouseData(); INLINE MouseData(const MouseData ©); diff --git a/panda/src/putil/nameUniquifier.h b/panda/src/putil/nameUniquifier.h index d488dd51d4..37581ca97e 100644 --- a/panda/src/putil/nameUniquifier.h +++ b/panda/src/putil/nameUniquifier.h @@ -32,7 +32,7 @@ // with unique vertex pool names, or for file converters // to file formats that require unique node names, etc. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA NameUniquifier { +class EXPCL_PANDA_PUTIL NameUniquifier { public: NameUniquifier(const string &separator = string(), const string &empty = string()); diff --git a/panda/src/putil/nodeCachedReferenceCount.h b/panda/src/putil/nodeCachedReferenceCount.h index 2f7c08717e..638165ffa1 100644 --- a/panda/src/putil/nodeCachedReferenceCount.h +++ b/panda/src/putil/nodeCachedReferenceCount.h @@ -62,7 +62,7 @@ // NodePointerTo<> class to maintain the node_ref // counters automatically. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA NodeCachedReferenceCount : public CachedTypedWritableReferenceCount { +class EXPCL_PANDA_PUTIL NodeCachedReferenceCount : public CachedTypedWritableReferenceCount { protected: INLINE NodeCachedReferenceCount(); INLINE NodeCachedReferenceCount(const NodeCachedReferenceCount ©); diff --git a/panda/src/putil/pta_double.h b/panda/src/putil/pta_double.h index 3f57fcaef9..8095879b56 100644 --- a/panda/src/putil/pta_double.h +++ b/panda/src/putil/pta_double.h @@ -33,10 +33,10 @@ // rather than defining the pta again. //////////////////////////////////////////////////////////////////// -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, RefCountObj); -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, PointerToBase >); -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, PointerToArray) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, ConstPointerToArray) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, RefCountObj); +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, PointerToBase >); +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, PointerToArray) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, ConstPointerToArray) typedef PointerToArray PTA_double; typedef ConstPointerToArray CPTA_double; diff --git a/panda/src/putil/pta_float.h b/panda/src/putil/pta_float.h index 364c8c7763..3a57b600da 100644 --- a/panda/src/putil/pta_float.h +++ b/panda/src/putil/pta_float.h @@ -33,10 +33,10 @@ // rather than defining the pta again. //////////////////////////////////////////////////////////////////// -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, RefCountObj); -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, PointerToBase >); -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, PointerToArray) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, ConstPointerToArray) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, RefCountObj); +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, PointerToBase >); +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, PointerToArray) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, ConstPointerToArray) typedef PointerToArray PTA_float; typedef ConstPointerToArray CPTA_float; diff --git a/panda/src/putil/pta_int.h b/panda/src/putil/pta_int.h index adc11683b4..b71bb09a03 100644 --- a/panda/src/putil/pta_int.h +++ b/panda/src/putil/pta_int.h @@ -33,10 +33,10 @@ // rather than defining the pta again. //////////////////////////////////////////////////////////////////// -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, RefCountObj); -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, PointerToBase >); -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, PointerToArray) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, ConstPointerToArray) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, RefCountObj); +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, PointerToBase >); +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, PointerToArray) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, ConstPointerToArray) BEGIN_PUBLISH typedef PointerToArray PTA_int; diff --git a/panda/src/putil/pta_ushort.h b/panda/src/putil/pta_ushort.h index 6088b83174..0265dd7829 100644 --- a/panda/src/putil/pta_ushort.h +++ b/panda/src/putil/pta_ushort.h @@ -33,10 +33,10 @@ // rather than defining the pta again. //////////////////////////////////////////////////////////////////// -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, RefCountObj); -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, PointerToBase >); -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, PointerToArray) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, ConstPointerToArray) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, RefCountObj); +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, PointerToBase >); +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, PointerToArray) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, ConstPointerToArray) typedef PointerToArray PTA_ushort; typedef ConstPointerToArray CPTA_ushort; diff --git a/panda/src/putil/sparseArray.h b/panda/src/putil/sparseArray.h index 9603d18113..c6fbed8388 100644 --- a/panda/src/putil/sparseArray.h +++ b/panda/src/putil/sparseArray.h @@ -50,7 +50,7 @@ class DatagramIterator; // Also, unlike BitArray, the SparseArray can store // negative integers. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA SparseArray { +class EXPCL_PANDA_PUTIL SparseArray { PUBLISHED: INLINE SparseArray(); INLINE SparseArray(const SparseArray ©); diff --git a/panda/src/putil/stringStream.h b/panda/src/putil/stringStream.h index 0f284ffefe..9c296a6563 100644 --- a/panda/src/putil/stringStream.h +++ b/panda/src/putil/stringStream.h @@ -28,7 +28,7 @@ // data to an internal buffer, which can be retrieved // and/or set as a string. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA StringStream : public iostream { +class EXPCL_PANDA_PUTIL StringStream : public iostream { PUBLISHED: INLINE StringStream(); INLINE StringStream(const string &source); diff --git a/panda/src/putil/stringStreamBuf.h b/panda/src/putil/stringStreamBuf.h index 9b991d5e8b..16ab21f99a 100644 --- a/panda/src/putil/stringStreamBuf.h +++ b/panda/src/putil/stringStreamBuf.h @@ -29,7 +29,7 @@ // contents can be appended to or extracted at any time // by application code. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA StringStreamBuf : public streambuf { +class EXPCL_PANDA_PUTIL StringStreamBuf : public streambuf { public: StringStreamBuf(); virtual ~StringStreamBuf(); diff --git a/panda/src/putil/string_utils.h b/panda/src/putil/string_utils.h index 5b10f9e118..2e75847c2f 100644 --- a/panda/src/putil/string_utils.h +++ b/panda/src/putil/string_utils.h @@ -26,41 +26,41 @@ // Case-insensitive string comparison, from Stroustrup's C++ third edition. // Works like strcmp(). -EXPCL_PANDA int cmp_nocase(const string &s, const string &s2); +EXPCL_PANDA_PUTIL int cmp_nocase(const string &s, const string &s2); // Similar, except it also accepts hyphen and underscore as equivalent. -EXPCL_PANDA int cmp_nocase_uh(const string &s, const string &s2); +EXPCL_PANDA_PUTIL int cmp_nocase_uh(const string &s, const string &s2); // Returns the string converted to lowercase. -EXPCL_PANDA string downcase(const string &s); +EXPCL_PANDA_PUTIL string downcase(const string &s); // Returns the string converted to uppercase. -EXPCL_PANDA string upcase(const string &s); +EXPCL_PANDA_PUTIL string upcase(const string &s); // Separates the string into words according to whitespace. -EXPCL_PANDA int extract_words(const string &str, vector_string &words); -EXPCL_PANDA int extract_words(const wstring &str, pvector &words); +EXPCL_PANDA_PUTIL int extract_words(const string &str, vector_string &words); +EXPCL_PANDA_PUTIL int extract_words(const wstring &str, pvector &words); // Separates the string into words according to the indicated delimiters. -EXPCL_PANDA void tokenize(const string &str, vector_string &words, +EXPCL_PANDA_PUTIL void tokenize(const string &str, vector_string &words, const string &delimiters); -EXPCL_PANDA void tokenize(const wstring &str, pvector &words, +EXPCL_PANDA_PUTIL void tokenize(const wstring &str, pvector &words, const wstring &delimiters); // Trims leading and/or trailing whitespace from the string. -EXPCL_PANDA string trim_left(const string &str); -EXPCL_PANDA wstring trim_left(const wstring &str); -EXPCL_PANDA string trim_right(const string &str); -EXPCL_PANDA wstring trim_right(const wstring &str); -EXPCL_PANDA string trim(const string &str); -EXPCL_PANDA wstring trim(const wstring &str); +EXPCL_PANDA_PUTIL string trim_left(const string &str); +EXPCL_PANDA_PUTIL wstring trim_left(const wstring &str); +EXPCL_PANDA_PUTIL string trim_right(const string &str); +EXPCL_PANDA_PUTIL wstring trim_right(const wstring &str); +EXPCL_PANDA_PUTIL string trim(const string &str); +EXPCL_PANDA_PUTIL wstring trim(const wstring &str); // Functions to parse numeric values out of a string. -EXPCL_PANDA int string_to_int(const string &str, string &tail); -EXPCL_PANDA bool string_to_int(const string &str, int &result); -EXPCL_PANDA double string_to_double(const string &str, string &tail); -EXPCL_PANDA bool string_to_double(const string &str, double &result); -EXPCL_PANDA bool string_to_float(const string &str, float &result); +EXPCL_PANDA_PUTIL int string_to_int(const string &str, string &tail); +EXPCL_PANDA_PUTIL bool string_to_int(const string &str, int &result); +EXPCL_PANDA_PUTIL double string_to_double(const string &str, string &tail); +EXPCL_PANDA_PUTIL bool string_to_double(const string &str, double &result); +EXPCL_PANDA_PUTIL bool string_to_float(const string &str, float &result); // Convenience function to make a string from anything that has an // ostream operator. diff --git a/panda/src/putil/timedCycle.h b/panda/src/putil/timedCycle.h index a8b435daa7..a31a6ee090 100644 --- a/panda/src/putil/timedCycle.h +++ b/panda/src/putil/timedCycle.h @@ -37,7 +37,7 @@ class DatagramIterator; // seconds. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA TimedCycle +class EXPCL_PANDA_PUTIL TimedCycle { public: INLINE TimedCycle(); diff --git a/panda/src/putil/typedWritable.h b/panda/src/putil/typedWritable.h index eaa5b58db8..f2a63a1054 100644 --- a/panda/src/putil/typedWritable.h +++ b/panda/src/putil/typedWritable.h @@ -37,7 +37,7 @@ class DatagramIterator; // See also TypedObject for detailed instructions. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA TypedWritable : public TypedObject { +class EXPCL_PANDA_PUTIL TypedWritable : public TypedObject { public: static TypedWritable* const Null; diff --git a/panda/src/putil/typedWritableReferenceCount.h b/panda/src/putil/typedWritableReferenceCount.h index 252166aeca..0c47eb57f5 100644 --- a/panda/src/putil/typedWritableReferenceCount.h +++ b/panda/src/putil/typedWritableReferenceCount.h @@ -36,7 +36,7 @@ // // See also TypedObject for detailed instructions. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA TypedWritableReferenceCount : public TypedWritable, public ReferenceCount { +class EXPCL_PANDA_PUTIL TypedWritableReferenceCount : public TypedWritable, public ReferenceCount { public: INLINE TypedWritableReferenceCount(); INLINE TypedWritableReferenceCount(const TypedWritableReferenceCount ©); diff --git a/panda/src/putil/uniqueIdAllocator.cxx b/panda/src/putil/uniqueIdAllocator.cxx index 23dc7d8737..331f44c33d 100644 --- a/panda/src/putil/uniqueIdAllocator.cxx +++ b/panda/src/putil/uniqueIdAllocator.cxx @@ -23,7 +23,7 @@ #include "uniqueIdAllocator.h" -NotifyCategoryDecl(uniqueIdAllocator, EXPCL_PANDA, EXPTP_PANDA); +NotifyCategoryDecl(uniqueIdAllocator, EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL); NotifyCategoryDef(uniqueIdAllocator, ""); const PN_uint32 UniqueIdAllocator::IndexEnd = (PN_uint32)-1; diff --git a/panda/src/putil/uniqueIdAllocator.h b/panda/src/putil/uniqueIdAllocator.h index 0fa14595a3..660d123c8a 100644 --- a/panda/src/putil/uniqueIdAllocator.h +++ b/panda/src/putil/uniqueIdAllocator.h @@ -45,7 +45,7 @@ // you would like to kick around other implementation // ideas, please contact Schuyler. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA UniqueIdAllocator { +class EXPCL_PANDA_PUTIL UniqueIdAllocator { PUBLISHED: UniqueIdAllocator(PN_uint32 min=0, PN_uint32 max=20); ~UniqueIdAllocator(); diff --git a/panda/src/putil/updateSeq.h b/panda/src/putil/updateSeq.h index e4505c3b87..dba1dc93d5 100644 --- a/panda/src/putil/updateSeq.h +++ b/panda/src/putil/updateSeq.h @@ -44,7 +44,7 @@ // than any other sequence number. All other sequences // are numeric and are monotonically increasing. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA UpdateSeq { +class EXPCL_PANDA_PUTIL UpdateSeq { PUBLISHED: INLINE UpdateSeq(); INLINE static UpdateSeq initial(); diff --git a/panda/src/putil/vector_double.cxx b/panda/src/putil/vector_double.cxx index 0a76749edb..d1f1a11b05 100644 --- a/panda/src/putil/vector_double.cxx +++ b/panda/src/putil/vector_double.cxx @@ -18,8 +18,8 @@ #include "vector_double.h" -#define EXPCL EXPCL_PANDA -#define EXPTP EXPTP_PANDA +#define EXPCL EXPCL_PANDA_PUTIL +#define EXPTP EXPTP_PANDA_PUTIL #define TYPE double #define NAME vector_double diff --git a/panda/src/putil/vector_double.h b/panda/src/putil/vector_double.h index 089fe8166a..38b92d3a15 100644 --- a/panda/src/putil/vector_double.h +++ b/panda/src/putil/vector_double.h @@ -32,8 +32,8 @@ // rather than defining the vector again. //////////////////////////////////////////////////////////////////// -#define EXPCL EXPCL_PANDA -#define EXPTP EXPTP_PANDA +#define EXPCL EXPCL_PANDA_PUTIL +#define EXPTP EXPTP_PANDA_PUTIL #define TYPE double #define NAME vector_double diff --git a/panda/src/putil/vector_float.cxx b/panda/src/putil/vector_float.cxx index 2a7f989fd3..376d83baf4 100644 --- a/panda/src/putil/vector_float.cxx +++ b/panda/src/putil/vector_float.cxx @@ -18,8 +18,8 @@ #include "vector_float.h" -#define EXPCL EXPCL_PANDA -#define EXPTP EXPTP_PANDA +#define EXPCL EXPCL_PANDA_PUTIL +#define EXPTP EXPTP_PANDA_PUTIL #define TYPE float #define NAME vector_float diff --git a/panda/src/putil/vector_float.h b/panda/src/putil/vector_float.h index 103faccfda..a908e933a1 100644 --- a/panda/src/putil/vector_float.h +++ b/panda/src/putil/vector_float.h @@ -32,8 +32,8 @@ // rather than defining the vector again. //////////////////////////////////////////////////////////////////// -#define EXPCL EXPCL_PANDA -#define EXPTP EXPTP_PANDA +#define EXPCL EXPCL_PANDA_PUTIL +#define EXPTP EXPTP_PANDA_PUTIL #define TYPE float #define NAME vector_float diff --git a/panda/src/putil/vector_typedWritable.cxx b/panda/src/putil/vector_typedWritable.cxx index 90bf995531..025dccec8b 100644 --- a/panda/src/putil/vector_typedWritable.cxx +++ b/panda/src/putil/vector_typedWritable.cxx @@ -18,8 +18,8 @@ #include "vector_typedWritable.h" -#define EXPCL EXPCL_PANDA -#define EXPTP EXPTP_PANDA +#define EXPCL EXPCL_PANDA_PUTIL +#define EXPTP EXPTP_PANDA_PUTIL #define TYPE TypedWritable * #define NAME vector_typedWritable diff --git a/panda/src/putil/vector_typedWritable.h b/panda/src/putil/vector_typedWritable.h index 78991ffb38..5b7ca7992b 100644 --- a/panda/src/putil/vector_typedWritable.h +++ b/panda/src/putil/vector_typedWritable.h @@ -34,8 +34,8 @@ class TypedWritable; // file, rather than defining the vector again. //////////////////////////////////////////////////////////////////// -#define EXPCL EXPCL_PANDA -#define EXPTP EXPTP_PANDA +#define EXPCL EXPCL_PANDA_PUTIL +#define EXPTP EXPTP_PANDA_PUTIL #define TYPE TypedWritable * #define NAME vector_typedWritable diff --git a/panda/src/putil/vector_ulong.cxx b/panda/src/putil/vector_ulong.cxx index 45154b05c5..0cbf6b48bc 100644 --- a/panda/src/putil/vector_ulong.cxx +++ b/panda/src/putil/vector_ulong.cxx @@ -18,8 +18,8 @@ #include "vector_ulong.h" -#define EXPCL EXPCL_PANDA -#define EXPTP EXPTP_PANDA +#define EXPCL EXPCL_PANDA_PUTIL +#define EXPTP EXPTP_PANDA_PUTIL #define TYPE unsigned long #define NAME vector_ulong diff --git a/panda/src/putil/vector_ulong.h b/panda/src/putil/vector_ulong.h index 79e118c38a..08cf37659d 100644 --- a/panda/src/putil/vector_ulong.h +++ b/panda/src/putil/vector_ulong.h @@ -32,8 +32,8 @@ // rather than defining the vector again. //////////////////////////////////////////////////////////////////// -#define EXPCL EXPCL_PANDA -#define EXPTP EXPTP_PANDA +#define EXPCL EXPCL_PANDA_PUTIL +#define EXPTP EXPTP_PANDA_PUTIL #define TYPE unsigned long #define NAME vector_ulong diff --git a/panda/src/putil/vector_ushort.cxx b/panda/src/putil/vector_ushort.cxx index 2c1535169c..e529f9dfa1 100644 --- a/panda/src/putil/vector_ushort.cxx +++ b/panda/src/putil/vector_ushort.cxx @@ -18,8 +18,8 @@ #include "vector_ushort.h" -#define EXPCL EXPCL_PANDA -#define EXPTP EXPTP_PANDA +#define EXPCL EXPCL_PANDA_PUTIL +#define EXPTP EXPTP_PANDA_PUTIL #define TYPE unsigned short #define NAME vector_ushort diff --git a/panda/src/putil/vector_ushort.h b/panda/src/putil/vector_ushort.h index 3130ff4bd1..de200c2c80 100644 --- a/panda/src/putil/vector_ushort.h +++ b/panda/src/putil/vector_ushort.h @@ -32,8 +32,8 @@ // rather than defining the vector again. //////////////////////////////////////////////////////////////////// -#define EXPCL EXPCL_PANDA -#define EXPTP EXPTP_PANDA +#define EXPCL EXPCL_PANDA_PUTIL +#define EXPTP EXPTP_PANDA_PUTIL #define TYPE unsigned short #define NAME vector_ushort diff --git a/panda/src/putil/vector_writable.cxx b/panda/src/putil/vector_writable.cxx index b208c1b260..8427947e1f 100644 --- a/panda/src/putil/vector_writable.cxx +++ b/panda/src/putil/vector_writable.cxx @@ -18,8 +18,8 @@ #include "vector_writable.h" -#define EXPCL EXPCL_PANDA -#define EXPTP EXPTP_PANDA +#define EXPCL EXPCL_PANDA_PUTIL +#define EXPTP EXPTP_PANDA_PUTIL #define TYPE Writable * #define NAME vector_writable diff --git a/panda/src/putil/vector_writable.h b/panda/src/putil/vector_writable.h index 1fb6a6be21..85d89f178f 100644 --- a/panda/src/putil/vector_writable.h +++ b/panda/src/putil/vector_writable.h @@ -34,8 +34,8 @@ class Writable; // rather than defining the vector again. //////////////////////////////////////////////////////////////////// -#define EXPCL EXPCL_PANDA -#define EXPTP EXPTP_PANDA +#define EXPCL EXPCL_PANDA_PUTIL +#define EXPTP EXPTP_PANDA_PUTIL #define TYPE Writable * #define NAME vector_writable diff --git a/panda/src/putil/writableConfigurable.h b/panda/src/putil/writableConfigurable.h index 4a379fe350..49ad16a15b 100644 --- a/panda/src/putil/writableConfigurable.h +++ b/panda/src/putil/writableConfigurable.h @@ -44,7 +44,7 @@ // frame. We can cache the configuration info by // by using the "dirty" flag. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA WritableConfigurable : public TypedWritable { +class EXPCL_PANDA_PUTIL WritableConfigurable : public TypedWritable { public: WritableConfigurable( void ) { make_dirty(); } diff --git a/panda/src/putil/writableParam.h b/panda/src/putil/writableParam.h index 412a60be96..c611c98903 100644 --- a/panda/src/putil/writableParam.h +++ b/panda/src/putil/writableParam.h @@ -33,7 +33,7 @@ // object. Simply contains a Datagram for the object // to construct itself from. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA WritableParam : public FactoryParam { +class EXPCL_PANDA_PUTIL WritableParam : public FactoryParam { public: INLINE const Datagram &get_datagram(); diff --git a/panda/src/recorder/config_recorder.h b/panda/src/recorder/config_recorder.h index 1db1bdb71a..28708c6b7e 100644 --- a/panda/src/recorder/config_recorder.h +++ b/panda/src/recorder/config_recorder.h @@ -23,7 +23,7 @@ #include "notifyCategoryProxy.h" #include "dconfig.h" -ConfigureDecl(config_recorder, EXPCL_PANDA, EXPTP_PANDA); -NotifyCategoryDecl(recorder, EXPCL_PANDA, EXPTP_PANDA); +ConfigureDecl(config_recorder, EXPCL_PANDA_RECORDER, EXPTP_PANDA_RECORDER); +NotifyCategoryDecl(recorder, EXPCL_PANDA_RECORDER, EXPTP_PANDA_RECORDER); #endif // CONFIG_RECORDER_H diff --git a/panda/src/recorder/mouseRecorder.h b/panda/src/recorder/mouseRecorder.h index d14852209d..5fafc42fa3 100644 --- a/panda/src/recorder/mouseRecorder.h +++ b/panda/src/recorder/mouseRecorder.h @@ -39,7 +39,7 @@ class BamWriter; // It also serves as a pass-through, so that additional // child nodes may be parented directly to it. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA MouseRecorder : public DataNode, public RecorderBase { +class EXPCL_PANDA_RECORDER MouseRecorder : public DataNode, public RecorderBase { PUBLISHED: MouseRecorder(const string &name); virtual ~MouseRecorder(); diff --git a/panda/src/recorder/recorderBase.h b/panda/src/recorder/recorderBase.h index e2f2173c96..c65a4dcf57 100644 --- a/panda/src/recorder/recorderBase.h +++ b/panda/src/recorder/recorderBase.h @@ -51,7 +51,7 @@ class TypedWritable; // write_datagram(), or they may choose to write // something slightly different. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA RecorderBase : virtual public ReferenceCount { +class EXPCL_PANDA_RECORDER RecorderBase : virtual public ReferenceCount { protected: RecorderBase(); diff --git a/panda/src/recorder/recorderController.h b/panda/src/recorder/recorderController.h index 5d4dd6428b..0add6dbd7f 100644 --- a/panda/src/recorder/recorderController.h +++ b/panda/src/recorder/recorderController.h @@ -36,7 +36,7 @@ class RecorderFrame; // user's runtime inputs to a bam file so that the // session can be recreated later. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA RecorderController : public TypedReferenceCount { +class EXPCL_PANDA_RECORDER RecorderController : public TypedReferenceCount { PUBLISHED: RecorderController(); ~RecorderController(); diff --git a/panda/src/recorder/recorderFrame.h b/panda/src/recorder/recorderFrame.h index 04a74c5769..187652089d 100644 --- a/panda/src/recorder/recorderFrame.h +++ b/panda/src/recorder/recorderFrame.h @@ -36,7 +36,7 @@ class FactoryParams; // created and destructed in recording and playback, // respectively. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA RecorderFrame : public TypedWritable { +class EXPCL_PANDA_RECORDER RecorderFrame : public TypedWritable { public: INLINE RecorderFrame(); INLINE RecorderFrame(double timestamp, int frame, diff --git a/panda/src/recorder/recorderHeader.h b/panda/src/recorder/recorderHeader.h index 8e2a8eb1c4..bc11005cea 100644 --- a/panda/src/recorder/recorderHeader.h +++ b/panda/src/recorder/recorderHeader.h @@ -34,7 +34,7 @@ class FactoryParams; // Description : This object contains the header information written // out at the beginning of a recorded session file. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA RecorderHeader : public TypedWritable { +class EXPCL_PANDA_RECORDER RecorderHeader : public TypedWritable { public: INLINE RecorderHeader(); INLINE RecorderHeader(const RecorderHeader ©); diff --git a/panda/src/recorder/recorderTable.h b/panda/src/recorder/recorderTable.h index c9687f3bcc..a1f8ce9718 100644 --- a/panda/src/recorder/recorderTable.h +++ b/panda/src/recorder/recorderTable.h @@ -36,7 +36,7 @@ class FactoryParams; // use to the bam file. Do not attempt to use it // directly. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA RecorderTable : public TypedWritable { +class EXPCL_PANDA_RECORDER RecorderTable : public TypedWritable { public: INLINE RecorderTable(); INLINE RecorderTable(const RecorderTable ©); diff --git a/panda/src/recorder/socketStreamRecorder.h b/panda/src/recorder/socketStreamRecorder.h index 56c8f3497f..992df0a432 100644 --- a/panda/src/recorder/socketStreamRecorder.h +++ b/panda/src/recorder/socketStreamRecorder.h @@ -46,7 +46,7 @@ class DatagramIterator; // straight through to the socket if it is connected, or // silently ignored if it is not. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA SocketStreamRecorder : public RecorderBase { +class EXPCL_PANDA_RECORDER SocketStreamRecorder : public RecorderBase { PUBLISHED: INLINE SocketStreamRecorder(); INLINE SocketStreamRecorder(SocketStream *stream, bool owns_stream); diff --git a/panda/src/text/config_text.h b/panda/src/text/config_text.h index 6595eac454..e4acc01433 100644 --- a/panda/src/text/config_text.h +++ b/panda/src/text/config_text.h @@ -31,7 +31,7 @@ class DSearchPath; -NotifyCategoryDecl(text, EXPCL_PANDA, EXPTP_PANDA); +NotifyCategoryDecl(text, EXPCL_PANDA_TEXT, EXPTP_PANDA_TEXT); extern ConfigVariableBool text_flatten; extern ConfigVariableInt text_anisotropic_degree; @@ -57,6 +57,6 @@ extern ConfigVariableEnum text_magfilter; extern ConfigVariableEnum text_wrap_mode; extern ConfigVariableEnum text_render_mode; -extern EXPCL_PANDA void init_libtext(); +extern EXPCL_PANDA_TEXT void init_libtext(); #endif diff --git a/panda/src/text/dynamicTextFont.h b/panda/src/text/dynamicTextFont.h index 4400036876..728c288396 100644 --- a/panda/src/text/dynamicTextFont.h +++ b/panda/src/text/dynamicTextFont.h @@ -44,7 +44,7 @@ class NurbsCurveResult; // FreeType 2.0 library (or any higher, // backward-compatible version). //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA DynamicTextFont : public TextFont, public FreetypeFont { +class EXPCL_PANDA_TEXT DynamicTextFont : public TextFont, public FreetypeFont { PUBLISHED: DynamicTextFont(const Filename &font_filename, int face_index = 0); DynamicTextFont(const char *font_data, int data_length, int face_index); diff --git a/panda/src/text/dynamicTextGlyph.h b/panda/src/text/dynamicTextGlyph.h index d2dc99c33f..b5eb08cae5 100644 --- a/panda/src/text/dynamicTextGlyph.h +++ b/panda/src/text/dynamicTextGlyph.h @@ -34,7 +34,7 @@ class DynamicTextPage; // additional information, such as where the glyph // appears on a texture map. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA DynamicTextGlyph : public TextGlyph { +class EXPCL_PANDA_TEXT DynamicTextGlyph : public TextGlyph { public: INLINE DynamicTextGlyph(int character, DynamicTextPage *page, int x, int y, int x_size, int y_size, diff --git a/panda/src/text/dynamicTextPage.h b/panda/src/text/dynamicTextPage.h index d88c619bbb..5d21a52663 100644 --- a/panda/src/text/dynamicTextPage.h +++ b/panda/src/text/dynamicTextPage.h @@ -37,7 +37,7 @@ class DynamicTextFont; // rendering. The font starts out with one page, and // will add more as it needs them. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA DynamicTextPage : public Texture { +class EXPCL_PANDA_TEXT DynamicTextPage : public Texture { public: DynamicTextPage(DynamicTextFont *font, int page_number); diff --git a/panda/src/text/fontPool.h b/panda/src/text/fontPool.h index 6ba61a7dfa..34f6a2df90 100644 --- a/panda/src/text/fontPool.h +++ b/panda/src/text/fontPool.h @@ -34,7 +34,7 @@ // TexturePool in that it unifies references to the same // filename. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA FontPool { +class EXPCL_PANDA_TEXT FontPool { PUBLISHED: // These functions take string parameters instead of Filenames // because that's somewhat more convenient to the scripting diff --git a/panda/src/text/geomTextGlyph.h b/panda/src/text/geomTextGlyph.h index 2ffcff82ef..cdad5f3847 100644 --- a/panda/src/text/geomTextGlyph.h +++ b/panda/src/text/geomTextGlyph.h @@ -35,7 +35,7 @@ // actual usage count on a dynamic glyph (and thus know // when it is safe to recycle the glyph). //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA GeomTextGlyph : public Geom { +class EXPCL_PANDA_TEXT GeomTextGlyph : public Geom { public: GeomTextGlyph(DynamicTextGlyph *glyph, const GeomVertexData *data); diff --git a/panda/src/text/staticTextFont.h b/panda/src/text/staticTextFont.h index 639f5d5875..6f09798fc2 100644 --- a/panda/src/text/staticTextFont.h +++ b/panda/src/text/staticTextFont.h @@ -41,7 +41,7 @@ class GeomPoint; // use. It doesn't require linking with any external // libraries like FreeType. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA StaticTextFont : public TextFont { +class EXPCL_PANDA_TEXT StaticTextFont : public TextFont { PUBLISHED: StaticTextFont(PandaNode *font_def); diff --git a/panda/src/text/textAssembler.h b/panda/src/text/textAssembler.h index 8c3abe9fe2..33064d856c 100644 --- a/panda/src/text/textAssembler.h +++ b/panda/src/text/textAssembler.h @@ -43,7 +43,7 @@ class TextAssembler; // advantage of it, if desired, for very low-level text // operations. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA TextAssembler { +class EXPCL_PANDA_TEXT TextAssembler { PUBLISHED: TextAssembler(TextEncoder *encoder); TextAssembler(const TextAssembler ©); diff --git a/panda/src/text/textFont.h b/panda/src/text/textFont.h index 6c885a6135..807e2404fa 100644 --- a/panda/src/text/textFont.h +++ b/panda/src/text/textFont.h @@ -38,7 +38,7 @@ class TextGlyph; // StaticTextFont or DynamicTextFont for an actual // implementation. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA TextFont : public TypedReferenceCount, public Namable { +class EXPCL_PANDA_TEXT TextFont : public TypedReferenceCount, public Namable { public: TextFont(); @@ -112,10 +112,10 @@ private: static TypeHandle _type_handle; }; -EXPCL_PANDA ostream &operator << (ostream &out, TextFont::RenderMode rm); -EXPCL_PANDA istream &operator >> (istream &in, TextFont::RenderMode &rm); -EXPCL_PANDA ostream &operator << (ostream &out, TextFont::WindingOrder wo); -EXPCL_PANDA istream &operator >> (istream &in, TextFont::WindingOrder &wo); +EXPCL_PANDA_TEXT ostream &operator << (ostream &out, TextFont::RenderMode rm); +EXPCL_PANDA_TEXT istream &operator >> (istream &in, TextFont::RenderMode &rm); +EXPCL_PANDA_TEXT ostream &operator << (ostream &out, TextFont::WindingOrder wo); +EXPCL_PANDA_TEXT istream &operator >> (istream &in, TextFont::WindingOrder &wo); #include "textFont.I" diff --git a/panda/src/text/textGlyph.h b/panda/src/text/textGlyph.h index 24fdfae324..bd575797b5 100644 --- a/panda/src/text/textGlyph.h +++ b/panda/src/text/textGlyph.h @@ -32,7 +32,7 @@ // font. This is a piece of renderable geometry of some // kind. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA TextGlyph : public ReferenceCount { +class EXPCL_PANDA_TEXT TextGlyph : public ReferenceCount { public: INLINE TextGlyph(int character); INLINE TextGlyph(int character, const Geom *geom, diff --git a/panda/src/text/textGraphic.h b/panda/src/text/textGraphic.h index 0b84ae0d97..5f5f246956 100644 --- a/panda/src/text/textGraphic.h +++ b/panda/src/text/textGraphic.h @@ -44,7 +44,7 @@ // to fit within this rectangle, but if it does not, it // may visually overlap with nearby text. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA TextGraphic { +class EXPCL_PANDA_TEXT TextGraphic { PUBLISHED: INLINE TextGraphic(); INLINE TextGraphic(const NodePath &model, const LVecBase4f &frame); diff --git a/panda/src/text/textNode.h b/panda/src/text/textNode.h index 8a1f8cf64a..068fff3f6c 100644 --- a/panda/src/text/textNode.h +++ b/panda/src/text/textNode.h @@ -53,7 +53,7 @@ // you may use however you like. Each time you call // generate() a new node is returned. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA TextNode : public PandaNode, public TextEncoder, public TextProperties { +class EXPCL_PANDA_TEXT TextNode : public PandaNode, public TextEncoder, public TextProperties { PUBLISHED: TextNode(const string &name); TextNode(const string &name, const TextProperties ©); diff --git a/panda/src/text/textProperties.h b/panda/src/text/textProperties.h index f8547f4d26..63af7ba55e 100644 --- a/panda/src/text/textProperties.h +++ b/panda/src/text/textProperties.h @@ -47,7 +47,7 @@ // TextProperties structure modifies the appearance of // subsequent text within the block. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA TextProperties { +class EXPCL_PANDA_TEXT TextProperties { PUBLISHED: enum Alignment { A_left, diff --git a/panda/src/text/textPropertiesManager.h b/panda/src/text/textPropertiesManager.h index e9dd5bad34..c57f5eded6 100644 --- a/panda/src/text/textPropertiesManager.h +++ b/panda/src/text/textPropertiesManager.h @@ -54,7 +54,7 @@ // set_graphic() call. Then "\5name\5" will embed the // named graphic. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA TextPropertiesManager { +class EXPCL_PANDA_TEXT TextPropertiesManager { protected: TextPropertiesManager(); ~TextPropertiesManager(); diff --git a/panda/src/tform/buttonThrower.h b/panda/src/tform/buttonThrower.h index 27561086c2..cece719924 100644 --- a/panda/src/tform/buttonThrower.h +++ b/panda/src/tform/buttonThrower.h @@ -40,7 +40,7 @@ // throws a corresponding event based on the button name // via the throw_event() call. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA ButtonThrower : public DataNode { +class EXPCL_PANDA_TFORM ButtonThrower : public DataNode { PUBLISHED: ButtonThrower(const string &name); ~ButtonThrower(); diff --git a/panda/src/tform/config_tform.h b/panda/src/tform/config_tform.h index 5245178fd6..51c9f981ee 100644 --- a/panda/src/tform/config_tform.h +++ b/panda/src/tform/config_tform.h @@ -23,21 +23,21 @@ #include "notifyCategoryProxy.h" #include "configVariableDouble.h" -NotifyCategoryDecl(tform, EXPCL_PANDA, EXPTP_PANDA); +NotifyCategoryDecl(tform, EXPCL_PANDA_TFORM, EXPTP_PANDA_TFORM); // Configure variables for tform package. -extern EXPCL_PANDA ConfigVariableDouble drive_forward_speed; -extern EXPCL_PANDA ConfigVariableDouble drive_reverse_speed; -extern EXPCL_PANDA ConfigVariableDouble drive_rotate_speed; -extern EXPCL_PANDA ConfigVariableDouble drive_vertical_dead_zone; -extern EXPCL_PANDA ConfigVariableDouble drive_vertical_center; -extern EXPCL_PANDA ConfigVariableDouble drive_horizontal_dead_zone; -extern EXPCL_PANDA ConfigVariableDouble drive_horizontal_center; -extern EXPCL_PANDA ConfigVariableDouble drive_vertical_ramp_up_time; -extern EXPCL_PANDA ConfigVariableDouble drive_vertical_ramp_down_time; -extern EXPCL_PANDA ConfigVariableDouble drive_horizontal_ramp_up_time; -extern EXPCL_PANDA ConfigVariableDouble drive_horizontal_ramp_down_time; +extern EXPCL_PANDA_TFORM ConfigVariableDouble drive_forward_speed; +extern EXPCL_PANDA_TFORM ConfigVariableDouble drive_reverse_speed; +extern EXPCL_PANDA_TFORM ConfigVariableDouble drive_rotate_speed; +extern EXPCL_PANDA_TFORM ConfigVariableDouble drive_vertical_dead_zone; +extern EXPCL_PANDA_TFORM ConfigVariableDouble drive_vertical_center; +extern EXPCL_PANDA_TFORM ConfigVariableDouble drive_horizontal_dead_zone; +extern EXPCL_PANDA_TFORM ConfigVariableDouble drive_horizontal_center; +extern EXPCL_PANDA_TFORM ConfigVariableDouble drive_vertical_ramp_up_time; +extern EXPCL_PANDA_TFORM ConfigVariableDouble drive_vertical_ramp_down_time; +extern EXPCL_PANDA_TFORM ConfigVariableDouble drive_horizontal_ramp_up_time; +extern EXPCL_PANDA_TFORM ConfigVariableDouble drive_horizontal_ramp_down_time; -extern EXPCL_PANDA ConfigVariableDouble inactivity_timeout; +extern EXPCL_PANDA_TFORM ConfigVariableDouble inactivity_timeout; #endif diff --git a/panda/src/tform/driveInterface.h b/panda/src/tform/driveInterface.h index 82d9b0e108..7f7b356908 100644 --- a/panda/src/tform/driveInterface.h +++ b/panda/src/tform/driveInterface.h @@ -35,7 +35,7 @@ // The basic motion is on a horizontal plane, as if // driving a vehicle. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA DriveInterface : public MouseInterfaceNode { +class EXPCL_PANDA_TFORM DriveInterface : public MouseInterfaceNode { PUBLISHED: DriveInterface(const string &name = ""); ~DriveInterface(); diff --git a/panda/src/tform/mouseInterfaceNode.h b/panda/src/tform/mouseInterfaceNode.h index c5704ae325..9dd23618a4 100644 --- a/panda/src/tform/mouseInterfaceNode.h +++ b/panda/src/tform/mouseInterfaceNode.h @@ -35,7 +35,7 @@ class ButtonEventList; // It collects together some common interface; in // particular, the require_button() and related methods. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA MouseInterfaceNode : public DataNode { +class EXPCL_PANDA_TFORM MouseInterfaceNode : public DataNode { public: MouseInterfaceNode(const string &name); virtual ~MouseInterfaceNode(); diff --git a/panda/src/tform/mouseSubregion.h b/panda/src/tform/mouseSubregion.h index 419358a8b8..02f5e6a48e 100644 --- a/panda/src/tform/mouseSubregion.h +++ b/panda/src/tform/mouseSubregion.h @@ -38,7 +38,7 @@ // end up with a virtual mouse within your // DisplayRegion. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA MouseSubregion : public MouseInterfaceNode { +class EXPCL_PANDA_TFORM MouseSubregion : public MouseInterfaceNode { PUBLISHED: MouseSubregion(const string &name); ~MouseSubregion(); diff --git a/panda/src/tform/mouseWatcher.h b/panda/src/tform/mouseWatcher.h index b3a1124a3b..12e8cdf830 100644 --- a/panda/src/tform/mouseWatcher.h +++ b/panda/src/tform/mouseWatcher.h @@ -57,7 +57,7 @@ class DisplayRegion; // scene graph. It will move the geometry around // according to the mouse's known position. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA MouseWatcher : public DataNode, public MouseWatcherGroup { +class EXPCL_PANDA_TFORM MouseWatcher : public DataNode, public MouseWatcherGroup { PUBLISHED: MouseWatcher(const string &name = ""); ~MouseWatcher(); diff --git a/panda/src/tform/mouseWatcherGroup.h b/panda/src/tform/mouseWatcherGroup.h index ad6572c4c6..ce2920acb2 100644 --- a/panda/src/tform/mouseWatcherGroup.h +++ b/panda/src/tform/mouseWatcherGroup.h @@ -33,7 +33,7 @@ // Description : This represents a collection of MouseWatcherRegions // that may be managed as a group. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA MouseWatcherGroup : virtual public ReferenceCount { +class EXPCL_PANDA_TFORM MouseWatcherGroup : virtual public ReferenceCount { public: MouseWatcherGroup(); virtual ~MouseWatcherGroup(); diff --git a/panda/src/tform/mouseWatcherParameter.h b/panda/src/tform/mouseWatcherParameter.h index 146eb29818..b941131dde 100644 --- a/panda/src/tform/mouseWatcherParameter.h +++ b/panda/src/tform/mouseWatcherParameter.h @@ -32,7 +32,7 @@ // generated for a region to indicate the mouse and // button state for the event. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA MouseWatcherParameter { +class EXPCL_PANDA_TFORM MouseWatcherParameter { public: INLINE MouseWatcherParameter(); INLINE MouseWatcherParameter(const MouseWatcherParameter &other); diff --git a/panda/src/tform/mouseWatcherRegion.h b/panda/src/tform/mouseWatcherRegion.h index b8a6cc406f..da142590a4 100644 --- a/panda/src/tform/mouseWatcherRegion.h +++ b/panda/src/tform/mouseWatcherRegion.h @@ -34,7 +34,7 @@ class MouseWatcherParameter; // Description : This is the class that defines a rectangular region // on the screen for the MouseWatcher. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA MouseWatcherRegion : public TypedWritableReferenceCount, public Namable { +class EXPCL_PANDA_TFORM MouseWatcherRegion : public TypedWritableReferenceCount, public Namable { PUBLISHED: INLINE MouseWatcherRegion(const string &name, float left, float right, float bottom, float top); diff --git a/panda/src/tform/trackball.h b/panda/src/tform/trackball.h index 044d8e45f1..6906c0e153 100644 --- a/panda/src/tform/trackball.h +++ b/panda/src/tform/trackball.h @@ -41,7 +41,7 @@ // it to actually transform objects (or cameras) in the // world. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA Trackball : public MouseInterfaceNode { +class EXPCL_PANDA_TFORM Trackball : public MouseInterfaceNode { PUBLISHED: Trackball(const string &name); ~Trackball(); diff --git a/panda/src/tform/transform2sg.h b/panda/src/tform/transform2sg.h index f8cc4bd405..769ad2d1a3 100644 --- a/panda/src/tform/transform2sg.h +++ b/panda/src/tform/transform2sg.h @@ -31,7 +31,7 @@ // output: none, but applies the matrix as the transform // transition for a given arc of the scene graph. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA Transform2SG : public DataNode { +class EXPCL_PANDA_TFORM Transform2SG : public DataNode { PUBLISHED: Transform2SG(const string &name); diff --git a/panda/src/vrpn/config_vrpn.h b/panda/src/vrpn/config_vrpn.h index 0c9e22c5a5..b3d36f9e9b 100644 --- a/panda/src/vrpn/config_vrpn.h +++ b/panda/src/vrpn/config_vrpn.h @@ -22,6 +22,6 @@ #include "pandabase.h" #include "notifyCategoryProxy.h" -NotifyCategoryDecl(vrpn, EXPCL_PANDA, EXPTP_PANDA); +NotifyCategoryDecl(vrpn, EXPCL_PANDA_VRPN, EXPTP_PANDA_VRPN); #endif diff --git a/panda/src/vrpn/vrpnClient.h b/panda/src/vrpn/vrpnClient.h index 695d3f264e..71e5ff9f13 100644 --- a/panda/src/vrpn/vrpnClient.h +++ b/panda/src/vrpn/vrpnClient.h @@ -39,7 +39,7 @@ class VrpnDialDevice; // and records information on the connected VRPN // devices. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDA VrpnClient : public ClientBase { +class EXPCL_PANDA_VRPN VrpnClient : public ClientBase { PUBLISHED: VrpnClient(const string &server_name); ~VrpnClient();