Move hsGDeviceRef to pnNucleusInc.

10 years ago · 4b7ae4d7d2
22 changed files with 20 additions and 23 deletions
--- a/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp
+++ b/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp
@ -67,7 +67,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfMessage/pfGUINotifyMsg.h"
 #include "plGImage/plMipmap.h"
 #include "plGImage/plDynamicTextMap.h"
-#include "plPipeline/hsGDeviceRef.h"
+#include "hsGDeviceRef.h"
 #include "plMessage/plAnimCmdMsg.h"
 #include "pnKeyedObject/plFixedKey.h"
 #include "pnMessage/plRefMsg.h"
--- a/Sources/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.cpp
+++ b/Sources/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.cpp
@ -58,7 +58,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plAudio/plWin32VideoSound.h"
 #include "plGImage/plMipmap.h"
 #include "pnKeyedObject/plUoid.h"
-#include "plPipeline/hsGDeviceRef.h"
+#include "hsGDeviceRef.h"
 #include "plPipeline/plPlates.h"
 #include "plResMgr/plLocalization.h"
 #include "plStatusLog/plStatusLog.h"
--- a/Sources/Plasma/FeatureLib/pfSurface/plLayerMovie.cpp
+++ b/Sources/Plasma/FeatureLib/pfSurface/plLayerMovie.cpp
@ -44,11 +44,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plLayerMovie.h"
 #include "hsStream.h"
 #include "hsResMgr.h"
-
+#include "hsGDeviceRef.h"

 #include "plMessage/plAnimCmdMsg.h"
 #include "plGImage/plMipmap.h"
-#include "plPipeline/hsGDeviceRef.h"

 plLayerMovie::plLayerMovie()
 :   fCurrentFrame(-1),
