From bead11fb28b4af457e5e16053209450641f8a9e4 Mon Sep 17 00:00:00 2001 From: Zrax Date: Thu, 7 Apr 2011 19:33:24 -0700 Subject: [PATCH] First part of PubUtilLib cmakification --- .../Plasma20/Sources/Plasma/CMakeLists.txt | 1 + .../plAgeDescription/CMakeLists.txt | 21 ++++ .../plAgeDescription/plAgeDescription.cpp | 6 +- .../plAgeDescription/plAgeDescription.h | 6 +- .../plAgeDescription/plAgeManifest.cpp | 6 +- .../plAgeDescription/plAgeManifest.h | 6 +- .../PubUtilLib/plAgeLoader/CMakeLists.txt | 26 ++++ .../PubUtilLib/plAgeLoader/plAgeLoader.cpp | 40 +++---- .../PubUtilLib/plAgeLoader/plAgeLoader.h | 12 +- .../plAgeLoader/plAgeLoaderCreatable.h | 2 +- .../plAgeLoader/plAgeLoaderPaging.cpp | 18 +-- .../plAgeLoader/plBackgroundDownloader.cpp | 40 +++---- .../PubUtilLib/plAgeLoader/plResPatcher.cpp | 32 ++--- .../PubUtilLib/plAgeLoader/plResPatcher.h | 6 +- .../PubUtilLib/plAudible/CMakeLists.txt | 24 ++++ .../PubUtilLib/plAudible/plAudibleCreatable.h | 2 +- .../PubUtilLib/plAudible/plAudibleNull.cpp | 4 +- .../PubUtilLib/plAudible/plWinAudible.cpp | 38 +++--- .../plAudible/plWinAudibleProxy.cpp | 4 +- .../PubUtilLib/plAudible/plWinAudibleProxy.h | 2 +- .../Plasma/PubUtilLib/plAvatar/CMakeLists.txt | 108 +++++++++++++++++ .../Plasma/PubUtilLib/plAvatar/plAGAnim.cpp | 2 +- .../Plasma/PubUtilLib/plAvatar/plAGAnim.h | 2 +- .../PubUtilLib/plAvatar/plAGAnimInstance.cpp | 10 +- .../PubUtilLib/plAvatar/plAGAnimInstance.h | 2 +- .../PubUtilLib/plAvatar/plAGApplicator.h | 2 +- .../Plasma/PubUtilLib/plAvatar/plAGChannel.h | 2 +- .../PubUtilLib/plAvatar/plAGMasterMod.cpp | 12 +- .../PubUtilLib/plAvatar/plAGMasterMod.h | 4 +- .../plAvatar/plAGMasterSDLModifier.cpp | 10 +- .../plAvatar/plAGMasterSDLModifier.h | 2 +- .../PubUtilLib/plAvatar/plAGModifier.cpp | 6 +- .../Plasma/PubUtilLib/plAvatar/plAGModifier.h | 4 +- .../PubUtilLib/plAvatar/plAnimStage.cpp | 12 +- .../Plasma/PubUtilLib/plAvatar/plAnimStage.h | 2 +- .../PubUtilLib/plAvatar/plAntiGravAction.cpp | 6 +- .../PubUtilLib/plAvatar/plArmatureEffects.cpp | 16 +-- .../PubUtilLib/plAvatar/plArmatureEffects.h | 2 +- .../PubUtilLib/plAvatar/plArmatureMod.cpp | 112 +++++++++--------- .../PubUtilLib/plAvatar/plArmatureMod.h | 4 +- .../PubUtilLib/plAvatar/plAvBehaviors.cpp | 4 +- .../PubUtilLib/plAvatar/plAvBehaviors.h | 4 +- .../Plasma/PubUtilLib/plAvatar/plAvBrain.cpp | 6 +- .../Plasma/PubUtilLib/plAvatar/plAvBrain.h | 2 +- .../PubUtilLib/plAvatar/plAvBrainClimb.cpp | 12 +- .../PubUtilLib/plAvatar/plAvBrainClimb.h | 2 +- .../PubUtilLib/plAvatar/plAvBrainCoop.cpp | 12 +- .../PubUtilLib/plAvatar/plAvBrainCritter.cpp | 12 +- .../PubUtilLib/plAvatar/plAvBrainCritter.h | 2 +- .../PubUtilLib/plAvatar/plAvBrainDrive.cpp | 6 +- .../PubUtilLib/plAvatar/plAvBrainGeneric.cpp | 22 ++-- .../PubUtilLib/plAvatar/plAvBrainHuman.cpp | 42 +++---- .../plAvBrainRideAnimatedPhysical.cpp | 2 +- .../PubUtilLib/plAvatar/plAvBrainSwim.cpp | 22 ++-- .../PubUtilLib/plAvatar/plAvBrainSwim.h | 2 +- .../plAvatar/plAvCallbackAction.cpp | 2 +- .../PubUtilLib/plAvatar/plAvCallbackAction.h | 6 +- .../Plasma/PubUtilLib/plAvatar/plAvDefs.h | 2 +- .../plAvatar/plAvLadderModifier.cpp | 26 ++-- .../PubUtilLib/plAvatar/plAvLadderModifier.h | 4 +- .../Plasma/PubUtilLib/plAvatar/plAvTask.h | 2 +- .../PubUtilLib/plAvatar/plAvTaskBrain.cpp | 2 +- .../PubUtilLib/plAvatar/plAvTaskSeek.cpp | 12 +- .../Plasma/PubUtilLib/plAvatar/plAvTaskSeek.h | 2 +- .../PubUtilLib/plAvatar/plAvatarClothing.cpp | 60 +++++----- .../PubUtilLib/plAvatar/plAvatarClothing.h | 6 +- .../PubUtilLib/plAvatar/plAvatarCreatable.h | 2 +- .../PubUtilLib/plAvatar/plAvatarMgr.cpp | 48 ++++---- .../Plasma/PubUtilLib/plAvatar/plAvatarMgr.h | 4 +- .../plAvatar/plAvatarSDLModifier.cpp | 22 ++-- .../PubUtilLib/plAvatar/plAvatarSDLModifier.h | 2 +- .../PubUtilLib/plAvatar/plAvatarTasks.cpp | 26 ++-- .../PubUtilLib/plAvatar/plAvatarTasks.h | 6 +- .../plAvatar/plClothingSDLModifier.cpp | 8 +- .../plAvatar/plClothingSDLModifier.h | 2 +- .../PubUtilLib/plAvatar/plCoopCoordinator.cpp | 16 +-- .../PubUtilLib/plAvatar/plCoopCoordinator.h | 2 +- .../PubUtilLib/plAvatar/plMatrixChannel.cpp | 16 +-- .../PubUtilLib/plAvatar/plMatrixChannel.h | 2 +- .../plAvatar/plMultistageBehMod.cpp | 12 +- .../PubUtilLib/plAvatar/plMultistageBehMod.h | 2 +- .../PubUtilLib/plAvatar/plNPCSpawnMod.cpp | 10 +- .../PubUtilLib/plAvatar/plNPCSpawnMod.h | 2 +- .../PubUtilLib/plAvatar/plOneShotMod.cpp | 2 +- .../Plasma/PubUtilLib/plAvatar/plOneShotMod.h | 4 +- .../plAvatar/plPhysicalControllerCore.cpp | 14 +-- .../plAvatar/plPhysicalControllerCore.h | 6 +- .../PubUtilLib/plAvatar/plPointChannel.cpp | 14 +-- .../PubUtilLib/plAvatar/plQuatChannel.cpp | 10 +- .../PubUtilLib/plAvatar/plScalarChannel.cpp | 8 +- .../PubUtilLib/plAvatar/plSeekPointMod.h | 4 +- .../PubUtilLib/plAvatar/plSittingModifier.cpp | 24 ++-- .../PubUtilLib/plAvatar/plSittingModifier.h | 4 +- .../Plasma/PubUtilLib/plAvatar/plSwimRegion.h | 2 +- .../PubUtilLib/plCompression/CMakeLists.txt | 21 ++++ .../PubUtilLib/plCompression/plZlibStream.cpp | 2 +- .../PubUtilLib/plContainer/CMakeLists.txt | 20 ++++ .../PubUtilLib/plContainer/hsStringTable.cpp | 2 +- .../PubUtilLib/plDrawable/CMakeLists.txt | 107 +++++++++++++++++ .../plDrawable/plAccessGeometry.cpp | 6 +- .../plDrawable/plActivePrintShape.cpp | 4 +- .../Plasma/PubUtilLib/plDrawable/plAuxSpan.h | 2 +- .../PubUtilLib/plDrawable/plClusterGroup.cpp | 12 +- .../PubUtilLib/plDrawable/plClusterGroup.h | 2 +- .../Plasma/PubUtilLib/plDrawable/plCutter.cpp | 12 +- .../Plasma/PubUtilLib/plDrawable/plCutter.h | 4 +- .../plDrawable/plDrawableCreatable.h | 2 +- .../plDrawable/plDrawableGenerator.cpp | 2 +- .../PubUtilLib/plDrawable/plDrawableSpans.cpp | 42 +++---- .../plDrawable/plDrawableSpansExport.cpp | 22 ++-- .../PubUtilLib/plDrawable/plDynaBulletMgr.cpp | 6 +- .../PubUtilLib/plDrawable/plDynaDecalMgr.cpp | 42 +++---- .../PubUtilLib/plDrawable/plDynaDecalMgr.h | 2 +- .../PubUtilLib/plDrawable/plDynaFootMgr.cpp | 10 +- .../PubUtilLib/plDrawable/plDynaPuddleMgr.cpp | 6 +- .../PubUtilLib/plDrawable/plDynaRippleMgr.cpp | 12 +- .../plDrawable/plDynaRippleMgrVS.cpp | 16 +-- .../plDrawable/plDynaTorpedoMgr.cpp | 4 +- .../plDrawable/plDynaTorpedoVSMgr.cpp | 6 +- .../PubUtilLib/plDrawable/plDynaWakeMgr.cpp | 14 +-- .../plDrawable/plFixedWaterState7.h | 2 +- .../PubUtilLib/plDrawable/plGeoSpanDice.cpp | 2 +- .../PubUtilLib/plDrawable/plGeometrySpan.cpp | 4 +- .../plDrawable/plInstanceDrawInterface.cpp | 6 +- .../plDrawable/plInstanceDrawInterface.h | 2 +- .../PubUtilLib/plDrawable/plMorphDelta.h | 2 +- .../PubUtilLib/plDrawable/plMorphSequence.cpp | 8 +- .../PubUtilLib/plDrawable/plMorphSequence.h | 2 +- .../plDrawable/plMorphSequenceSDLMod.cpp | 6 +- .../plDrawable/plMorphSequenceSDLMod.h | 2 +- .../plDrawable/plParticleFiller.cpp | 12 +- .../PubUtilLib/plDrawable/plPrintShape.h | 2 +- .../PubUtilLib/plDrawable/plProxyGen.cpp | 16 +-- .../Plasma/PubUtilLib/plDrawable/plProxyGen.h | 2 +- .../PubUtilLib/plDrawable/plSharedMesh.h | 4 +- .../PubUtilLib/plDrawable/plSpaceTree.cpp | 4 +- .../PubUtilLib/plDrawable/plSpaceTree.h | 2 +- .../plDrawable/plSpaceTreeMaker.cpp | 6 +- .../PubUtilLib/plDrawable/plSpanTypes.cpp | 8 +- .../PubUtilLib/plDrawable/plSpanTypes.h | 2 +- .../PubUtilLib/plDrawable/plVisLOSMgr.cpp | 10 +- .../PubUtilLib/plDrawable/plWaveSet7.cpp | 50 ++++---- .../Plasma/PubUtilLib/plDrawable/plWaveSet7.h | 2 +- .../PubUtilLib/plDrawable/plWaveSetBase.cpp | 2 +- .../PubUtilLib/plDrawable/plWaveSetBase.h | 2 +- .../PubUtilLib/plEncryption/CMakeLists.txt | 18 +++ 146 files changed, 1035 insertions(+), 689 deletions(-) create mode 100644 MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeDescription/CMakeLists.txt create mode 100644 MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeLoader/CMakeLists.txt create mode 100644 MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudible/CMakeLists.txt create mode 100644 MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/CMakeLists.txt create mode 100644 MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plCompression/CMakeLists.txt create mode 100644 MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plContainer/CMakeLists.txt create mode 100644 MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/CMakeLists.txt create mode 100644 MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plEncryption/CMakeLists.txt diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CMakeLists.txt index 28e89837..38f6b401 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CMakeLists.txt +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CMakeLists.txt @@ -2,3 +2,4 @@ add_subdirectory(CoreLib) add_subdirectory(CoreLibExe) add_subdirectory(FeatureLib) add_subdirectory(NucleusLib) +add_subdirectory(PubUtilLib) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeDescription/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeDescription/CMakeLists.txt new file mode 100644 index 00000000..3f0ed321 --- /dev/null +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeDescription/CMakeLists.txt @@ -0,0 +1,21 @@ +include_directories("../../CoreLib") +include_directories("../../FeatureLib") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +include_directories(${OPENSSL_INCLUDE_DIR}) + +set(plAgeDescription_SOURCES + plAgeDescription.cpp + plAgeManifest.cpp +) + +set(plAgeDescription_HEADERS + plAgeDescription.h + plAgeManifest.h +) + +add_library(plAgeDescription STATIC ${plAgeDescription_SOURCES} ${plAgeDescription_HEADERS}) + +source_group("Source Files" FILES ${plAgeDescription_SOURCES}) +source_group("Header Files" FILES ${plAgeDescription_HEADERS}) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeDescription.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeDescription.cpp index a4764d0f..4deb4760 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeDescription.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeDescription.cpp @@ -28,9 +28,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAgeDescription.h" #include "hsUtils.h" #include "hsStlUtils.h" -#include "../plFile/hsFiles.h" -#include "../plFile/plInitFileReader.h" -#include "../plFile/plEncryptedStream.h" +#include "plFile/hsFiles.h" +#include "plFile/plInitFileReader.h" +#include "plFile/plEncryptedStream.h" #include "hsStringTokenizer.h" #include #include diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeDescription.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeDescription.h index ccf3b910..401a1b6f 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeDescription.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeDescription.h @@ -29,9 +29,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsTemplates.h" #include "hsUtils.h" -#include "../plUnifiedTime/plUnifiedTime.h" -#include "../pnKeyedObject/plUoid.h" -#include "../plFile/plInitFileReader.h" +#include "plUnifiedTime/plUnifiedTime.h" +#include "pnKeyedObject/plUoid.h" +#include "plFile/plInitFileReader.h" // // Age Definition File Reader/Writer diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeManifest.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeManifest.cpp index 29fbd702..547654ae 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeManifest.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeManifest.cpp @@ -35,9 +35,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAgeManifest.h" #include "hsUtils.h" -#include "../plFile/hsFiles.h" -#include "../plFile/plFileUtils.h" -#include "../plFile/plInitFileReader.h" +#include "plFile/hsFiles.h" +#include "plFile/plFileUtils.h" +#include "plFile/plInitFileReader.h" #include "hsStringTokenizer.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeManifest.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeManifest.h index 035cece0..3f1ef783 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeManifest.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeManifest.h @@ -37,9 +37,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsTemplates.h" #include "hsUtils.h" -#include "../plUnifiedTime/plUnifiedTime.h" -#include "../plFile/plInitFileReader.h" -#include "../plEncryption/plChecksum.h" +#include "plUnifiedTime/plUnifiedTime.h" +#include "plFile/plInitFileReader.h" +#include "plEncryption/plChecksum.h" //// Small Container Classes for a Single File /////////////////////////////// diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeLoader/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeLoader/CMakeLists.txt new file mode 100644 index 00000000..78fad603 --- /dev/null +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeLoader/CMakeLists.txt @@ -0,0 +1,26 @@ +include_directories("../../CoreLib") +include_directories("../../FeatureLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +include_directories(${OPENSSL_INCLUDE_DIR}) + +set(plAgeLoader_SOURCES + plAgeLoader.cpp + plAgeLoaderPaging.cpp + plBackgroundDownloader.cpp + plResPatcher.cpp +) + +set(plAgeLoader_HEADERS + plAgeLoader.h + plAgeLoaderCreatable.h + plBackgroundDownloader.h + plResPatcher.h +) + +add_library(plAgeLoader STATIC ${plAgeLoader_SOURCES} ${plAgeLoader_HEADERS}) + +source_group("Source Files" FILES ${plAgeLoader_SOURCES}) +source_group("Header Files" FILES ${plAgeLoader_HEADERS}) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoader.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoader.cpp index 212e9262..7b24dc9b 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoader.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoader.cpp @@ -32,28 +32,28 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plBackgroundDownloader.h" #include "process.h" // for getpid() -#include "../pnProduct/pnProduct.h" - -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnMessage/plClientMsg.h" -#include "../pnNetCommon/plNetApp.h" - -#include "../plScene/plRelevanceMgr.h" -#include "../plResMgr/plKeyFinder.h" -#include "../plAgeDescription/plAgeDescription.h" -#include "../plSDL/plSDL.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plResMgr/plRegistryHelpers.h" -#include "../plResMgr/plRegistryNode.h" -#include "../plResMgr/plResManager.h" -#include "../plFile/plEncryptedStream.h" +#include "pnProduct/pnProduct.h" + +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnMessage/plClientMsg.h" +#include "pnNetCommon/plNetApp.h" + +#include "plScene/plRelevanceMgr.h" +#include "plResMgr/plKeyFinder.h" +#include "plAgeDescription/plAgeDescription.h" +#include "plSDL/plSDL.h" +#include "plNetClient/plNetClientMgr.h" +#include "plResMgr/plRegistryHelpers.h" +#include "plResMgr/plRegistryNode.h" +#include "plResMgr/plResManager.h" +#include "plFile/plEncryptedStream.h" /// TEMP HACK TO LOAD CONSOLE INIT FILES ON AGE LOAD -#include "../plMessage/plConsoleMsg.h" -#include "../plMessage/plLoadAvatarMsg.h" -#include "../plMessage/plAgeLoadedMsg.h" +#include "plMessage/plConsoleMsg.h" +#include "plMessage/plLoadAvatarMsg.h" +#include "plMessage/plAgeLoadedMsg.h" extern hsBool gDataServerLocal; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoader.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoader.h index 7cb17121..105c6c35 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoader.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoader.h @@ -29,14 +29,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsStlUtils.h" -#include "../pnUtils/pnUtils.h" -#include "../pnNetBase/pnNetBase.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnKeyedObject/plKey.h" +#include "pnUtils/pnUtils.h" +#include "pnNetBase/pnNetBase.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/plKey.h" -#include "../plAgeDescription/plAgeDescription.h" +#include "plAgeDescription/plAgeDescription.h" -#include "../plUUID/plUUID.h" +#include "plUUID/plUUID.h" // // A singleton class which manages loading and unloading ages and operations associated with that diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoaderCreatable.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoaderCreatable.h index 8c865af2..98d19741 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoaderCreatable.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoaderCreatable.h @@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAgeLoaderCreatable_inc #define plAgeLoaderCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plAgeLoader.h" REGISTER_CREATABLE( plAgeLoader); diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoaderPaging.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoaderPaging.cpp index d20969c6..82c01ffa 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoaderPaging.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoaderPaging.cpp @@ -31,17 +31,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include -#include "../pnNetCommon/plNetApp.h" -#include "../pnKeyedObject/plKey.h" +#include "pnNetCommon/plNetApp.h" +#include "pnKeyedObject/plKey.h" -#include "../plMessage/plAgeLoadedMsg.h" -#include "../plNetMessage/plNetMessage.h" -#include "../plProgressMgr/plProgressMgr.h" -#include "../plSDL/plSDL.h" -#include "../pnDispatch/plDispatch.h" -#include "../plResMgr/plResManager.h" +#include "plMessage/plAgeLoadedMsg.h" +#include "plNetMessage/plNetMessage.h" +#include "plProgressMgr/plProgressMgr.h" +#include "plSDL/plSDL.h" +#include "pnDispatch/plDispatch.h" +#include "plResMgr/plResManager.h" -#include "../plNetClient/plNetClientMgr.h" +#include "plNetClient/plNetClientMgr.h" // // if room is reserved or for animations, don't report it to the server. diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeLoader/plBackgroundDownloader.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeLoader/plBackgroundDownloader.cpp index fc68b08c..70c4abae 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeLoader/plBackgroundDownloader.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeLoader/plBackgroundDownloader.cpp @@ -27,26 +27,26 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include -#include "../pnUtils/pnUtils.h" -#include "../pnNetBase/pnNetBase.h" -#include "../plEncryption/plChecksum.h" - -#include "../NucleusLib/inc/hsResMgr.h" - -#include "../plAgeDescription/plAgeManifest.h" -#include "../plResMgr/plResManager.h" -#include "../plFile/plFileUtils.h" -#include "../plFile/plEncryptedStream.h" -#include "../plCompression/plZlibStream.h" -#include "../plAudioCore/plAudioFileReader.h" -#include "../plProgressMgr/plProgressMgr.h" - -#include "../pnAsyncCore/pnAsyncCore.h" -#include "../pnNetCli/pnNetCli.h" -#include "../plNetGameLib/plNetGameLib.h" - -#include "../pnDispatch/plDispatch.h" -#include "../plStatusLog/plStatusLog.h" +#include "pnUtils/pnUtils.h" +#include "pnNetBase/pnNetBase.h" +#include "plEncryption/plChecksum.h" + +#include "hsResMgr.h" + +#include "plAgeDescription/plAgeManifest.h" +#include "plResMgr/plResManager.h" +#include "plFile/plFileUtils.h" +#include "plFile/plEncryptedStream.h" +#include "plCompression/plZlibStream.h" +#include "plAudioCore/plAudioFileReader.h" +#include "plProgressMgr/plProgressMgr.h" + +#include "pnAsyncCore/pnAsyncCore.h" +#include "pnNetCli/pnNetCli.h" +#include "plNetGameLib/plNetGameLib.h" + +#include "pnDispatch/plDispatch.h" +#include "plStatusLog/plStatusLog.h" static const unsigned kMaxDownloadTries = 10; static const wchar s_manifest[] = L"AllAges"; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeLoader/plResPatcher.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeLoader/plResPatcher.cpp index 1d41ef5d..c9f006ef 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeLoader/plResPatcher.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeLoader/plResPatcher.cpp @@ -25,22 +25,22 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plResPatcher.h" -#include "../NucleusLib/inc/hsResMgr.h" - -#include "../plAgeDescription/plAgeManifest.h" -#include "../plResMgr/plResManager.h" -#include "../plFile/plFileUtils.h" -#include "../plFile/plEncryptedStream.h" -#include "../plCompression/plZlibStream.h" -#include "../plAudioCore/plAudioFileReader.h" -#include "../plProgressMgr/plProgressMgr.h" - -#include "../pnAsyncCore/pnAsyncCore.h" -#include "../pnNetCli/pnNetCli.h" -#include "../plNetGameLib/plNetGameLib.h" - -#include "../pnDispatch/plDispatch.h" -#include "../plStatusLog/plStatusLog.h" +#include "hsResMgr.h" + +#include "plAgeDescription/plAgeManifest.h" +#include "plResMgr/plResManager.h" +#include "plFile/plFileUtils.h" +#include "plFile/plEncryptedStream.h" +#include "plCompression/plZlibStream.h" +#include "plAudioCore/plAudioFileReader.h" +#include "plProgressMgr/plProgressMgr.h" + +#include "pnAsyncCore/pnAsyncCore.h" +#include "pnNetCli/pnNetCli.h" +#include "plNetGameLib/plNetGameLib.h" + +#include "pnDispatch/plDispatch.h" +#include "plStatusLog/plStatusLog.h" static const unsigned kMaxDownloadTries = 10; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeLoader/plResPatcher.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeLoader/plResPatcher.h index 1868b371..aa195414 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeLoader/plResPatcher.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeLoader/plResPatcher.h @@ -28,9 +28,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStlUtils.h" -#include "../pnUtils/pnUtils.h" -#include "../pnNetBase/pnNetBase.h" -#include "../plEncryption/plChecksum.h" +#include "pnUtils/pnUtils.h" +#include "pnNetBase/pnNetBase.h" +#include "plEncryption/plChecksum.h" class plManifest; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudible/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudible/CMakeLists.txt new file mode 100644 index 00000000..5524f1c5 --- /dev/null +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudible/CMakeLists.txt @@ -0,0 +1,24 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +include_directories(${OPENAL_INCLUDE_DIR}) + +set(plAudible_SOURCES + plAudibleNull.cpp + plWinAudible.cpp + plWinAudibleProxy.cpp +) + +set(plAudible_HEADERS + plAudibleCreatable.h + plAudibleNull.h + plWinAudible.h + plWinAudibleProxy.h +) + +add_library(plAudible STATIC ${plAudible_SOURCES} ${plAudible_HEADERS}) + +source_group("Source Files" FILES ${plAudible_SOURCES}) +source_group("Header Files" FILES ${plAudible_HEADERS}) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudible/plAudibleCreatable.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudible/plAudibleCreatable.h index 4ef034e1..591d13cd 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudible/plAudibleCreatable.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudible/plAudibleCreatable.h @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAudibleCreatable_inc #define plAudibleCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plAudibleNull.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudible/plAudibleNull.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudible/plAudibleNull.cpp index f14dbcc6..8c6866b0 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudible/plAudibleNull.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudible/plAudibleNull.cpp @@ -30,8 +30,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plgDispatch.h" #include "hsResMgr.h" -#include "../pnMessage/plNodeRefMsg.h" -#include "../pnKeyedObject/plKey.h" +#include "pnMessage/plNodeRefMsg.h" +#include "pnKeyedObject/plKey.h" hsVector3 plAudibleNull::GetVelocity(int index) const { diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudible/plWinAudible.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudible/plWinAudible.cpp index 0cdb78f8..53d5ba3b 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudible/plWinAudible.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudible/plWinAudible.cpp @@ -29,29 +29,29 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plWinAudible.h" #include "hsMatrix44.h" #include "hsTimer.h" -#include "../plAudio/plSound.h" -#include "../plAudio/plWin32Sound.h" -#include "../plAudio/plVoiceChat.h" -#include "../plAudio/plAudioSystem.h" -#include "../plAudio/plWin32StreamingSound.h" -#include "../pnMessage/plSoundMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnMessage/plAudioSysMsg.h" -#include "../plMessage/plLinkToAgeMsg.h" +#include "plAudio/plSound.h" +#include "plAudio/plWin32Sound.h" +#include "plAudio/plVoiceChat.h" +#include "plAudio/plAudioSystem.h" +#include "plAudio/plWin32StreamingSound.h" +#include "pnMessage/plSoundMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "pnMessage/plAudioSysMsg.h" +#include "plMessage/plLinkToAgeMsg.h" #include "hsResMgr.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include "hsQuat.h" #include "plgDispatch.h" -#include "../pnMessage/plNodeRefMsg.h" -#include "../pnMessage/plEventCallbackMsg.h" -#include "../pnMessage/plCmdIfaceModMsg.h" -#include "../pnMessage/plProxyDrawMsg.h" -#include "../plMessage/plInputEventMsg.h" -#include "../pnInputCore/plControlEventCodes.h" -#include "../plModifier/plSoundSDLModifier.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../plStatusLog/plStatusLog.h" +#include "pnMessage/plNodeRefMsg.h" +#include "pnMessage/plEventCallbackMsg.h" +#include "pnMessage/plCmdIfaceModMsg.h" +#include "pnMessage/plProxyDrawMsg.h" +#include "plMessage/plInputEventMsg.h" +#include "pnInputCore/plControlEventCodes.h" +#include "plModifier/plSoundSDLModifier.h" +#include "pnSceneObject/plSceneObject.h" +#include "plStatusLog/plStatusLog.h" #define SND_INDEX_CHECK( index, ret ) \ if( index >= fSoundObjs.GetCount() ) \ diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudible/plWinAudibleProxy.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudible/plWinAudibleProxy.cpp index 33bab6b6..d7f60004 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudible/plWinAudibleProxy.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudible/plWinAudibleProxy.cpp @@ -28,8 +28,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plWinAudibleProxy.h" #include "plWinAudible.h" -#include "../plDrawable/plDrawableGenerator.h" -#include "../pnMessage/plProxyDrawMsg.h" +#include "plDrawable/plDrawableGenerator.h" +#include "pnMessage/plProxyDrawMsg.h" plWinAudibleProxy::plWinAudibleProxy() : plProxyGen(hsColorRGBA().Set(0.2f,0.2f,0.8f,1.f), hsColorRGBA().Set(1.f,0.5f,0.5f,1.f), 0.2f), diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudible/plWinAudibleProxy.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudible/plWinAudibleProxy.h index 9954b66d..6f8a958d 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudible/plWinAudibleProxy.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudible/plWinAudibleProxy.h @@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plWinAudibleProxy_inc #define plWinAudibleProxy_inc -#include "../plDrawable/plProxyGen.h" +#include "plDrawable/plProxyGen.h" class plWinAudible; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/CMakeLists.txt new file mode 100644 index 00000000..5ecf5d61 --- /dev/null +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/CMakeLists.txt @@ -0,0 +1,108 @@ +include_directories("../../CoreLib") +include_directories("../../FeatureLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +include_directories(${OPENSSL_INCLUDE_DIR}) +include_directories(${OPENAL_INCLUDE_DIR}) + +set(plAvatar_SOURCES + plAGAnim.cpp + plAGAnimInstance.cpp + plAGApplicator.cpp + plAGChannel.cpp + plAGMasterMod.cpp + plAGMasterSDLModifier.cpp + plAGModifier.cpp + plAnimStage.cpp + plAntiGravAction.cpp + plArmatureEffects.cpp + plArmatureMod.cpp + plAvatarClothing.cpp + plAvatarMgr.cpp + plAvatarSDLModifier.cpp + plAvatarTasks.cpp + plAvBehaviors.cpp + plAvBrain.cpp + plAvBrainClimb.cpp + plAvBrainCoop.cpp + plAvBrainCritter.cpp + plAvBrainDrive.cpp + plAvBrainGeneric.cpp + plAvBrainHuman.cpp + plAvBrainRideAnimatedPhysical.cpp + plAvBrainSwim.cpp + plAvCallbackAction.cpp + plAvLadderModifier.cpp + plAvTaskBrain.cpp + plAvTaskSeek.cpp + plClothingSDLModifier.cpp + plCoopCoordinator.cpp + plMatrixChannel.cpp + plMultistageBehMod.cpp + plNPCSpawnMod.cpp + plOneShotMod.cpp + plPhysicalControllerCore.cpp + plPointChannel.cpp + plQuatChannel.cpp + plScalarChannel.cpp + plSeekPointMod.cpp + plSittingModifier.cpp + plSwimRegion.cpp +) + +set(plAvatar_HEADERS + plAGAnim.h + plAGAnimInstance.h + plAGApplicator.h + plAGChannel.h + plAGMasterMod.h + plAGMasterSDLModifier.h + plAGModifier.h + plAnimStage.h + plAntiGravAction.h + plArmatureEffects.h + plArmatureMod.h + plAvatarClothing.h + plAvatarCreatable.h + plAvatarMgr.h + plAvatarSDLModifier.h + plAvatarTasks.h + plAvBehaviors.h + plAvBrain.h + plAvBrainClimb.h + plAvBrainCoop.h + plAvBrainCritter.h + plAvBrainDrive.h + plAvBrainGeneric.h + plAvBrainHuman.h + plAvBrainRideAnimatedPhysical.h + plAvBrainSwim.h + plAvCallbackAction.h + plAvDefs.h + plAvLadderModifier.h + plAvTask.h + plAvTaskBrain.h + plAvTaskSeek.h + plClothingLayout.h + plClothingSDLModifier.h + plCoopCoordinator.h + plCritterCommands.h + plMatrixChannel.h + plMultistageBehMod.h + plNPCSpawnMod.h + plOneShotMod.h + plPhysicalControllerCore.h + plPointChannel.h + plQuatChannel.h + plScalarChannel.h + plSeekPointMod.h + plSittingModifier.h + plSwimRegion.h +) + +add_library(plAvatar STATIC ${plAvatar_SOURCES} ${plAvatar_HEADERS}) + +source_group("Source Files" FILES ${plAvatar_SOURCES}) +source_group("Header Files" FILES ${plAvatar_HEADERS}) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.cpp index babe7b71..752bdf91 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.cpp @@ -39,7 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" // other -#include "../plMessage/plAnimCmdMsg.h" +#include "plMessage/plAnimCmdMsg.h" ///////////////////////////////////////////////////////////////////////////////////////// // diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.h index dab0b936..0ba17407 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.h @@ -34,7 +34,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com */ #pragma warning(disable: 4786) // don't care if mangled names are longer than 255 characters -#include "../pnNetCommon/plSynchedObject.h" +#include "pnNetCommon/plSynchedObject.h" #include "hsStlUtils.h" #include "hsStlSortUtils.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.cpp index 237453b2..e6323803 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.cpp @@ -41,11 +41,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTimer.h" // just when debugging for GetSysSeconds // other -#include "../pnNetCommon/plSDLTypes.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plMessage/plOneShotCallbacks.h" -#include "../plModifier/plSDLModifier.h" -#include "../plSDL/plSDL.h" +#include "pnNetCommon/plSDLTypes.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plMessage/plOneShotCallbacks.h" +#include "plModifier/plSDLModifier.h" +#include "plSDL/plSDL.h" ///////////////////////////////////////////////////////////////////////////////////////// // diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.h index 05ad2491..369440a5 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.h @@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plScalarChannel.h" // other -#include "../plInterp/plAnimTimeConvert.h" +#include "plInterp/plAnimTimeConvert.h" // declarations class plAGChannel; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGApplicator.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGApplicator.h index 58db61a1..064716da 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGApplicator.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGApplicator.h @@ -44,7 +44,7 @@ class plAGModifier; // INCLUDES // ///////////////////////////////////////////////////////////////////////////////////////// -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" #include "plAvDefs.h" ///////////////////////////////////////////////////////////////////////////////////////// diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGChannel.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGChannel.h index 33fbc03c..32deac5c 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGChannel.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGChannel.h @@ -84,7 +84,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ///////////////////////////////////////////////////////////////////////////////////////// -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" ///////////////////////////////////////////////////////////////////////////////////////// // diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.cpp index 161a6b68..cd51dfb4 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.cpp @@ -40,12 +40,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // other // #include "../pnMessage/plRefMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../pnMessage/plSDLModifierMsg.h" -#include "../pnMessage/plSDLNotificationMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" +#include "plMessage/plAnimCmdMsg.h" +#include "pnMessage/plSDLModifierMsg.h" +#include "pnMessage/plSDLNotificationMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" //////////////// // PLAGMASTERMOD diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.h index 9ed493f9..d2111491 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.h @@ -37,10 +37,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // INCLUDES // ///////////////////////////////////////////////////////////////////////////////////////// -#include "../pnModifier/plModifier.h" +#include "pnModifier/plModifier.h" #include "plAGChannel.h" #include "plAvDefs.h" -#include "../pnKeyedObject/plMsgForwarder.h" +#include "pnKeyedObject/plMsgForwarder.h" // templates #include "hsStlUtils.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterSDLModifier.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterSDLModifier.cpp index 6f959035..17663e63 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterSDLModifier.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterSDLModifier.cpp @@ -24,15 +24,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plAGMasterSDLModifier.h" -#include "../plSDL/plSDL.h" -#include "../plInterp/plAnimTimeConvert.h" -#include "../pnSceneObject/plSceneObject.h" +#include "plSDL/plSDL.h" +#include "plInterp/plAnimTimeConvert.h" +#include "pnSceneObject/plSceneObject.h" #include "plAGMasterMod.h" #include "plAGAnimInstance.h" #include "plgDispatch.h" -#include "../pnMessage/plTimeMsg.h" +#include "pnMessage/plTimeMsg.h" #include "hsTimer.h" -#include "../plMessage/plAnimCmdMsg.h" +#include "plMessage/plAnimCmdMsg.h" // static vars char plAGMasterSDLModifier::AGMasterVarNames::kStrAtcs[]="atcs"; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterSDLModifier.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterSDLModifier.h index 78349a71..e793c5ea 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterSDLModifier.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterSDLModifier.h @@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAGMasterSDLModifier_inc #define plAGMasterSDLModifier_inc -#include "../plModifier/plAnimTimeConvertSDLModifier.h" +#include "plModifier/plAnimTimeConvertSDLModifier.h" // // This modifier is responsible for sending and recving diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGModifier.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGModifier.cpp index e0bf01e8..aec162f9 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGModifier.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGModifier.cpp @@ -33,9 +33,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTimer.h" // other -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnSceneObject/plSimulationInterface.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plSimulationInterface.h" ///////////////// // diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGModifier.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGModifier.h index 74733ead..d8839da4 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGModifier.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGModifier.h @@ -32,10 +32,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define PLAGMODIFIER_H #include "hsTypes.h" // need for plSingleModifier -#include "../pnModifier/plSingleModifier.h" // inherited +#include "pnModifier/plSingleModifier.h" // inherited // local -#include "../plAvatar/plScalarChannel.h" +#include "plAvatar/plScalarChannel.h" // stl #include "hsStlUtils.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.cpp index 8c8c168b..96ac3adc 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.cpp @@ -46,15 +46,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include // other -#include "../pnSceneObject/plSceneObject.h" -#include "../plMessage/plSimStateMsg.h" -#include "../plStatusLog/plStatusLog.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../plPipeline/plDebugText.h" +#include "pnSceneObject/plSceneObject.h" +#include "plMessage/plSimStateMsg.h" +#include "plStatusLog/plStatusLog.h" +#include "pnMessage/plNotifyMsg.h" +#include "plPipeline/plDebugText.h" #ifdef DEBUG_MULTISTAGE #include "plAvatarMgr.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" #endif diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.h index 16817f7c..227a465d 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.h @@ -33,7 +33,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsMatrix44.h" #include "hsStlUtils.h" -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" class plMessage; class plAGAnimInstance; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAntiGravAction.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAntiGravAction.cpp index 5152604d..46fd9320 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAntiGravAction.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAntiGravAction.cpp @@ -30,9 +30,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAntiGravAction.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../plHavok1/plHKPhysical.h" -#include "../plAvatar/plSwimRegion.h" +#include "pnSceneObject/plSceneObject.h" +#include "plHavok1/plHKPhysical.h" +#include "plAvatar/plSwimRegion.h" #include "hsTimer.h" // This is meant to be a specific physicsAction for the swim behavior diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plArmatureEffects.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plArmatureEffects.cpp index 2116059b..6159b276 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plArmatureEffects.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plArmatureEffects.cpp @@ -25,16 +25,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plAvCallbackAction.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" #include "plArmatureEffects.h" -#include "../pfMessage/plArmatureEffectMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plMessage/plAvatarMsg.h" +#include "pfMessage/plArmatureEffectMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plMessage/plAvatarMsg.h" #include "plArmatureMod.h" -#include "../pnSceneObject/plAudioInterface.h" -#include "../plAudio/plSound.h" -#include "../plAudio/plAudioSystem.h" -#include "../pfAudio/plRandomSoundMod.h" +#include "pnSceneObject/plAudioInterface.h" +#include "plAudio/plSound.h" +#include "plAudio/plAudioSystem.h" +#include "pfAudio/plRandomSoundMod.h" #include "hsResMgr.h" #include "plgDispatch.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plArmatureEffects.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plArmatureEffects.h index c3c2000b..e7062298 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plArmatureEffects.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plArmatureEffects.h @@ -29,7 +29,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plArmatureEffects_inc #define plArmatureEffects_inc -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include "hsTemplates.h" #include "hsBitVector.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.cpp index f0fe4837..2244751e 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.cpp @@ -47,64 +47,64 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTimer.h" // other -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnSceneObject/plAudioInterface.h" -#include "../plInterp/plAnimTimeConvert.h" - -#include "../pnMessage/plEnableMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnMessage/plSDLModifierMsg.h" -#include "../pnMessage/plAttachMsg.h" -#include "../pnMessage/plWarpMsg.h" -#include "../pnMessage/plCorrectionMsg.h" -#include "../pnMessage/plCameraMsg.h" -#include "../pnMessage/plPipeResMakeMsg.h" - -#include "../plMessage/plAvatarMsg.h" -#include "../plMessage/plAvatarFootMsg.h" -#include "../plMessage/plInputEventMsg.h" -#include "../plMessage/plLoadAgeMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plMessage/plListenerMsg.h" -#include "../plMessage/plAgeLoadedMsg.h" -#include "../plMessage/plParticleUpdateMsg.h" - -#include "../plParticleSystem/plParticleSystem.h" -#include "../plParticleSystem/plParticleSDLMod.h" - -#include "../pfMessage/plArmatureEffectMsg.h" -#include "../pfMessage/pfKIMsg.h" -#include "../plVault/plVault.h" - -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plKeyImp.h" - -#include "../plDrawable/plInstanceDrawInterface.h" -#include "../plDrawable/plDrawableSpans.h" -#include "../plSurface/plLayerAnimation.h" -#include "../plSurface/hsGMaterial.h" - -#include "../pnNetCommon/plNetApp.h" -#include "../plNetClient/plNetClientMgr.h" // for CCR stuff.. -#include "../plNetClient/plNetLinkingMgr.h" -#include "../plModifier/plSpawnModifier.h" -#include "../plPipeline/plDebugText.h" -#include "../plResMgr/plKeyFinder.h" -#include "../plAudio/plWin32StaticSound.h" -#include "../plAudio/plAudioSystem.h" -#include "../plNetMessage/plNetMessage.h" -#include "../plInputCore/plAvatarInputInterface.h" -#include "../plInputCore/plSceneInputInterface.h" -#include "../plInputCore/plInputDevice.h" -#include "../pfCamera/plVirtualCamNeu.h" -#include "../plScene/plRelevanceMgr.h" -#include "../plMessage/plSimStateMsg.h" - -#include "../plGImage/plLODMipmap.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plAudioInterface.h" +#include "plInterp/plAnimTimeConvert.h" + +#include "pnMessage/plEnableMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "pnMessage/plSDLModifierMsg.h" +#include "pnMessage/plAttachMsg.h" +#include "pnMessage/plWarpMsg.h" +#include "pnMessage/plCorrectionMsg.h" +#include "pnMessage/plCameraMsg.h" +#include "pnMessage/plPipeResMakeMsg.h" + +#include "plMessage/plAvatarMsg.h" +#include "plMessage/plAvatarFootMsg.h" +#include "plMessage/plInputEventMsg.h" +#include "plMessage/plLoadAgeMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plMessage/plListenerMsg.h" +#include "plMessage/plAgeLoadedMsg.h" +#include "plMessage/plParticleUpdateMsg.h" + +#include "plParticleSystem/plParticleSystem.h" +#include "plParticleSystem/plParticleSDLMod.h" + +#include "pfMessage/plArmatureEffectMsg.h" +#include "pfMessage/pfKIMsg.h" +#include "plVault/plVault.h" + +#include "pnKeyedObject/plFixedKey.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKeyImp.h" + +#include "plDrawable/plInstanceDrawInterface.h" +#include "plDrawable/plDrawableSpans.h" +#include "plSurface/plLayerAnimation.h" +#include "plSurface/hsGMaterial.h" + +#include "pnNetCommon/plNetApp.h" +#include "plNetClient/plNetClientMgr.h" // for CCR stuff.. +#include "plNetClient/plNetLinkingMgr.h" +#include "plModifier/plSpawnModifier.h" +#include "plPipeline/plDebugText.h" +#include "plResMgr/plKeyFinder.h" +#include "plAudio/plWin32StaticSound.h" +#include "plAudio/plAudioSystem.h" +#include "plNetMessage/plNetMessage.h" +#include "plInputCore/plAvatarInputInterface.h" +#include "plInputCore/plSceneInputInterface.h" +#include "plInputCore/plInputDevice.h" +#include "pfCamera/plVirtualCamNeu.h" +#include "plScene/plRelevanceMgr.h" +#include "plMessage/plSimStateMsg.h" + +#include "plGImage/plLODMipmap.h" #include "plPipeline.h" #include "plTweak.h" -#include "../plDrawable/plVisLOSMgr.h" +#include "plDrawable/plVisLOSMgr.h" int plArmatureModBase::fMinLOD = 0; // standard is 3 levels of LOD double plArmatureModBase::fLODDistance = 50.0; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.h index f0416769..7d5c0042 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.h @@ -45,10 +45,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // other local #include "plAvDefs.h" -#include "../pnSceneObject/plSimulationInterface.h" +#include "pnSceneObject/plSimulationInterface.h" #include "hsMatrix44.h" -#include "../plNetCommon/plNetCommon.h" +#include "plNetCommon/plNetCommon.h" #include diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBehaviors.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBehaviors.cpp index de34bb8c..aabaff1c 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBehaviors.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBehaviors.cpp @@ -27,9 +27,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAvBrainHuman.h" #include "plArmatureMod.h" #include "plAGAnimInstance.h" -#include "../plMessage/plAvatarMsg.h" +#include "plMessage/plAvatarMsg.h" -#include "../plPipeline/plDebugText.h" +#include "plPipeline/plDebugText.h" plArmatureBehavior::plArmatureBehavior() : fAnim(nil), fArmature(nil), fBrain(nil), fIndex((UInt8)-1), fFlags(0) {} diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBehaviors.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBehaviors.h index 582ef859..1d0e94dd 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBehaviors.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBehaviors.h @@ -28,8 +28,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsTemplates.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnTimer/plTimedValue.h" +#include "pnKeyedObject/plKey.h" +#include "pnTimer/plTimedValue.h" class plAGAnim; class plAGAnimInstance; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrain.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrain.cpp index 184522fd..34745e7b 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrain.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrain.cpp @@ -35,11 +35,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsQuat.h" // other -#include "../pnSceneObject/plSceneObject.h" -#include "../plPipeline/plDebugText.h" +#include "pnSceneObject/plSceneObject.h" +#include "plPipeline/plDebugText.h" // messages -#include "../plMessage/plAvatarMsg.h" +#include "plMessage/plAvatarMsg.h" ///////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////// diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrain.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrain.h index d3b75a6a..8d5a30ba 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrain.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrain.h @@ -33,7 +33,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsGeometry3.h" #include "hsResMgr.h" -#include "../pnNetCommon/plSynchedObject.h" +#include "pnNetCommon/plSynchedObject.h" #pragma warning(disable: 4284) #include diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainClimb.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainClimb.cpp index 02928b47..f4877379 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainClimb.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainClimb.cpp @@ -63,12 +63,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTimer.h" // other -#include "../plPipeline/plDebugText.h" -#include "../plMessage/plSimStateMsg.h" -#include "../plMessage/plLOSHitMsg.h" -#include "../plMessage/plLOSRequestMsg.h" -#include "../plMessage/plClimbEventMsg.h" -#include "../pnNetCommon/plSDLTypes.h" +#include "plPipeline/plDebugText.h" +#include "plMessage/plSimStateMsg.h" +#include "plMessage/plLOSHitMsg.h" +#include "plMessage/plLOSRequestMsg.h" +#include "plMessage/plClimbEventMsg.h" +#include "pnNetCommon/plSDLTypes.h" ///////////////////////////////////////////////////////////////// // diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainClimb.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainClimb.h index 645ce191..291fe5c8 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainClimb.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainClimb.h @@ -34,7 +34,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ///////////////////////////////////////////////////////////////// #include "plAvBrain.h" -#include "../plMessage/plClimbMsg.h" +#include "plMessage/plClimbMsg.h" ///////////////////////////////////////////////////////////////// // diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCoop.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCoop.cpp index 023b331c..a4729ade 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCoop.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCoop.cpp @@ -39,14 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAvatarMgr.h" // other -#include "../plScene/plSceneNode.h" -#include "../pnNetCommon/plNetApp.h" +#include "plScene/plSceneNode.h" +#include "pnNetCommon/plNetApp.h" // messages -#include "../plMessage/plAvatarMsg.h" -#include "../plMessage/plAvCoopMsg.h" -#include "../plMessage/plPickedMsg.h" -#include "../pnMessage/plNotifyMsg.h" +#include "plMessage/plAvatarMsg.h" +#include "plMessage/plAvCoopMsg.h" +#include "plMessage/plPickedMsg.h" +#include "pnMessage/plNotifyMsg.h" ///////////////////////////////////////////////////////////////////////////////////////// // diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCritter.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCritter.cpp index e024847f..e518a6f2 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCritter.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCritter.cpp @@ -37,13 +37,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plgDispatch.h" -#include "../plMessage/plAIMsg.h" +#include "plMessage/plAIMsg.h" -#include "../plPipeline/plDebugText.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../plMath/plRandom.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plNetTransport/plNetTransportMember.h" +#include "plPipeline/plDebugText.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "plMath/plRandom.h" +#include "plNetClient/plNetClientMgr.h" +#include "plNetTransport/plNetTransportMember.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCritter.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCritter.h index 3f663cb9..fea0fb59 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCritter.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCritter.h @@ -28,7 +28,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAvBrain.h" #include "hsTemplates.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" class plArmatureMod; class plWalkingController; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainDrive.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainDrive.cpp index 4f53e32e..b1552509 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainDrive.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainDrive.cpp @@ -34,11 +34,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // other includes #include "hsQuat.h" -#include "../plMessage/plSimStateMsg.h" -#include "../pnMessage/plCameraMsg.h" +#include "plMessage/plSimStateMsg.h" +#include "pnMessage/plCameraMsg.h" // messages -#include "../plMessage/plInputEventMsg.h" +#include "plMessage/plInputEventMsg.h" // CTOR default plAvBrainDrive::plAvBrainDrive() diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainGeneric.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainGeneric.cpp index bfaa5020..f19dcba0 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainGeneric.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainGeneric.cpp @@ -43,20 +43,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plgDispatch.h" // other -#include "../pnNetCommon/plSDLTypes.h" -#include "../pnMessage/plCameraMsg.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../plMessage/plAvatarMsg.h" -#include "../plMessage/plInputEventMsg.h" -#include "../plMessage/plSimStateMsg.h" -#include "../plMessage/plConsoleMsg.h" -#include "../plPipeline/plDebugText.h" -#include "../plInputCore/plAvatarInputInterface.h" -#include "../plMessage/plInputIfaceMgrMsg.h" +#include "pnNetCommon/plSDLTypes.h" +#include "pnMessage/plCameraMsg.h" +#include "pnMessage/plNotifyMsg.h" +#include "plMessage/plAvatarMsg.h" +#include "plMessage/plInputEventMsg.h" +#include "plMessage/plSimStateMsg.h" +#include "plMessage/plConsoleMsg.h" +#include "plPipeline/plDebugText.h" +#include "plInputCore/plAvatarInputInterface.h" +#include "plMessage/plInputIfaceMgrMsg.h" #ifdef DEBUG_MULTISTAGE #include "plAvatarMgr.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" #endif hsBool plAvBrainGeneric::fForce3rdPerson = true; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainHuman.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainHuman.cpp index cde8713f..eb904eb6 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainHuman.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainHuman.cpp @@ -53,27 +53,27 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plgDispatch.h" #include "hsQuat.h" #include "plPhysical.h" -#include "../plStatusLog/plStatusLog.h" - -#include "../pnNetCommon/plNetApp.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../plInputCore/plAvatarInputInterface.h" -#include "../plInputCore/plInputDevice.h" -#include "../plMath/plRandom.h" -#include "../plPipeline/plDebugText.h" -#include "../plNetClient/plNetLinkingMgr.h" - -#include "../plMessage/plAvatarMsg.h" -#include "../plMessage/plClimbMsg.h" -#include "../plMessage/plInputEventMsg.h" -#include "../plMessage/plLOSHitMsg.h" -#include "../plMessage/plLOSRequestMsg.h" -#include "../plMessage/plSimStateMsg.h" -#include "../plMessage/plSwimMsg.h" -#include "../plMessage/plAgeLoadedMsg.h" -#include "../pnMessage/plWarpMsg.h" -#include "../pnMessage/plProxyDrawMsg.h" -#include "../plMessage/plRideAnimatedPhysMsg.h" +#include "plStatusLog/plStatusLog.h" + +#include "pnNetCommon/plNetApp.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "plInputCore/plAvatarInputInterface.h" +#include "plInputCore/plInputDevice.h" +#include "plMath/plRandom.h" +#include "plPipeline/plDebugText.h" +#include "plNetClient/plNetLinkingMgr.h" + +#include "plMessage/plAvatarMsg.h" +#include "plMessage/plClimbMsg.h" +#include "plMessage/plInputEventMsg.h" +#include "plMessage/plLOSHitMsg.h" +#include "plMessage/plLOSRequestMsg.h" +#include "plMessage/plSimStateMsg.h" +#include "plMessage/plSwimMsg.h" +#include "plMessage/plAgeLoadedMsg.h" +#include "pnMessage/plWarpMsg.h" +#include "pnMessage/plProxyDrawMsg.h" +#include "plMessage/plRideAnimatedPhysMsg.h" float plAvBrainHuman::fWalkTimeToMaxTurn = .3f; float plAvBrainHuman::fRunTimeToMaxTurn = .1f; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainRideAnimatedPhysical.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainRideAnimatedPhysical.cpp index f6ee7660..8b32e6f5 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainRideAnimatedPhysical.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainRideAnimatedPhysical.cpp @@ -29,7 +29,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAvBrainHuman.h" #include "plAvBrain.h" #include "plAvCallbackAction.h" -#include "../plMessage/plRideAnimatedPhysMsg.h" +#include "plMessage/plRideAnimatedPhysMsg.h" void plAvBrainRideAnimatedPhysical::Activate(plArmatureModBase *avMod) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainSwim.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainSwim.cpp index 1a602534..2aeafca1 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainSwim.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainSwim.cpp @@ -55,17 +55,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPhysicalControllerCore.h" #include "plAvCallbackAction.h" // other -#include "../plPhysical/plCollisionDetector.h" -#include "../plPipeline/plDebugText.h" - -#include "../plMessage/plAvatarMsg.h" -#include "../plMessage/plSwimMsg.h" -#include "../plMessage/plLOSRequestMsg.h" -#include "../plMessage/plLOSHitMsg.h" -#include "../plMessage/plInputEventMsg.h" -#include "../plMessage/plSimStateMsg.h" -#include "../pnMessage/plCameraMsg.h" -#include "../pfMessage/plArmatureEffectMsg.h" +#include "plPhysical/plCollisionDetector.h" +#include "plPipeline/plDebugText.h" + +#include "plMessage/plAvatarMsg.h" +#include "plMessage/plSwimMsg.h" +#include "plMessage/plLOSRequestMsg.h" +#include "plMessage/plLOSHitMsg.h" +#include "plMessage/plInputEventMsg.h" +#include "plMessage/plSimStateMsg.h" +#include "pnMessage/plCameraMsg.h" +#include "pfMessage/plArmatureEffectMsg.h" class plSwimBehavior : public plArmatureBehavior { diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainSwim.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainSwim.h index cfcb4d75..32e4212a 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainSwim.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainSwim.h @@ -28,7 +28,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAvBrain.h" #include "hsTemplates.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" class plArmatureMod; class plAntiGravAction; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvCallbackAction.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvCallbackAction.cpp index 655f4e02..8d00069b 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvCallbackAction.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvCallbackAction.cpp @@ -24,7 +24,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plAvCallbackAction.h" -#include "../plMessage/plLOSHitMsg.h" +#include "plMessage/plLOSHitMsg.h" #include "plArmatureMod.h" // for LOS enum type #include "plMatrixChannel.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvCallbackAction.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvCallbackAction.h index 4daa441f..8289b036 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvCallbackAction.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvCallbackAction.h @@ -29,9 +29,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsGeometry3.h" #include "hsMatrix44.h" #include "hsTemplates.h" -#include "../pnKeyedObject/plKey.h" -#include "../plPhysical/plSimDefs.h" -#include "../pnMessage/plMessage.h" +#include "pnKeyedObject/plKey.h" +#include "plPhysical/plSimDefs.h" +#include "pnMessage/plMessage.h" #include "plPhysicalControllerCore.h" class plLOSHitMsg; class plAGApplicator; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvDefs.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvDefs.h index e15b6815..7bbcece1 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvDefs.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvDefs.h @@ -31,7 +31,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com if we don't keep them with class headers, which tend to be more volatile. */ -#include "../CoreLib/hsGeometry3.h" // for the hsVector3, below +#include "hsGeometry3.h" // for the hsVector3, below // animation alignment types (used by "calcanimalignment") diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvLadderModifier.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvLadderModifier.cpp index 18788ce8..6b86f2a4 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvLadderModifier.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvLadderModifier.cpp @@ -23,7 +23,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "../plAvatar/plAvCallbackAction.h" +#include "plAvatar/plAvCallbackAction.h" #include "hsTypes.h" @@ -43,19 +43,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" //other -#include "../plMessage/plCollideMsg.h" -#include "../plMessage/plAvatarMsg.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../plStatusLog/plStatusLog.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnMessage/plEnableMsg.h" - -#include "../pnMessage/plTimeMsg.h" +#include "plMessage/plCollideMsg.h" +#include "plMessage/plAvatarMsg.h" +#include "pnMessage/plNotifyMsg.h" +#include "plStatusLog/plStatusLog.h" +#include "pnKeyedObject/plKey.h" +#include "pnMessage/plEnableMsg.h" + +#include "pnMessage/plTimeMsg.h" #include "plgDispatch.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../plAvatar/plAvBrainHuman.h" -#include "../plModifier/plDetectorLog.h" +#include "pnNetCommon/plNetApp.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "plAvatar/plAvBrainHuman.h" +#include "plModifier/plDetectorLog.h" enum NotifyType { diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvLadderModifier.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvLadderModifier.h index ad209273..cb15fe9c 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvLadderModifier.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvLadderModifier.h @@ -26,8 +26,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAvLadderMod_INC #define plAvLadderMod_INC -#include "../pnModifier/plSingleModifier.h" -#include "../pnMessage/plMessage.h" +#include "pnModifier/plSingleModifier.h" +#include "pnMessage/plMessage.h" #include "hsGeometry3.h" // has a detector region. when a local avatar enters that region, diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvTask.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvTask.h index 908af555..8f7f9798 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvTask.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvTask.h @@ -32,7 +32,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ///////////////////////////////////////////////////////////////////////////////////////// // base class -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" ///////////////////////////////////////////////////////////////////////////////////////// // diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvTaskBrain.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvTaskBrain.cpp index aaae0a65..141d9963 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvTaskBrain.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvTaskBrain.cpp @@ -32,7 +32,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAvBrain.h" // other -#include "../plPipeline/plDebugText.h" +#include "plPipeline/plDebugText.h" ///////////////////////////////////////////////////////////////////////////////////////// // diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvTaskSeek.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvTaskSeek.cpp index 4c1a851c..549e70d8 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvTaskSeek.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvTaskSeek.cpp @@ -41,12 +41,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAvCallbackAction.h" // other -#include "../plMessage/plAvatarMsg.h" -#include "../pnMessage/plCameraMsg.h" -#include "../pnInputCore/plControlEventCodes.h" -#include "../plPipeline/plDebugText.h" -#include "../plStatusLog/plStatusLog.h" -#include "../pnSceneObject/plCoordinateInterface.h" +#include "plMessage/plAvatarMsg.h" +#include "pnMessage/plCameraMsg.h" +#include "pnInputCore/plControlEventCodes.h" +#include "plPipeline/plDebugText.h" +#include "plStatusLog/plStatusLog.h" +#include "pnSceneObject/plCoordinateInterface.h" #include "hsTimer.h" #include "plgDispatch.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvTaskSeek.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvTaskSeek.h index 5b6f5a0f..9d7bf499 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvTaskSeek.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvTaskSeek.h @@ -29,7 +29,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAvatarTasks.h" #include "hsQuat.h" -#include "..\CoreLib\hsGeometry3.h" +#include "hsGeometry3.h" class plArmatureMod; class plArmatureBrain; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.cpp index d85ab704..dc6896e5 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.cpp @@ -28,40 +28,40 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "hsResMgr.h" #include "plGDispatch.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../plDrawable/plInstanceDrawInterface.h" -#include "../pnMessage/plRefMsg.h" -#include "../pnMessage/plPipeResMakeMsg.h" -#include "../pfMessage/plClothingMsg.h" -#include "../plMessage/plRenderMsg.h" -#include "../plGImage/plMipmap.h" -#include "../plPipeline/hsGDeviceRef.h" -#include "../plPipeline/plRenderTarget.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnSceneObject/plSceneObject.h" +#include "plDrawable/plInstanceDrawInterface.h" +#include "pnMessage/plRefMsg.h" +#include "pnMessage/plPipeResMakeMsg.h" +#include "pfMessage/plClothingMsg.h" +#include "plMessage/plRenderMsg.h" +#include "plGImage/plMipmap.h" +#include "plPipeline/hsGDeviceRef.h" +#include "plPipeline/plRenderTarget.h" #include "plPipeline.h" #include "plClothingLayout.h" #include "plAvatarClothing.h" #include "plClothingSDLModifier.h" -#include "../plGImage/hsCodecManager.h" -#include "../plAvatar/plArmatureMod.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plAvatar/plArmatureEffects.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnMessage/plSDLModifierMsg.h" -#include "../plMessage/plReplaceGeometryMsg.h" -#include "../plDrawable/plDrawableSpans.h" -#include "../plDrawable/plSharedMesh.h" -#include "../plDrawable/plMorphSequence.h" -#include "../plDrawable/plMorphSequenceSDLMod.h" -#include "../plDrawable/plSpaceTree.h" -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plLayer.h" -#include "../plMath/plRandom.h" -#include "../plSDL/plSDL.h" -#include "../plVault/plVault.h" -#include "../plResMgr/plKeyFinder.h" -#include "../plNetClientComm/plNetClientComm.h" +#include "plGImage/hsCodecManager.h" +#include "plAvatar/plArmatureMod.h" +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plArmatureEffects.h" +#include "pnNetCommon/plNetApp.h" +#include "pnMessage/plSDLModifierMsg.h" +#include "plMessage/plReplaceGeometryMsg.h" +#include "plDrawable/plDrawableSpans.h" +#include "plDrawable/plSharedMesh.h" +#include "plDrawable/plMorphSequence.h" +#include "plDrawable/plMorphSequenceSDLMod.h" +#include "plDrawable/plSpaceTree.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plLayer.h" +#include "plMath/plRandom.h" +#include "plSDL/plSDL.h" +#include "plVault/plVault.h" +#include "plResMgr/plKeyFinder.h" +#include "plNetClientComm/plNetClientComm.h" plClothingItem::plClothingItem() : fName(nil), fGroup(0), fTileset(0), fType(0), fSortOrder(0), diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.h index 6c9dcf7f..03970409 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.h @@ -26,9 +26,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PLAVATARCLOTHING_INC #define PLAVATARCLOTHING_INC -#include "../pnUtils/pnUtils.h" -#include "../pnNetCommon/plSynchedObject.h" -#include "../CoreLib/hsColorRGBA.h" +#include "pnUtils/pnUtils.h" +#include "pnNetCommon/plSynchedObject.h" +#include "hsColorRGBA.h" #include "hsBitVector.h" #include "plClothingLayout.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarCreatable.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarCreatable.h index be70f260..e82b9ac4 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarCreatable.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarCreatable.h @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAvatarCreatable_inc #define plAvatarCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plAGAnim.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.cpp index 362f3c84..b06ef7d4 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.cpp @@ -41,34 +41,34 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // global #include "hsResMgr.h" -#include "../pnNetCommon/plNetApp.h" +#include "pnNetCommon/plNetApp.h" #include "plgDispatch.h" #include "hsTimer.h" // other -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plResMgr/plKeyFinder.h" -#include "../pfCCR/plCCRMgr.h" // Only included for defined constants. -#include "../plNetTransport/plNetTransport.h" -#include "../plNetTransport/plNetTransportMember.h" -#include "../plModifier/plSpawnModifier.h" -#include "../plModifier/plMaintainersMarkerModifier.h" -#include "../plVault/plDniCoordinateInfo.h" -#include "../plMath/plRandom.h" - -#include "../pnMessage/plPlayerPageMsg.h" -#include "../pnMessage/plWarpMsg.h" -#include "../pnMessage/plNotifyMsg.h" - -#include "../plMessage/plMemberUpdateMsg.h" -#include "../plMessage/plAvatarMsg.h" -#include "../plMessage/plAvCoopMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../plStatusLog/plStatusLog.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plFixedKey.h" +#include "plNetClient/plNetClientMgr.h" +#include "plResMgr/plKeyFinder.h" +#include "pfCCR/plCCRMgr.h" // Only included for defined constants. +#include "plNetTransport/plNetTransport.h" +#include "plNetTransport/plNetTransportMember.h" +#include "plModifier/plSpawnModifier.h" +#include "plModifier/plMaintainersMarkerModifier.h" +#include "plVault/plDniCoordinateInfo.h" +#include "plMath/plRandom.h" + +#include "pnMessage/plPlayerPageMsg.h" +#include "pnMessage/plWarpMsg.h" +#include "pnMessage/plNotifyMsg.h" + +#include "plMessage/plMemberUpdateMsg.h" +#include "plMessage/plAvatarMsg.h" +#include "plMessage/plAvCoopMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "plStatusLog/plStatusLog.h" // The static single instance, allocated on demand by GetInstance() plAvatarMgr *plAvatarMgr::fInstance = nil; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.h index b992003c..2e87da2c 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.h @@ -33,8 +33,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStlSortUtils.h" #include "hsGeometry3.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../plMessage/plLoadAvatarMsg.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "plMessage/plLoadAvatarMsg.h" // This is still pretty much a hack, but it's a compartmentalized hack instead of the previous // interwoven spaghetti hack. diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarSDLModifier.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarSDLModifier.cpp index 3db4cea8..3b1a9c69 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarSDLModifier.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarSDLModifier.cpp @@ -26,17 +26,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAvatarSDLModifier.h" #include "plArmatureMod.h" -#include "../plAvatar/plArmatureMod.h" -#include "../plAvatar/plAvBrainGeneric.h" -#include "../plAvatar/plAvBrainClimb.h" -#include "../plAvatar/plAvBrainDrive.h" -#include "../plAvatar/plAnimStage.h" -#include "../plAvatar/plAvCallbackAction.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnMessage/plSDLModifierMsg.h" -#include "../plSDL/plSDL.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../pnAsyncCore/pnAsyncCore.h" +#include "plAvatar/plArmatureMod.h" +#include "plAvatar/plAvBrainGeneric.h" +#include "plAvatar/plAvBrainClimb.h" +#include "plAvatar/plAvBrainDrive.h" +#include "plAvatar/plAnimStage.h" +#include "plAvatar/plAvCallbackAction.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnMessage/plSDLModifierMsg.h" +#include "plSDL/plSDL.h" +#include "plNetClient/plNetClientMgr.h" +#include "pnAsyncCore/pnAsyncCore.h" // static vars char plAvatarPhysicalSDLModifier::kStrPosition[] = "position"; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarSDLModifier.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarSDLModifier.h index 9768ff46..7a69b021 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarSDLModifier.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarSDLModifier.h @@ -28,7 +28,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsConfig.h" #include "hsStlUtils.h" -#include "../plModifier/plSDLModifier.h" +#include "plModifier/plSDLModifier.h" // diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.cpp index e04cba49..16366387 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.cpp @@ -45,22 +45,22 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // other #include "plgDispatch.h" -#include "../plMessage/plAvatarMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plMessage/plOneShotCallbacks.h" -#include "../plMessage/plConsoleMsg.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../plPipeline/plDebugText.h" -#include "../plInputCore/plInputInterfaceMgr.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plNetCommon/plNetCommon.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../pfMessage/pfKIMsg.h" +#include "plMessage/plAvatarMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plMessage/plOneShotCallbacks.h" +#include "plMessage/plConsoleMsg.h" +#include "pnKeyedObject/plKey.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "plPipeline/plDebugText.h" +#include "plInputCore/plInputInterfaceMgr.h" +#include "plNetClient/plNetClientMgr.h" +#include "plNetCommon/plNetCommon.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "pfMessage/pfKIMsg.h" // for console hack hsBool plAvOneShotTask::fForce3rdPerson = true; -#include "../pnMessage/plCameraMsg.h" +#include "pnMessage/plCameraMsg.h" ///////////// // diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.h index 7e3e1b1f..d10057ea 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.h @@ -34,9 +34,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAvDefs.h" #include "hsQuat.h" -#include "../CoreLib/hsGeometry3.h" -#include "../CoreLib/hsMatrix44.h" -#include "../pnKeyedObject/plKey.h" +#include "hsGeometry3.h" +#include "hsMatrix44.h" +#include "pnKeyedObject/plKey.h" class plAGAnim; class plAGAnimInstance; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plClothingSDLModifier.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plClothingSDLModifier.cpp index 43cdc7e3..326fce74 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plClothingSDLModifier.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plClothingSDLModifier.cpp @@ -28,10 +28,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plClothingLayout.h" #include "plArmatureMod.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnMessage/plSDLModifierMsg.h" -#include "../plSDL/plSDL.h" -#include "../pnKeyedObject/plKeyImp.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnMessage/plSDLModifierMsg.h" +#include "plSDL/plSDL.h" +#include "pnKeyedObject/plKeyImp.h" // static vars char plClothingSDLModifier::kStrItem[]="item"; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plClothingSDLModifier.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plClothingSDLModifier.h index c4865012..7df3cd46 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plClothingSDLModifier.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plClothingSDLModifier.h @@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plClothingSDLModifier_inc #define plClothingSDLModifier_inc -#include "../plModifier/plSDLModifier.h" +#include "plModifier/plSDLModifier.h" #include "hsColorRGBA.h" #include "hsTemplates.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plCoopCoordinator.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plCoopCoordinator.cpp index a9f41923..73d39b1b 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plCoopCoordinator.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plCoopCoordinator.cpp @@ -42,15 +42,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsUtils.h" // other -#include "../plMessage/plAvCoopMsg.h" -#include "../plMessage/plAvatarMsg.h" -#include "../plMessage/plInputIfaceMgrMsg.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../pnNetCommon/plNetApp.h" -#include "../plNetClient/plNetClientMgr.h" +#include "plMessage/plAvCoopMsg.h" +#include "plMessage/plAvatarMsg.h" +#include "plMessage/plInputIfaceMgrMsg.h" +#include "pnMessage/plNotifyMsg.h" +#include "pnNetCommon/plNetApp.h" +#include "plNetClient/plNetClientMgr.h" #include "plPhysical.h" -#include "../pnTimer/plTimerCallbackManager.h" -#include "../plMessage/plTimerCallbackMsg.h" +#include "pnTimer/plTimerCallbackManager.h" +#include "plMessage/plTimerCallbackMsg.h" const unsigned kAbortTimer = 1; const float kAbortTimerDuration = 15; // 15 seconds diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plCoopCoordinator.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plCoopCoordinator.h index f7ae2dae..92292e0d 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plCoopCoordinator.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plCoopCoordinator.h @@ -33,7 +33,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ///////////////////////////////////////////////////////////////////////////////////////// // global -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" ///////////////////////////////////////////////////////////////////////////////////////// // diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.cpp index 496d6483..97c85042 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.cpp @@ -47,14 +47,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTimer.h" // other -#include "../pnSceneObject/plDrawInterface.h" -#include "../pnSceneObject/plSimulationInterface.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnSceneObject/plAudioInterface.h" -#include "../plInterp/plController.h" -#include "../plInterp/plAnimTimeConvert.h" -#include "../plInterp/hsInterp.h" -#include "../plTransform/hsAffineParts.h" +#include "pnSceneObject/plDrawInterface.h" +#include "pnSceneObject/plSimulationInterface.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plAudioInterface.h" +#include "plInterp/plController.h" +#include "plInterp/plAnimTimeConvert.h" +#include "plInterp/hsInterp.h" +#include "plTransform/hsAffineParts.h" ///////////////////////////////////////////////////////////////////////////////////////// // diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.h index 3de13fd8..43d4f3ae 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.h @@ -32,7 +32,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // global #include "hsTypes.h" // you need types to include Matrix #include "hsMatrix44.h" -#include "../plTransform/hsAffineParts.h" +#include "plTransform/hsAffineParts.h" // local prototypes class plQuatChannel; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plMultistageBehMod.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plMultistageBehMod.cpp index f1859327..178f7660 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plMultistageBehMod.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plMultistageBehMod.cpp @@ -36,15 +36,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" //other -#include "../plMessage/plAvatarMsg.h" -#include "../plMessage/plMultistageMsg.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../plInputCore/plAvatarInputInterface.h" +#include "plMessage/plAvatarMsg.h" +#include "plMessage/plMultistageMsg.h" +#include "pnMessage/plNotifyMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "plInputCore/plAvatarInputInterface.h" #ifdef DEBUG_MULTISTAGE #include "plAvatarMgr.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" #endif plMultistageBehMod::plMultistageBehMod() : fStages(nil), fFreezePhys(false), fSmartSeek(false), fReverseFBControlsOnRelease(false), fNetProp(true), fNetForce(false) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plMultistageBehMod.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plMultistageBehMod.h index ced8e8c5..cd37c274 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plMultistageBehMod.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plMultistageBehMod.h @@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plMultistageBehMod_h_inc #define plMultistageBehMod_h_inc -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" #include "hsStlUtils.h" class plAnimStageVec; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plNPCSpawnMod.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plNPCSpawnMod.cpp index b716c9a8..664f206e 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plNPCSpawnMod.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plNPCSpawnMod.cpp @@ -32,13 +32,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAvatarMgr.h" // global -#include +#include "hsMatrix44.h" // other -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" -//#include "../pnMessage/plWarpMsg.h" -#include "../pnMessage/plNotifyMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" +//#include "pnMessage/plWarpMsg.h" +#include "pnMessage/plNotifyMsg.h" // plNPCSpawnMod ctor diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plNPCSpawnMod.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plNPCSpawnMod.h index 927612a1..fdf28c2c 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plNPCSpawnMod.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plNPCSpawnMod.h @@ -23,7 +23,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" class plNotifyMsg; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plOneShotMod.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plOneShotMod.cpp index 07b9c92d..1d986d2d 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plOneShotMod.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plOneShotMod.cpp @@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plgDispatch.h" // other -#include "../plMessage/plAvatarMsg.h" +#include "plMessage/plAvatarMsg.h" // CTOR() plOneShotMod::plOneShotMod() diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plOneShotMod.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plOneShotMod.h index de593195..1b0fd2d4 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plOneShotMod.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plOneShotMod.h @@ -26,8 +26,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plOneShotMod_INC #define plOneShotMod_INC -#include "../pnModifier/plMultiModifier.h" -#include "../pnMessage/plMessage.h" +#include "pnModifier/plMultiModifier.h" +#include "pnMessage/plMessage.h" // PLONESHOTMOD // A one shot diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plPhysicalControllerCore.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plPhysicalControllerCore.cpp index 3c032b41..9d59db58 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plPhysicalControllerCore.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plPhysicalControllerCore.cpp @@ -24,17 +24,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plPhysicalControllerCore.h" -#include "../plMessage/plLOSHitMsg.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../../NucleusLib/inc/plPhysical.h" -#include "../../NucleusLib/pnMessage/plCorrectionMsg.h" +#include "plMessage/plLOSHitMsg.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "plPhysical.h" +#include "pnMessage/plCorrectionMsg.h" #include "plSwimRegion.h" #include "plArmatureMod.h" // for LOS enum type #include "plMatrixChannel.h" #include "hsTimer.h" -#include "../plPhysx/plSimulationMgr.h" -#include "../plPhysx/plPXPhysical.h" -#include "../pnMessage/plSetNetGroupIDMsg.h" +#include "plPhysx/plSimulationMgr.h" +#include "plPhysx/plPXPhysical.h" +#include "pnMessage/plSetNetGroupIDMsg.h" #define kSWIMRADIUS 1.1f #define kSWIMHEIGHT 2.8f #define kGENERICCONTROLLERRADIUS 1.1f diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plPhysicalControllerCore.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plPhysicalControllerCore.h index 5b6acb0f..be119d4c 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plPhysicalControllerCore.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plPhysicalControllerCore.h @@ -28,9 +28,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsGeometry3.h" #include "hsMatrix44.h" #include "hsTemplates.h" -#include "../pnKeyedObject/plKey.h" -#include "../plPhysical/plSimDefs.h" -#include "../pnMessage/plMessage.h" +#include "pnKeyedObject/plKey.h" +#include "plPhysical/plSimDefs.h" +#include "pnMessage/plMessage.h" #include "hsQuat.h" #define PHYSX_ONLY_TRIGGER_FROM_KINEMATIC 1 diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plPointChannel.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plPointChannel.cpp index f35d332c..60b96d30 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plPointChannel.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plPointChannel.cpp @@ -27,13 +27,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plScalarChannel.h" #include "hsResMgr.h" -#include "../pnSceneObject/plDrawInterface.h" -#include "../pnSceneObject/plSimulationInterface.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnSceneObject/plAudioInterface.h" -#include "../plInterp/plController.h" -#include "../plInterp/plAnimTimeConvert.h" -#include "../plGLight/plLightInfo.h" +#include "pnSceneObject/plDrawInterface.h" +#include "pnSceneObject/plSimulationInterface.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plAudioInterface.h" +#include "plInterp/plController.h" +#include "plInterp/plAnimTimeConvert.h" +#include "plGLight/plLightInfo.h" ////////////// // PLPOINTSRCE diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plQuatChannel.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plQuatChannel.cpp index 90440290..518b2214 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plQuatChannel.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plQuatChannel.cpp @@ -27,11 +27,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPointChannel.h" #include "plMatrixChannel.h" -#include "../pnSceneObject/plDrawInterface.h" -#include "../pnSceneObject/plSimulationInterface.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnSceneObject/plAudioInterface.h" -#include "../plInterp/plAnimTimeConvert.h" +#include "pnSceneObject/plDrawInterface.h" +#include "pnSceneObject/plSimulationInterface.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plAudioInterface.h" +#include "plInterp/plAnimTimeConvert.h" #include "hsMatrix44.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plScalarChannel.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plScalarChannel.cpp index 5a1c81af..d75c24ab 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plScalarChannel.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plScalarChannel.cpp @@ -37,10 +37,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" // other -#include "../plGLight/plLightInfo.h" -#include "../plInterp/plController.h" -#include "../plInterp/plAnimTimeConvert.h" -#include "../plSDL/plSDL.h" +#include "plGLight/plLightInfo.h" +#include "plInterp/plController.h" +#include "plInterp/plAnimTimeConvert.h" +#include "plSDL/plSDL.h" ///////////////////////////////////////////////////////////////////////////////////////// diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plSeekPointMod.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plSeekPointMod.h index cd5db0ae..0e913a1d 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plSeekPointMod.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plSeekPointMod.h @@ -26,8 +26,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PLSEEKPOINTMOD_INC #define PLSEEKPOINTMOD_INC -#include "../pnModifier/plMultiModifier.h" -#include "../pnMessage/plMessage.h" +#include "pnModifier/plMultiModifier.h" +#include "pnMessage/plMessage.h" // PLSEEKPOINTMOD // This modifier is something the avatar knows how to go to. (you know, seek) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plSittingModifier.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plSittingModifier.cpp index e48b8721..c2085a92 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plSittingModifier.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plSittingModifier.cpp @@ -27,18 +27,18 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plSittingModifier.h" //other -#include "../plMessage/plAvatarMsg.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../pnMessage/plCameraMsg.h" -#include "../plAvatar/plArmatureMod.h" -#include "../plAvatar/plAnimStage.h" -#include "../plAvatar/plAvTaskBrain.h" -#include "../plAvatar/plAvBrainGeneric.h" -#include "../plAvatar/plAvBrainHuman.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../plInputCore/plAvatarInputInterface.h" +#include "plMessage/plAvatarMsg.h" +#include "pnMessage/plNotifyMsg.h" +#include "pnMessage/plCameraMsg.h" +#include "plAvatar/plArmatureMod.h" +#include "plAvatar/plAnimStage.h" +#include "plAvatar/plAvTaskBrain.h" +#include "plAvatar/plAvBrainGeneric.h" +#include "plAvatar/plAvBrainHuman.h" +#include "plAvatar/plAvatarMgr.h" +#include "pnNetCommon/plNetApp.h" +#include "pnSceneObject/plSceneObject.h" +#include "plInputCore/plAvatarInputInterface.h" ///////////////////////////////////////////////////////////////////////////////////////// // diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plSittingModifier.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plSittingModifier.h index 647eae0d..6079acb4 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plSittingModifier.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plSittingModifier.h @@ -32,8 +32,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ///////////////////////////////////////////////////////////////////////////////////////// -#include "../pnModifier/plSingleModifier.h" // base class -#include "../pnKeyedobject/plKey.h" // for the notification keys +#include "pnModifier/plSingleModifier.h" // base class +#include "pnKeyedobject/plKey.h" // for the notification keys #include "hsTemplates.h" // for the array they're kept in ///////////////////////////////////////////////////////////////////////////////////////// diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plSwimRegion.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plSwimRegion.h index 8964404a..b3e083e3 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plSwimRegion.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plSwimRegion.h @@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plSwimRegion_inc #define plSwimRegion_inc -#include "../pnSceneObject/plObjInterface.h" +#include "pnSceneObject/plObjInterface.h" class plArmatureModBase; class plPhysical; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plCompression/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plCompression/CMakeLists.txt new file mode 100644 index 00000000..9d3d4e46 --- /dev/null +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plCompression/CMakeLists.txt @@ -0,0 +1,21 @@ +include_directories("../../CoreLib") + +find_package(ZLIB REQUIRED) +include_directories(${ZLIB_INCLUDE_DIR}) + +set(plCompression_SOURCES + plZlibCompress.cpp + plZlibStream.cpp +) + +set(plCompression_HEADERS + plCompress.h + plZlibCompress.h + plZlibStream.h +) + +add_library(plCompression STATIC ${plCompression_SOURCES} ${plCompression_HEADERS}) +target_link_libraries(plCompression ${ZLIB_LIBRARIES}) + +source_group("Source Files" FILES ${plCompression_SOURCES}) +source_group("Header Files" FILES ${plCompression_HEADERS}) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plCompression/plZlibStream.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plCompression/plZlibStream.cpp index 26be9ae1..bcc0f80c 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plCompression/plZlibStream.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plCompression/plZlibStream.cpp @@ -24,7 +24,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plZlibStream.h" -#include "zlib.h" +#include voidpf ZlibAlloc(voidpf opaque, uInt items, uInt size) { diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plContainer/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plContainer/CMakeLists.txt new file mode 100644 index 00000000..71857cb3 --- /dev/null +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plContainer/CMakeLists.txt @@ -0,0 +1,20 @@ +include_directories("../../CoreLib") + +set(plContainer_SOURCES + hsStringTable.cpp + plConfigInfo.cpp + plConfigInfoLogging.cpp + plKeysAndValues.cpp +) + +set(plContainer_HEADERS + hsStringTable.h + plConfigInfo.h + plContainer.h + plKeysAndValues.h +) + +add_library(plContainer STATIC ${plContainer_SOURCES} ${plContainer_HEADERS}) + +source_group("Source Files" FILES ${plContainer_SOURCES}) +source_group("Header Files" FILES ${plContainer_HEADERS}) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plContainer/hsStringTable.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plContainer/hsStringTable.cpp index 4bd0c364..59f68c1e 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plContainer/hsStringTable.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plContainer/hsStringTable.cpp @@ -24,7 +24,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsStringTable.h" -#include "stdlib.h" +#include #if HS_BUILD_FOR_PS2 || __MWERKS__ || HS_BUILD_FOR_UNIX #include #endif diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/CMakeLists.txt new file mode 100644 index 00000000..96b5ccb3 --- /dev/null +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/CMakeLists.txt @@ -0,0 +1,107 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plDrawable_SOURCES + plAccessGeometry.cpp + plAccessSnapShot.cpp + plAccMeshSmooth.cpp + plActivePrintShape.cpp + plAvMeshSmooth.cpp + plCluster.cpp + plClusterGroup.cpp + plCutter.cpp + plDrawableGenerator.cpp + plDrawableSpans.cpp + plDrawableSpansExport.cpp + plDynaBulletMgr.cpp + plDynaDecal.cpp + plDynaDecalMgr.cpp + plDynaFootMgr.cpp + plDynaPuddleMgr.cpp + plDynaRippleMgr.cpp + plDynaRippleMgrVS.cpp + plDynaTorpedoMgr.cpp + plDynaTorpedoVSMgr.cpp + plDynaWakeMgr.cpp + plFixedWaterState7.cpp + plGeometrySpan.cpp + plGeoSpanDice.cpp + plInstanceDrawInterface.cpp + plInterMeshSmooth.cpp + plMorphArray.cpp + plMorphDelta.cpp + plMorphSequence.cpp + plMorphSequenceSDLMod.cpp + plParticleFiller.cpp + plPrintShape.cpp + plProxyGen.cpp + plSharedMesh.cpp + plSpaceTree.cpp + plSpaceTreeMaker.cpp + plSpanInstance.cpp + plSpanTemplate.cpp + plSpanTypes.cpp + plVisLOSMgr.cpp + plWaveSet7.cpp + plWaveSetBase.cpp +) + +set(plDrawable_HEADERS + plAccessGeometry.h + plAccessPartySpan.h + plAccessSnapShot.h + plAccessSpan.h + plAccessTriSpan.h + plAccessVtxSpan.h + plAccMeshSmooth.h + plActivePrintShape.h + plAuxSpan.h + plAvMeshSmooth.h + plCluster.h + plClusterGroup.h + plCutter.h + plDrawableCreatable.h + plDrawableGenerator.h + plDrawableSpans.h + plDynaBulletMgr.h + plDynaDecal.h + plDynaDecalMgr.h + plDynaFootMgr.h + plDynaPuddleMgr.h + plDynaRippleMgr.h + plDynaRippleVSMgr.h + plDynaTorpedoMgr.h + plDynaTorpedoVSMgr.h + plDynaWakeMgr.h + plFixedWaterState7.h + plGeometrySpan.h + plGeoSpanDice.h + plInstanceDrawInterface.h + plInterMeshSmooth.h + plMorphArray.h + plMorphDelta.h + plMorphSequence.h + plMorphSequenceSDLMod.h + plParticleFiller.h + plPrintShape.h + plProxyGen.h + plRipVSConsts.h + plSharedMesh.h + plSpaceTree.h + plSpaceTreeMaker.h + plSpanInstance.h + plSpanTemplate.h + plSpanTypes.h + plTimedInterp.h + plVisLOSMgr.h + plWaveSet7.h + plWaveSetBase.h + plWaveSetShaderConsts.h +) + +add_library(plDrawable STATIC ${plDrawable_SOURCES} ${plDrawable_HEADERS}) + +source_group("Source Files" FILES ${plDrawable_SOURCES}) +source_group("Header Files" FILES ${plDrawable_HEADERS}) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plAccessGeometry.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plAccessGeometry.cpp index 547ebaea..75a65f80 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plAccessGeometry.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plAccessGeometry.cpp @@ -29,7 +29,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAccessGeometry.h" -#include "../pnSceneObject/plDrawInterface.h" +#include "pnSceneObject/plDrawInterface.h" #include "plDrawableSpans.h" #include "plGeometrySpan.h" @@ -41,8 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAccessSnapShot.h" // For dipping directly into device buffers. -#include "../plPipeline/plGBufferGroup.h" -#include "../plPipeline/hsGDeviceRef.h" +#include "plPipeline/plGBufferGroup.h" +#include "plPipeline/hsGDeviceRef.h" #include "plPipeline.h" #include "plTweak.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plActivePrintShape.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plActivePrintShape.cpp index c11061b4..efdb44db 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plActivePrintShape.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plActivePrintShape.cpp @@ -27,13 +27,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plActivePrintShape.h" -#include "../plMessage/plRippleShapeMsg.h" +#include "plMessage/plRippleShapeMsg.h" #include "hsStream.h" #include "hsResMgr.h" #include "plgDispatch.h" -#include "../pnMessage/plTimeMsg.h" +#include "pnMessage/plTimeMsg.h" plActivePrintShape::plActivePrintShape() : fShapeMsg(nil) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plAuxSpan.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plAuxSpan.h index 0a4d79d2..094149c7 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plAuxSpan.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plAuxSpan.h @@ -30,7 +30,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTemplates.h" #include "plSpanTypes.h" -#include "../plPipeline/plGBufferGroup.h" +#include "plPipeline/plGBufferGroup.h" class plDrawableSpans; class hsGMaterial; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plClusterGroup.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plClusterGroup.cpp index a22166e6..0c08bda2 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plClusterGroup.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plClusterGroup.cpp @@ -30,14 +30,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plSpanTemplate.h" #include "plCluster.h" -#include "../pnMessage/plTimeMsg.h" +#include "pnMessage/plTimeMsg.h" -#include "../plScene/plVisMgr.h" -#include "../plScene/plVisRegion.h" +#include "plScene/plVisMgr.h" +#include "plScene/plVisRegion.h" -#include "../plSurface/hsGMaterial.h" +#include "plSurface/hsGMaterial.h" -#include "../plGLight/plLightInfo.h" +#include "plGLight/plLightInfo.h" #include "plDrawableSpans.h" @@ -47,7 +47,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com //STUB #include "plgDispatch.h" -#include "../plMessage/plAgeLoadedMsg.h" +#include "plMessage/plAgeLoadedMsg.h" plClusterGroup::plClusterGroup() : fSceneNode(nil), diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plClusterGroup.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plClusterGroup.h index 797f2f55..65166e1e 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plClusterGroup.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plClusterGroup.h @@ -30,7 +30,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTemplates.h" #include "hsBitVector.h" #include "plRenderLevel.h" -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" class hsStream; class hsResMgr; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plCutter.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plCutter.cpp index 8923996b..69cfd7f0 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plCutter.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plCutter.cpp @@ -35,12 +35,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // Test hack #include "plDrawableSpans.h" #include "plDrawableGenerator.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plDrawInterface.h" -#include "../plScene/plSceneNode.h" -#include "../plScene/plPageTreeMgr.h" -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plLayerInterface.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plDrawInterface.h" +#include "plScene/plSceneNode.h" +#include "plScene/plPageTreeMgr.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plLayerInterface.h" void plCutter::Read(hsStream* stream, hsResMgr* mgr) { diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plCutter.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plCutter.h index ac7eedc8..cab5943c 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plCutter.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plCutter.h @@ -27,12 +27,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plCutter_inc #define plCutter_inc -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" #include "hsGeometry3.h" #include "hsTemplates.h" #include "hsBounds.h" -#include "../plIntersect/plVolumeIsect.h" +#include "plIntersect/plVolumeIsect.h" #include "hsColorRGBA.h" struct hsPoint3; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDrawableCreatable.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDrawableCreatable.h index 22272ee0..aa5fbd5d 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDrawableCreatable.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDrawableCreatable.h @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plDrawableCreatable_inc #define plDrawableCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plDrawableSpans.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDrawableGenerator.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDrawableGenerator.cpp index 33d337c4..75378739 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDrawableGenerator.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDrawableGenerator.cpp @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsFastMath.h" #include "plRenderLevel.h" #include "hsResMgr.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plUoid.h" // Making light white and dark black by default, because this is really // redundant. The handling of what color unlit and fully lit map to is diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpans.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpans.cpp index 980350ab..350e017b 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpans.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpans.cpp @@ -56,32 +56,32 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plCluster.h" #include "plSpanTemplate.h" -#include "../plMath/hsRadixSort.h" -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plLayerInterface.h" -#include "../plPipeline/plFogEnvironment.h" -#include "../plPipeline/hsGDeviceRef.h" -#include "../plPipeline/plPipeDebugFlags.h" -#include "../pnMessage/plRefMsg.h" -#include "../pnMessage/plNodeRefMsg.h" -#include "../pnMessage/plDISpansMsg.h" -#include "../plMessage/plDeviceRecreateMsg.h" -#include "../plMessage/plRenderMsg.h" -#include "../plPipeline/plGBufferGroup.h" -#include "../pnSceneObject/plDrawInterface.h" -#include "../pnKeyedObject/plKey.h" -#include "../plParticleSystem/plParticleEmitter.h" -#include "../plParticleSystem/plParticle.h" -#include "../plGLight/plLightInfo.h" +#include "plMath/hsRadixSort.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plLayerInterface.h" +#include "plPipeline/plFogEnvironment.h" +#include "plPipeline/hsGDeviceRef.h" +#include "plPipeline/plPipeDebugFlags.h" +#include "pnMessage/plRefMsg.h" +#include "pnMessage/plNodeRefMsg.h" +#include "pnMessage/plDISpansMsg.h" +#include "plMessage/plDeviceRecreateMsg.h" +#include "plMessage/plRenderMsg.h" +#include "plPipeline/plGBufferGroup.h" +#include "pnSceneObject/plDrawInterface.h" +#include "pnKeyedObject/plKey.h" +#include "plParticleSystem/plParticleEmitter.h" +#include "plParticleSystem/plParticle.h" +#include "plGLight/plLightInfo.h" #include "plgDispatch.h" #include "plProfile.h" -#include "../plMath/plTriUtils.h" +#include "plMath/plTriUtils.h" -#include "../pnMessage/plPipeResMakeMsg.h" +#include "pnMessage/plPipeResMakeMsg.h" -#include "../plScene/plVisMgr.h" -#include "../plScene/plVisRegion.h" +#include "plScene/plVisMgr.h" +#include "plScene/plVisRegion.h" #include diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpansExport.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpansExport.cpp index 719642b1..73e93519 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpansExport.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpansExport.cpp @@ -43,19 +43,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plSpaceTree.h" #include "plSpaceTreeMaker.h" // This is fun and amusing and wonderful to have here. // Keep it here forever. -#include "../plSurface/hsGMaterial.h" -#include "../plPipeline/plFogEnvironment.h" -#include "../pnMessage/plRefMsg.h" -#include "../pnMessage/plNodeRefMsg.h" // for NodeRefMsg -#include "../plMessage/plDeviceRecreateMsg.h" -#include "../plPipeline/plGBufferGroup.h" -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plLayerInterface.h" -#include "../plGImage/plBitmap.h" -#include "../plGLight/plLightInfo.h" +#include "plSurface/hsGMaterial.h" +#include "plPipeline/plFogEnvironment.h" +#include "pnMessage/plRefMsg.h" +#include "pnMessage/plNodeRefMsg.h" // for NodeRefMsg +#include "plMessage/plDeviceRecreateMsg.h" +#include "plPipeline/plGBufferGroup.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plLayerInterface.h" +#include "plGImage/plBitmap.h" +#include "plGLight/plLightInfo.h" #include "plgDispatch.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" //#define VERT_LOG diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaBulletMgr.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaBulletMgr.cpp index 2ba8b39d..ec977baa 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaBulletMgr.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaBulletMgr.cpp @@ -28,7 +28,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plDynaBulletMgr.h" #include "plDynaDecal.h" -#include "../plMessage/plBulletMsg.h" +#include "plMessage/plBulletMsg.h" #include "plCutter.h" @@ -38,11 +38,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "hsResMgr.h" #include "hsTimer.h" -#include "../pnMessage/plRefMsg.h" +#include "pnMessage/plRefMsg.h" #include "hsFastMath.h" -#include "../plMath/plRandom.h" +#include "plMath/plRandom.h" static plRandom sRand; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.cpp index 43e06d8b..bdc43f1e 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.cpp @@ -39,43 +39,43 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPrintShape.h" -#include "../plAvatar/plArmatureMod.h" +#include "plAvatar/plArmatureMod.h" -#include "../plParticleSystem/plParticleSystem.h" -#include "../plParticleSystem/plParticleEmitter.h" +#include "plParticleSystem/plParticleSystem.h" +#include "plParticleSystem/plParticleEmitter.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plDrawInterface.h" -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plLayerInterface.h" -#include "../plScene/plPageTreeMgr.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plDrawInterface.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plLayerInterface.h" +#include "plScene/plPageTreeMgr.h" -#include "../plPipeline/plGBufferGroup.h" -#include "../plPipeline/hsGDeviceRef.h" +#include "plPipeline/plGBufferGroup.h" +#include "plPipeline/hsGDeviceRef.h" -#include "../plMessage/plAgeLoadedMsg.h" -#include "../plMessage/plDynaDecalEnableMsg.h" -#include "../pnMessage/plRefMsg.h" -#include "../pnMessage/plTimeMsg.h" +#include "plMessage/plAgeLoadedMsg.h" +#include "plMessage/plDynaDecalEnableMsg.h" +#include "pnMessage/plRefMsg.h" +#include "pnMessage/plTimeMsg.h" #include "plgDispatch.h" -#include "../plMath/plRandom.h" +#include "plMath/plRandom.h" #include "hsFastMath.h" #include "hsStream.h" #include "hsResMgr.h" #include "hsTimer.h" -#include "../pnMessage/plPipeResMakeMsg.h" +#include "pnMessage/plPipeResMakeMsg.h" // Stuff for creating a bumpenv decal on demand. -#include "../plGImage/plMipmap.h" -#include "../plSurface/plLayer.h" -#include "../plMessage/plLayRefMsg.h" +#include "plGImage/plMipmap.h" +#include "plSurface/plLayer.h" +#include "plMessage/plLayRefMsg.h" //### Hackage -#include "../plMessage/plRenderMsg.h" -#include "../plMessage/plListenerMsg.h" +#include "plMessage/plRenderMsg.h" +#include "plMessage/plListenerMsg.h" #include "plPipeline.h" #include "plTweak.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.h index e68a0f78..ecd16e67 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.h @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plDynaDecalMgr_inc #define plDynaDecalMgr_inc -#include "../pnNetCommon/plSynchedObject.h" +#include "pnNetCommon/plSynchedObject.h" #include "hsTemplates.h" #include "hsGeometry3.h" #include "hsMatrix44.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaFootMgr.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaFootMgr.cpp index 4e9943e0..0a34b0ec 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaFootMgr.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaFootMgr.cpp @@ -38,13 +38,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "hsTimer.h" -#include "../plMessage/plDynaDecalEnableMsg.h" +#include "plMessage/plDynaDecalEnableMsg.h" -#include "../plMessage/plAvatarFootMsg.h" -#include "../plAvatar/plArmatureMod.h" -#include "../plAvatar/plAvBrainHuman.h" +#include "plMessage/plAvatarFootMsg.h" +#include "plAvatar/plArmatureMod.h" +#include "plAvatar/plAvBrainHuman.h" -#include "../plMath/plRandom.h" +#include "plMath/plRandom.h" static plRandom sRand; static const UInt32 kNumPrintIDs = 2; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaPuddleMgr.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaPuddleMgr.cpp index fb43749d..60de91a5 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaPuddleMgr.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaPuddleMgr.cpp @@ -34,10 +34,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "hsResMgr.h" -#include "../plMessage/plAvatarFootMsg.h" +#include "plMessage/plAvatarFootMsg.h" -#include "../plAvatar/plAvBrainHuman.h" -#include "../plAvatar/plArmatureMod.h" +#include "plAvatar/plAvBrainHuman.h" +#include "plAvatar/plArmatureMod.h" static const UInt32 kNumPrintIDs = 2; static const UInt32 kPrintIDs[kNumPrintIDs] = diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaRippleMgr.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaRippleMgr.cpp index 8e2c761f..553b713e 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaRippleMgr.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaRippleMgr.cpp @@ -38,14 +38,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "hsTimer.h" -#include "../plMessage/plDynaDecalEnableMsg.h" -#include "../plMessage/plRippleShapeMsg.h" +#include "plMessage/plDynaDecalEnableMsg.h" +#include "plMessage/plRippleShapeMsg.h" -#include "../plMessage/plAvatarMsg.h" -#include "../plAvatar/plAvBrainHuman.h" -#include "../plAvatar/plArmatureMod.h" +#include "plMessage/plAvatarMsg.h" +#include "plAvatar/plAvBrainHuman.h" +#include "plAvatar/plArmatureMod.h" -#include "../plMath/plRandom.h" +#include "plMath/plRandom.h" static plRandom sRand; #include "plTweak.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaRippleMgrVS.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaRippleMgrVS.cpp index e1bb7798..b78f65db 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaRippleMgrVS.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaRippleMgrVS.cpp @@ -42,17 +42,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plWaveSetBase.h" #include "plRipVSConsts.h" -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plLayerInterface.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plLayerInterface.h" -#include "../plMessage/plDynaDecalEnableMsg.h" -#include "../plMessage/plRippleShapeMsg.h" +#include "plMessage/plDynaDecalEnableMsg.h" +#include "plMessage/plRippleShapeMsg.h" -#include "../plMessage/plAvatarMsg.h" -#include "../plAvatar/plAvBrainHuman.h" -#include "../plAvatar/plArmatureMod.h" +#include "plMessage/plAvatarMsg.h" +#include "plAvatar/plAvBrainHuman.h" +#include "plAvatar/plArmatureMod.h" -#include "../plMath/plRandom.h" +#include "plMath/plRandom.h" static plRandom sRand; #include "plTweak.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaTorpedoMgr.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaTorpedoMgr.cpp index 6d09e70a..0a5775d6 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaTorpedoMgr.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaTorpedoMgr.cpp @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plDynaTorpedoMgr.h" -#include "../plMessage/plBulletMsg.h" +#include "plMessage/plBulletMsg.h" #include "plCutter.h" @@ -38,7 +38,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTimer.h" #include "plTweak.h" -#include "../plMath/plRandom.h" +#include "plMath/plRandom.h" static const UInt32 kNumPrintIDs = 0; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaTorpedoVSMgr.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaTorpedoVSMgr.cpp index 88070dac..44768f4a 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaTorpedoVSMgr.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaTorpedoVSMgr.cpp @@ -31,13 +31,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plWaveSetBase.h" #include "plRipVSConsts.h" -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plLayerInterface.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plLayerInterface.h" #include "hsStream.h" #include "hsResMgr.h" -#include "../pnMessage/plRefMsg.h" +#include "pnMessage/plRefMsg.h" plDynaTorpedoVSMgr::plDynaTorpedoVSMgr() : fWaveSetBase(nil) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaWakeMgr.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaWakeMgr.cpp index 1fd46a9b..67ce224b 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaWakeMgr.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plDynaWakeMgr.cpp @@ -38,17 +38,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "hsTimer.h" -#include "../plMessage/plDynaDecalEnableMsg.h" -#include "../plMessage/plRippleShapeMsg.h" +#include "plMessage/plDynaDecalEnableMsg.h" +#include "plMessage/plRippleShapeMsg.h" -#include "../plMessage/plAvatarMsg.h" -#include "../plAvatar/plAvBrainHuman.h" -#include "../plAvatar/plArmatureMod.h" +#include "plMessage/plAvatarMsg.h" +#include "plAvatar/plAvBrainHuman.h" +#include "plAvatar/plArmatureMod.h" -#include "../plInterp/plAnimPath.h" +#include "plInterp/plAnimPath.h" #include "hsFastMath.h" -#include "../plMath/plRandom.h" +#include "plMath/plRandom.h" static plRandom sRand; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plFixedWaterState7.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plFixedWaterState7.h index 14bf044e..dcd90521 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plFixedWaterState7.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plFixedWaterState7.h @@ -29,7 +29,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsGeometry3.h" #include "hsColorRGBA.h" -#include "../pnTimer/plTimedValue.h" +#include "pnTimer/plTimedValue.h" class hsStream; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plGeoSpanDice.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plGeoSpanDice.cpp index 86b242a3..8310db08 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plGeoSpanDice.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plGeoSpanDice.cpp @@ -24,7 +24,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include "memory.h" +#include #include "hsTypes.h" #include "plGeoSpanDice.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plGeometrySpan.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plGeometrySpan.cpp index 24ad7795..622919d1 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plGeometrySpan.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plGeometrySpan.cpp @@ -36,8 +36,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsWindows.h" #include "hsTypes.h" #include "plGeometrySpan.h" -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plLayerInterface.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plLayerInterface.h" #include "hsBitVector.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plInstanceDrawInterface.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plInstanceDrawInterface.cpp index 0366dcfd..254ae373 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plInstanceDrawInterface.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plInstanceDrawInterface.cpp @@ -26,11 +26,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plInstanceDrawInterface.h" #include "plSharedMesh.h" #include "plMorphSequence.h" -#include "../plMessage/plReplaceGeometryMsg.h" +#include "plMessage/plReplaceGeometryMsg.h" #include "plDrawableSpans.h" #include "plGeometrySpan.h" -#include "../plScene/plSceneNode.h" -#include "../pnMessage/plDISpansMsg.h" +#include "plScene/plSceneNode.h" +#include "pnMessage/plDISpansMsg.h" #include "hsResMgr.h" plInstanceDrawInterface::plInstanceDrawInterface() : plDrawInterface(), fTargetID(-1) {} diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plInstanceDrawInterface.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plInstanceDrawInterface.h index 9d2753ba..be451a4f 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plInstanceDrawInterface.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plInstanceDrawInterface.h @@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plInstanceDrawInterface_inc #define plInstanceDrawInterface_inc -#include "../pnSceneObject/plDrawInterface.h" +#include "pnSceneObject/plDrawInterface.h" class plDrawableSpans; class plSharedMesh; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plMorphDelta.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plMorphDelta.h index 01f7973d..ed47efc5 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plMorphDelta.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plMorphDelta.h @@ -29,7 +29,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTemplates.h" #include "hsGeometry3.h" -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" #include "plAccessSpan.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plMorphSequence.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plMorphSequence.cpp index faed4932..f5fe5dde 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plMorphSequence.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plMorphSequence.cpp @@ -31,16 +31,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAccessGeometry.h" #include "plAccessVtxSpan.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plDrawInterface.h" -#include "../pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plDrawInterface.h" +#include "pnSceneObject/plCoordinateInterface.h" #include "plDrawableSpans.h" #include "plInstanceDrawInterface.h" #include "hsResMgr.h" #include "plgDispatch.h" -#include "../plMessage/plRenderMsg.h" +#include "plMessage/plRenderMsg.h" #include "plSharedMesh.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plMorphSequence.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plMorphSequence.h index 5e05f089..7e384140 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plMorphSequence.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plMorphSequence.h @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plMorphSequence_inc #define plMorphSequence_inc -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" #include "plMorphArray.h" class plDrawable; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plMorphSequenceSDLMod.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plMorphSequenceSDLMod.cpp index eb97c162..112a8545 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plMorphSequenceSDLMod.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plMorphSequenceSDLMod.cpp @@ -27,9 +27,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plMorphSequence.h" #include "plSharedMesh.h" #include "hsResMgr.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnMessage/plSDLModifierMsg.h" -#include "../plSDL/plSDL.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnMessage/plSDLModifierMsg.h" +#include "plSDL/plSDL.h" // static vars char plMorphSequenceSDLMod::kStrMorphArrayDescName[]="MorphArray"; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plMorphSequenceSDLMod.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plMorphSequenceSDLMod.h index 11b9f1e3..2f2860f0 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plMorphSequenceSDLMod.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plMorphSequenceSDLMod.h @@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plMorphSequenceSDLMod_inc #define plMorphSequenceSDLMod_inc -#include "../plModifier/plSDLModifier.h" +#include "plModifier/plSDLModifier.h" #include "hsTypes.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plParticleFiller.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plParticleFiller.cpp index 9bc37947..8f4203f3 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plParticleFiller.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plParticleFiller.cpp @@ -35,16 +35,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plViewTransform.h" // Getting at the destination data -#include "../pnSceneObject/plDrawInterface.h" -#include "../plDrawable/plDrawableSpans.h" -#include "../plPipeline/plGBufferGroup.h" +#include "pnSceneObject/plDrawInterface.h" +#include "plDrawable/plDrawableSpans.h" +#include "plPipeline/plGBufferGroup.h" // For shading -#include "../plGLight/plLightInfo.h" +#include "plGLight/plLightInfo.h" // Getting at the source data -#include "../plParticleSystem/plParticleEmitter.h" -#include "../plParticleSystem/plParticle.h" +#include "plParticleSystem/plParticleEmitter.h" +#include "plParticleSystem/plParticle.h" static hsScalar sInvDelSecs; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plPrintShape.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plPrintShape.h index 4f4846f8..83b41213 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plPrintShape.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plPrintShape.h @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPrintShape_inc #define plPrintShape_inc -#include "../pnSceneObject/plObjInterface.h" +#include "pnSceneObject/plObjInterface.h" class plPrintShape : public plObjInterface { diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plProxyGen.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plProxyGen.cpp index e191e915..8e09374c 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plProxyGen.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plProxyGen.cpp @@ -27,14 +27,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plProxyGen.h" -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plLayer.h" -#include "../plDrawable/plDrawableSpans.h" -#include "../plDrawable/plDrawableGenerator.h" -#include "../pnMessage/plProxyDrawMsg.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnMessage/plRefMsg.h" -#include "../pnMessage/plNodeRefMsg.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plLayer.h" +#include "plDrawable/plDrawableSpans.h" +#include "plDrawable/plDrawableGenerator.h" +#include "pnMessage/plProxyDrawMsg.h" +#include "pnKeyedObject/plKey.h" +#include "pnMessage/plRefMsg.h" +#include "pnMessage/plNodeRefMsg.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plProxyGen.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plProxyGen.h index eed352f8..ed31bd41 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plProxyGen.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plProxyGen.h @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plProxyGen_inc #define plProxyGen_inc -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include "hsColorRGBA.h" #include "hsTemplates.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plSharedMesh.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plSharedMesh.h index 2fd828cd..b3946188 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plSharedMesh.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plSharedMesh.h @@ -26,8 +26,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PLSHAREDMESH_INC #define PLSHAREDMESH_INC -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnMessage/plMessage.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnMessage/plMessage.h" class plGeometrySpan; class plDrawableSpans; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plSpaceTree.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plSpaceTree.cpp index f0eb51c5..2e9cbcc0 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plSpaceTree.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plSpaceTree.cpp @@ -30,8 +30,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsBitVector.h" #include "plProfile.h" -#include "../plIntersect/plVolumeIsect.h" -#include "../plMath/hsRadixSort.h" +#include "plIntersect/plVolumeIsect.h" +#include "plMath/hsRadixSort.h" static hsBitVector scratchTotVec; static hsBitVector scratchBitVec; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plSpaceTree.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plSpaceTree.h index 906bb3b9..48dcdbd1 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plSpaceTree.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plSpaceTree.h @@ -29,7 +29,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTemplates.h" #include "hsBounds.h" -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" #include "hsBitVector.h" class hsStream; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plSpaceTreeMaker.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plSpaceTreeMaker.cpp index 862a3893..9cfd6597 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plSpaceTreeMaker.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plSpaceTreeMaker.cpp @@ -26,12 +26,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plSpaceTreeMaker.h" -#include "../plMath/hsRadixSort.h" -#include "../plDrawable/plSpaceTree.h" +#include "plMath/hsRadixSort.h" +#include "plDrawable/plSpaceTree.h" #include "hsUtils.h" // for testing, get hsRand() #include "hsTimer.h" -#include "../plIntersect/plVolumeIsect.h" +#include "plIntersect/plVolumeIsect.h" //#define MF_DO_TIMES diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plSpanTypes.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plSpanTypes.cpp index 6d2ad324..fcb49325 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plSpanTypes.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plSpanTypes.cpp @@ -36,10 +36,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plSpanTypes.h" #include "hsStream.h" -#include "../pnKeyedObject/plKey.h" -#include "../plPipeline/plGBufferGroup.h" -#include "../plPipeline/hsGDeviceRef.h" -#include "../plGLight/plLightInfo.h" +#include "pnKeyedObject/plKey.h" +#include "plPipeline/plGBufferGroup.h" +#include "plPipeline/hsGDeviceRef.h" +#include "plGLight/plLightInfo.h" #include "plDrawable.h" #include "plAuxSpan.h" #include "plAccessSnapShot.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plSpanTypes.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plSpanTypes.h index 3524d7ae..1d46bf31 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plSpanTypes.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plSpanTypes.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsBounds.h" #include "hsMatrix44.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" class hsGMaterial; class plGeometrySpan; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plVisLOSMgr.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plVisLOSMgr.cpp index 04e4e0aa..4f2ee153 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plVisLOSMgr.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plVisLOSMgr.cpp @@ -35,14 +35,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAccessGeometry.h" #include "plAccessSpan.h" -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plLayerInterface.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plLayerInterface.h" -#include "../plScene/plSceneNode.h" -#include "../plScene/plPageTreeMgr.h" +#include "plScene/plSceneNode.h" +#include "plScene/plPageTreeMgr.h" // Stuff for cursor los -#include "../plInputCore/plInputDevice.h" +#include "plInputCore/plInputDevice.h" #include "plPipeline.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.cpp index d2531d9c..0af9e207 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.cpp @@ -40,52 +40,52 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plDynaDecal.h" #include "plDynaRippleVSMgr.h" -#include "../plMessage/plRenderMsg.h" -#include "../pnMessage/plTimeMsg.h" +#include "plMessage/plRenderMsg.h" +#include "pnMessage/plTimeMsg.h" -#include "../pnMessage/plObjRefMsg.h" +#include "pnMessage/plObjRefMsg.h" #include "plgDispatch.h" #include "plPipeline.h" #include "hsResMgr.h" -#include "../pnSceneObject/plDrawInterface.h" +#include "pnSceneObject/plDrawInterface.h" #include "plPhysical.h" -#include "../plMessage/plSimInfluenceMsg.h" +#include "plMessage/plSimInfluenceMsg.h" -#include "../plSurface/hsGMaterial.h" -#include "../plDrawable/plDrawableSpans.h" -#include "../plDrawable/plDrawableGenerator.h" +#include "plSurface/hsGMaterial.h" +#include "plDrawable/plDrawableSpans.h" +#include "plDrawable/plDrawableGenerator.h" -#include "../plMessage/plAvatarMsg.h" -#include "../plAvatar/plArmatureMod.h" +#include "plMessage/plAvatarMsg.h" +#include "plAvatar/plArmatureMod.h" -#include "../plGImage/plMipmap.h" -#include "../plGImage/plCubicEnvironmap.h" -#include "../plSurface/plLayer.h" -#include "../plMessage/plLayRefMsg.h" +#include "plGImage/plMipmap.h" +#include "plGImage/plCubicEnvironmap.h" +#include "plSurface/plLayer.h" +#include "plMessage/plLayRefMsg.h" -#include "../plSurface/plShader.h" +#include "plSurface/plShader.h" -#include "../plPipeline/plRenderTarget.h" -#include "../plScene/plRenderRequest.h" -#include "../plMessage/plRenderRequestMsg.h" -#include "../plScene/plPageTreeMgr.h" +#include "plPipeline/plRenderTarget.h" +#include "plScene/plRenderRequest.h" +#include "plMessage/plRenderRequestMsg.h" +#include "plScene/plPageTreeMgr.h" -#include "../plPipeline/plDynamicEnvMap.h" +#include "plPipeline/plDynamicEnvMap.h" -#include "../plGImage/plBumpMapGen.h" +#include "plGImage/plBumpMapGen.h" -#include "../plMessage/plMatRefMsg.h" -#include "../plMessage/plAgeLoadedMsg.h" +#include "plMessage/plMatRefMsg.h" +#include "plMessage/plAgeLoadedMsg.h" #include "plTweak.h" #ifndef PLASMA_EXTERNAL_RELEASE -#include "../plStatusLog/plStatusLog.h" -#include "../plPipeline/plPlates.h" +#include "plStatusLog/plStatusLog.h" +#include "plPipeline/plPlates.h" #endif // PLASMA_EXTERNAL_RELEASE using namespace plShaderID; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.h index 19f0451f..393ca5f2 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.h @@ -30,7 +30,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsGeometry3.h" #include "hsTemplates.h" -#include "../plMath/plRandom.h" +#include "plMath/plRandom.h" #include "hsBounds.h" #include "plFixedWaterState7.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plWaveSetBase.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plWaveSetBase.cpp index f528aec1..9d31230a 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plWaveSetBase.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plWaveSetBase.cpp @@ -28,7 +28,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plWaveSetBase.h" #include "hsResMgr.h" -#include "../pnMessage/plRefMsg.h" +#include "pnMessage/plRefMsg.h" plWaveSetBase::plWaveSetBase() { diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plWaveSetBase.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plWaveSetBase.h index 77694ef9..755f3bfe 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plWaveSetBase.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plWaveSetBase.h @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plWaveSetBase_inc #define plWaveSetBase_inc -#include "../pnModifier/plMultiModifier.h" +#include "pnModifier/plMultiModifier.h" #include "hsGeometry3.h" class hsGMaterial; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plEncryption/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plEncryption/CMakeLists.txt new file mode 100644 index 00000000..d2fe7c71 --- /dev/null +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plEncryption/CMakeLists.txt @@ -0,0 +1,18 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +include_directories(${OPENSSL_INCLUDE_DIR}) + +set(plEncryption_SOURCES + plChecksum.cpp +) + +set(plEncryption_HEADERS + plChecksum.h +) + +add_library(plEncryption STATIC ${plEncryption_SOURCES} ${plEncryption_HEADERS}) + +source_group("Source Files" FILES ${plEncryption_SOURCES}) +source_group("Header Files" FILES ${plEncryption_HEADERS})