From 7a5d61f7c816e9e75c97117cbd314f819f9ceb88 Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Sun, 12 Feb 2012 15:23:02 -0800 Subject: [PATCH] Move plRandom into pnEncryption. --HG-- rename : Sources/Plasma/PubUtilLib/plMath/plRandom.h => Sources/Plasma/NucleusLib/pnEncryption/plRandom.h --- Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.cpp | 2 +- Sources/Plasma/FeatureLib/pfAnimation/plBlower.h | 2 +- Sources/Plasma/NucleusLib/pnEncryption/CMakeLists.txt | 1 + .../{PubUtilLib/plMath => NucleusLib/pnEncryption}/plRandom.h | 0 Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCritter.cpp | 2 +- Sources/Plasma/PubUtilLib/plAvatar/plAvBrainHuman.cpp | 2 +- Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.cpp | 2 +- Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.cpp | 2 +- Sources/Plasma/PubUtilLib/plDrawable/plDynaBulletMgr.cpp | 2 +- Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.cpp | 2 +- Sources/Plasma/PubUtilLib/plDrawable/plDynaFootMgr.cpp | 2 +- Sources/Plasma/PubUtilLib/plDrawable/plDynaRippleMgr.cpp | 2 +- Sources/Plasma/PubUtilLib/plDrawable/plDynaRippleMgrVS.cpp | 2 +- Sources/Plasma/PubUtilLib/plDrawable/plDynaTorpedoMgr.cpp | 2 +- Sources/Plasma/PubUtilLib/plDrawable/plDynaWakeMgr.cpp | 2 +- Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.h | 2 +- Sources/Plasma/PubUtilLib/plMath/CMakeLists.txt | 1 - Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEffect.cpp | 2 +- .../Plasma/PubUtilLib/plParticleSystem/plParticleGenerator.cpp | 2 +- Sources/Tools/MaxComponent/plClusterComponent.cpp | 2 +- Sources/Tools/MaxComponent/plObjectFlockerComponent.cpp | 2 +- Sources/Tools/MaxConvert/plDistributor.h | 2 +- 22 files changed, 20 insertions(+), 20 deletions(-) rename Sources/Plasma/{PubUtilLib/plMath => NucleusLib/pnEncryption}/plRandom.h (100%) diff --git a/Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.cpp b/Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.cpp index 63b45a86..e2b457ee 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.cpp +++ b/Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.cpp @@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plMessage/plAgeLoadedMsg.h" #include "pnSceneObject/plSceneObject.h" #include "hsTimer.h" -#include "plMath/plRandom.h" +#include "pnEncryption/plRandom.h" #include "pnMessage/plEnableMsg.h" #include "plMessage/plAnimCmdMsg.h" #include "plMessage/plLoadCloneMsg.h" diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plBlower.h b/Sources/Plasma/FeatureLib/pfAnimation/plBlower.h index e8318e0b..d23d95ae 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plBlower.h +++ b/Sources/Plasma/FeatureLib/pfAnimation/plBlower.h @@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pnModifier/plSingleModifier.h" #include "hsGeometry3.h" -#include "plMath/plRandom.h" +#include "pnEncryption/plRandom.h" #include "hsTemplates.h" class plSceneObject; diff --git a/Sources/Plasma/NucleusLib/pnEncryption/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnEncryption/CMakeLists.txt index b27bffdc..349b3d42 100644 --- a/Sources/Plasma/NucleusLib/pnEncryption/CMakeLists.txt +++ b/Sources/Plasma/NucleusLib/pnEncryption/CMakeLists.txt @@ -10,6 +10,7 @@ set(pnEncryption_SOURCES set(pnEncryption_HEADERS plChallengeHash.h plChecksum.h + plRandom.h ) add_library(pnEncryption STATIC ${pnEncryption_SOURCES} ${pnEncryption_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plMath/plRandom.h b/Sources/Plasma/NucleusLib/pnEncryption/plRandom.h similarity index 100% rename from Sources/Plasma/PubUtilLib/plMath/plRandom.h rename to Sources/Plasma/NucleusLib/pnEncryption/plRandom.h diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCritter.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCritter.cpp index 27d6cfcb..9fd821ed 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCritter.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCritter.cpp @@ -55,7 +55,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPipeline/plDebugText.h" #include "pnSceneObject/plCoordinateInterface.h" -#include "plMath/plRandom.h" +#include "pnEncryption/plRandom.h" #include "plNetClient/plNetClientMgr.h" #include "plNetTransport/plNetTransportMember.h" diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainHuman.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainHuman.cpp index 34581ae7..7dd2ecca 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainHuman.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainHuman.cpp @@ -73,7 +73,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pnSceneObject/plCoordinateInterface.h" #include "plInputCore/plAvatarInputInterface.h" #include "plInputCore/plInputDevice.h" -#include "plMath/plRandom.h" +#include "pnEncryption/plRandom.h" #include "plPipeline/plDebugText.h" #include "plNetClient/plNetLinkingMgr.h" diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.cpp index b271b04e..83a2da7e 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.cpp @@ -73,7 +73,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plDrawable/plSpaceTree.h" #include "plSurface/hsGMaterial.h" #include "plSurface/plLayer.h" -#include "plMath/plRandom.h" +#include "pnEncryption/plRandom.h" #include "plSDL/plSDL.h" #include "plVault/plVault.h" #include "plResMgr/plKeyFinder.h" diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.cpp index 07e4e982..51fb0198 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.cpp @@ -74,7 +74,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plModifier/plSpawnModifier.h" #include "plModifier/plMaintainersMarkerModifier.h" #include "plVault/plDniCoordinateInfo.h" -#include "plMath/plRandom.h" +#include "pnEncryption/plRandom.h" #include "pnMessage/plPlayerPageMsg.h" #include "pnMessage/plWarpMsg.h" diff --git a/Sources/Plasma/PubUtilLib/plDrawable/plDynaBulletMgr.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plDynaBulletMgr.cpp index dd0a39bf..9757768b 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plDynaBulletMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plDynaBulletMgr.cpp @@ -58,7 +58,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsFastMath.h" -#include "plMath/plRandom.h" +#include "pnEncryption/plRandom.h" static plRandom sRand; diff --git a/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.cpp index 380f79a5..e159da44 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.cpp @@ -75,7 +75,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pnMessage/plTimeMsg.h" #include "plgDispatch.h" -#include "plMath/plRandom.h" +#include "pnEncryption/plRandom.h" #include "hsFastMath.h" #include "hsStream.h" diff --git a/Sources/Plasma/PubUtilLib/plDrawable/plDynaFootMgr.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plDynaFootMgr.cpp index 776f6a10..f0a1b9db 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plDynaFootMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plDynaFootMgr.cpp @@ -60,7 +60,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAvatar/plArmatureMod.h" #include "plAvatar/plAvBrainHuman.h" -#include "plMath/plRandom.h" +#include "pnEncryption/plRandom.h" static plRandom sRand; static const uint32_t kNumPrintIDs = 2; diff --git a/Sources/Plasma/PubUtilLib/plDrawable/plDynaRippleMgr.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plDynaRippleMgr.cpp index 1f41a0d9..36d7909d 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plDynaRippleMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plDynaRippleMgr.cpp @@ -61,7 +61,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAvatar/plAvBrainHuman.h" #include "plAvatar/plArmatureMod.h" -#include "plMath/plRandom.h" +#include "pnEncryption/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 a2bf1374..bdf94371 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plDynaRippleMgrVS.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plDynaRippleMgrVS.cpp @@ -68,7 +68,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAvatar/plAvBrainHuman.h" #include "plAvatar/plArmatureMod.h" -#include "plMath/plRandom.h" +#include "pnEncryption/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 4e567102..1cf3fe3c 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plDynaTorpedoMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plDynaTorpedoMgr.cpp @@ -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 "pnEncryption/plRandom.h" static const uint32_t kNumPrintIDs = 0; diff --git a/Sources/Plasma/PubUtilLib/plDrawable/plDynaWakeMgr.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plDynaWakeMgr.cpp index 9751aa80..f80b530b 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plDynaWakeMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plDynaWakeMgr.cpp @@ -64,7 +64,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plInterp/plAnimPath.h" #include "hsFastMath.h" -#include "plMath/plRandom.h" +#include "pnEncryption/plRandom.h" static plRandom sRand; diff --git a/Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.h b/Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.h index 90207cf8..17bec842 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 "pnEncryption/plRandom.h" #include "hsBounds.h" #include "plFixedWaterState7.h" diff --git a/Sources/Plasma/PubUtilLib/plMath/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plMath/CMakeLists.txt index 36f68520..5be16a99 100644 --- a/Sources/Plasma/PubUtilLib/plMath/CMakeLists.txt +++ b/Sources/Plasma/PubUtilLib/plMath/CMakeLists.txt @@ -14,7 +14,6 @@ set(plMath_HEADERS hsRadixSort.h hsSearchVersion.h plAvg.h - plRandom.h plTriUtils.h ) diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEffect.cpp b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEffect.cpp index 3997259c..3ccc1f2a 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEffect.cpp +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEffect.cpp @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "plPipeline.h" #include "hsFastMath.h" -#include "plMath/plRandom.h" +#include "pnEncryption/plRandom.h" #include "plParticleSystem.h" #include "plMessage/plParticleUpdateMsg.h" diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleGenerator.cpp b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleGenerator.cpp index 40b6a271..f5a5c632 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleGenerator.cpp +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleGenerator.cpp @@ -52,7 +52,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plMessage/plParticleUpdateMsg.h" #include "plInterp/plController.h" #include "hsResMgr.h" -#include "plMath/plRandom.h" +#include "pnEncryption/plRandom.h" static const float DEFAULT_INVERSE_MASS = 1.f; diff --git a/Sources/Tools/MaxComponent/plClusterComponent.cpp b/Sources/Tools/MaxComponent/plClusterComponent.cpp index 24326bce..5981210a 100644 --- a/Sources/Tools/MaxComponent/plClusterComponent.cpp +++ b/Sources/Tools/MaxComponent/plClusterComponent.cpp @@ -57,7 +57,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsBitVector.h" #include "plMath/hsRadixSort.h" -#include "plMath/plRandom.h" +#include "pnEncryption/plRandom.h" #include "pfAnimation/plBlower.h" #include "plDicer.h" diff --git a/Sources/Tools/MaxComponent/plObjectFlockerComponent.cpp b/Sources/Tools/MaxComponent/plObjectFlockerComponent.cpp index 03877df1..8fe16d8a 100644 --- a/Sources/Tools/MaxComponent/plObjectFlockerComponent.cpp +++ b/Sources/Tools/MaxComponent/plObjectFlockerComponent.cpp @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "resource.h" #include "plComponent.h" #include "plComponentReg.h" -#include "plMath/plRandom.h" +#include "pnEncryption/plRandom.h" #include "plObjectFlockerComponent.h" #include "pnKeyedObject/plUoid.h" #include "MaxMain/plMaxNode.h" diff --git a/Sources/Tools/MaxConvert/plDistributor.h b/Sources/Tools/MaxConvert/plDistributor.h index 23143474..3e6d3da7 100644 --- a/Sources/Tools/MaxConvert/plDistributor.h +++ b/Sources/Tools/MaxConvert/plDistributor.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plDistributor_inc #define plDistributor_inc -#include "plMath/plRandom.h" +#include "pnEncryption/plRandom.h" #include "plDistTree.h" class INode;