--- a/Sources/Plasma/NucleusLib/inc/CMakeLists.txt
+++ b/Sources/Plasma/NucleusLib/inc/CMakeLists.txt
@ -3,6 +3,7 @@ include_directories("../../NucleusLib")
 include_directories("../../NucleusLib/inc")

 set(pnNucleusInc_HEADERS
+    hsGDeviceRef.h
    hsGMatState.h
    hsGMatState.inl
    hsResMgr.h
--- a/Sources/Plasma/PubUtilLib/plPipeline/hsGDeviceRef.h
+++ b/Sources/Plasma/PubUtilLib/plPipeline/hsGDeviceRef.h
--- a/Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.cpp
+++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.cpp
@ -53,7 +53,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfMessage/plClothingMsg.h"
 #include "plMessage/plRenderMsg.h"
 #include "plGImage/plMipmap.h"
-#include "plPipeline/hsGDeviceRef.h"
+#include "hsGDeviceRef.h"
 #include "plPipeline/plRenderTarget.h"
 #include "plPipeline.h"
 #include "plClothingLayout.h"
--- a/Sources/Plasma/PubUtilLib/plDrawable/plAccessGeometry.cpp
+++ b/Sources/Plasma/PubUtilLib/plDrawable/plAccessGeometry.cpp
@ -58,7 +58,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com

 // For dipping directly into device buffers.
 #include "plGBufferGroup.h"
-#include "plPipeline/hsGDeviceRef.h"
+#include "hsGDeviceRef.h"
 #include "plPipeline.h"

 #include "plTweak.h"
--- a/Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpans.cpp
+++ b/Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpans.cpp
@ -78,7 +78,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plSurface/hsGMaterial.h"
 #include "plSurface/plLayerInterface.h"
 #include "plPipeline/plFogEnvironment.h"
-#include "plPipeline/hsGDeviceRef.h"
+#include "hsGDeviceRef.h"
 #include "pnMessage/plRefMsg.h"
 #include "pnMessage/plNodeRefMsg.h" 
 #include "pnMessage/plDISpansMsg.h"
--- a/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.cpp
+++ b/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.cpp
@ -67,7 +67,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plSurface/plLayerInterface.h"
 #include "plScene/plPageTreeMgr.h"

-#include "plPipeline/hsGDeviceRef.h"
+#include "hsGDeviceRef.h"

 #include "plMessage/plAgeLoadedMsg.h"
 #include "plMessage/plDynaDecalEnableMsg.h"
--- a/Sources/Plasma/PubUtilLib/plDrawable/plGBufferGroup.cpp
+++ b/Sources/Plasma/PubUtilLib/plDrawable/plGBufferGroup.cpp
@ -58,7 +58,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plSurface/hsGMaterial.h"
 #include "plGeometrySpan.h"
 #include "plPipeline.h"
-#include "plPipeline/hsGDeviceRef.h"
+#include "hsGDeviceRef.h"
 #include "plProfile.h"

 #include "plVertCoder.h"
--- a/Sources/Plasma/PubUtilLib/plDrawable/plSpanTypes.cpp
+++ b/Sources/Plasma/PubUtilLib/plDrawable/plSpanTypes.cpp
@ -54,7 +54,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsStream.h"
 #include "pnKeyedObject/plKey.h"
 #include "plGBufferGroup.h"
-#include "plPipeline/hsGDeviceRef.h"
+#include "hsGDeviceRef.h"
 #include "plGLight/plLightInfo.h"
 #include "plDrawable.h"
 #include "plAuxSpan.h"
--- a/Sources/Plasma/PubUtilLib/plGImage/plBitmap.cpp
+++ b/Sources/Plasma/PubUtilLib/plGImage/plBitmap.cpp
@ -57,8 +57,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com

 #include "hsResMgr.h"
 #include "hsStream.h"
+#include "hsGDeviceRef.h"
 #include "pnKeyedObject/plKey.h"
-#include "plPipeline/hsGDeviceRef.h"


 //// Static Members ///////////////////////////////////////////////////////////
--- a/Sources/Plasma/PubUtilLib/plGImage/plDynamicTextMap.cpp
+++ b/Sources/Plasma/PubUtilLib/plGImage/plDynamicTextMap.cpp
@ -58,7 +58,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsExceptions.h"

 #include "hsMatrix44.h"
-#include "plPipeline/hsGDeviceRef.h"
+#include "hsGDeviceRef.h"
 #include "plMessage/plDynamicTextMsg.h"
 #include "pnKeyedObject/plKey.h"
 #include "plProfile.h"
--- a/Sources/Plasma/PubUtilLib/plGImage/plLODMipmap.cpp
+++ b/Sources/Plasma/PubUtilLib/plGImage/plLODMipmap.cpp
@ -44,12 +44,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plLODMipmap.h"

 #include "hsResMgr.h"
+#include "hsGDeviceRef.h"
 #include "pnKeyedObject/plKey.h"
 #include "pnKeyedObject/plUoid.h"
 #include "pnMessage/plRefMsg.h"

-#include "plPipeline/hsGDeviceRef.h"
-

 plLODMipmap::plLODMipmap() 
 :   fBase(nil), 
--- a/Sources/Plasma/PubUtilLib/plGImage/plMipmap.cpp
+++ b/Sources/Plasma/PubUtilLib/plGImage/plMipmap.cpp
@ -57,7 +57,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsExceptions.h"

 #include "hsColorRGBA.h"
-#include "plPipeline/hsGDeviceRef.h"
+#include "hsGDeviceRef.h"
 #include "plProfile.h"
 #include "plJPEG.h"
 #include <cmath>
--- a/Sources/Plasma/PubUtilLib/plGLight/plLightInfo.cpp
+++ b/Sources/Plasma/PubUtilLib/plGLight/plLightInfo.cpp
@ -52,7 +52,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plDrawable/plSpaceTree.h"
 #include "plDrawable/plDrawableGenerator.h"
 #include "plDrawable/plDrawableSpans.h"
-#include "plPipeline/hsGDeviceRef.h"
+#include "hsGDeviceRef.h"
 #include "plPipeline/plRenderTarget.h"
 #include "hsFastMath.h"
 #include "pnSceneObject/plDrawInterface.h"
--- a/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt
+++ b/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt
@ -41,7 +41,6 @@ set(plPipeline_HEADERS
    hsFogControl.h
    hsG3DDeviceSelector.h
    hsGColorizer.h
-    hsGDeviceRef.h
    hsWinRef.h
    plCaptureRender.h
    plCubicRenderTarget.h
--- a/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXDeviceRef.h
+++ b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXDeviceRef.h
@ -54,7 +54,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define _plDXDeviceRef_h

 #include "HeadSpin.h"
-#include "plPipeline/hsGDeviceRef.h"
+#include "hsGDeviceRef.h"


 //// Definition ///////////////////////////////////////////////////////////////
--- a/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPipeline.h
+++ b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPipeline.h
@ -52,7 +52,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsGeometry3.h"
 #include "hsTemplates.h"
 #include "hsColorRGBA.h"
-#include "plPipeline/hsGDeviceRef.h"
+#include "hsGDeviceRef.h"
 #include "hsPoint2.h"

 class plAccessSpan;
--- a/Sources/Plasma/PubUtilLib/plPipeline/plTextGenerator.cpp
+++ b/Sources/Plasma/PubUtilLib/plPipeline/plTextGenerator.cpp
@ -57,7 +57,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pnKeyedObject/hsKeyedObject.h"
 #include "plTextGenerator.h"
 #include "plGImage/plMipmap.h"
-#include "plPipeline/hsGDeviceRef.h"
+#include "hsGDeviceRef.h"
 #include "pnMessage/plRefMsg.h"

 #include "plgDispatch.h"
--- a/Sources/Plasma/PubUtilLib/plSurface/plLayer.cpp
+++ b/Sources/Plasma/PubUtilLib/plSurface/plLayer.cpp
@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsGMatState.inl"
 #include "plMessage/plLayRefMsg.h"
 #include "plGImage/plBitmap.h"
-#include "plPipeline/hsGDeviceRef.h"
+#include "hsGDeviceRef.h"
 #include "plShader.h"

 #include "plPipeline.h"
--- a/Sources/Plasma/PubUtilLib/plSurface/plShader.cpp
+++ b/Sources/Plasma/PubUtilLib/plSurface/plShader.cpp
@ -48,8 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsStream.h"
 #include "hsMatrix44.h"
 #include "hsColorRGBA.h"
-
-#include "plPipeline/hsGDeviceRef.h"
+#include "hsGDeviceRef.h"


 // Little shader const helper