diff --git a/Sources/Plasma/CMakeLists.txt b/Sources/Plasma/CMakeLists.txt index 8f2b2722..38f6b401 100644 --- a/Sources/Plasma/CMakeLists.txt +++ b/Sources/Plasma/CMakeLists.txt @@ -1,4 +1,5 @@ -add_subdirectory(CoreLib) -add_subdirectory(CoreLibExe) -add_subdirectory(FeatureLib) -add_subdirectory(NucleusLib) +add_subdirectory(CoreLib) +add_subdirectory(CoreLibExe) +add_subdirectory(FeatureLib) +add_subdirectory(NucleusLib) +add_subdirectory(PubUtilLib) diff --git a/Sources/Plasma/PubUtilLib/plAgeDescription/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plAgeDescription/CMakeLists.txt new file mode 100644 index 00000000..8ae407c3 --- /dev/null +++ b/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/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeDescription.cpp b/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeDescription.cpp index 9a0b4fbd..8008e500 100644 --- a/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeDescription.cpp +++ b/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeDescription.cpp @@ -44,9 +44,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/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeDescription.h b/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeDescription.h index ebe6ef93..8e0be6c5 100644 --- a/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeDescription.h +++ b/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeDescription.h @@ -45,9 +45,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/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeManifest.cpp b/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeManifest.cpp index d65f417f..23c85ed9 100644 --- a/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeManifest.cpp +++ b/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeManifest.cpp @@ -51,9 +51,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/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeManifest.h b/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeManifest.h index 27063d34..bcea96fc 100644 --- a/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeManifest.h +++ b/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeManifest.h @@ -53,9 +53,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/Sources/Plasma/PubUtilLib/plAgeLoader/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plAgeLoader/CMakeLists.txt new file mode 100644 index 00000000..e094c6ea --- /dev/null +++ b/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/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoader.cpp b/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoader.cpp index 99eb4d06..05ab6295 100644 --- a/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoader.cpp +++ b/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoader.cpp @@ -48,28 +48,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/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoader.h b/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoader.h index a6666758..3c95e830 100644 --- a/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoader.h +++ b/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoader.h @@ -45,14 +45,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/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoaderCreatable.h b/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoaderCreatable.h index 8909857d..76fa715a 100644 --- a/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoaderCreatable.h +++ b/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoaderCreatable.h @@ -42,7 +42,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/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoaderPaging.cpp b/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoaderPaging.cpp index bba861b3..bbbf1c7b 100644 --- a/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoaderPaging.cpp +++ b/Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoaderPaging.cpp @@ -47,17 +47,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/Sources/Plasma/PubUtilLib/plAgeLoader/plBackgroundDownloader.cpp b/Sources/Plasma/PubUtilLib/plAgeLoader/plBackgroundDownloader.cpp index 5ecce86a..7737138a 100644 --- a/Sources/Plasma/PubUtilLib/plAgeLoader/plBackgroundDownloader.cpp +++ b/Sources/Plasma/PubUtilLib/plAgeLoader/plBackgroundDownloader.cpp @@ -43,26 +43,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/Sources/Plasma/PubUtilLib/plAgeLoader/plResPatcher.cpp b/Sources/Plasma/PubUtilLib/plAgeLoader/plResPatcher.cpp index 1278e6aa..93787a16 100644 --- a/Sources/Plasma/PubUtilLib/plAgeLoader/plResPatcher.cpp +++ b/Sources/Plasma/PubUtilLib/plAgeLoader/plResPatcher.cpp @@ -41,22 +41,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/Sources/Plasma/PubUtilLib/plAgeLoader/plResPatcher.h b/Sources/Plasma/PubUtilLib/plAgeLoader/plResPatcher.h index 2f528c04..ad2fc6c5 100644 --- a/Sources/Plasma/PubUtilLib/plAgeLoader/plResPatcher.h +++ b/Sources/Plasma/PubUtilLib/plAgeLoader/plResPatcher.h @@ -44,9 +44,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/Sources/Plasma/PubUtilLib/plAudible/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plAudible/CMakeLists.txt new file mode 100644 index 00000000..85526541 --- /dev/null +++ b/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/Sources/Plasma/PubUtilLib/plAudible/plAudibleCreatable.h b/Sources/Plasma/PubUtilLib/plAudible/plAudibleCreatable.h index 438e51fd..e35b928a 100644 --- a/Sources/Plasma/PubUtilLib/plAudible/plAudibleCreatable.h +++ b/Sources/Plasma/PubUtilLib/plAudible/plAudibleCreatable.h @@ -43,7 +43,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/Sources/Plasma/PubUtilLib/plAudible/plAudibleNull.cpp b/Sources/Plasma/PubUtilLib/plAudible/plAudibleNull.cpp index 16861895..a49a7eb8 100644 --- a/Sources/Plasma/PubUtilLib/plAudible/plAudibleNull.cpp +++ b/Sources/Plasma/PubUtilLib/plAudible/plAudibleNull.cpp @@ -46,8 +46,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/Sources/Plasma/PubUtilLib/plAudible/plWinAudible.cpp b/Sources/Plasma/PubUtilLib/plAudible/plWinAudible.cpp index 7ee9440a..a2b6390e 100644 --- a/Sources/Plasma/PubUtilLib/plAudible/plWinAudible.cpp +++ b/Sources/Plasma/PubUtilLib/plAudible/plWinAudible.cpp @@ -45,29 +45,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/Sources/Plasma/PubUtilLib/plAudible/plWinAudibleProxy.cpp b/Sources/Plasma/PubUtilLib/plAudible/plWinAudibleProxy.cpp index e2409fcf..a6065eb1 100644 --- a/Sources/Plasma/PubUtilLib/plAudible/plWinAudibleProxy.cpp +++ b/Sources/Plasma/PubUtilLib/plAudible/plWinAudibleProxy.cpp @@ -44,8 +44,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/Sources/Plasma/PubUtilLib/plAudible/plWinAudibleProxy.h b/Sources/Plasma/PubUtilLib/plAudible/plWinAudibleProxy.h index 33daa8a9..ba48534d 100644 --- a/Sources/Plasma/PubUtilLib/plAudible/plWinAudibleProxy.h +++ b/Sources/Plasma/PubUtilLib/plAudible/plWinAudibleProxy.h @@ -42,7 +42,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/Sources/Plasma/PubUtilLib/plAvatar/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plAvatar/CMakeLists.txt new file mode 100644 index 00000000..4bc7662a --- /dev/null +++ b/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/Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.cpp index 1ee6568c..dbd5ba1c 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.cpp @@ -55,7 +55,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/Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.h b/Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.h index ddb4d8f7..e84d4702 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.h @@ -50,7 +50,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/Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.cpp index fa919c76..c62f6ee6 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.cpp @@ -57,11 +57,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/Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.h b/Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.h index 637e9538..390f3251 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.h @@ -61,7 +61,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/Sources/Plasma/PubUtilLib/plAvatar/plAGApplicator.h b/Sources/Plasma/PubUtilLib/plAvatar/plAGApplicator.h index 2590804f..e9f6c13e 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAGApplicator.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAGApplicator.h @@ -60,7 +60,7 @@ class plAGModifier; // INCLUDES // ///////////////////////////////////////////////////////////////////////////////////////// -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" #include "plAvDefs.h" ///////////////////////////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAGChannel.h b/Sources/Plasma/PubUtilLib/plAvatar/plAGChannel.h index 094f4962..27d00e82 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAGChannel.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAGChannel.h @@ -100,7 +100,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ///////////////////////////////////////////////////////////////////////////////////////// -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" ///////////////////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.cpp index a1a5f182..c51190e6 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.cpp @@ -56,12 +56,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/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.h b/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.h index b5a0939a..73ec9540 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.h @@ -53,10 +53,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/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterSDLModifier.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterSDLModifier.cpp index 174e8549..4041f3fa 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterSDLModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterSDLModifier.cpp @@ -40,15 +40,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/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterSDLModifier.h b/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterSDLModifier.h index 333f25d8..cd66cba4 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterSDLModifier.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterSDLModifier.h @@ -42,7 +42,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/Sources/Plasma/PubUtilLib/plAvatar/plAGModifier.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAGModifier.cpp index 17a5a3b3..68c54910 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAGModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAGModifier.cpp @@ -49,9 +49,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/Sources/Plasma/PubUtilLib/plAvatar/plAGModifier.h b/Sources/Plasma/PubUtilLib/plAvatar/plAGModifier.h index b01b12c1..e206a0b3 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAGModifier.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAGModifier.h @@ -48,10 +48,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/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.cpp index 4a6c9814..743c7145 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.cpp @@ -61,15 +61,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/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.h b/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.h index 7748bc04..ed7f2678 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.h @@ -49,7 +49,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/Sources/Plasma/PubUtilLib/plAvatar/plArmatureEffects.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plArmatureEffects.cpp index 236eb129..93dd2784 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plArmatureEffects.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plArmatureEffects.cpp @@ -40,16 +40,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#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/Sources/Plasma/PubUtilLib/plAvatar/plArmatureEffects.h b/Sources/Plasma/PubUtilLib/plAvatar/plArmatureEffects.h index 2cb30cc4..5ac591af 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plArmatureEffects.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plArmatureEffects.h @@ -45,7 +45,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/Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.cpp index f69e6cba..f31d23f2 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.cpp @@ -63,64 +63,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/Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.h b/Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.h index 26d1839c..45a3762b 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.h @@ -61,10 +61,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/Sources/Plasma/PubUtilLib/plAvatar/plAvBehaviors.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAvBehaviors.cpp index 0fc39143..0e309f0e 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvBehaviors.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvBehaviors.cpp @@ -43,9 +43,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/Sources/Plasma/PubUtilLib/plAvatar/plAvBehaviors.h b/Sources/Plasma/PubUtilLib/plAvatar/plAvBehaviors.h index acd37c68..0ab1afac 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvBehaviors.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvBehaviors.h @@ -44,8 +44,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/Sources/Plasma/PubUtilLib/plAvatar/plAvBrain.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrain.cpp index a7028f6a..1f646bf6 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrain.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrain.cpp @@ -51,11 +51,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/Sources/Plasma/PubUtilLib/plAvatar/plAvBrain.h b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrain.h index 6c539c51..a3d2d7ab 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrain.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrain.h @@ -49,7 +49,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/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainClimb.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainClimb.cpp index 872bfca7..354da1a3 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainClimb.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainClimb.cpp @@ -79,12 +79,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/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainClimb.h b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainClimb.h index 3b6103d3..c7bf4dfc 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainClimb.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainClimb.h @@ -50,7 +50,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/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCoop.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCoop.cpp index 878830e2..c9b857bb 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCoop.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCoop.cpp @@ -55,14 +55,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/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCritter.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCritter.cpp index 2b2b6586..7ea9df37 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCritter.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCritter.cpp @@ -53,13 +53,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/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCritter.h b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCritter.h index 71ff002d..8e757af5 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCritter.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCritter.h @@ -44,7 +44,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 plWalkingStrategy; diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainDrive.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainDrive.cpp index 431eb500..847cbb83 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainDrive.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainDrive.cpp @@ -49,11 +49,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/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainGeneric.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainGeneric.cpp index 1f0488bb..1627aa93 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainGeneric.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainGeneric.cpp @@ -58,20 +58,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/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainHuman.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainHuman.cpp index 6ba9da21..a8396af2 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainHuman.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainHuman.cpp @@ -67,27 +67,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/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainRideAnimatedPhysical.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainRideAnimatedPhysical.cpp index 8b0649b7..c7cc73d7 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainRideAnimatedPhysical.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainRideAnimatedPhysical.cpp @@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAvBrainHuman.h" #include "plAvBrain.h" #include "plPhysicalControllerCore.h" -#include "../plMessage/plRideAnimatedPhysMsg.h" +#include "plMessage/plRideAnimatedPhysMsg.h" void plAvBrainRideAnimatedPhysical::Activate(plArmatureModBase *avMod) diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainSwim.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainSwim.cpp index ede57195..3d96f042 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainSwim.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainSwim.cpp @@ -66,17 +66,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPhysical.h" #include "plPhysicalControllerCore.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/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainSwim.h b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainSwim.h index 0cdd6349..033c30fb 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainSwim.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainSwim.h @@ -44,7 +44,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 plControlEventMsg; diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAvDefs.h b/Sources/Plasma/PubUtilLib/plAvatar/plAvDefs.h index cb92b31e..cb168bb7 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvDefs.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvDefs.h @@ -47,7 +47,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/Sources/Plasma/PubUtilLib/plAvatar/plAvLadderModifier.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAvLadderModifier.cpp index 457ebaee..90ed4611 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvLadderModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvLadderModifier.cpp @@ -59,19 +59,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/Sources/Plasma/PubUtilLib/plAvatar/plAvLadderModifier.h b/Sources/Plasma/PubUtilLib/plAvatar/plAvLadderModifier.h index 6984c86b..a9b38cef 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvLadderModifier.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvLadderModifier.h @@ -42,8 +42,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/Sources/Plasma/PubUtilLib/plAvatar/plAvTask.h b/Sources/Plasma/PubUtilLib/plAvatar/plAvTask.h index 53d1b021..2ea7894e 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvTask.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvTask.h @@ -48,7 +48,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/Sources/Plasma/PubUtilLib/plAvatar/plAvTaskBrain.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAvTaskBrain.cpp index 7b3d2316..661a2487 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvTaskBrain.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvTaskBrain.cpp @@ -48,7 +48,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/Sources/Plasma/PubUtilLib/plAvatar/plAvTaskSeek.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAvTaskSeek.cpp index 560a43cc..7d568a53 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvTaskSeek.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvTaskSeek.cpp @@ -57,12 +57,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPhysicalControllerCore.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/Sources/Plasma/PubUtilLib/plAvatar/plAvTaskSeek.h b/Sources/Plasma/PubUtilLib/plAvatar/plAvTaskSeek.h index 64a51996..da66d118 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvTaskSeek.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvTaskSeek.h @@ -45,7 +45,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/Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.cpp index 37c60df8..8564372b 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.cpp @@ -44,40 +44,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/Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.h b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.h index 0f085f6b..f70f491f 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.h @@ -42,9 +42,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/Sources/Plasma/PubUtilLib/plAvatar/plAvatarCreatable.h b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarCreatable.h index c38e9e64..1469aa43 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvatarCreatable.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarCreatable.h @@ -43,7 +43,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/Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.cpp index cb4f774c..ad4cff2e 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.cpp @@ -57,34 +57,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/Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.h b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.h index fafea066..0de8261d 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.h @@ -49,8 +49,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/Sources/Plasma/PubUtilLib/plAvatar/plAvatarSDLModifier.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarSDLModifier.cpp index 89684f0c..8fce7c0a 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvatarSDLModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarSDLModifier.cpp @@ -42,17 +42,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/plPhysicalControllerCore.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/plPhysicalControllerCore.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/Sources/Plasma/PubUtilLib/plAvatar/plAvatarSDLModifier.h b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarSDLModifier.h index 7c432b18..b331dcba 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvatarSDLModifier.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarSDLModifier.h @@ -44,7 +44,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/Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.cpp index 6d32dbc4..1de7bd95 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.cpp @@ -61,22 +61,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/Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.h b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.h index 2562832b..3140751f 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.h @@ -50,9 +50,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/Sources/Plasma/PubUtilLib/plAvatar/plClothingSDLModifier.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plClothingSDLModifier.cpp index 70b068e2..95e13e09 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plClothingSDLModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plClothingSDLModifier.cpp @@ -44,10 +44,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/Sources/Plasma/PubUtilLib/plAvatar/plClothingSDLModifier.h b/Sources/Plasma/PubUtilLib/plAvatar/plClothingSDLModifier.h index b4b49677..b0bf94dc 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plClothingSDLModifier.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plClothingSDLModifier.h @@ -42,7 +42,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/Sources/Plasma/PubUtilLib/plAvatar/plCoopCoordinator.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plCoopCoordinator.cpp index 95d5173b..3d7a27d8 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plCoopCoordinator.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plCoopCoordinator.cpp @@ -58,15 +58,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/Sources/Plasma/PubUtilLib/plAvatar/plCoopCoordinator.h b/Sources/Plasma/PubUtilLib/plAvatar/plCoopCoordinator.h index 71b09ce9..1bbfa39c 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plCoopCoordinator.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plCoopCoordinator.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ///////////////////////////////////////////////////////////////////////////////////////// // global -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" ///////////////////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.cpp index 5e436fea..8e757bd5 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.cpp @@ -63,14 +63,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/Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.h b/Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.h index 6a695182..21645d99 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.h @@ -48,7 +48,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/Sources/Plasma/PubUtilLib/plAvatar/plMultistageBehMod.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plMultistageBehMod.cpp index 834b48fb..35f1deaf 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plMultistageBehMod.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plMultistageBehMod.cpp @@ -52,15 +52,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/Sources/Plasma/PubUtilLib/plAvatar/plMultistageBehMod.h b/Sources/Plasma/PubUtilLib/plAvatar/plMultistageBehMod.h index 3323e71f..3711b94f 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plMultistageBehMod.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plMultistageBehMod.h @@ -42,7 +42,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/Sources/Plasma/PubUtilLib/plAvatar/plNPCSpawnMod.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plNPCSpawnMod.cpp index 782d4100..365dd4cd 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plNPCSpawnMod.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plNPCSpawnMod.cpp @@ -48,13 +48,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/Sources/Plasma/PubUtilLib/plAvatar/plNPCSpawnMod.h b/Sources/Plasma/PubUtilLib/plAvatar/plNPCSpawnMod.h index 7b782435..2a718c4f 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plNPCSpawnMod.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plNPCSpawnMod.h @@ -39,7 +39,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/Sources/Plasma/PubUtilLib/plAvatar/plOneShotMod.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plOneShotMod.cpp index ceef54f9..0bf2f928 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plOneShotMod.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plOneShotMod.cpp @@ -51,7 +51,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/Sources/Plasma/PubUtilLib/plAvatar/plOneShotMod.h b/Sources/Plasma/PubUtilLib/plAvatar/plOneShotMod.h index 4d9ce031..5da73432 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plOneShotMod.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plOneShotMod.h @@ -42,8 +42,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/Sources/Plasma/PubUtilLib/plAvatar/plPointChannel.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plPointChannel.cpp index 344de39d..a791f02b 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plPointChannel.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plPointChannel.cpp @@ -43,13 +43,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/Sources/Plasma/PubUtilLib/plAvatar/plQuatChannel.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plQuatChannel.cpp index df5f694d..a2c29639 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plQuatChannel.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plQuatChannel.cpp @@ -43,11 +43,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/Sources/Plasma/PubUtilLib/plAvatar/plScalarChannel.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plScalarChannel.cpp index 0556be43..56a0eb29 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plScalarChannel.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plScalarChannel.cpp @@ -53,10 +53,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/Sources/Plasma/PubUtilLib/plAvatar/plSeekPointMod.h b/Sources/Plasma/PubUtilLib/plAvatar/plSeekPointMod.h index af2b7cb5..09d634cf 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plSeekPointMod.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plSeekPointMod.h @@ -42,8 +42,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/Sources/Plasma/PubUtilLib/plAvatar/plSittingModifier.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plSittingModifier.cpp index f9ecb3f0..06b20f7d 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plSittingModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plSittingModifier.cpp @@ -43,18 +43,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/Sources/Plasma/PubUtilLib/plAvatar/plSittingModifier.h b/Sources/Plasma/PubUtilLib/plAvatar/plSittingModifier.h index f9ee7e6a..f8f694ee 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plSittingModifier.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plSittingModifier.h @@ -48,8 +48,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/Sources/Plasma/PubUtilLib/plAvatar/plSwimRegion.h b/Sources/Plasma/PubUtilLib/plAvatar/plSwimRegion.h index e1ec0890..a1230633 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plSwimRegion.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plSwimRegion.h @@ -42,7 +42,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/Sources/Plasma/PubUtilLib/plCompression/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plCompression/CMakeLists.txt new file mode 100644 index 00000000..248b3c9e --- /dev/null +++ b/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/Sources/Plasma/PubUtilLib/plCompression/plZlibStream.cpp b/Sources/Plasma/PubUtilLib/plCompression/plZlibStream.cpp index 25b6c058..72867e08 100644 --- a/Sources/Plasma/PubUtilLib/plCompression/plZlibStream.cpp +++ b/Sources/Plasma/PubUtilLib/plCompression/plZlibStream.cpp @@ -40,7 +40,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/Sources/Plasma/PubUtilLib/plContainer/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plContainer/CMakeLists.txt new file mode 100644 index 00000000..775a8dc4 --- /dev/null +++ b/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/Sources/Plasma/PubUtilLib/plContainer/hsStringTable.cpp b/Sources/Plasma/PubUtilLib/plContainer/hsStringTable.cpp index 0dcc2d5b..a0a57ea2 100644 --- a/Sources/Plasma/PubUtilLib/plContainer/hsStringTable.cpp +++ b/Sources/Plasma/PubUtilLib/plContainer/hsStringTable.cpp @@ -40,7 +40,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/Sources/Plasma/PubUtilLib/plDrawable/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plDrawable/CMakeLists.txt new file mode 100644 index 00000000..4474b0bb --- /dev/null +++ b/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/Sources/Plasma/PubUtilLib/plDrawable/plAccessGeometry.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plAccessGeometry.cpp index 39f95173..34521288 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plAccessGeometry.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plAccessGeometry.cpp @@ -45,7 +45,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" @@ -57,8 +57,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/Sources/Plasma/PubUtilLib/plDrawable/plActivePrintShape.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plActivePrintShape.cpp index 8c1235f8..d1a7bffa 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plActivePrintShape.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plActivePrintShape.cpp @@ -43,13 +43,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/Sources/Plasma/PubUtilLib/plDrawable/plAuxSpan.h b/Sources/Plasma/PubUtilLib/plDrawable/plAuxSpan.h index 815be594..ad6f1c6a 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plAuxSpan.h +++ b/Sources/Plasma/PubUtilLib/plDrawable/plAuxSpan.h @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTemplates.h" #include "plSpanTypes.h" -#include "../plPipeline/plGBufferGroup.h" +#include "plPipeline/plGBufferGroup.h" class plDrawableSpans; class hsGMaterial; diff --git a/Sources/Plasma/PubUtilLib/plDrawable/plClusterGroup.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plClusterGroup.cpp index ce94e0ad..d4f9de6f 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plClusterGroup.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plClusterGroup.cpp @@ -46,14 +46,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" @@ -63,7 +63,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/Sources/Plasma/PubUtilLib/plDrawable/plClusterGroup.h b/Sources/Plasma/PubUtilLib/plDrawable/plClusterGroup.h index 07f2f7ef..4495c600 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plClusterGroup.h +++ b/Sources/Plasma/PubUtilLib/plDrawable/plClusterGroup.h @@ -46,7 +46,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/Sources/Plasma/PubUtilLib/plDrawable/plCutter.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plCutter.cpp index 581c5e70..60074847 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plCutter.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plCutter.cpp @@ -51,12 +51,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/Sources/Plasma/PubUtilLib/plDrawable/plCutter.h b/Sources/Plasma/PubUtilLib/plDrawable/plCutter.h index 9788d784..70fe34ca 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plCutter.h +++ b/Sources/Plasma/PubUtilLib/plDrawable/plCutter.h @@ -43,12 +43,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/Sources/Plasma/PubUtilLib/plDrawable/plDrawableCreatable.h b/Sources/Plasma/PubUtilLib/plDrawable/plDrawableCreatable.h index c912f14d..0135f334 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plDrawableCreatable.h +++ b/Sources/Plasma/PubUtilLib/plDrawable/plDrawableCreatable.h @@ -43,7 +43,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/Sources/Plasma/PubUtilLib/plDrawable/plDrawableGenerator.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plDrawableGenerator.cpp index 0f87203c..d7e7abfd 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plDrawableGenerator.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plDrawableGenerator.cpp @@ -56,7 +56,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/Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpans.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpans.cpp index 7b9fea44..8fa2e17e 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpans.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpans.cpp @@ -72,32 +72,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/Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpansExport.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpansExport.cpp index 2ccaaaca..83338477 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpansExport.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpansExport.cpp @@ -59,19 +59,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/Sources/Plasma/PubUtilLib/plDrawable/plDynaBulletMgr.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plDynaBulletMgr.cpp index 47f6e352..4c2effd5 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plDynaBulletMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plDynaBulletMgr.cpp @@ -44,7 +44,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" @@ -54,11 +54,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/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.cpp index cf3b5a1c..b1c6142c 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.cpp @@ -55,43 +55,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/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.h b/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.h index 20c7eda9..8a2760ae 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.h +++ b/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.h @@ -43,7 +43,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/Sources/Plasma/PubUtilLib/plDrawable/plDynaFootMgr.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plDynaFootMgr.cpp index e706d6bb..24c3a695 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plDynaFootMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plDynaFootMgr.cpp @@ -54,13 +54,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/Sources/Plasma/PubUtilLib/plDrawable/plDynaPuddleMgr.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plDynaPuddleMgr.cpp index 80f64ebf..c6ac67b3 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plDynaPuddleMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plDynaPuddleMgr.cpp @@ -50,10 +50,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/Sources/Plasma/PubUtilLib/plDrawable/plDynaRippleMgr.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plDynaRippleMgr.cpp index 79039ae2..9c6b52b3 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plDynaRippleMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plDynaRippleMgr.cpp @@ -54,14 +54,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/Sources/Plasma/PubUtilLib/plDrawable/plDynaRippleMgrVS.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plDynaRippleMgrVS.cpp index c6844b64..0a9adce3 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plDynaRippleMgrVS.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plDynaRippleMgrVS.cpp @@ -58,17 +58,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/Sources/Plasma/PubUtilLib/plDrawable/plDynaTorpedoMgr.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plDynaTorpedoMgr.cpp index cdbb940a..517ae0e4 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plDynaTorpedoMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plDynaTorpedoMgr.cpp @@ -43,7 +43,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" @@ -54,7 +54,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/Sources/Plasma/PubUtilLib/plDrawable/plDynaTorpedoVSMgr.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plDynaTorpedoVSMgr.cpp index 477d7b63..ee3c06a2 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plDynaTorpedoVSMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plDynaTorpedoVSMgr.cpp @@ -47,13 +47,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/Sources/Plasma/PubUtilLib/plDrawable/plDynaWakeMgr.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plDynaWakeMgr.cpp index 9f140f23..cdebdf82 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plDynaWakeMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plDynaWakeMgr.cpp @@ -54,17 +54,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/Sources/Plasma/PubUtilLib/plDrawable/plFixedWaterState7.h b/Sources/Plasma/PubUtilLib/plDrawable/plFixedWaterState7.h index 19a64abe..b0758c9a 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plFixedWaterState7.h +++ b/Sources/Plasma/PubUtilLib/plDrawable/plFixedWaterState7.h @@ -45,7 +45,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/Sources/Plasma/PubUtilLib/plDrawable/plGeoSpanDice.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plGeoSpanDice.cpp index 91897fad..1455f1fe 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plGeoSpanDice.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plGeoSpanDice.cpp @@ -40,7 +40,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/Sources/Plasma/PubUtilLib/plDrawable/plGeometrySpan.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plGeometrySpan.cpp index 95ca4c51..21133515 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plGeometrySpan.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plGeometrySpan.cpp @@ -52,8 +52,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/Sources/Plasma/PubUtilLib/plDrawable/plInstanceDrawInterface.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plInstanceDrawInterface.cpp index b936f3ca..bfc0562d 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plInstanceDrawInterface.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plInstanceDrawInterface.cpp @@ -42,11 +42,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/Sources/Plasma/PubUtilLib/plDrawable/plInstanceDrawInterface.h b/Sources/Plasma/PubUtilLib/plDrawable/plInstanceDrawInterface.h index 59358823..5639f9cf 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plInstanceDrawInterface.h +++ b/Sources/Plasma/PubUtilLib/plDrawable/plInstanceDrawInterface.h @@ -42,7 +42,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/Sources/Plasma/PubUtilLib/plDrawable/plMorphDelta.h b/Sources/Plasma/PubUtilLib/plDrawable/plMorphDelta.h index 75bc3e4d..717a8b1f 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plMorphDelta.h +++ b/Sources/Plasma/PubUtilLib/plDrawable/plMorphDelta.h @@ -45,7 +45,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/Sources/Plasma/PubUtilLib/plDrawable/plMorphSequence.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plMorphSequence.cpp index d7e1df0c..0493aa7a 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plMorphSequence.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plMorphSequence.cpp @@ -47,16 +47,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/Sources/Plasma/PubUtilLib/plDrawable/plMorphSequence.h b/Sources/Plasma/PubUtilLib/plDrawable/plMorphSequence.h index dc0a9354..3319bb98 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plMorphSequence.h +++ b/Sources/Plasma/PubUtilLib/plDrawable/plMorphSequence.h @@ -43,7 +43,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/Sources/Plasma/PubUtilLib/plDrawable/plMorphSequenceSDLMod.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plMorphSequenceSDLMod.cpp index 97eda58f..33d77fb9 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plMorphSequenceSDLMod.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plMorphSequenceSDLMod.cpp @@ -43,9 +43,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/Sources/Plasma/PubUtilLib/plDrawable/plMorphSequenceSDLMod.h b/Sources/Plasma/PubUtilLib/plDrawable/plMorphSequenceSDLMod.h index 5757c278..ad4cf7ca 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plMorphSequenceSDLMod.h +++ b/Sources/Plasma/PubUtilLib/plDrawable/plMorphSequenceSDLMod.h @@ -42,7 +42,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/Sources/Plasma/PubUtilLib/plDrawable/plParticleFiller.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plParticleFiller.cpp index ec09863e..41c89a77 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plParticleFiller.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plParticleFiller.cpp @@ -51,16 +51,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/Sources/Plasma/PubUtilLib/plDrawable/plPrintShape.h b/Sources/Plasma/PubUtilLib/plDrawable/plPrintShape.h index 4a3ae6b9..ae954f47 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plPrintShape.h +++ b/Sources/Plasma/PubUtilLib/plDrawable/plPrintShape.h @@ -43,7 +43,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/Sources/Plasma/PubUtilLib/plDrawable/plProxyGen.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plProxyGen.cpp index df7e3583..13c9a675 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plProxyGen.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plProxyGen.cpp @@ -43,14 +43,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/Sources/Plasma/PubUtilLib/plDrawable/plProxyGen.h b/Sources/Plasma/PubUtilLib/plDrawable/plProxyGen.h index 1c1d09a9..112124f8 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plProxyGen.h +++ b/Sources/Plasma/PubUtilLib/plDrawable/plProxyGen.h @@ -43,7 +43,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/Sources/Plasma/PubUtilLib/plDrawable/plSharedMesh.h b/Sources/Plasma/PubUtilLib/plDrawable/plSharedMesh.h index 5e166926..b2afbf68 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plSharedMesh.h +++ b/Sources/Plasma/PubUtilLib/plDrawable/plSharedMesh.h @@ -42,8 +42,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/Sources/Plasma/PubUtilLib/plDrawable/plSpaceTree.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plSpaceTree.cpp index a4d96afb..1eb6e23d 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plSpaceTree.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plSpaceTree.cpp @@ -46,8 +46,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/Sources/Plasma/PubUtilLib/plDrawable/plSpaceTree.h b/Sources/Plasma/PubUtilLib/plDrawable/plSpaceTree.h index 1a615040..ad983d82 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plSpaceTree.h +++ b/Sources/Plasma/PubUtilLib/plDrawable/plSpaceTree.h @@ -45,7 +45,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/Sources/Plasma/PubUtilLib/plDrawable/plSpaceTreeMaker.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plSpaceTreeMaker.cpp index 5a5196d7..4f854ab0 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plSpaceTreeMaker.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plSpaceTreeMaker.cpp @@ -42,12 +42,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/Sources/Plasma/PubUtilLib/plDrawable/plSpanTypes.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plSpanTypes.cpp index a776a752..228ed0ce 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plSpanTypes.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plSpanTypes.cpp @@ -52,10 +52,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/Sources/Plasma/PubUtilLib/plDrawable/plSpanTypes.h b/Sources/Plasma/PubUtilLib/plDrawable/plSpanTypes.h index aa66cc4c..01f3ba77 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plSpanTypes.h +++ b/Sources/Plasma/PubUtilLib/plDrawable/plSpanTypes.h @@ -58,7 +58,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/Sources/Plasma/PubUtilLib/plDrawable/plVisLOSMgr.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plVisLOSMgr.cpp index d1647b24..3f82a91a 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plVisLOSMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plVisLOSMgr.cpp @@ -51,14 +51,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/Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.cpp index 54afcc37..76407b88 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.cpp @@ -56,52 +56,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/Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.h b/Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.h index 3e472ad7..4a19ce81 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.h +++ b/Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.h @@ -46,7 +46,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/Sources/Plasma/PubUtilLib/plDrawable/plWaveSetBase.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plWaveSetBase.cpp index ba714742..8453dde6 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plWaveSetBase.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plWaveSetBase.cpp @@ -44,7 +44,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/Sources/Plasma/PubUtilLib/plDrawable/plWaveSetBase.h b/Sources/Plasma/PubUtilLib/plDrawable/plWaveSetBase.h index ec877265..87c1c9c6 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plWaveSetBase.h +++ b/Sources/Plasma/PubUtilLib/plDrawable/plWaveSetBase.h @@ -43,7 +43,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/Sources/Plasma/PubUtilLib/plEncryption/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plEncryption/CMakeLists.txt new file mode 100644 index 00000000..506e32df --- /dev/null +++ b/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})