From 24fa42f9ab1700d4d9cd0d30142067b615733c1c Mon Sep 17 00:00:00 2001 From: Zrax Date: Thu, 7 Apr 2011 23:37:07 -0700 Subject: [PATCH] PubUtilLib Part IV (cherry picked from commit 3bf6b7e182396f613859a18cb6dcf484727f6226) --- CMakeLists.txt | 4 + Sources/Plasma/PubUtilLib/CMakeLists.txt | 39 +++++---- .../Plasma/PubUtilLib/inc/plAllCreatables.h | 54 ++++++------- .../PubUtilLib/plNetCommon/plNetMember.h | 2 +- .../PubUtilLib/plNetGameLib/CMakeLists.txt | 68 ++++++++-------- .../PubUtilLib/plNetMessage/CMakeLists.txt | 22 +++++ .../PubUtilLib/plNetMessage/plNetMessage.cpp | 22 ++--- .../plNetMessage/plNetMessageCreatable.h | 2 +- .../plNetMessage/plNetMsgHelpers.cpp | 10 +-- .../PubUtilLib/plNetMessage/plNetMsgHelpers.h | 12 +-- .../PubUtilLib/plNetTransport/CMakeLists.txt | 21 +++++ .../plNetTransport/plNetTransport.cpp | 4 +- .../plNetTransport/plNetTransportMember.h | 4 +- .../plParticleSystem/CMakeLists.txt | 34 ++++++++ .../plParticleSystem/plBoundInterface.h | 2 +- .../plParticleSystem/plConvexVolume.h | 2 +- .../PubUtilLib/plParticleSystem/plParticle.h | 2 +- .../plParticleSystem/plParticleApplicator.cpp | 8 +- .../plParticleSystem/plParticleApplicator.h | 4 +- .../plParticleSystem/plParticleCreatable.h | 2 +- .../plParticleSystem/plParticleEffect.cpp | 4 +- .../plParticleSystem/plParticleEffect.h | 2 +- .../plParticleSystem/plParticleEmitter.cpp | 12 +-- .../plParticleSystem/plParticleEmitter.h | 4 +- .../plParticleSystem/plParticleGenerator.cpp | 8 +- .../plParticleSystem/plParticleGenerator.h | 2 +- .../plParticleSystem/plParticleSDLMod.cpp | 6 +- .../plParticleSystem/plParticleSDLMod.h | 2 +- .../plParticleSystem/plParticleSystem.cpp | 20 ++--- .../plParticleSystem/plParticleSystem.h | 8 +- .../PubUtilLib/plPhysical/CMakeLists.txt | 33 ++++++++ .../plPhysical/plCollisionDetector.cpp | 36 +++++---- .../plPhysical/plDetectorModifier.h | 4 +- .../plPhysical/plPhysicalCreatable.h | 2 +- .../PubUtilLib/plPhysical/plPhysicalProxy.cpp | 12 +-- .../PubUtilLib/plPhysical/plPhysicalProxy.h | 2 +- .../plPhysical/plPhysicalSDLModifier.cpp | 12 +-- .../plPhysical/plPhysicalSDLModifier.h | 2 +- .../plPhysical/plPhysicalSndGroup.cpp | 6 +- .../plPhysical/plPhysicalSndGroup.h | 4 +- .../plPhysical/plPhysicsSoundMgr.cpp | 8 +- .../plPhysical/plPickingDetector.cpp | 16 ++-- .../PubUtilLib/plProgressMgr/CMakeLists.txt | 17 ++++ .../Plasma/PubUtilLib/plResMgr/CMakeLists.txt | 39 +++++++++ .../PubUtilLib/plResMgr/plKeyFinder.cpp | 2 +- .../Plasma/PubUtilLib/plResMgr/plKeyFinder.h | 4 +- .../PubUtilLib/plResMgr/plLocalization.cpp | 2 +- .../Plasma/PubUtilLib/plResMgr/plPageInfo.cpp | 2 +- .../Plasma/PubUtilLib/plResMgr/plPageInfo.h | 2 +- .../PubUtilLib/plResMgr/plRegistryHelpers.h | 2 +- .../PubUtilLib/plResMgr/plRegistryKeyList.h | 2 +- .../PubUtilLib/plResMgr/plRegistryNode.cpp | 8 +- .../PubUtilLib/plResMgr/plResManager.cpp | 32 ++++---- .../plResMgr/plResManagerHelper.cpp | 20 ++--- .../PubUtilLib/plResMgr/plResManagerHelper.h | 2 +- .../PubUtilLib/plResMgr/plResMgrCreatable.h | 2 +- .../Plasma/PubUtilLib/plResMgr/plVersion.cpp | 2 +- .../Plasma/PubUtilLib/plSDL/CMakeLists.txt | 39 +++++++++ Sources/Plasma/PubUtilLib/plSDL/plSDL.h | 8 +- Sources/Plasma/PubUtilLib/plSDL/plSDLMgr.cpp | 4 +- .../Plasma/PubUtilLib/plSDL/plSDLParser.cpp | 8 +- .../plSDL/plStateChangeNotifier.cpp | 4 +- .../PubUtilLib/plSDL/plStateDataRecord.cpp | 4 +- .../PubUtilLib/plSDL/plStateDescriptor.cpp | 2 +- .../PubUtilLib/plSDL/plStateVariable.cpp | 24 +++--- .../PubUtilLib/plSDL/plVarDescriptor.cpp | 8 +- .../Plasma/PubUtilLib/plScene/CMakeLists.txt | 38 +++++++++ .../Plasma/PubUtilLib/plScene/plOccluder.cpp | 12 +-- .../Plasma/PubUtilLib/plScene/plOccluder.h | 2 +- .../PubUtilLib/plScene/plOccluderProxy.cpp | 6 +- .../PubUtilLib/plScene/plOccluderProxy.h | 2 +- .../PubUtilLib/plScene/plPageTreeMgr.cpp | 8 +- .../PubUtilLib/plScene/plPostEffectMod.cpp | 12 +-- .../PubUtilLib/plScene/plPostEffectMod.h | 2 +- .../PubUtilLib/plScene/plRelevanceMgr.cpp | 2 +- .../PubUtilLib/plScene/plRelevanceMgr.h | 2 +- .../PubUtilLib/plScene/plRelevanceRegion.cpp | 2 +- .../PubUtilLib/plScene/plRelevanceRegion.h | 2 +- .../PubUtilLib/plScene/plRenderRequest.cpp | 4 +- .../PubUtilLib/plScene/plRenderRequest.h | 4 +- .../PubUtilLib/plScene/plSceneCreatable.h | 2 +- .../Plasma/PubUtilLib/plScene/plSceneNode.cpp | 22 ++--- .../Plasma/PubUtilLib/plScene/plSceneNode.h | 2 +- Sources/Plasma/PubUtilLib/plScene/plVisMgr.h | 2 +- .../Plasma/PubUtilLib/plScene/plVisRegion.cpp | 4 +- .../Plasma/PubUtilLib/plScene/plVisRegion.h | 2 +- .../PubUtilLib/plSockets/CMakeLists.txt | 34 ++++++++ .../plSockets/plOutgoingUdpSocket.cpp | 2 +- .../plSockets/plTcpListenSocket.cpp | 2 +- .../PubUtilLib/plSockets/plTcpSocket.cpp | 2 +- .../PubUtilLib/plStatGather/CMakeLists.txt | 24 ++++++ .../PubUtilLib/plStatGather/plAutoProfile.cpp | 40 ++++----- .../PubUtilLib/plStatGather/plAutoProfile.h | 2 +- .../plStatGather/plCalculatedProfiles.cpp | 2 +- .../plStatGather/plProfileManagerFull.cpp | 12 +-- .../PubUtilLib/plStatusLog/CMakeLists.txt | 21 +++++ .../PubUtilLib/plStatusLog/plStatusLog.cpp | 14 ++-- .../PubUtilLib/plStreamLogger/CMakeLists.txt | 16 ++++ .../PubUtilLib/plSurface/CMakeLists.txt | 81 +++++++++++++++++++ .../PubUtilLib/plSurface/hsGMaterial.cpp | 2 +- .../PubUtilLib/plSurface/plGrassShaderMod.cpp | 26 +++--- .../PubUtilLib/plSurface/plGrassShaderMod.h | 2 +- .../Plasma/PubUtilLib/plSurface/plLayer.cpp | 10 +-- .../PubUtilLib/plSurface/plLayerAnimation.cpp | 26 +++--- .../PubUtilLib/plSurface/plLayerAnimation.h | 2 +- .../PubUtilLib/plSurface/plLayerInterface.cpp | 4 +- .../PubUtilLib/plSurface/plLayerInterface.h | 4 +- .../Plasma/PubUtilLib/plSurface/plShader.cpp | 2 +- .../Plasma/PubUtilLib/plSurface/plShader.h | 2 +- .../PubUtilLib/plSurface/plSurfaceCreatable.h | 2 +- .../PubUtilLib/plTransform/CMakeLists.txt | 21 +++++ .../PubUtilLib/plTransform/hsAffineParts.cpp | 2 +- .../Plasma/PubUtilLib/plUUID/CMakeLists.txt | 20 +++++ .../PubUtilLib/plUnifiedTime/CMakeLists.txt | 21 +++++ .../plUnifiedTime/plClientUnifiedTime.cpp | 4 +- .../Plasma/PubUtilLib/plVault/CMakeLists.txt | 30 +++++++ Sources/Plasma/PubUtilLib/plVault/Pch.h | 24 +++--- .../PubUtilLib/plVault/plDniCoordinateInfo.h | 2 +- Sources/Plasma/PubUtilLib/plVault/plVault.h | 8 +- 119 files changed, 940 insertions(+), 420 deletions(-) create mode 100644 Sources/Plasma/PubUtilLib/plNetMessage/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plNetTransport/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plParticleSystem/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plPhysical/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plProgressMgr/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plResMgr/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plSDL/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plScene/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plSockets/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plStatGather/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plStatusLog/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plStreamLogger/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plSurface/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plTransform/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plUUID/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plUnifiedTime/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plVault/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index f763e040..90101ddb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,10 @@ set(PLASMA_TARGETS Client set_property(CACHE PLASMA_TARGETS PROPERTY STRINGS "Client" "Server" "Patcher" "Ethereal" "NoAvMsgs") +if(PLASMA_TARGETS STREQUAL "Client") + add_definitions(-DCLIENT) +endif(PLASMA_TARGETS STREQUAL "Client") + if(PLASMA_TARGETS STREQUAL "Patcher") add_definitions(-DPATCHER) endif(PLASMA_TARGETS STREQUAL "Patcher") diff --git a/Sources/Plasma/PubUtilLib/CMakeLists.txt b/Sources/Plasma/PubUtilLib/CMakeLists.txt index 7bd7c42b..e8da53cc 100644 --- a/Sources/Plasma/PubUtilLib/CMakeLists.txt +++ b/Sources/Plasma/PubUtilLib/CMakeLists.txt @@ -29,26 +29,25 @@ add_subdirectory(plNetClientComm) add_subdirectory(plNetClientRecorder) #add_subdirectory(plNetCommon) # TODO: STLport add_subdirectory(plNetGameLib) -#add_subdirectory(plNetMessage) -#add_subdirectory(plNetTransport) -#add_subdirectory(plParticleSystem) -#add_subdirectory(plPhysical) -#add_subdirectory(plPhysX) -#add_subdirectory(plPipeline) -#add_subdirectory(plProgressMgr) -#add_subdirectory(plResMgr) -#add_subdirectory(plScene) -#add_subdirectory(plSDL) +add_subdirectory(plNetMessage) +add_subdirectory(plNetTransport) +add_subdirectory(plParticleSystem) +add_subdirectory(plPhysical) +#add_subdirectory(plPhysX) # TODO: PhysX +#add_subdirectory(plPipeline) # TODO: Bink, DirectX +add_subdirectory(plProgressMgr) +add_subdirectory(plResMgr) +add_subdirectory(plScene) +add_subdirectory(plSDL) #add_subdirectory(plSDLBrowser) # Not being used by any current slns -#add_subdirectory(plSockets) -#add_subdirectory(plStatGather) -#add_subdirectory(plStatusLog) -#add_subdirectory(plStreamLogger) -#add_subdirectory(plSurface) -#add_subdirectory(plTransform) -#add_subdirectory(plUnifiedTime) -#add_subdirectory(plUUID) -#add_subdirectory(plVault) +add_subdirectory(plSockets) +add_subdirectory(plStatGather) +add_subdirectory(plStatusLog) +add_subdirectory(plStreamLogger) +add_subdirectory(plSurface) +add_subdirectory(plTransform) +add_subdirectory(plUnifiedTime) +add_subdirectory(plUUID) +add_subdirectory(plVault) #add_subdirectory(plWinStrBlock) # Not being used by any current slns #add_subdirectory(plWndCtrls) # Not being used by any current slns -#add_subdirectory(PubUtilInc) diff --git a/Sources/Plasma/PubUtilLib/inc/plAllCreatables.h b/Sources/Plasma/PubUtilLib/inc/plAllCreatables.h index b3232877..ea68261f 100644 --- a/Sources/Plasma/PubUtilLib/inc/plAllCreatables.h +++ b/Sources/Plasma/PubUtilLib/inc/plAllCreatables.h @@ -43,33 +43,33 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAllCreatables_inc #define plAllCreatables_inc -#include "../plGImage/plGImageCreatable.h" -#include "../plGLight/plGLightCreatable.h" -#include "../plInterp/plInterpCreatable.h" -#include "../plInputCore/plInputCoreCreatable.h" -#include "../plPipeline/plPipelineCreatable.h" -#include "../plResMgr/plResMgrCreatable.h" -#include "../plSurface/plSurfaceCreatable.h" -#include "../plNetClient/plNetClientCreatable.h" -#include "../plNetClientComm/plNetClientCommCreatable.h" -#include "../plMessage/plMessageCreatable.h" -#include "../plAudible/plAudibleCreatable.h" -#include "../plDrawable/plDrawableCreatable.h" -#include "../plPhysical/plPhysicalCreatable.h" -#include "../plModifier/plModifierCreatable.h" -#include "../plScene/plSceneCreatable.h" -#include "../plPhysX/plPhysXCreatable.h" -#include "../plAudio/plAudioCreatable.h" -#include "../plAudioCore/plAudioCoreCreatable.h" -#include "../plParticleSystem/plParticleCreatable.h" -#include "../plNetCommon/plNetCommonCreatable.h" -#include "../plVault/plVaultCreatable.h" -#include "../plAvatar/plAvatarCreatable.h" -#include "../plIntersect/plIntersectCreatable.h" -#include "../plNetMessage/plNetMessageCreatable.h" -#include "../plStatGather/plStatGatherCreatable.h" -#include "../plSDL/plSDLCreatable.h" -#include "../plAgeLoader/plAgeLoaderCreatable.h" +#include "plGImage/plGImageCreatable.h" +#include "plGLight/plGLightCreatable.h" +#include "plInterp/plInterpCreatable.h" +#include "plInputCore/plInputCoreCreatable.h" +#include "plPipeline/plPipelineCreatable.h" +#include "plResMgr/plResMgrCreatable.h" +#include "plSurface/plSurfaceCreatable.h" +#include "plNetClient/plNetClientCreatable.h" +#include "plNetClientComm/plNetClientCommCreatable.h" +#include "plMessage/plMessageCreatable.h" +#include "plAudible/plAudibleCreatable.h" +#include "plDrawable/plDrawableCreatable.h" +#include "plPhysical/plPhysicalCreatable.h" +#include "plModifier/plModifierCreatable.h" +#include "plScene/plSceneCreatable.h" +#include "plPhysX/plPhysXCreatable.h" +#include "plAudio/plAudioCreatable.h" +#include "plAudioCore/plAudioCoreCreatable.h" +#include "plParticleSystem/plParticleCreatable.h" +#include "plNetCommon/plNetCommonCreatable.h" +#include "plVault/plVaultCreatable.h" +#include "plAvatar/plAvatarCreatable.h" +#include "plIntersect/plIntersectCreatable.h" +#include "plNetMessage/plNetMessageCreatable.h" +#include "plStatGather/plStatGatherCreatable.h" +#include "plSDL/plSDLCreatable.h" +#include "plAgeLoader/plAgeLoaderCreatable.h" #endif // plAllCreatables_inc \ No newline at end of file diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetMember.h b/Sources/Plasma/PubUtilLib/plNetCommon/plNetMember.h index 1a7ed768..eca69514 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetMember.h +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plNetMember.h @@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsConfig.h" #include "hsUtils.h" #include "hsStlUtils.h" -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" class plNetApp; class plNetGenericServer; diff --git a/Sources/Plasma/PubUtilLib/plNetGameLib/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plNetGameLib/CMakeLists.txt index b955b145..094b38dc 100644 --- a/Sources/Plasma/PubUtilLib/plNetGameLib/CMakeLists.txt +++ b/Sources/Plasma/PubUtilLib/plNetGameLib/CMakeLists.txt @@ -1,35 +1,33 @@ -include_directories("../../CoreLib") -include_directories("../../NucleusLib/inc") -include_directories("../../NucleusLib") -include_directories("../../PubUtilLib") - -include_directories(${OPENSSL_INCLUDE_DIR}) - -set(plNetGameLib_PRIVATE - Private/plNglAllIncludes.h - Private/plNglAuth.h - Private/plNglAuth.cpp - Private/plNglCore.h - Private/plNglCore.cpp - Private/plNglCsr.h - Private/plNglCsr.cpp - Private/plNglFile.h - Private/plNglFile.cpp - Private/plNglGame.h - Private/plNglGame.cpp - Private/plNglGateKeeper.h - Private/plNglGateKeeper.cpp - Private/plNglMisc.cpp - Private/plNglTrans.cpp -) - -set(plNetGameLib_HEADERS - Intern.h - Pch.h - plNetGameLib.h -) - -add_library(plNetGameLib STATIC ${plNetGameLib_PRIVATE} ${plNetGameLib_HEADERS}) - -source_group("Private" FILES ${plNetGameLib_PRIVATE}) -source_group("Header Files" FILES ${plNetGameLib_HEADERS}) +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plNetGameLib_PRIVATE + Private/plNglAllIncludes.h + Private/plNglAuth.h + Private/plNglAuth.cpp + Private/plNglCore.h + Private/plNglCore.cpp + Private/plNglCsr.h + Private/plNglCsr.cpp + Private/plNglFile.h + Private/plNglFile.cpp + Private/plNglGame.h + Private/plNglGame.cpp + Private/plNglGateKeeper.h + Private/plNglGateKeeper.cpp + Private/plNglMisc.cpp + Private/plNglTrans.cpp +) + +set(plNetGameLib_HEADERS + Intern.h + Pch.h + plNetGameLib.h +) + +add_library(plNetGameLib STATIC ${plNetGameLib_PRIVATE} ${plNetGameLib_HEADERS}) + +source_group("Private" FILES ${plNetGameLib_PRIVATE}) +source_group("Header Files" FILES ${plNetGameLib_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plNetMessage/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plNetMessage/CMakeLists.txt new file mode 100644 index 00000000..6252b877 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plNetMessage/CMakeLists.txt @@ -0,0 +1,22 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plNetMessage_SOURCES + plNetMessage.cpp + plNetMsgHelpers.cpp +) + +set(plNetMessage_HEADERS + plNetCommonMessage.h + plNetMessage.h + plNetMessageCreatable.h + plNetMsgHelpers.h + plNetMsgVersion.h +) + +add_library(plNetMessage STATIC ${plNetMessage_SOURCES} ${plNetMessage_HEADERS}) + +source_group("Source Files" FILES ${plNetMessage_SOURCES}) +source_group("Header Files" FILES ${plNetMessage_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plNetMessage/plNetMessage.cpp b/Sources/Plasma/PubUtilLib/plNetMessage/plNetMessage.cpp index 030fb068..9cf3517e 100644 --- a/Sources/Plasma/PubUtilLib/plNetMessage/plNetMessage.cpp +++ b/Sources/Plasma/PubUtilLib/plNetMessage/plNetMessage.cpp @@ -46,17 +46,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNetMsgVersion.h" #include "plCreatableIndex.h" -#include "../pnKeyedObject/plKeyImp.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnNetCommon/plNetSharedState.h" -#include "../pnMessage/plMessage.h" -#include "../pnNetCommon/pnNetCommon.h" -#include "../pnNetCommon/plGenericVar.h" -#include "../pnFactory/plFactory.h" - -#include "../plVault/plVault.h" -#include "../plNetCommon/plNetCommon.h" -#include "../plSDL/plSDL.h" +#include "pnKeyedObject/plKeyImp.h" +#include "pnKeyedObject/plKey.h" +#include "pnNetCommon/plNetSharedState.h" +#include "pnMessage/plMessage.h" +#include "pnNetCommon/pnNetCommon.h" +#include "pnNetCommon/plGenericVar.h" +#include "pnFactory/plFactory.h" + +#include "plVault/plVault.h" +#include "plNetCommon/plNetCommon.h" +#include "plSDL/plSDL.h" #if defined(HS_BUILD_FOR_UNIX) #include diff --git a/Sources/Plasma/PubUtilLib/plNetMessage/plNetMessageCreatable.h b/Sources/Plasma/PubUtilLib/plNetMessage/plNetMessageCreatable.h index a2d7fc51..9a88f844 100644 --- a/Sources/Plasma/PubUtilLib/plNetMessage/plNetMessageCreatable.h +++ b/Sources/Plasma/PubUtilLib/plNetMessage/plNetMessageCreatable.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // kept separate for a reason -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plNetMessage.h" // NON CREATABLES diff --git a/Sources/Plasma/PubUtilLib/plNetMessage/plNetMsgHelpers.cpp b/Sources/Plasma/PubUtilLib/plNetMessage/plNetMsgHelpers.cpp index c9cb6023..040ecce8 100644 --- a/Sources/Plasma/PubUtilLib/plNetMessage/plNetMsgHelpers.cpp +++ b/Sources/Plasma/PubUtilLib/plNetMessage/plNetMsgHelpers.cpp @@ -41,11 +41,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plNetMsgHelpers.h" #include "plNetMessage.h" -#include "../plCompression/plZlibCompress.h" -#include "../pnNetCommon/plNetServers.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnMessage/plMessage.h" +#include "plCompression/plZlibCompress.h" +#include "pnNetCommon/plNetServers.h" +#include "pnNetCommon/plNetApp.h" +#include "pnKeyedObject/plKey.h" +#include "pnMessage/plMessage.h" #include "hsStream.h" #include diff --git a/Sources/Plasma/PubUtilLib/plNetMessage/plNetMsgHelpers.h b/Sources/Plasma/PubUtilLib/plNetMessage/plNetMsgHelpers.h index 4bfbfd17..56cc4b2c 100644 --- a/Sources/Plasma/PubUtilLib/plNetMessage/plNetMsgHelpers.h +++ b/Sources/Plasma/PubUtilLib/plNetMessage/plNetMsgHelpers.h @@ -51,12 +51,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsUtils.h" #include "hsStream.h" #include "hsStlUtils.h" -#include "../pnNetCommon/pnNetCommon.h" -#include "../pnFactory/plCreatable.h" -#include "../pnKeyedObject/plUoid.h" -#include "../pnKeyedObject/plKey.h" -#include "../plUnifiedTime/plUnifiedTime.h" -#include "../plNetCommon/plClientGuid.h" +#include "pnNetCommon/pnNetCommon.h" +#include "pnFactory/plCreatable.h" +#include "pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plKey.h" +#include "plUnifiedTime/plUnifiedTime.h" +#include "plNetCommon/plClientGuid.h" #include class plKey; diff --git a/Sources/Plasma/PubUtilLib/plNetTransport/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plNetTransport/CMakeLists.txt new file mode 100644 index 00000000..c2032867 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plNetTransport/CMakeLists.txt @@ -0,0 +1,21 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +include_directories(${OPENSSL_INCLUDE_DIR}) + +set(plNetTransport_SOURCES + plNetTransport.cpp + plNetTransportMember.cpp +) + +set(plNetTransport_HEADERS + plNetTransport.h + plNetTransportMember.h +) + +add_library(plNetTransport STATIC ${plNetTransport_SOURCES} ${plNetTransport_HEADERS}) + +source_group("Source Files" FILES ${plNetTransport_SOURCES}) +source_group("Header Files" FILES ${plNetTransport_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransport.cpp b/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransport.cpp index d37033fb..77bdaa66 100644 --- a/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransport.cpp +++ b/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransport.cpp @@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTimer.h" #include "plNetTransport.h" #include "plNetTransportMember.h" -#include "../plNetMessage/plNetMessage.h" -#include "../plNetClient/plNetClientMgr.h" +#include "plNetMessage/plNetMessage.h" +#include "plNetClient/plNetClientMgr.h" #include plNetTransport::~plNetTransport() diff --git a/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransportMember.h b/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransportMember.h index b252e2e1..cbb87b78 100644 --- a/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransportMember.h +++ b/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransportMember.h @@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsConfig.h" #include "hsStlUtils.h" -#include "../plNetCommon/plNetMember.h" -#include "../pnKeyedObject/plKey.h" +#include "plNetCommon/plNetMember.h" +#include "pnKeyedObject/plKey.h" // // This represents a participant in the game, ie. another diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plParticleSystem/CMakeLists.txt new file mode 100644 index 00000000..24f2e5b2 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/CMakeLists.txt @@ -0,0 +1,34 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plParticleSystem_SOURCES + plBoundInterface.cpp + plConvexVolume.cpp + plParticleApplicator.cpp + plParticleEffect.cpp + plParticleEmitter.cpp + plParticleGenerator.cpp + plParticleSDLMod.cpp + plParticleSystem.cpp +) + +set(plParticleSystem_HEADERS + plBoundInterface.h + plConvexVolume.h + plEffectTargetInfo.h + plParticle.h + plParticleApplicator.h + plParticleCreatable.h + plParticleEffect.h + plParticleEmitter.h + plParticleGenerator.h + plParticleSDLMod.h + plParticleSystem.h +) + +add_library(plParticleSystem STATIC ${plParticleSystem_SOURCES} ${plParticleSystem_HEADERS}) + +source_group("Source Files" FILES ${plParticleSystem_SOURCES}) +source_group("Header Files" FILES ${plParticleSystem_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plBoundInterface.h b/Sources/Plasma/PubUtilLib/plParticleSystem/plBoundInterface.h index fc0722e9..9cbdef09 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plBoundInterface.h +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plBoundInterface.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plBoundInterface_inc #define plBoundInterface_inc -#include "../pnSceneObject/plObjInterface.h" +#include "pnSceneObject/plObjInterface.h" class plConvexVolume; struct hsMatrix44; diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plConvexVolume.h b/Sources/Plasma/PubUtilLib/plParticleSystem/plConvexVolume.h index 8677d172..7ad67238 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plConvexVolume.h +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plConvexVolume.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plConvexVolume_inc #define plConvexVolume_inc -#include "../pnSceneObject/plObjInterface.h" +#include "pnSceneObject/plObjInterface.h" struct hsPlane3; struct hsPoint3; diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticle.h b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticle.h index c5553dea..e4f4b8d7 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticle.h +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticle.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plParticle_inc #include "hsGeometry3.h" -#include "../CoreLib/hsColorRGBA.h" +#include "hsColorRGBA.h" // The meat of the particle. These classes, in combination with the plParticleEmitter that spawned it, // should contain everything specific to a particle, necessary to build a renderable poly to represent a diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleApplicator.cpp b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleApplicator.cpp index 84ec1a8f..72f07a27 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleApplicator.cpp +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleApplicator.cpp @@ -42,10 +42,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plParticleSystem.h" #include "plParticleGenerator.h" #include "plParticleApplicator.h" -#include "../plAvatar/plScalarChannel.h" -#include "../plAvatar/plAGModifier.h" -#include "../plMessage/plParticleUpdateMsg.h" -#include "../pnSceneObject/plSceneObject.h" +#include "plAvatar/plScalarChannel.h" +#include "plAvatar/plAGModifier.h" +#include "plMessage/plParticleUpdateMsg.h" +#include "pnSceneObject/plSceneObject.h" #define PI 3.14159 diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleApplicator.h b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleApplicator.h index c33fbe2c..11a16df2 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleApplicator.h +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleApplicator.h @@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PLPARTICLEAPPLICATOR_INC #define PLPARTICLEAPPLICATOR_INC -#include "../plAvatar/plAGChannel.h" -#include "../plAvatar/plAGApplicator.h" +#include "plAvatar/plAGChannel.h" +#include "plAvatar/plAGApplicator.h" class plParticleSystem; diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleCreatable.h b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleCreatable.h index 3cf5419e..f46a6fb7 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleCreatable.h +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plParticleCreatable_inc #define plParticleCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plParticleSystem.h" #include "plParticleEffect.h" diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEffect.cpp b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEffect.cpp index 6ed677d9..69463732 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEffect.cpp +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEffect.cpp @@ -49,9 +49,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "plPipeline.h" #include "hsFastMath.h" -#include "../plMath/plRandom.h" +#include "plMath/plRandom.h" #include "plParticleSystem.h" -#include "../plMessage/plParticleUpdateMsg.h" +#include "plMessage/plParticleUpdateMsg.h" /////////////////////////////////////////////////////////////////////////////////////////// plParticleCollisionEffect::plParticleCollisionEffect() diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEffect.h b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEffect.h index d4ca1412..7894734e 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEffect.h +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEffect.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plParticleEffect_inc #define plParticleEffect_inc -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include "hsMatrix44.h" class plEffectTargetInfo; diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEmitter.cpp b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEmitter.cpp index 0face349..3374e546 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEmitter.cpp +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEmitter.cpp @@ -42,17 +42,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsUtils.h" #include "hsResMgr.h" -#include "../pnMessage/plRefMsg.h" -#include "../plMessage/plParticleUpdateMsg.h" +#include "pnMessage/plRefMsg.h" +#include "plMessage/plParticleUpdateMsg.h" #include "plParticleGenerator.h" #include "plParticleEmitter.h" #include "plParticleSystem.h" #include "plParticle.h" #include "plParticleEffect.h" -#include "../CoreLib/hsColorRGBA.h" -#include "../plInterp/plController.h" -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plLayerInterface.h" +#include "hsColorRGBA.h" +#include "plInterp/plController.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plLayerInterface.h" #include "plProfile.h" #include "hsFastMath.h" diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEmitter.h b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEmitter.h index 04ad3ca1..2ebe9527 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEmitter.h +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEmitter.h @@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsGeometry3.h" #include "hsBounds.h" -#include "../pnNetCommon/plSynchedValue.h" -#include "../CoreLib/hsColorRGBA.h" +#include "pnNetCommon/plSynchedValue.h" +#include "hsColorRGBA.h" class hsBounds3Ext; class plParticleSystem; diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleGenerator.cpp b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleGenerator.cpp index 817457da..78899542 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleGenerator.cpp +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleGenerator.cpp @@ -48,11 +48,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plParticleSystem.h" #include "plParticleEmitter.h" #include "plParticleGenerator.h" -#include "../CoreLib/hsColorRGBA.h" -#include "../plMessage/plParticleUpdateMsg.h" -#include "../plInterp/plController.h" +#include "hsColorRGBA.h" +#include "plMessage/plParticleUpdateMsg.h" +#include "plInterp/plController.h" #include "hsResMgr.h" -#include "../plMath/plRandom.h" +#include "plMath/plRandom.h" static const hsScalar DEFAULT_INVERSE_MASS = 1.f; diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleGenerator.h b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleGenerator.h index 6a3e3a1f..55322a4b 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleGenerator.h +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleGenerator.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plParticleGenerator_inc #include "hsGeometry3.h" -#include "../pnNetCommon/plSynchedValue.h" +#include "pnNetCommon/plSynchedValue.h" class plParticleEmitter; class plScalarController; diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSDLMod.cpp b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSDLMod.cpp index 150205f5..57249dd4 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSDLMod.cpp +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSDLMod.cpp @@ -42,9 +42,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plParticleSDLMod.h" #include "plParticleSystem.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../plSDL/plSDL.h" -#include "../pnKeyedObject/plKey.h" +#include "pnSceneObject/plSceneObject.h" +#include "plSDL/plSDL.h" +#include "pnKeyedObject/plKey.h" // static vars char plParticleSDLMod::kStrNumParticles[]="numParticles"; diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSDLMod.h b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSDLMod.h index 68d5d3ff..7d1a360a 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSDLMod.h +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSDLMod.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plParticleSDLMod_inc #define plParticleSDLMod_inc -#include "../plModifier/plSDLModifier.h" +#include "plModifier/plSDLModifier.h" // // This modifier is responsible for sending and recving diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSystem.cpp b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSystem.cpp index f330c4db..ef8d51d9 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSystem.cpp +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSystem.cpp @@ -49,21 +49,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plgDispatch.h" #include "hsResMgr.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plDrawInterface.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnMessage/plTimeMsg.h" -#include "../plMessage/plRenderMsg.h" -#include "../plMessage/plAgeLoadedMsg.h" -#include "../plMessage/plParticleUpdateMsg.h" -#include "../plInterp/plController.h" -#include "../plSurface/hsGMaterial.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plDrawInterface.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnMessage/plTimeMsg.h" +#include "plMessage/plRenderMsg.h" +#include "plMessage/plAgeLoadedMsg.h" +#include "plMessage/plParticleUpdateMsg.h" +#include "plInterp/plController.h" +#include "plSurface/hsGMaterial.h" #include "plPipeline.h" #include "hsTimer.h" #include "plProfile.h" #include "plTweak.h" -#include "../plDrawable/plParticleFiller.h" +#include "plDrawable/plParticleFiller.h" plProfile_CreateCounter("Num Particles", "Particles", NumParticles); diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSystem.h b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSystem.h index 5e83257f..124e2811 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSystem.h +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSystem.h @@ -44,10 +44,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTemplates.h" #include "hsGeometry3.h" -#include "../../NucleusLib/pnModifier/plModifier.h" -#include "../pnNetCommon/plSynchedValue.h" -#include "../CoreLib/hsColorRGBA.h" -#include "../CoreLib/hsMatrix44.h" +#include "pnModifier/plModifier.h" +#include "pnNetCommon/plSynchedValue.h" +#include "hsColorRGBA.h" +#include "hsMatrix44.h" #include "plEffectTargetInfo.h" class plPipeline; diff --git a/Sources/Plasma/PubUtilLib/plPhysical/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plPhysical/CMakeLists.txt new file mode 100644 index 00000000..df927167 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plPhysical/CMakeLists.txt @@ -0,0 +1,33 @@ +include_directories("../../CoreLib") +include_directories("../../FeatureLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +include_directories(${OPENAL_INCLUDE_DIR}) + +set(plPhysical_SOURCES + plCollisionDetector.cpp + plPhysicalProxy.cpp + plPhysicalSDLModifier.cpp + plPhysicalSndGroup.cpp + plPhysicsSoundMgr.cpp + plPickingDetector.cpp +) + +set(plPhysical_HEADERS + plCollisionDetector.h + plDetectorModifier.h + plPhysicalCreatable.h + plPhysicalProxy.h + plPhysicalSDLModifier.h + plPhysicalSndGroup.h + plPhysicsSoundMgr.h + plPickingDetector.h + plSimDefs.h +) + +add_library(plPhysical STATIC ${plPhysical_SOURCES} ${plPhysical_HEADERS}) + +source_group("Source Files" FILES ${plPhysical_SOURCES}) +source_group("Header Files" FILES ${plPhysical_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.cpp b/Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.cpp index 212a2e37..d251d550 100644 --- a/Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.cpp +++ b/Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.cpp @@ -42,31 +42,39 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plCollisionDetector.h" -#include "../plMessage/plCollideMsg.h" +#include "plMessage/plCollideMsg.h" #include "plgDispatch.h" -#include "../plMessage/plActivatorMsg.h" -#include "../pnMessage/plCameraMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../plMessage/plInputIfaceMgrMsg.h" -#include "../pnInputCore/plControlEventCodes.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnNetCommon/plNetApp.h" -#include "../plNetClient/plNetLinkingMgr.h" +#include "plMessage/plActivatorMsg.h" +#include "pnMessage/plCameraMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "plMessage/plInputIfaceMgrMsg.h" +#include "pnInputCore/plControlEventCodes.h" +#include "pnNetCommon/plNetApp.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnNetCommon/plNetApp.h" +#include "plNetClient/plNetLinkingMgr.h" #include "plPhysical.h" -#include "../pnMessage/plPlayerPageMsg.h" -#include "../plMessage/plSimStateMsg.h" +#include "pnMessage/plPlayerPageMsg.h" +#include "plMessage/plSimStateMsg.h" +<<<<<<< HEAD:Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.cpp #include "../pnSceneObject/plCoordinateInterface.h" #include "../plAvatar/plArmatureMod.h" #include "../plAvatar/plAvatarMgr.h" #include "../plAvatar/plAvBrainHuman.h" #include "../plAvatar/plAvBrainDrive.h" #include "../plAvatar/plPhysicalControllerCore.h" - -#include "../plModifier/plDetectorLog.h" +======= +#include "pnSceneObject/plCoordinateInterface.h" +#include "plAvatar/plArmatureMod.h" +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plAvBrainHuman.h" +#include "plAvatar/plAvBrainDrive.h" +>>>>>>> 3bf6b7e18 (PubUtilLib Part IV):MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.cpp + +#include "plModifier/plDetectorLog.h" #ifdef USE_PHYSX_COLLISION_FLUTTER_WORKAROUND #include "../plPhysX/plSimulationMgr.h" diff --git a/Sources/Plasma/PubUtilLib/plPhysical/plDetectorModifier.h b/Sources/Plasma/PubUtilLib/plPhysical/plDetectorModifier.h index 26cbb567..059e1feb 100644 --- a/Sources/Plasma/PubUtilLib/plPhysical/plDetectorModifier.h +++ b/Sources/Plasma/PubUtilLib/plPhysical/plDetectorModifier.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plDetectorModifier_inc #define plDetectorModifier_inc -#include "../pnModifier/plSingleModifier.h" -#include "../pnMessage/plObjRefMsg.h" +#include "pnModifier/plSingleModifier.h" +#include "pnMessage/plObjRefMsg.h" #include "hsStream.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalCreatable.h b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalCreatable.h index a3a06154..16664ef7 100644 --- a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalCreatable.h +++ b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPhysicalCreatable_inc #define plPhysicalCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plDetectorModifier.h" diff --git a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalProxy.cpp b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalProxy.cpp index 1270b959..095106a9 100644 --- a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalProxy.cpp +++ b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalProxy.cpp @@ -41,13 +41,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plPhysicalProxy.h" #include "plPhysical.h" -#include "../plPhysX/plPXPhysicalControllerCore.h" -#include "../plDrawable/plDrawableSpans.h" -#include "../plDrawable/plDrawableGenerator.h" -#include "../pnMessage/plProxyDrawMsg.h" +#include "plPhysX/plPXPhysicalControllerCore.h" +#include "plDrawable/plDrawableSpans.h" +#include "plDrawable/plDrawableGenerator.h" +#include "pnMessage/plProxyDrawMsg.h" -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plLayer.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plLayer.h" plPhysicalProxy::plPhysicalProxy() : plProxyGen(hsColorRGBA().Set(0,0,0,1.f), hsColorRGBA().Set(1.f,0.8f,0.2f,1.f), 0.5f), diff --git a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalProxy.h b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalProxy.h index faaa3a22..492275fa 100644 --- a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalProxy.h +++ b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalProxy.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPhysicalProxy_inc #define plPhysicalProxy_inc -#include "../plDrawable/plProxyGen.h" +#include "plDrawable/plProxyGen.h" class plDrawableSpans; class hsGMaterial; diff --git a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSDLModifier.cpp b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSDLModifier.cpp index d04dae49..8ad3b747 100644 --- a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSDLModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSDLModifier.cpp @@ -43,13 +43,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsGeometry3.h" #include "plPhysical.h" -#include "../plSDL/plSDL.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plSimulationInterface.h" -#include "../pnNetCommon/plNetApp.h" +#include "plSDL/plSDL.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plSimulationInterface.h" +#include "pnNetCommon/plNetApp.h" #include "hsQuat.h" -//#include "../plHavok1/plSimulationMgr.h" -#include "../plStatusLog/plStatusLog.h" +//#include "plHavok1/plSimulationMgr.h" +#include "plStatusLog/plStatusLog.h" // static vars static const char* kStrLinear = "linear"; diff --git a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSDLModifier.h b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSDLModifier.h index a8509a3c..39d15dc5 100644 --- a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSDLModifier.h +++ b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSDLModifier.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPhysicalSDLModifier_inc #define plPhysicalSDLModifier_inc -#include "../plModifier/plSDLModifier.h" +#include "plModifier/plSDLModifier.h" class plStateDataRecord; class plStatusLog; diff --git a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSndGroup.cpp b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSndGroup.cpp index a3e8d8a3..1b2f390e 100644 --- a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSndGroup.cpp +++ b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSndGroup.cpp @@ -51,9 +51,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "plPhysicalSndGroup.h" -#include "../plAudio/plSound.h" -#include "../pnMessage/plRefMsg.h" -#include "../plMessage/plAnimCmdMsg.h" +#include "plAudio/plSound.h" +#include "pnMessage/plRefMsg.h" +#include "plMessage/plAnimCmdMsg.h" plPhysicalSndGroup::plPhysicalSndGroup() : fPlayingSlideSound(false) diff --git a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSndGroup.h b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSndGroup.h index 8df510d4..c6e1679b 100644 --- a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSndGroup.h +++ b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSndGroup.h @@ -55,8 +55,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsTemplates.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/plUoid.h" class plSound; class plPhysicalSndGroup : public hsKeyedObject diff --git a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicsSoundMgr.cpp b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicsSoundMgr.cpp index 0759ae86..e9664b50 100644 --- a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicsSoundMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicsSoundMgr.cpp @@ -44,10 +44,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTimer.h" #include "plPhysicsSoundMgr.h" #include "plPhysicalSndGroup.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../plStatusLog/plStatusLog.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../FeatureLib/pfAudio/plRandomSoundMod.h" +#include "pnKeyedObject/plFixedKey.h" +#include "plStatusLog/plStatusLog.h" +#include "plMessage/plAnimCmdMsg.h" +#include "pfAudio/plRandomSoundMod.h" #define MIN_VOLUME 0.0001f diff --git a/Sources/Plasma/PubUtilLib/plPhysical/plPickingDetector.cpp b/Sources/Plasma/PubUtilLib/plPhysical/plPickingDetector.cpp index 3d47df65..404d7caa 100644 --- a/Sources/Plasma/PubUtilLib/plPhysical/plPickingDetector.cpp +++ b/Sources/Plasma/PubUtilLib/plPhysical/plPickingDetector.cpp @@ -41,14 +41,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "plPickingDetector.h" -#include "../plMessage/plActivatorMsg.h" -#include "../plMessage/plPickedMsg.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../pnMessage/plFakeOutMsg.h" -#include "../pnNetCommon/plNetApp.h" +#include "plMessage/plActivatorMsg.h" +#include "plMessage/plPickedMsg.h" +#include "pnNetCommon/plNetApp.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnKeyedObject/plKey.h" +#include "pnMessage/plObjRefMsg.h" +#include "pnMessage/plFakeOutMsg.h" +#include "pnNetCommon/plNetApp.h" #include "plgDispatch.h" diff --git a/Sources/Plasma/PubUtilLib/plProgressMgr/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plProgressMgr/CMakeLists.txt new file mode 100644 index 00000000..fdc4afa2 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plProgressMgr/CMakeLists.txt @@ -0,0 +1,17 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plProgressMgr_SOURCES + plProgressMgr.cpp +) + +set(plProgressMgr_HEADERS + plProgressMgr.h +) + +add_library(plProgressMgr STATIC ${plProgressMgr_SOURCES} ${plProgressMgr_HEADERS}) + +source_group("Source Files" FILES ${plProgressMgr_SOURCES}) +source_group("Header Files" FILES ${plProgressMgr_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plResMgr/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plResMgr/CMakeLists.txt new file mode 100644 index 00000000..17424816 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plResMgr/CMakeLists.txt @@ -0,0 +1,39 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plResMgr_SOURCES + plBSDiffBuffer.cpp + plDiffBuffer.cpp + plKeyFinder.cpp + plLocalization.cpp + plPageInfo.cpp + plRegistryHelpers.cpp + plRegistryKeyList.cpp + plRegistryNode.cpp + plResManager.cpp + plResManagerHelper.cpp + plVersion.cpp +) + +set(plResMgr_HEADERS + plBSDiffBuffer.h + plDiffBuffer.h + plKeyFinder.h + plLocalization.h + plPageInfo.h + plRegistryHelpers.h + plRegistryKeyList.h + plRegistryNode.h + plResManager.h + plResManagerHelper.h + plResMgrCreatable.h + plResMgrSettings.h + plVersion.h +) + +add_library(plResMgr STATIC ${plResMgr_SOURCES} ${plResMgr_HEADERS}) + +source_group("Source Files" FILES ${plResMgr_SOURCES}) +source_group("Header Files" FILES ${plResMgr_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.cpp b/Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.cpp index df145b78..d7ecbb53 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.cpp +++ b/Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.cpp @@ -51,7 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plRegistryNode.h" #include "plRegistryKeyList.h" #include "plPageInfo.h" -#include "../pnFactory/plFactory.h" +#include "pnFactory/plFactory.h" #include "hsUtils.h" #include "plCreatableIndex.h" diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.h b/Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.h index ef7d4934..319aab3b 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.h +++ b/Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.h @@ -64,8 +64,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com //---------------------------- #include "hsTypes.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plUoid.h" #include "hsStlUtils.h" #include diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plLocalization.cpp b/Sources/Plasma/PubUtilLib/plResMgr/plLocalization.cpp index f8efd087..16513665 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plLocalization.cpp +++ b/Sources/Plasma/PubUtilLib/plResMgr/plLocalization.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "plLocalization.h" -#include "../plFile/plFileUtils.h" +#include "plFile/plFileUtils.h" #include "hsUtils.h" plLocalization::Language plLocalization::fLanguage = plLocalization::kEnglish; diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plPageInfo.cpp b/Sources/Plasma/PubUtilLib/plResMgr/plPageInfo.cpp index e587979a..531bced4 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plPageInfo.cpp +++ b/Sources/Plasma/PubUtilLib/plResMgr/plPageInfo.cpp @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPageInfo.h" #include "hsUtils.h" #include "hsStream.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plUoid.h" #include "plVersion.h" static UInt32 sCurrPageInfoVersion = 6; diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plPageInfo.h b/Sources/Plasma/PubUtilLib/plResMgr/plPageInfo.h index 302ff02a..c2ab1d70 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plPageInfo.h +++ b/Sources/Plasma/PubUtilLib/plResMgr/plPageInfo.h @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define _plPageInfo_h #include "hsTypes.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plUoid.h" #include class hsStream; diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plRegistryHelpers.h b/Sources/Plasma/PubUtilLib/plResMgr/plRegistryHelpers.h index 6b7dce83..8bf27b59 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plRegistryHelpers.h +++ b/Sources/Plasma/PubUtilLib/plResMgr/plRegistryHelpers.h @@ -53,7 +53,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define _plRegistryHelpers_h #include "hsTypes.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include class plKey; diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plRegistryKeyList.h b/Sources/Plasma/PubUtilLib/plResMgr/plRegistryKeyList.h index adbbe72e..65c3edbe 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plRegistryKeyList.h +++ b/Sources/Plasma/PubUtilLib/plResMgr/plRegistryKeyList.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plRegistryKeyList_h_inc #include "hsTypes.h" -#include "../pnKeyedObject/plKeyImp.h" +#include "pnKeyedObject/plKeyImp.h" #include #include diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plRegistryNode.cpp b/Sources/Plasma/PubUtilLib/plResMgr/plRegistryNode.cpp index 8c8954b5..4bb2239a 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plRegistryNode.cpp +++ b/Sources/Plasma/PubUtilLib/plResMgr/plRegistryNode.cpp @@ -43,10 +43,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plRegistryKeyList.h" #include "plRegistryHelpers.h" -#include "../pnKeyedObject/plKeyImp.h" -#include "../plStatusLog/plStatusLog.h" -#include "../pnFactory/plFactory.h" -#include "../plFile/plFileUtils.h" +#include "pnKeyedObject/plKeyImp.h" +#include "plStatusLog/plStatusLog.h" +#include "pnFactory/plFactory.h" +#include "plFile/plFileUtils.h" #include "hsStlUtils.h" #include "plVersion.h" diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plResManager.cpp b/Sources/Plasma/PubUtilLib/plResMgr/plResManager.cpp index 40abbff0..48ab6ba5 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plResManager.cpp +++ b/Sources/Plasma/PubUtilLib/plResMgr/plResManager.cpp @@ -47,24 +47,24 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsSTLStream.h" #include "hsTimer.h" -#include "../pnTimer/plTimerCallbackManager.h" +#include "pnTimer/plTimerCallbackManager.h" #include "hsStlUtils.h" -#include "../plScene/plSceneNode.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnKeyedObject/plKeyImp.h" -#include "../pnDispatch/plDispatch.h" -#include "../plStatusLog/plStatusLog.h" -#include "../pnMessage/plRefMsg.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../plMessage/plAgeLoadedMsg.h" -#include "../pnMessage/plClientMsg.h" -#include "../plFile/hsFiles.h" -#include "../plFile/plFileUtils.h" -#include "../pnFactory/plCreator.h" -#include "../pnNetCommon/plSynchedObject.h" -#include "../pnNetCommon/plNetApp.h" +#include "plScene/plSceneNode.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnKeyedObject/plKeyImp.h" +#include "pnDispatch/plDispatch.h" +#include "plStatusLog/plStatusLog.h" +#include "pnMessage/plRefMsg.h" +#include "pnMessage/plObjRefMsg.h" +#include "plMessage/plAgeLoadedMsg.h" +#include "pnMessage/plClientMsg.h" +#include "plFile/hsFiles.h" +#include "plFile/plFileUtils.h" +#include "pnFactory/plCreator.h" +#include "pnNetCommon/plSynchedObject.h" +#include "pnNetCommon/plNetApp.h" hsBool gDataServerLocal = false; diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plResManagerHelper.cpp b/Sources/Plasma/PubUtilLib/plResMgr/plResManagerHelper.cpp index 40098a3e..d726dc5e 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plResManagerHelper.cpp +++ b/Sources/Plasma/PubUtilLib/plResMgr/plResManagerHelper.cpp @@ -58,9 +58,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com //#include "plRegistry.h" #include "plResMgrSettings.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../plMessage/plResMgrHelperMsg.h" -#include "../plStatusLog/plStatusLog.h" +#include "pnKeyedObject/plFixedKey.h" +#include "plMessage/plResMgrHelperMsg.h" +#include "plStatusLog/plStatusLog.h" #include "hsTimer.h" #ifdef MCN_RESMGR_DEBUGGING @@ -68,13 +68,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com static const int kLogSize = 40; static const float kUpdateDelay = 0.5f; -#include "../plInputCore/plInputInterface.h" -#include "../plInputCore/plInputDevice.h" -#include "../plInputCore/plInputInterfaceMgr.h" -#include "../pnInputCore/plInputMap.h" -#include "../plMessage/plInputEventMsg.h" -#include "../plMessage/plInputIfaceMgrMsg.h" -#include "../pnKeyedObject/plKeyImp.h" +#include "plInputCore/plInputInterface.h" +#include "plInputCore/plInputDevice.h" +#include "plInputCore/plInputInterfaceMgr.h" +#include "pnInputCore/plInputMap.h" +#include "plMessage/plInputEventMsg.h" +#include "plMessage/plInputIfaceMgrMsg.h" +#include "pnKeyedObject/plKeyImp.h" #endif diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plResManagerHelper.h b/Sources/Plasma/PubUtilLib/plResMgr/plResManagerHelper.h index c41cfd75..bed12926 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plResManagerHelper.h +++ b/Sources/Plasma/PubUtilLib/plResMgr/plResManagerHelper.h @@ -56,7 +56,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsTemplates.h" #include "plRegistryHelpers.h" -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" // Defined as a project setting so we can do this right //#define MCN_RESMGR_DEBUGGING diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plResMgrCreatable.h b/Sources/Plasma/PubUtilLib/plResMgr/plResMgrCreatable.h index a2a33dc7..d84cd2b0 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plResMgrCreatable.h +++ b/Sources/Plasma/PubUtilLib/plResMgr/plResMgrCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plResMgrCreatable_inc #define plResMgrCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plResManagerHelper.h" diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plVersion.cpp b/Sources/Plasma/PubUtilLib/plResMgr/plVersion.cpp index 31e30121..48228557 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plVersion.cpp +++ b/Sources/Plasma/PubUtilLib/plResMgr/plVersion.cpp @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plVersion.h" -#include "../pnFactory/plFactory.h" +#include "pnFactory/plFactory.h" #include #include "plCreatableIndex.h" diff --git a/Sources/Plasma/PubUtilLib/plSDL/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plSDL/CMakeLists.txt new file mode 100644 index 00000000..6282a24d --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plSDL/CMakeLists.txt @@ -0,0 +1,39 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plSDL_SOURCES + plSDLMgr.cpp + plSDLParser.cpp + plStateChangeNotifier.cpp + plStateDataRecord.cpp + plStateDescriptor.cpp + plStateVariable.cpp + plVarDescriptor.cpp +) + +set(plSDL_HEADERS + plSDL.h + plSDLCreatable.h + plSDLDescriptor.h +) + +set(plSDL_SDLFILES + SDL/animation.sdl + SDL/avatar.sdl + SDL/cloneMessage.sdl + SDL/clothing.sdl + SDL/morph.sdl + SDL/particle.sdl + SDL/physical.sdl + SDL/responder.sdl + SDL/sound.sdl + SDL/xregion.sdl +) + +add_library(plSDL STATIC ${plSDL_SOURCES} ${plSDL_HEADERS} ${plSDL_SDLFILES}) + +source_group("Source Files" FILES ${plSDL_SOURCES}) +source_group("Header Files" FILES ${plSDL_HEADERS}) +source_group("SDL" FILES ${plSDL_SDLFILES}) diff --git a/Sources/Plasma/PubUtilLib/plSDL/plSDL.h b/Sources/Plasma/PubUtilLib/plSDL/plSDL.h index 66f146d2..e2459ec4 100644 --- a/Sources/Plasma/PubUtilLib/plSDL/plSDL.h +++ b/Sources/Plasma/PubUtilLib/plSDL/plSDL.h @@ -50,11 +50,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsUtils.h" #include "hsStlUtils.h" -#include "../pnFactory/plCreatable.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnFactory/plCreatable.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plUoid.h" -#include "../plUnifiedTime/plUnifiedTime.h" +#include "plUnifiedTime/plUnifiedTime.h" namespace plSDL { diff --git a/Sources/Plasma/PubUtilLib/plSDL/plSDLMgr.cpp b/Sources/Plasma/PubUtilLib/plSDL/plSDLMgr.cpp index 936c8667..99d67cf9 100644 --- a/Sources/Plasma/PubUtilLib/plSDL/plSDLMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plSDL/plSDLMgr.cpp @@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "hsStlUtils.h" #include "plSDL.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnNetCommon/pnNetCommon.h" +#include "pnNetCommon/plNetApp.h" +#include "pnNetCommon/pnNetCommon.h" #include ///////////////////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plSDL/plSDLParser.cpp b/Sources/Plasma/PubUtilLib/plSDL/plSDLParser.cpp index ac0b9403..515f39ef 100644 --- a/Sources/Plasma/PubUtilLib/plSDL/plSDLParser.cpp +++ b/Sources/Plasma/PubUtilLib/plSDL/plSDLParser.cpp @@ -42,10 +42,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsStlUtils.h" #include "plSDL.h" -#include "../plFile/hsFiles.h" -#include "../plFile/plStreamSource.h" -#include "../pnNetCommon/pnNetCommon.h" -#include "../pnNetCommon/plNetApp.h" +#include "plFile/hsFiles.h" +#include "plFile/plStreamSource.h" +#include "pnNetCommon/pnNetCommon.h" +#include "pnNetCommon/plNetApp.h" static const int kTokenLen=256; diff --git a/Sources/Plasma/PubUtilLib/plSDL/plStateChangeNotifier.cpp b/Sources/Plasma/PubUtilLib/plSDL/plStateChangeNotifier.cpp index 79fb159b..d86174de 100644 --- a/Sources/Plasma/PubUtilLib/plSDL/plStateChangeNotifier.cpp +++ b/Sources/Plasma/PubUtilLib/plSDL/plStateChangeNotifier.cpp @@ -40,8 +40,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plSDL.h" -#include "../pnMessage/plSDLNotificationMsg.h" -#include "algorithm" +#include "pnMessage/plSDLNotificationMsg.h" +#include // static UInt32 plStateChangeNotifier::fCurrentPlayerID = 0; diff --git a/Sources/Plasma/PubUtilLib/plSDL/plStateDataRecord.cpp b/Sources/Plasma/PubUtilLib/plSDL/plStateDataRecord.cpp index 231863c3..7cdb265e 100644 --- a/Sources/Plasma/PubUtilLib/plSDL/plStateDataRecord.cpp +++ b/Sources/Plasma/PubUtilLib/plSDL/plStateDataRecord.cpp @@ -46,8 +46,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStlUtils.h" #include "plSDL.h" -#include "../plNetMessage/plNetMessage.h" -#include "../pnNetCommon/plNetApp.h" +#include "plNetMessage/plNetMessage.h" +#include "pnNetCommon/plNetApp.h" const char* plSDL::kAgeSDLObjectName = {"AgeSDLHook"}; diff --git a/Sources/Plasma/PubUtilLib/plSDL/plStateDescriptor.cpp b/Sources/Plasma/PubUtilLib/plSDL/plStateDescriptor.cpp index 7ab207b5..f8c8c97b 100644 --- a/Sources/Plasma/PubUtilLib/plSDL/plStateDescriptor.cpp +++ b/Sources/Plasma/PubUtilLib/plSDL/plStateDescriptor.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsStream.h" #include "plSDL.h" -#include "../pnNetCommon/plNetApp.h" +#include "pnNetCommon/plNetApp.h" const UInt8 plStateDescriptor::kVersion=1; // for Read/Write format diff --git a/Sources/Plasma/PubUtilLib/plSDL/plStateVariable.cpp b/Sources/Plasma/PubUtilLib/plSDL/plStateVariable.cpp index eee3ceda..4d0d1036 100644 --- a/Sources/Plasma/PubUtilLib/plSDL/plStateVariable.cpp +++ b/Sources/Plasma/PubUtilLib/plSDL/plStateVariable.cpp @@ -45,21 +45,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStlUtils.h" #include "plSDL.h" -#include "../pnProduct/pnProduct.h" -#include "../pnFactory/plCreatable.h" -#include "../pnKeyedObject/plUoid.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plKeyImp.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnNetCommon/pnNetCommon.h" +#include "pnProduct/pnProduct.h" +#include "pnFactory/plCreatable.h" +#include "pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKeyImp.h" +#include "pnNetCommon/plNetApp.h" +#include "pnNetCommon/pnNetCommon.h" -#include "../plResMgr/plResManager.h" -#include "../plResMgr/plKeyFinder.h" -#include "../plUnifiedTime/plClientUnifiedTime.h" +#include "plResMgr/plResManager.h" +#include "plResMgr/plKeyFinder.h" +#include "plUnifiedTime/plClientUnifiedTime.h" -#include "../plResMgr/plResManager.h" -#include "../plUnifiedTime/plClientUnifiedTime.h" +#include "plResMgr/plResManager.h" +#include "plUnifiedTime/plClientUnifiedTime.h" /***************************************************************************** diff --git a/Sources/Plasma/PubUtilLib/plSDL/plVarDescriptor.cpp b/Sources/Plasma/PubUtilLib/plSDL/plVarDescriptor.cpp index 41484a23..65e69271 100644 --- a/Sources/Plasma/PubUtilLib/plSDL/plVarDescriptor.cpp +++ b/Sources/Plasma/PubUtilLib/plSDL/plVarDescriptor.cpp @@ -43,11 +43,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plSDL.h" #include "hsStlUtils.h" -#include "../pnKeyedObject/plUoid.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnMessage/plMessage.h" +#include "pnKeyedObject/plUoid.h" +#include "pnNetCommon/plNetApp.h" +#include "pnMessage/plMessage.h" -#include "../plUnifiedTime/plUnifiedTime.h" +#include "plUnifiedTime/plUnifiedTime.h" const UInt8 plVarDescriptor::kVersion=3; // for Read/Write format diff --git a/Sources/Plasma/PubUtilLib/plScene/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plScene/CMakeLists.txt new file mode 100644 index 00000000..a3271cc8 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plScene/CMakeLists.txt @@ -0,0 +1,38 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plScene_SOURCES + plCullPoly.cpp + plOccluder.cpp + plOccluderProxy.cpp + plPageTreeMgr.cpp + plPostEffectMod.cpp + plRelevanceMgr.cpp + plRelevanceRegion.cpp + plRenderRequest.cpp + plSceneNode.cpp + plVisMgr.cpp + plVisRegion.cpp +) + +set(plScene_HEADERS + plCullPoly.h + plOccluder.h + plOccluderProxy.h + plPageTreeMgr.h + plPostEffectMod.h + plRelevanceMgr.h + plRelevanceRegion.h + plRenderRequest.h + plSceneCreatable.h + plSceneNode.h + plVisMgr.h + plVisRegion.h +) + +add_library(plScene STATIC ${plScene_SOURCES} ${plScene_HEADERS}) + +source_group("Source Files" FILES ${plScene_SOURCES}) +source_group("Header Files" FILES ${plScene_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plScene/plOccluder.cpp b/Sources/Plasma/PubUtilLib/plScene/plOccluder.cpp index 3b538a4a..09ae8f62 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plOccluder.cpp +++ b/Sources/Plasma/PubUtilLib/plScene/plOccluder.cpp @@ -44,12 +44,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plOccluder.h" #include "hsStream.h" #include "plOccluderProxy.h" -#include "../plDrawable/plDrawableGenerator.h" -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plLayerInterface.h" -#include "../plSurface/plLayer.h" -#include "../pnMessage/plNodeRefMsg.h" -#include "../pnKeyedObject/plKey.h" +#include "plDrawable/plDrawableGenerator.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plLayerInterface.h" +#include "plSurface/plLayer.h" +#include "pnMessage/plNodeRefMsg.h" +#include "pnKeyedObject/plKey.h" #include "hsResMgr.h" #include "plgDispatch.h" #include "plVisRegion.h" diff --git a/Sources/Plasma/PubUtilLib/plScene/plOccluder.h b/Sources/Plasma/PubUtilLib/plScene/plOccluder.h index 03cdfa39..7b5c434c 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plOccluder.h +++ b/Sources/Plasma/PubUtilLib/plScene/plOccluder.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plOccluder_inc #define plOccluder_inc -#include "../pnSceneObject/plObjInterface.h" +#include "pnSceneObject/plObjInterface.h" #include "hsTemplates.h" #include "hsMatrix44.h" #include "plCullPoly.h" diff --git a/Sources/Plasma/PubUtilLib/plScene/plOccluderProxy.cpp b/Sources/Plasma/PubUtilLib/plScene/plOccluderProxy.cpp index 2c931849..7723be5d 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plOccluderProxy.cpp +++ b/Sources/Plasma/PubUtilLib/plScene/plOccluderProxy.cpp @@ -43,9 +43,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plOccluderProxy.h" #include "plOccluder.h" -#include "../plDrawable/plDrawableSpans.h" -#include "../plDrawable/plDrawableGenerator.h" -#include "../pnMessage/plProxyDrawMsg.h" +#include "plDrawable/plDrawableSpans.h" +#include "plDrawable/plDrawableGenerator.h" +#include "pnMessage/plProxyDrawMsg.h" plOccluderProxy::plOccluderProxy() : plProxyGen(hsColorRGBA().Set(0.2f,0.2f,0.8f,1.f), hsColorRGBA().Set(1.f,0.5f,0.5f,1.f), 0.5f), diff --git a/Sources/Plasma/PubUtilLib/plScene/plOccluderProxy.h b/Sources/Plasma/PubUtilLib/plScene/plOccluderProxy.h index 97d4aec7..6050aaaf 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plOccluderProxy.h +++ b/Sources/Plasma/PubUtilLib/plScene/plOccluderProxy.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plOccluderProxy_inc #define plOccluderProxy_inc -#include "../plDrawable/plProxyGen.h" +#include "plDrawable/plProxyGen.h" class plOccluder; class plDrawableSpans; diff --git a/Sources/Plasma/PubUtilLib/plScene/plPageTreeMgr.cpp b/Sources/Plasma/PubUtilLib/plScene/plPageTreeMgr.cpp index 20d54a88..f4d44488 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plPageTreeMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plScene/plPageTreeMgr.cpp @@ -42,12 +42,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plPageTreeMgr.h" -#include "../plDrawable/plSpaceTreeMaker.h" -#include "../plDrawable/plSpaceTree.h" +#include "plDrawable/plSpaceTreeMaker.h" +#include "plDrawable/plSpaceTree.h" #include "plDrawable.h" -#include "../plScene/plSceneNode.h" +#include "plScene/plSceneNode.h" #include "plPipeline.h" -#include "../plMath/hsRadixSort.h" +#include "plMath/hsRadixSort.h" #include "plCullPoly.h" #include "plOccluder.h" #include "hsFastMath.h" diff --git a/Sources/Plasma/PubUtilLib/plScene/plPostEffectMod.cpp b/Sources/Plasma/PubUtilLib/plScene/plPostEffectMod.cpp index 6e2ebbf2..4a13b892 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plPostEffectMod.cpp +++ b/Sources/Plasma/PubUtilLib/plScene/plPostEffectMod.cpp @@ -46,15 +46,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plSceneNode.h" #include "plRenderRequest.h" -#include "../plPipeline/plRenderTarget.h" +#include "plPipeline/plRenderTarget.h" -#include "../plMessage/plRenderRequestMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plMessage/plRenderMsg.h" +#include "plMessage/plRenderRequestMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plMessage/plRenderMsg.h" -#include "../pnMessage/plRefMsg.h" +#include "pnMessage/plRefMsg.h" -#include "../pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plSceneObject.h" #include "plDrawable.h" #include "plPipeline.h" #include "plgDispatch.h" diff --git a/Sources/Plasma/PubUtilLib/plScene/plPostEffectMod.h b/Sources/Plasma/PubUtilLib/plScene/plPostEffectMod.h index 7046dc77..d4c58616 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plPostEffectMod.h +++ b/Sources/Plasma/PubUtilLib/plScene/plPostEffectMod.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPostEffectMod_inc #define plPostEffectMod_inc -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" #include "hsMatrix44.h" #include "hsBitVector.h" diff --git a/Sources/Plasma/PubUtilLib/plScene/plRelevanceMgr.cpp b/Sources/Plasma/PubUtilLib/plScene/plRelevanceMgr.cpp index 74460b75..abef64bc 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plRelevanceMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plScene/plRelevanceMgr.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plRelevanceMgr.h" #include "plRelevanceRegion.h" -#include "../plIntersect/plRegionBase.h" +#include "plIntersect/plRegionBase.h" #include "hsStream.h" #include "hsStringTokenizer.h" diff --git a/Sources/Plasma/PubUtilLib/plScene/plRelevanceMgr.h b/Sources/Plasma/PubUtilLib/plScene/plRelevanceMgr.h index e60e6e2c..b1451ea0 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plRelevanceMgr.h +++ b/Sources/Plasma/PubUtilLib/plScene/plRelevanceMgr.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plRelevanceMgr_inc #define plRelevanceMgr_inc -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include "hsGeometry3.h" #include "hsTemplates.h" #include "hsBitVector.h" diff --git a/Sources/Plasma/PubUtilLib/plScene/plRelevanceRegion.cpp b/Sources/Plasma/PubUtilLib/plScene/plRelevanceRegion.cpp index 58136d7a..4c0fe83a 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plRelevanceRegion.cpp +++ b/Sources/Plasma/PubUtilLib/plScene/plRelevanceRegion.cpp @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "plRelevanceRegion.h" #include "plRelevanceMgr.h" -#include "../plIntersect/plRegionBase.h" +#include "plIntersect/plRegionBase.h" void plRelevanceRegion::Read(hsStream* s, hsResMgr* mgr) { diff --git a/Sources/Plasma/PubUtilLib/plScene/plRelevanceRegion.h b/Sources/Plasma/PubUtilLib/plScene/plRelevanceRegion.h index de0dc074..194dfafd 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plRelevanceRegion.h +++ b/Sources/Plasma/PubUtilLib/plScene/plRelevanceRegion.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plRelevanceRegion_inc #define plRelevanceRegion_inc -#include "../pnSceneObject/plObjInterface.h" +#include "pnSceneObject/plObjInterface.h" class plRelevanceMgr; class plRegionBase; diff --git a/Sources/Plasma/PubUtilLib/plScene/plRenderRequest.cpp b/Sources/Plasma/PubUtilLib/plScene/plRenderRequest.cpp index dd0885c5..30a32d14 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plRenderRequest.cpp +++ b/Sources/Plasma/PubUtilLib/plScene/plRenderRequest.cpp @@ -43,11 +43,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plRenderRequest.h" #include "plPageTreeMgr.h" -#include "../plPipeline/plRenderTarget.h" +#include "plPipeline/plRenderTarget.h" #include "hsFastMath.h" #include "hsStream.h" #include "plPipeline.h" -#include "../plMessage/plRenderRequestMsg.h" +#include "plMessage/plRenderRequestMsg.h" #include "plgDispatch.h" #include "plVisMgr.h" diff --git a/Sources/Plasma/PubUtilLib/plScene/plRenderRequest.h b/Sources/Plasma/PubUtilLib/plScene/plRenderRequest.h index b84131ad..c6f01ab5 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plRenderRequest.h +++ b/Sources/Plasma/PubUtilLib/plScene/plRenderRequest.h @@ -49,8 +49,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsRefCnt.h" #include "hsBitVector.h" -#include "../pnKeyedObject/plKey.h" -#include "../plMessage/plRenderRequestMsg.h" +#include "pnKeyedObject/plKey.h" +#include "plMessage/plRenderRequestMsg.h" class plRenderTarget; class plPageTreeMgr; diff --git a/Sources/Plasma/PubUtilLib/plScene/plSceneCreatable.h b/Sources/Plasma/PubUtilLib/plScene/plSceneCreatable.h index 2fa35eac..e919521e 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plSceneCreatable.h +++ b/Sources/Plasma/PubUtilLib/plScene/plSceneCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plSceneCreatable_inc #define plSceneCreatable_inc -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" #include "plSceneNode.h" diff --git a/Sources/Plasma/PubUtilLib/plScene/plSceneNode.cpp b/Sources/Plasma/PubUtilLib/plScene/plSceneNode.cpp index d623d4cd..c27461da 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plSceneNode.cpp +++ b/Sources/Plasma/PubUtilLib/plScene/plSceneNode.cpp @@ -43,31 +43,31 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plSceneNode.h" -#include "../pnDispatch/plDispatch.h" -#include "../plMessage/plNodeCleanupMsg.h" -#include "../pnMessage/plNodeRefMsg.h" +#include "pnDispatch/plDispatch.h" +#include "plMessage/plNodeCleanupMsg.h" +#include "pnMessage/plNodeRefMsg.h" #include "hsStream.h" #include "hsResMgr.h" -#include "../pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plSceneObject.h" #include "plDrawable.h" #include "plPhysical.h" #include "plAudible.h" -#include "../plGLight/plLightInfo.h" -#include "../pnMessage/plRefMsg.h" +#include "plGLight/plLightInfo.h" +#include "pnMessage/plRefMsg.h" #include "plPipeline.h" -#include "../pnKeyedObject/plKey.h" -#include "../plDrawable/plSpaceTreeMaker.h" -#include "../plDrawable/plSpaceTree.h" +#include "pnKeyedObject/plKey.h" +#include "plDrawable/plSpaceTreeMaker.h" +#include "plDrawable/plSpaceTree.h" #include "plPageTreeMgr.h" #include "plOccluder.h" //MFHORSE //BLACK // temp hack for debugging -#include "../plDrawable/plDrawableSpans.h" -#include "../pnKeyedObject/plKeyImp.h" +#include "plDrawable/plDrawableSpans.h" +#include "pnKeyedObject/plKeyImp.h" plSceneNode::plSceneNode() : fDepth(0), diff --git a/Sources/Plasma/PubUtilLib/plScene/plSceneNode.h b/Sources/Plasma/PubUtilLib/plScene/plSceneNode.h index 43cf1e89..d271d72f 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plSceneNode.h +++ b/Sources/Plasma/PubUtilLib/plScene/plSceneNode.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plSceneNode_inc #define plSceneNode_inc -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include "hsTemplates.h" diff --git a/Sources/Plasma/PubUtilLib/plScene/plVisMgr.h b/Sources/Plasma/PubUtilLib/plScene/plVisMgr.h index 396efd93..b8bdf37f 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plVisMgr.h +++ b/Sources/Plasma/PubUtilLib/plScene/plVisMgr.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plVisMgr_inc #define plVisMgr_inc -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include "hsTemplates.h" #include "hsBitVector.h" diff --git a/Sources/Plasma/PubUtilLib/plScene/plVisRegion.cpp b/Sources/Plasma/PubUtilLib/plScene/plVisRegion.cpp index f9de8749..cc5d3865 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plVisRegion.cpp +++ b/Sources/Plasma/PubUtilLib/plScene/plVisRegion.cpp @@ -48,8 +48,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plVisMgr.h" -#include "../pnMessage/plEnableMsg.h" -#include "../plIntersect/plRegionBase.h" +#include "pnMessage/plEnableMsg.h" +#include "plIntersect/plRegionBase.h" plVisRegion::plVisRegion() : fIndex(0), diff --git a/Sources/Plasma/PubUtilLib/plScene/plVisRegion.h b/Sources/Plasma/PubUtilLib/plScene/plVisRegion.h index 15706c99..d39148a9 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plVisRegion.h +++ b/Sources/Plasma/PubUtilLib/plScene/plVisRegion.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plVisRegion_inc #define plVisRegion_inc -#include "../pnSceneObject/plObjInterface.h" +#include "pnSceneObject/plObjInterface.h" class hsStream; class hsResMgr; diff --git a/Sources/Plasma/PubUtilLib/plSockets/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plSockets/CMakeLists.txt new file mode 100644 index 00000000..1b687afd --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plSockets/CMakeLists.txt @@ -0,0 +1,34 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plSockets_SOURCES + plBufferedSocketReader.cpp + plBufferedSocketWriter.cpp + plFdSet.cpp + plMemBuffer.cpp + plNet.cpp + plOutgoingUdpSocket.cpp + plRingBuffer.cpp + plSocket.cpp + plTcpListenSocket.cpp + plTcpSocket.cpp +) + +set(plSockets_HEADERS + plBufferedSocketReader.h + plBufferedSocketWriter.h + plFdSet.h + plMemBuffer.h + plNet.h + plOutgoingUdpSocket.h + plRingBuffer.h + plSocket.h + plTcpListenSocket.h + plTcpSocket.h +) + +add_library(plSockets STATIC ${plSockets_SOURCES} ${plSockets_HEADERS}) + +source_group("Source Files" FILES ${plSockets_SOURCES}) +source_group("Header Files" FILES ${plSockets_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plSockets/plOutgoingUdpSocket.cpp b/Sources/Plasma/PubUtilLib/plSockets/plOutgoingUdpSocket.cpp index ae7b9831..775d62f5 100644 --- a/Sources/Plasma/PubUtilLib/plSockets/plOutgoingUdpSocket.cpp +++ b/Sources/Plasma/PubUtilLib/plSockets/plOutgoingUdpSocket.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plOutgoingUdpSocket.h" #include "plFdSet.h" -#include "../pnNetCommon/plNetAddress.h" +#include "pnNetCommon/plNetAddress.h" #if HS_BUILD_FOR_UNIX #include diff --git a/Sources/Plasma/PubUtilLib/plSockets/plTcpListenSocket.cpp b/Sources/Plasma/PubUtilLib/plSockets/plTcpListenSocket.cpp index ee9b33eb..17bac46e 100644 --- a/Sources/Plasma/PubUtilLib/plSockets/plTcpListenSocket.cpp +++ b/Sources/Plasma/PubUtilLib/plSockets/plTcpListenSocket.cpp @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plTcpListenSocket.h" -#include "../pnNetCommon/plNetAddress.h" +#include "pnNetCommon/plNetAddress.h" // Initialize a socket for listening diff --git a/Sources/Plasma/PubUtilLib/plSockets/plTcpSocket.cpp b/Sources/Plasma/PubUtilLib/plSockets/plTcpSocket.cpp index b6165a1c..c6180732 100644 --- a/Sources/Plasma/PubUtilLib/plSockets/plTcpSocket.cpp +++ b/Sources/Plasma/PubUtilLib/plSockets/plTcpSocket.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plTcpSocket.h" #include "plFdSet.h" -#include "../pnNetCommon/plNetAddress.h" +#include "pnNetCommon/plNetAddress.h" #if HS_BUILD_FOR_UNIX #include diff --git a/Sources/Plasma/PubUtilLib/plStatGather/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plStatGather/CMakeLists.txt new file mode 100644 index 00000000..06552397 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plStatGather/CMakeLists.txt @@ -0,0 +1,24 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +include_directories(${OPENSSL_INCLUDE_DIR}) + +set(plStatGather_SOURCES + plAutoProfile.cpp + plCalculatedProfiles.cpp + plProfileManagerFull.cpp +) + +set(plStatGather_HEADERS + plAutoProfile.h + plCalculatedProfiles.h + plProfileManagerFull.h + plStatGatherCreatable.h +) + +add_library(plStatGather STATIC ${plStatGather_SOURCES} ${plStatGather_HEADERS}) + +source_group("Source Files" FILES ${plStatGather_SOURCES}) +source_group("Header Files" FILES ${plStatGather_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plStatGather/plAutoProfile.cpp b/Sources/Plasma/PubUtilLib/plStatGather/plAutoProfile.cpp index 86e72b84..e398b4bc 100644 --- a/Sources/Plasma/PubUtilLib/plStatGather/plAutoProfile.cpp +++ b/Sources/Plasma/PubUtilLib/plStatGather/plAutoProfile.cpp @@ -42,35 +42,35 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAutoProfile.h" #include "plgDispatch.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plNetClient/plNetLinkingMgr.h" +#include "plNetClient/plNetClientMgr.h" +#include "plNetClient/plNetLinkingMgr.h" #include "hsStream.h" #include "hsTimer.h" -#include "../plMessage/plAgeLoadedMsg.h" -#include "../pnTimer/plTimerCallbackManager.h" -#include "../plMessage/plTimerCallbackMsg.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plAvatar/plArmatureMod.h" -#include "../plModifier/plSpawnModifier.h" -#include "../plMessage/plConsoleMsg.h" -#include "../pnMessage/plClientMsg.h" -#include "../plAgeLoader/plAgeLoader.h" +#include "plMessage/plAgeLoadedMsg.h" +#include "pnTimer/plTimerCallbackManager.h" +#include "plMessage/plTimerCallbackMsg.h" +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plArmatureMod.h" +#include "plModifier/plSpawnModifier.h" +#include "plMessage/plConsoleMsg.h" +#include "pnMessage/plClientMsg.h" +#include "plAgeLoader/plAgeLoader.h" #include "plProfileManagerFull.h" -#include "../plFile/plFileUtils.h" +#include "plFile/plFileUtils.h" -#include "../plPipeline/plDebugText.h" -#include "../pnMessage/plTimeMsg.h" +#include "plPipeline/plDebugText.h" +#include "pnMessage/plTimeMsg.h" -#include "../plStatusLog/plStatusLog.h" -#include "../plVault/plVault.h" +#include "plStatusLog/plStatusLog.h" +#include "plVault/plVault.h" -#include "../plContainer/plConfigInfo.h" // for plStringList +#include "plContainer/plConfigInfo.h" // for plStringList // For taking screenshots -#include "../plGImage/plMipmap.h" -#include "../Apps/plClient/plClient.h" -#include "../plJPEG/plJPEG.h" +#include "plGImage/plMipmap.h" +#include "../../Apps/plClient/plClient.h" +#include "plJPEG/plJPEG.h" #include "plPipeline.h" #include diff --git a/Sources/Plasma/PubUtilLib/plStatGather/plAutoProfile.h b/Sources/Plasma/PubUtilLib/plStatGather/plAutoProfile.h index 906d81bc..32602c21 100644 --- a/Sources/Plasma/PubUtilLib/plStatGather/plAutoProfile.h +++ b/Sources/Plasma/PubUtilLib/plStatGather/plAutoProfile.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAutoProfile_h_inc #define plAutoProfile_h_inc -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" class plAutoProfile : public hsKeyedObject { diff --git a/Sources/Plasma/PubUtilLib/plStatGather/plCalculatedProfiles.cpp b/Sources/Plasma/PubUtilLib/plStatGather/plCalculatedProfiles.cpp index cacd3d9e..fba4d88a 100644 --- a/Sources/Plasma/PubUtilLib/plStatGather/plCalculatedProfiles.cpp +++ b/Sources/Plasma/PubUtilLib/plStatGather/plCalculatedProfiles.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plProfile.h" #include "plProfileManager.h" -#include "../plNetClient/plNetClientMgr.h" +#include "plNetClient/plNetClientMgr.h" #include "hsTimer.h" plProfile_CreateCounter("Age Upload BitsPerSec", "Network", UploadAgeBitsPerSec); diff --git a/Sources/Plasma/PubUtilLib/plStatGather/plProfileManagerFull.cpp b/Sources/Plasma/PubUtilLib/plStatGather/plProfileManagerFull.cpp index f2f26392..a78665fb 100644 --- a/Sources/Plasma/PubUtilLib/plStatGather/plProfileManagerFull.cpp +++ b/Sources/Plasma/PubUtilLib/plStatGather/plProfileManagerFull.cpp @@ -42,15 +42,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plProfileManagerFull.h" #include "plProfileManager.h" -#include "../plPipeline/plDebugText.h" -#include "../plPipeline/plPlates.h" +#include "plPipeline/plDebugText.h" +#include "plPipeline/plPlates.h" #include "plCalculatedProfiles.h" #include "hsStream.h" -#include "../pnUtils/pnUtils.h" -#include "../plUnifiedTime/plUnifiedTime.h" -#include "../plFile/plFileUtils.h" +#include "pnUtils/pnUtils.h" +#include "plUnifiedTime/plUnifiedTime.h" +#include "plFile/plFileUtils.h" plProfileManagerFull::plProfileManagerFull() : fVars(plProfileManager::Instance().fVars), @@ -443,7 +443,7 @@ const wchar* plProfileManagerFull::GetProfilePath() plFileUtils::CreateDir(profilePath); wchar buff[256]; - swprintf(buff, L"%02d-%02d-%04d_%02d-%02d//", + swprintf(buff, 256, L"%02d-%02d-%04d_%02d-%02d//", curTime.GetMonth(), curTime.GetDay(), curTime.GetYear(), diff --git a/Sources/Plasma/PubUtilLib/plStatusLog/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plStatusLog/CMakeLists.txt new file mode 100644 index 00000000..00188017 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plStatusLog/CMakeLists.txt @@ -0,0 +1,21 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plStatusLog_SOURCES + plEncryptLogLine.cpp + plLoggable.cpp + plStatusLog.cpp +) + +set(plStatusLog_HEADERS + plEncryptLogLine.h + plLoggable.h + plStatusLog.h +) + +add_library(plStatusLog STATIC ${plStatusLog_SOURCES} ${plStatusLog_HEADERS}) + +source_group("Source Files" FILES ${plStatusLog_SOURCES}) +source_group("Header Files" FILES ${plStatusLog_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp b/Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp index c25fe6e5..1fe415a8 100644 --- a/Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp +++ b/Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp @@ -61,16 +61,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTemplates.h" #include "hsTimer.h" #include "hsStlUtils.h" -#include "../plFile/plFileUtils.h" +#include "plFile/plFileUtils.h" #include "plStatusLog.h" #include "plPipeline.h" -#include "../plPipeline/plDebugText.h" +#include "plPipeline/plDebugText.h" #include "hsStlUtils.h" -#include "../plFile/hsFiles.h" -#include "../plUnifiedTime/plUnifiedTime.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnUtils/pnUtils.h" -#include "../pnProduct/pnProduct.h" +#include "plFile/hsFiles.h" +#include "plUnifiedTime/plUnifiedTime.h" +#include "pnNetCommon/plNetApp.h" +#include "pnUtils/pnUtils.h" +#include "pnProduct/pnProduct.h" #include "plEncryptLogLine.h" diff --git a/Sources/Plasma/PubUtilLib/plStreamLogger/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plStreamLogger/CMakeLists.txt new file mode 100644 index 00000000..16783c9d --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plStreamLogger/CMakeLists.txt @@ -0,0 +1,16 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plStreamLogger_SOURCES + plStreamLogger.cpp +) + +set(plStreamLogger_HEADERS + plStreamLogger.h +) + +add_library(plStreamLogger STATIC ${plStreamLogger_SOURCES} ${plStreamLogger_HEADERS}) + +source_group("Source Files" FILES ${plStreamLogger_SOURCES}) +source_group("Header Files" FILES ${plStreamLogger_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plSurface/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plSurface/CMakeLists.txt new file mode 100644 index 00000000..4b0c57d7 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plSurface/CMakeLists.txt @@ -0,0 +1,81 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plSurface_SOURCES + hsGMaterial.cpp + plGrassShaderMod.cpp + plLayer.cpp + plLayerAnimation.cpp + plLayerDepth.cpp + plLayerInterface.cpp + plLayerMultiply.cpp + plLayerOr.cpp + plLayerShadowBase.cpp + plShader.cpp + plShaderTable.cpp +) + +set(plSurface_HEADERS + hsGMaterial.h + plGrassShaderMod.h + plLayer.h + plLayerAnimation.h + plLayerDepth.h + plLayerInterface.h + plLayerMultiply.h + plLayerOr.h + plLayerShadowBase.h + plShader.h + plShaderTable.h + plSurfaceCreatable.h +) + +set(plSurface_SHADERS + ps_BiasNormals.h + ps_CaddAAdd.h + ps_CaddAbase.h + ps_CaddAMult.h + ps_CalphaAadd.h + ps_CalphaAbase.h + ps_CalphaAMult.h + ps_CbaseAbase.h + ps_CmultAAdd.h + ps_CmultAbase.h + ps_CmultAMult.h + ps_CompCosines.h + ps_GrassShader.h + ps_MoreCosines.h + ps_ShoreLeave6.h + ps_WaveDecEnv.h + ps_WaveFixed.h + ps_WaveGraph.h + ps_WaveGrid.h + ps_WaveRip.h + vs_BiasNormals.h + vs_CompCosines.h + vs_GrassShader.h + vs_ShoreLeave6.h + vs_ShoreLeave7.h + vs_WaveDec1Lay.h + vs_WaveDec1Lay_7.h + vs_WaveDec2Lay11.h + vs_WaveDec2Lay11_7.h + vs_WaveDec2Lay12.h + vs_WaveDec2Lay12_7.h + vs_WaveDecEnv.h + vs_WaveDecEnv_7.h + vs_WaveFixedFin6.h + vs_WaveFixedFin7.h + vs_WaveGraph2.h + vs_WaveGridFin.h + vs_WaveRip.h + vs_WaveRip7.h +) + +add_library(plSurface STATIC ${plSurface_SOURCES} ${plSurface_HEADERS} ${plSurface_SHADERS}) + +source_group("Source Files" FILES ${plSurface_SOURCES}) +source_group("Header Files" FILES ${plSurface_HEADERS}) +source_group("Shaders" FILES ${plSurface_SHADERS}) diff --git a/Sources/Plasma/PubUtilLib/plSurface/hsGMaterial.cpp b/Sources/Plasma/PubUtilLib/plSurface/hsGMaterial.cpp index 958a47b0..6bc7806f 100644 --- a/Sources/Plasma/PubUtilLib/plSurface/hsGMaterial.cpp +++ b/Sources/Plasma/PubUtilLib/plSurface/hsGMaterial.cpp @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "plLayerInterface.h" #include "plLayer.h" -#include "../plMessage/plMatRefMsg.h" +#include "plMessage/plMatRefMsg.h" #include "plProfile.h" plProfile_CreateTimer("MaterialAnims", "Animation", MaterialAnims); diff --git a/Sources/Plasma/PubUtilLib/plSurface/plGrassShaderMod.cpp b/Sources/Plasma/PubUtilLib/plSurface/plGrassShaderMod.cpp index c53947d0..85c33e16 100644 --- a/Sources/Plasma/PubUtilLib/plSurface/plGrassShaderMod.cpp +++ b/Sources/Plasma/PubUtilLib/plSurface/plGrassShaderMod.cpp @@ -45,23 +45,23 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "plgDispatch.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plUoid.h" -//#include "../pnSceneObject/plDrawInterface.h" +//#include "pnSceneObject/plDrawInterface.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../plMessage/plMatRefMsg.h" -#include "../plMessage/plAgeLoadedMsg.h" -#include "../plMessage/plLayRefMsg.h" +#include "pnMessage/plObjRefMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "plMessage/plMatRefMsg.h" +#include "plMessage/plAgeLoadedMsg.h" +#include "plMessage/plLayRefMsg.h" -#include "../plDrawable/plAccessGeometry.h" -#include "../plDrawable/plAccessSpan.h" -#include "../plDrawable/plAccessVtxSpan.h" +#include "plDrawable/plAccessGeometry.h" +#include "plDrawable/plAccessSpan.h" +#include "plDrawable/plAccessVtxSpan.h" -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plShader.h" -#include "../plSurface/plLayer.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plShader.h" +#include "plSurface/plLayer.h" void plGrassWave::Write(hsStream *s) { diff --git a/Sources/Plasma/PubUtilLib/plSurface/plGrassShaderMod.h b/Sources/Plasma/PubUtilLib/plSurface/plGrassShaderMod.h index 7048fa77..069cbf03 100644 --- a/Sources/Plasma/PubUtilLib/plSurface/plGrassShaderMod.h +++ b/Sources/Plasma/PubUtilLib/plSurface/plGrassShaderMod.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PLGRASSSHADERMOD_INC #define PLGRASSSHADERMOD_INC -#include "../pnModifier/plModifier.h" +#include "pnModifier/plModifier.h" class plSceneObject; class hsGMaterial; diff --git a/Sources/Plasma/PubUtilLib/plSurface/plLayer.cpp b/Sources/Plasma/PubUtilLib/plSurface/plLayer.cpp index 647da88a..30960c63 100644 --- a/Sources/Plasma/PubUtilLib/plSurface/plLayer.cpp +++ b/Sources/Plasma/PubUtilLib/plSurface/plLayer.cpp @@ -42,19 +42,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plLayer.h" -#include "../plMessage/plAnimCmdMsg.h" +#include "plMessage/plAnimCmdMsg.h" #include "hsStream.h" #include "hsResMgr.h" #include "hsMatrix44.h" #include "hsGMatState.inl" -#include "../plMessage/plLayRefMsg.h" -#include "../plGImage/plBitmap.h" -#include "../plPipeline/hsGDeviceRef.h" +#include "plMessage/plLayRefMsg.h" +#include "plGImage/plBitmap.h" +#include "plPipeline/hsGDeviceRef.h" #include "plShader.h" #include "plPipeline.h" #include "plgDispatch.h" -#include "../pnMessage/plPipeResMakeMsg.h" +#include "pnMessage/plPipeResMakeMsg.h" plLayer::plLayer() { diff --git a/Sources/Plasma/PubUtilLib/plSurface/plLayerAnimation.cpp b/Sources/Plasma/PubUtilLib/plSurface/plLayerAnimation.cpp index e979677a..8c7a9389 100644 --- a/Sources/Plasma/PubUtilLib/plSurface/plLayerAnimation.cpp +++ b/Sources/Plasma/PubUtilLib/plSurface/plLayerAnimation.cpp @@ -43,21 +43,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsTimer.h" #include "plLayerAnimation.h" -#include "../pnKeyedObject/plKey.h" - -#include "../plInterp/plController.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../pnMessage/plSDLModifierMsg.h" -#include "../plModifier/plLayerSDLModifier.h" -#include "../pnMessage/plCameraMsg.h" -#include "../plNetClient/plLinkEffectsMgr.h" +#include "pnKeyedObject/plKey.h" + +#include "plInterp/plController.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "pnMessage/plSDLModifierMsg.h" +#include "plModifier/plLayerSDLModifier.h" +#include "pnMessage/plCameraMsg.h" +#include "plNetClient/plLinkEffectsMgr.h" #include "plgDispatch.h" #include "hsResMgr.h" -#include "../plModifier/plSDLModifier.h" -#include "../plSDL/plSDL.h" -#include "../pnMessage/plSDLNotificationMsg.h" -#include "../plMessage/plAvatarMsg.h" +#include "plModifier/plSDLModifier.h" +#include "plSDL/plSDL.h" +#include "pnMessage/plSDLNotificationMsg.h" +#include "plMessage/plAvatarMsg.h" plLayerAnimationBase::plLayerAnimationBase() : diff --git a/Sources/Plasma/PubUtilLib/plSurface/plLayerAnimation.h b/Sources/Plasma/PubUtilLib/plSurface/plLayerAnimation.h index c9f66ea8..2f468275 100644 --- a/Sources/Plasma/PubUtilLib/plSurface/plLayerAnimation.h +++ b/Sources/Plasma/PubUtilLib/plSurface/plLayerAnimation.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plLayerAnimation_inc #include "plLayerInterface.h" -#include "../plInterp/plAnimTimeConvert.h" +#include "plInterp/plAnimTimeConvert.h" class plMessage; class plController; diff --git a/Sources/Plasma/PubUtilLib/plSurface/plLayerInterface.cpp b/Sources/Plasma/PubUtilLib/plSurface/plLayerInterface.cpp index 873a11a8..0ac74757 100644 --- a/Sources/Plasma/PubUtilLib/plSurface/plLayerInterface.cpp +++ b/Sources/Plasma/PubUtilLib/plSurface/plLayerInterface.cpp @@ -42,12 +42,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plLayerInterface.h" -#include "../plMessage/plLayRefMsg.h" +#include "plMessage/plLayRefMsg.h" #include "plLayer.h" #include "hsMatrix44.h" #include "hsGMatState.h" #include "hsResMgr.h" -#include "../pnNetCommon/plSDLTypes.h" +#include "pnNetCommon/plSDLTypes.h" plLayerInterface::plLayerInterface() : fUnderLay(nil), diff --git a/Sources/Plasma/PubUtilLib/plSurface/plLayerInterface.h b/Sources/Plasma/PubUtilLib/plSurface/plLayerInterface.h index eabe2c9b..4e829782 100644 --- a/Sources/Plasma/PubUtilLib/plSurface/plLayerInterface.h +++ b/Sources/Plasma/PubUtilLib/plSurface/plLayerInterface.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLayerInterface_inc #define plLayerInterface_inc -#include "../pnNetCommon/plSynchedValue.h" -#include "../pnNetCommon/plSynchedObject.h" +#include "pnNetCommon/plSynchedValue.h" +#include "pnNetCommon/plSynchedObject.h" #include "hsGMatState.h" struct hsMatrix44; diff --git a/Sources/Plasma/PubUtilLib/plSurface/plShader.cpp b/Sources/Plasma/PubUtilLib/plSurface/plShader.cpp index 106c2387..6d62616e 100644 --- a/Sources/Plasma/PubUtilLib/plSurface/plShader.cpp +++ b/Sources/Plasma/PubUtilLib/plSurface/plShader.cpp @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsMatrix44.h" #include "hsColorRGBA.h" -#include "../plPipeline/hsGDeviceRef.h" +#include "plPipeline/hsGDeviceRef.h" // Little shader const helper diff --git a/Sources/Plasma/PubUtilLib/plSurface/plShader.h b/Sources/Plasma/PubUtilLib/plSurface/plShader.h index f8ed121a..c159eee1 100644 --- a/Sources/Plasma/PubUtilLib/plSurface/plShader.h +++ b/Sources/Plasma/PubUtilLib/plSurface/plShader.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plShader_inc #define plShader_inc -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include "hsTemplates.h" #include "hsGeometry3.h" #include "hsMatrix44.h" diff --git a/Sources/Plasma/PubUtilLib/plSurface/plSurfaceCreatable.h b/Sources/Plasma/PubUtilLib/plSurface/plSurfaceCreatable.h index 951c13f4..4d9bb0a2 100644 --- a/Sources/Plasma/PubUtilLib/plSurface/plSurfaceCreatable.h +++ b/Sources/Plasma/PubUtilLib/plSurface/plSurfaceCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plSurfaceCreatable_inc #define plSurfaceCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "hsGMaterial.h" diff --git a/Sources/Plasma/PubUtilLib/plTransform/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plTransform/CMakeLists.txt new file mode 100644 index 00000000..f0cd243b --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plTransform/CMakeLists.txt @@ -0,0 +1,21 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plTransform_SOURCES + hsAffineParts.cpp + hsEuler.cpp + mat_decomp.cpp +) + +set(plTransform_HEADERS + hsAffineParts.h + hsEuler.h + mat_decomp.h +) + +add_library(plTransform STATIC ${plTransform_SOURCES} ${plTransform_HEADERS}) + +source_group("Source Files" FILES ${plTransform_SOURCES}) +source_group("Header Files" FILES ${plTransform_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plTransform/hsAffineParts.cpp b/Sources/Plasma/PubUtilLib/plTransform/hsAffineParts.cpp index 7638d879..feeba114 100644 --- a/Sources/Plasma/PubUtilLib/plTransform/hsAffineParts.cpp +++ b/Sources/Plasma/PubUtilLib/plTransform/hsAffineParts.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" #include "hsAffineParts.h" -#include "../plInterp/hsInterp.h" +#include "plInterp/hsInterp.h" #include "hsStream.h" #include "plProfile.h" diff --git a/Sources/Plasma/PubUtilLib/plUUID/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plUUID/CMakeLists.txt new file mode 100644 index 00000000..7aa05914 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plUUID/CMakeLists.txt @@ -0,0 +1,20 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plUUID_SOURCES + plUUID.cpp +) + +if(WIN32) + set(plUUID_SOURCES ${plUUID_SOURCES} plUUID_Win32.cpp) +endif(WIN32) + +set(plUUID_HEADERS + plUUID.h +) + +add_library(plUUID STATIC ${plUUID_SOURCES} ${plUUID_HEADERS}) + +source_group("Source Files" FILES ${plUUID_SOURCES}) +source_group("Header Files" FILES ${plUUID_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plUnifiedTime/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plUnifiedTime/CMakeLists.txt new file mode 100644 index 00000000..c21b43b4 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plUnifiedTime/CMakeLists.txt @@ -0,0 +1,21 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plUnifiedTime_SOURCES + plClientUnifiedTime.cpp + plTimeSpan.cpp + plUnifiedTime.cpp +) + +set(plUnifiedTime_HEADERS + plClientUnifiedTime.h + plTimeSpan.h + plUnifiedTime.h +) + +add_library(plUnifiedTime STATIC ${plUnifiedTime_SOURCES} ${plUnifiedTime_HEADERS}) + +source_group("Source Files" FILES ${plUnifiedTime_SOURCES}) +source_group("Header Files" FILES ${plUnifiedTime_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plUnifiedTime/plClientUnifiedTime.cpp b/Sources/Plasma/PubUtilLib/plUnifiedTime/plClientUnifiedTime.cpp index 339c53e7..5480eedc 100644 --- a/Sources/Plasma/PubUtilLib/plUnifiedTime/plClientUnifiedTime.cpp +++ b/Sources/Plasma/PubUtilLib/plUnifiedTime/plClientUnifiedTime.cpp @@ -45,8 +45,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plClientUnifiedTime.h" #if 0 -#include "../plNetClient/plNetObjectDebugger.h" -#include "../plNetClient/plNetClientMgr.h" +#include "plNetClient/plNetObjectDebugger.h" +#include "plNetClient/plNetClientMgr.h" #endif // static diff --git a/Sources/Plasma/PubUtilLib/plVault/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plVault/CMakeLists.txt new file mode 100644 index 00000000..2433fdbd --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plVault/CMakeLists.txt @@ -0,0 +1,30 @@ +include_directories("../../CoreLib") +include_directories("../../FeatureLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plVault_SOURCES + plDniCoordinateInfo.cpp + plVault.cpp + plVaultClientApi.cpp + plVaultConstants.cpp + plVaultNodeAccess.cpp +) + +set(plVault_HEADERS + Intern.h + Pch.h + plAgeInfoSource.h + plDniCoordinateInfo.h + plVault.h + plVaultClientApi.h + plVaultConstants.h + plVaultCreatable.h + plVaultNodeAccess.h +) + +add_library(plVault STATIC ${plVault_SOURCES} ${plVault_HEADERS}) + +source_group("Source Files" FILES ${plVault_SOURCES}) +source_group("Header Files" FILES ${plVault_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plVault/Pch.h b/Sources/Plasma/PubUtilLib/plVault/Pch.h index 803c7980..6e2a77e0 100644 --- a/Sources/Plasma/PubUtilLib/plVault/Pch.h +++ b/Sources/Plasma/PubUtilLib/plVault/Pch.h @@ -66,24 +66,24 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStlUtils.h" #include "hsStringTokenizer.h" #include "hsGeometry3.h" -#include "../plSDL/plSDL.h" -#include "../plUnifiedTime/plUnifiedTime.h" -#include "../plNetCommon/plNetCommon.h" -#include "../plNetCommon/plNetServerSessionInfo.h" -#include "../plNetCommon/plSpawnPointInfo.h" -#include "../pnDispatch/plDispatch.h" +#include "plSDL/plSDL.h" +#include "plUnifiedTime/plUnifiedTime.h" +#include "plNetCommon/plNetCommon.h" +#include "plNetCommon/plNetServerSessionInfo.h" +#include "plNetCommon/plSpawnPointInfo.h" +#include "pnDispatch/plDispatch.h" #include "plDniCoordinateInfo.h" -#include "../plGImage/plMipmap.h" -#include "../plJPEG/plJPEG.h" -#include "../plMessage/plVaultNotifyMsg.h" -#include "../plNetClientComm/plNetClientComm.h" +#include "plGImage/plMipmap.h" +#include "plJPEG/plJPEG.h" +#include "plMessage/plVaultNotifyMsg.h" +#include "plNetClientComm/plNetClientComm.h" #define KI_CONSTANTS_ONLY -#include "../../FeatureLib/pfMessage/pfKIMsg.h" // for KI level constants =( +#include "pfMessage/pfKIMsg.h" // for KI level constants =( #undef KI_CONSTANTS_ONLY #pragma warning(pop) -#include "../plNetGameLib/plNetGameLib.h" +#include "plNetGameLib/plNetGameLib.h" #endif // def CLIENT diff --git a/Sources/Plasma/PubUtilLib/plVault/plDniCoordinateInfo.h b/Sources/Plasma/PubUtilLib/plVault/plDniCoordinateInfo.h index f2e933ec..6318e5e2 100644 --- a/Sources/Plasma/PubUtilLib/plVault/plDniCoordinateInfo.h +++ b/Sources/Plasma/PubUtilLib/plVault/plDniCoordinateInfo.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsConfig.h" #include "hsStlUtils.h" -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" /////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plVault/plVault.h b/Sources/Plasma/PubUtilLib/plVault/plVault.h index 7e408a18..76c8cce1 100644 --- a/Sources/Plasma/PubUtilLib/plVault/plVault.h +++ b/Sources/Plasma/PubUtilLib/plVault/plVault.h @@ -48,10 +48,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PLASMA20_SOURCES_PLASMA_PUBUTILLIB_PLVAULT_PLVAULT_H #define PLASMA20_SOURCES_PLASMA_PUBUTILLIB_PLVAULT_PLVAULT_H -#include "../pnUtils/pnUtils.h" -#include "../pnNetBase/pnNetBase.h" -#include "../pnNetProtocol/pnNetProtocol.h" -#include "../pnAsyncCore/pnAsyncCore.h" +#include "pnUtils/pnUtils.h" +#include "pnNetBase/pnNetBase.h" +#include "pnNetProtocol/pnNetProtocol.h" +#include "pnAsyncCore/pnAsyncCore.h" #include "plVaultConstants.h" #include "plVaultNodeAccess.h"