Move plGBufferGroup and plVertCoder to plDrawable.

Sources/Plasma/PubUtilLib/plDrawable/CMakeLists.txt

@@ -26,6 +26,7 @@ set(plDrawable_SOURCES
     plDynaTorpedoVSMgr.cpp
     plDynaWakeMgr.cpp
     plFixedWaterState7.cpp
+    plGBufferGroup.cpp
     plGeometrySpan.cpp
     plGeoSpanDice.cpp
     plInstanceDrawInterface.cpp
@@ -43,6 +44,7 @@ set(plDrawable_SOURCES
     plSpanInstance.cpp
     plSpanTemplate.cpp
     plSpanTypes.cpp
+    plVertCoder.cpp
     plVisLOSMgr.cpp
     plWaveSet7.cpp
     plWaveSetBase.cpp
@@ -76,6 +78,7 @@ set(plDrawable_HEADERS
     plDynaTorpedoVSMgr.h
     plDynaWakeMgr.h
     plFixedWaterState7.h
+    plGBufferGroup.h
     plGeometrySpan.h
     plGeoSpanDice.h
     plInstanceDrawInterface.h
@@ -95,6 +98,7 @@ set(plDrawable_HEADERS
     plSpanTemplate.h
     plSpanTypes.h
     plTimedInterp.h
+    plVertCoder.h
     plVisLOSMgr.h
     plWaveSet7.h
     plWaveSetBase.h

Sources/Plasma/PubUtilLib/plDrawable/plAccessGeometry.cpp

@@ -57,7 +57,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plAccessSnapShot.h"
 
 // For dipping directly into device buffers.
-#include "plPipeline/plGBufferGroup.h"
+#include "plGBufferGroup.h"
 #include "plPipeline/hsGDeviceRef.h"
 #include "plPipeline.h"
 

Sources/Plasma/PubUtilLib/plDrawable/plAuxSpan.h

@@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "hsTemplates.h"
 #include "plSpanTypes.h"
-#include "plPipeline/plGBufferGroup.h"
+#include "plGBufferGroup.h"
 
 class plDrawableSpans;
 class hsGMaterial;

Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpans.cpp

@@ -71,7 +71,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plClusterGroup.h"
 #include "plCluster.h"
 #include "plSpanTemplate.h"
-                                    
+#include "plGBufferGroup.h"
+
 #include "plMath/hsRadixSort.h"
 #include "plSurface/hsGMaterial.h"
 #include "plSurface/plLayerInterface.h"
@@ -83,7 +84,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pnMessage/plDISpansMsg.h"
 #include "plMessage/plDeviceRecreateMsg.h"
 #include "plMessage/plRenderMsg.h"
-#include "plPipeline/plGBufferGroup.h"
 #include "pnSceneObject/plDrawInterface.h"
 #include "pnKeyedObject/plKey.h"
 #include "plParticleSystem/plParticleEmitter.h"

Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpansExport.cpp

@@ -55,6 +55,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsResMgr.h"
 #include "plPipeline.h"
 #include "plGeometrySpan.h"
+#include "plGBufferGroup.h"
 
 #include "plSpaceTree.h"
 #include "plSpaceTreeMaker.h"       // This is fun and amusing and wonderful to have here.
@@ -64,7 +65,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pnMessage/plRefMsg.h"
 #include "pnMessage/plNodeRefMsg.h" // for NodeRefMsg
 #include "plMessage/plDeviceRecreateMsg.h"
-#include "plPipeline/plGBufferGroup.h"
 #include "plSurface/hsGMaterial.h"
 #include "plSurface/plLayerInterface.h"
 #include "plGImage/plBitmap.h"

Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.cpp

@@ -48,6 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "plAccessGeometry.h"
 #include "plAccessSpan.h"
+#include "plGBufferGroup.h"
 
 #include "plDrawableSpans.h"
 #include "plAuxSpan.h"
@@ -66,7 +67,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plSurface/plLayerInterface.h"
 #include "plScene/plPageTreeMgr.h"
 
-#include "plPipeline/plGBufferGroup.h"
 #include "plPipeline/hsGDeviceRef.h"
 
 #include "plMessage/plAgeLoadedMsg.h"

Sources/Plasma/PubUtilLib/plDrawable/plGBufferGroup.cpp

@@ -56,9 +56,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsStream.h"
 
 #include "plSurface/hsGMaterial.h"
-#include "plDrawable/plGeometrySpan.h"
+#include "plGeometrySpan.h"
 #include "plPipeline.h"
-#include "hsGDeviceRef.h"
+#include "plPipeline/hsGDeviceRef.h"
 #include "plProfile.h"
 
 #include "plVertCoder.h"

Sources/Plasma/PubUtilLib/plDrawable/plParticleFiller.cpp

@@ -53,7 +53,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 // Getting at the destination data
 #include "pnSceneObject/plDrawInterface.h"
 #include "plDrawable/plDrawableSpans.h"
-#include "plPipeline/plGBufferGroup.h"
+#include "plGBufferGroup.h"
 
 // For shading
 #include "plGLight/plLightInfo.h"

Sources/Plasma/PubUtilLib/plDrawable/plSpanTypes.cpp

@@ -53,7 +53,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plSpanTypes.h"
 #include "hsStream.h"
 #include "pnKeyedObject/plKey.h"
-#include "plPipeline/plGBufferGroup.h"
+#include "plGBufferGroup.h"
 #include "plPipeline/hsGDeviceRef.h"
 #include "plGLight/plLightInfo.h"
 #include "plDrawable.h"

Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt

@@ -18,14 +18,12 @@ set(plPipeline_SOURCES
     plDTProgressMgr.cpp
     plDynamicEnvMap.cpp
     plFogEnvironment.cpp
-    plGBufferGroup.cpp
     plPlates.cpp
     plRenderTarget.cpp
     plStatusLogDrawer.cpp
     plTextFont.cpp
     plTextGenerator.cpp
     plTransitionMgr.cpp
-    plVertCoder.cpp
 )
 
 set(plDXPipeline_SOURCES
@@ -55,7 +53,6 @@ set(plPipeline_HEADERS
     plDTProgressMgr.h
     plDynamicEnvMap.h
     plFogEnvironment.h
-    plGBufferGroup.h
     plPipeDebugFlags.h
     plPipelineCreatable.h
     plPipelineCreate.h
@@ -66,7 +63,6 @@ set(plPipeline_HEADERS
     plTextFont.h
     plTextGenerator.h
     plTransitionMgr.h
-    plVertCoder.h
 )
 
 set(plDXPipeline_HEADERS

Sources/Plasma/PubUtilLib/plPipeline/DX/plDXDeviceRefs.cpp

@@ -64,7 +64,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plDXLightRef.h"
 #include "plDXTextureRef.h"
 #include "plDXRenderTargetRef.h"
-#include "plPipeline/plGBufferGroup.h"
+#include "plDrawable/plGBufferGroup.h"
 #include "plDrawable/plGeometrySpan.h"
 #include "plDrawable/plDrawableSpans.h"
 #include "plGLight/plLightInfo.h"

Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPipeline.cpp

@@ -112,7 +112,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plPipeline/plDebugText.h"
 #include "plPipeline/plFogEnvironment.h"
 #include "plDXTextFont.h"
-#include "plPipeline/plGBufferGroup.h"
+#include "plDrawable/plGBufferGroup.h"
 #include "hsTimer.h"
 #include "plgDispatch.h"
 #include "plScene/plRenderRequest.h"

Sources/Plasma/PubUtilLib/plPipeline/DX/plDXVertexShader.cpp

@@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "plSurface/plShader.h"
 
-#include "plPipeline/plGBufferGroup.h"
+#include "plDrawable/plGBufferGroup.h"
 #include "plDXPipeline.h"
 
 plDXVertexShader::plDXVertexShader(plShader* owner)

Sources/Tools/MaxComponent/plParticleComponents.cpp

@@ -80,7 +80,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "MaxMain/MaxCompat.h"
 #include "pnKeyedObject/plKey.h"
 #include "plSurface/hsGMaterial.h"
-#include "plPipeline/plGBufferGroup.h"
+#include "plDrawable/plGBufferGroup.h"
 
 #include "plParticleSystem/plParticleSystem.h"
 #include "plParticleSystem/plParticleEmitter.h"

Sources/Tools/MaxConvert/plMeshConverter.cpp

@@ -78,7 +78,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "MaxPlasmaMtls/Materials/plPassMtl.h"
 #include "MaxPlasmaMtls/Materials/plCompositeMtlPB.h"
 #include "MaxPlasmaMtls/Materials/plPassMtlBasicPB.h"
-#include "plPipeline/plGBufferGroup.h"
+#include "plDrawable/plGBufferGroup.h"
 #include "plParticleSystem/plConvexVolume.h"
 #include "plDrawable/plGeoSpanDice.h"
 
@@ -2555,4 +2555,4 @@ void SetWaterColor(hsTArray<plGeometrySpan*>& spans)
     int i;
     for( i = 0; i < spans.GetCount(); i++ )
         SetWaterColor(spans[i]);
-}
+}