From 4b7ae4d7d27311a72b3e344ede10baaad0d7728d Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Mon, 13 Jul 2015 22:42:19 -0700 Subject: [PATCH] Move hsGDeviceRef to pnNucleusInc. --- Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp | 2 +- Sources/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.cpp | 2 +- Sources/Plasma/FeatureLib/pfSurface/plLayerMovie.cpp | 3 +-- Sources/Plasma/NucleusLib/inc/CMakeLists.txt | 1 + .../{PubUtilLib/plPipeline => NucleusLib/inc}/hsGDeviceRef.h | 0 Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.cpp | 2 +- Sources/Plasma/PubUtilLib/plDrawable/plAccessGeometry.cpp | 2 +- Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpans.cpp | 2 +- Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.cpp | 2 +- Sources/Plasma/PubUtilLib/plDrawable/plGBufferGroup.cpp | 2 +- Sources/Plasma/PubUtilLib/plDrawable/plSpanTypes.cpp | 2 +- Sources/Plasma/PubUtilLib/plGImage/plBitmap.cpp | 2 +- Sources/Plasma/PubUtilLib/plGImage/plDynamicTextMap.cpp | 2 +- Sources/Plasma/PubUtilLib/plGImage/plLODMipmap.cpp | 3 +-- Sources/Plasma/PubUtilLib/plGImage/plMipmap.cpp | 2 +- Sources/Plasma/PubUtilLib/plGLight/plLightInfo.cpp | 2 +- Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt | 1 - Sources/Plasma/PubUtilLib/plPipeline/DX/plDXDeviceRef.h | 2 +- Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPipeline.h | 2 +- Sources/Plasma/PubUtilLib/plPipeline/plTextGenerator.cpp | 2 +- Sources/Plasma/PubUtilLib/plSurface/plLayer.cpp | 2 +- Sources/Plasma/PubUtilLib/plSurface/plShader.cpp | 3 +-- 22 files changed, 20 insertions(+), 23 deletions(-) rename Sources/Plasma/{PubUtilLib/plPipeline => NucleusLib/inc}/hsGDeviceRef.h (100%) diff --git a/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp b/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp index 48630a7f..e25f6fe4 100644 --- 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" diff --git a/Sources/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.cpp b/Sources/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.cpp index 91c97a90..afabb63e 100644 --- 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" diff --git a/Sources/Plasma/FeatureLib/pfSurface/plLayerMovie.cpp b/Sources/Plasma/FeatureLib/pfSurface/plLayerMovie.cpp index a5a4d00a..d7c1a9ee 100644 --- 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), diff --git a/Sources/Plasma/NucleusLib/inc/CMakeLists.txt b/Sources/Plasma/NucleusLib/inc/CMakeLists.txt index a37a1492..f9d175e6 100644 --- 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 diff --git a/Sources/Plasma/PubUtilLib/plPipeline/hsGDeviceRef.h b/Sources/Plasma/NucleusLib/inc/hsGDeviceRef.h similarity index 100% rename from Sources/Plasma/PubUtilLib/plPipeline/hsGDeviceRef.h rename to Sources/Plasma/NucleusLib/inc/hsGDeviceRef.h diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.cpp index f78cc5b4..b8c99788 100644 --- 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" diff --git a/Sources/Plasma/PubUtilLib/plDrawable/plAccessGeometry.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plAccessGeometry.cpp index b59fdcae..f5c1c97f 100644 --- 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" diff --git a/Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpans.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpans.cpp index 66bb4588..792ac2fe 100644 --- 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" diff --git a/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.cpp index 1d14eb3e..6866a2c9 100644 --- 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" diff --git a/Sources/Plasma/PubUtilLib/plDrawable/plGBufferGroup.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plGBufferGroup.cpp index be980d3d..3356ad2b 100644 --- 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" diff --git a/Sources/Plasma/PubUtilLib/plDrawable/plSpanTypes.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plSpanTypes.cpp index 7e29a848..eb80321e 100644 --- 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" diff --git a/Sources/Plasma/PubUtilLib/plGImage/plBitmap.cpp b/Sources/Plasma/PubUtilLib/plGImage/plBitmap.cpp index a50d611c..d659cdb1 100644 --- 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 /////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plGImage/plDynamicTextMap.cpp b/Sources/Plasma/PubUtilLib/plGImage/plDynamicTextMap.cpp index 130936e9..ebe526cb 100644 --- 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" diff --git a/Sources/Plasma/PubUtilLib/plGImage/plLODMipmap.cpp b/Sources/Plasma/PubUtilLib/plGImage/plLODMipmap.cpp index c593fe01..34465a4c 100644 --- 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), diff --git a/Sources/Plasma/PubUtilLib/plGImage/plMipmap.cpp b/Sources/Plasma/PubUtilLib/plGImage/plMipmap.cpp index 10c6a442..2300efc9 100644 --- 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 diff --git a/Sources/Plasma/PubUtilLib/plGLight/plLightInfo.cpp b/Sources/Plasma/PubUtilLib/plGLight/plLightInfo.cpp index 73721929..5199f159 100644 --- 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" diff --git a/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt index 869d8455..c676d085 100644 --- 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 diff --git a/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXDeviceRef.h b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXDeviceRef.h index d907035b..18b9da96 100644 --- 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 /////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPipeline.h b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPipeline.h index 4db91f59..c584042a 100644 --- 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; diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plTextGenerator.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plTextGenerator.cpp index d5780262..1d1f6021 100644 --- 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" diff --git a/Sources/Plasma/PubUtilLib/plSurface/plLayer.cpp b/Sources/Plasma/PubUtilLib/plSurface/plLayer.cpp index 9a32682f..67f392bd 100644 --- 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" diff --git a/Sources/Plasma/PubUtilLib/plSurface/plShader.cpp b/Sources/Plasma/PubUtilLib/plSurface/plShader.cpp index 26e4bc94..ce7c5f68 100644 --- 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