From 8596c34c5093de4b386e41d04c8a19e47ecee34c Mon Sep 17 00:00:00 2001 From: Branan Purvine-Riley Date: Thu, 7 Apr 2011 15:40:56 -0700 Subject: [PATCH 01/18] Beginnings of CMake port (cherry picked from commit 3a51dd090273e86d9acc8798f2ce66cc9ad7ce23) --- CMakeLists.txt | 26 +++++ Sources/Plasma/CMakeLists.txt | 4 + Sources/Plasma/CoreLib/CMakeLists.txt | 99 +++++++++++++++++++ Sources/Plasma/CoreLibExe/CMakeLists.txt | 16 +++ Sources/Plasma/FeatureLib/CMakeLists.txt | 2 + .../FeatureLib/pfAnimation/CMakeLists.txt | 41 ++++++++ .../pfAnimation/pfAnimationCreatable.h | 2 +- .../pfAnimation/pfObjectFlocker.cpp | 16 +-- .../FeatureLib/pfAnimation/pfObjectFlocker.h | 2 +- .../pfAnimation/plAnimDebugList.cpp | 16 +-- .../FeatureLib/pfAnimation/plBlower.cpp | 6 +- .../Plasma/FeatureLib/pfAnimation/plBlower.h | 4 +- .../pfAnimation/plFilterCoordInterface.h | 2 +- .../FeatureLib/pfAnimation/plFollowMod.cpp | 12 +-- .../FeatureLib/pfAnimation/plFollowMod.h | 2 +- .../pfAnimation/plLightModifier.cpp | 4 +- .../FeatureLib/pfAnimation/plLightModifier.h | 2 +- .../pfAnimation/plLineFollowMod.cpp | 22 ++--- .../FeatureLib/pfAnimation/plLineFollowMod.h | 2 +- .../pfAnimation/plRandomCommandMod.cpp | 6 +- .../pfAnimation/plRandomCommandMod.h | 2 +- .../FeatureLib/pfAnimation/plStereizer.cpp | 6 +- .../FeatureLib/pfAnimation/plStereizer.h | 2 +- .../pfAnimation/plViewFaceModifier.cpp | 14 +-- .../pfAnimation/plViewFaceModifier.h | 2 +- .../Plasma/FeatureLib/pfAudio/CMakeLists.txt | 25 +++++ .../FeatureLib/pfAudio/pfAudioCreatable.h | 2 +- .../Plasma/FeatureLib/pfAudio/plListener.cpp | 32 +++--- .../Plasma/FeatureLib/pfAudio/plListener.h | 2 +- .../FeatureLib/pfAudio/plRandomSoundMod.cpp | 16 +-- .../FeatureLib/pfAudio/plRandomSoundMod.h | 2 +- .../PubUtilLib/plModifier/plSimpleModifier.h | 4 +- 32 files changed, 304 insertions(+), 91 deletions(-) create mode 100644 CMakeLists.txt create mode 100644 Sources/Plasma/CMakeLists.txt create mode 100644 Sources/Plasma/CoreLib/CMakeLists.txt create mode 100644 Sources/Plasma/CoreLibExe/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfAnimation/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfAudio/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 00000000..61e1a5db --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,26 @@ +project(CyanWorldsEngine) +cmake_minimum_required(VERSION 2.8) + +# Find all 3rd-party libraries that are required +find_package(OpenSSL REQUIRED) +find_package(OpenAL REQUIRED) + +option(EXTERNAL_RELEASE "Is this release intended for the general public?" OFF) + +# TODO: are there any other build types which are useful for us? +add_definitions(-DBUILD_TYPE_LIVE) + +if(EXTERNAL_RELEASE) + add_definitions(-DPLASMA_EXTERNAL_RELEASE) +endif(EXTERNAL_RELEASE) + +if(CMAKE_BUILD_TYPE STREQUAL Debug) + add_definitions(-D_DEBUG) +endif(CMAKE_BUILD_TYPE STREQUAL Debug) + +if(MSVC) + add_definitions(-D_CRT_SECURE_NO_WARNINGS) +endif(MSVC) + +add_subdirectory(Sources/Plasma) +# add_subdirectory(Sources/Tools) diff --git a/Sources/Plasma/CMakeLists.txt b/Sources/Plasma/CMakeLists.txt new file mode 100644 index 00000000..8f2b2722 --- /dev/null +++ b/Sources/Plasma/CMakeLists.txt @@ -0,0 +1,4 @@ +add_subdirectory(CoreLib) +add_subdirectory(CoreLibExe) +add_subdirectory(FeatureLib) +add_subdirectory(NucleusLib) diff --git a/Sources/Plasma/CoreLib/CMakeLists.txt b/Sources/Plasma/CoreLib/CMakeLists.txt new file mode 100644 index 00000000..5944e2c7 --- /dev/null +++ b/Sources/Plasma/CoreLib/CMakeLists.txt @@ -0,0 +1,99 @@ +add_definitions(-D_LIB) + +set(CoreLib_SOURCES + HeadSpin.cpp + hsBitVector.cpp + hsBounds.cpp + hsCritSect.cpp + hsExceptionStack.cpp + hsFastMath.cpp + hsGeometry3.cpp + hsMalloc.cpp + hsMatrix33.cpp + hsMatrix44.cpp + hsMemory.cpp + hsMMIOStream.cpp + hsQuat.cpp + hsSafeRefCnt.cpp + hsSTLStream.cpp + hsStlUtils.cpp + hsStream.cpp + hsStringTokenizer.cpp + hsTemplates.cpp + hsThread.cpp + hsUtils.cpp + hsWide.cpp + pcSmallRect.cpp + plGeneric.cpp + plLoadMask.cpp + plViewTransform.cpp +) + +if(WIN32 AND NOT CYGWIN) + set(CoreLib_SOURCES ${CoreLib_SOURCES} + hsThread_Win.cpp + ) +endif(WIN32 AND NOT CYGWIN) +if(UNIX) + set(CoreLib_SOURCES ${CoreLib_SOURCES} + hsThread_Unix.cpp + ) +endif(UNIX) + +# for now we use the Unix file on mac... I think this is Carbon code, which +# we don't want to use. I don't think it's worth support OS9 anymore +#if(APPLE) +# set(CoreLib_SOURCES ${CoreLib_SOURCES} +# hsThread_Mac.cpp +# ) +#endif(APPLE) + + +set(CoreLib_HEADERS + HeadSpin.h + hsBiExpander.h + hsBitVector.h + hsBounds.h + hsColorRGBA.h + hsConfig.h + hsCritSect.h + hsExceptions.h + hsFastMath.h + hsFixedTypes.h + hsGeometry3.h + hsHashTable.h + hsMalloc.h + hsMatrix44.h + hsMemory.h + hsMMIOStream.h + hsPoint2.h + hsQuat.h + hsQueue.h + hsRefCnt.h + hsSafeRefCnt.h + hsScalar.h + hsStlSortUtils.h + hsSTLStream.h + hsStream.h + hsStringTokenizer.h + hsTemplates.h + hsTempPointer.h + hsThread.h + hsTypes.h + hsUtils.h + hsWide.h + hsWindowHndl.h + hsWindows.h + pcSmallRect.h + plGeneric.h + plLoadMask.h + plQuality.h + plRefCnt.h + plTweak.h + plViewTransform.h +) + +add_library(CoreLib STATIC ${CoreLib_SOURCES} ${CoreLib_HEADERS}) + +source_group("Source Files" FILES ${CoreLib_SOURCES}) +source_group("Header Files" FILES ${CoreLib_HEADERS}) diff --git a/Sources/Plasma/CoreLibExe/CMakeLists.txt b/Sources/Plasma/CoreLibExe/CMakeLists.txt new file mode 100644 index 00000000..c077c368 --- /dev/null +++ b/Sources/Plasma/CoreLibExe/CMakeLists.txt @@ -0,0 +1,16 @@ +add_definitions(-D_LIB) + +set(CoreLibExe_SOURCES + hsExeError.cpp + hsExeMalloc.cpp +) + +set(CoreLibExe_HEADERS + Intern.h + Pch.h +) + +add_library(CoreLibExe STATIC ${CoreLibExe_SOURCES} ${CoreLibExe_HEADERS}) + +source_group("Source Files" FILES ${CoreLibExe_SOURCES}) +source_group("Header Files" FILES ${CoreLibExe_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/CMakeLists.txt b/Sources/Plasma/FeatureLib/CMakeLists.txt new file mode 100644 index 00000000..a60bb33a --- /dev/null +++ b/Sources/Plasma/FeatureLib/CMakeLists.txt @@ -0,0 +1,2 @@ +add_subdirectory(pfAnimation) +add_subdirectory(pfAudio) diff --git a/Sources/Plasma/FeatureLib/pfAnimation/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfAnimation/CMakeLists.txt new file mode 100644 index 00000000..713776eb --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfAnimation/CMakeLists.txt @@ -0,0 +1,41 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") +include_directories("../../NucleusLib/inc") +include_directories("../../PubUtilLib") + +include_directories(${OPENSSL_INCLUDE_DIR}) + +# this is in the vcproj, but it seems silly for animation... +# find_package(OpenSSL REQUIRED) + +set(pfAnimation_SOURCES + pfObjectFlocker.cpp + plAnimDebugList.cpp + plBlower.cpp + plFilterCoordInterface.cpp + plFollowMod.cpp + plLightModifier.cpp + plLineFollowMod.cpp + plRandomCommandMod.cpp + plStereizer.cpp + plViewFaceModifier.cpp +) + +set(pfAnimation_HEADERS + pfAnimationCreatable.h + pfObjectFlocker.h + plAnimDebugList.h + plBlower.h + plFilterCoordInterface.h + plFollowMod.h + plLightModifier.h + plLineFollowMod.h + plRandomCommandMod.h + plStereizer.h + plViewFaceModifier.h +) + +add_library(pfAnimation STATIC ${pfAnimation_SOURCES} ${pfAnimation_HEADERS}) + +source_group("Source Files" FILES ${pfAnimation_SOURCES}) +source_group("Header Files" FILES ${pfAnimation_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfAnimation/pfAnimationCreatable.h b/Sources/Plasma/FeatureLib/pfAnimation/pfAnimationCreatable.h index 02bfcb1b..ab0ff140 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/pfAnimationCreatable.h +++ b/Sources/Plasma/FeatureLib/pfAnimation/pfAnimationCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pfAnimationCreatable_inc #define pfAnimationCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plViewFaceModifier.h" diff --git a/Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.cpp b/Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.cpp index 00146c53..3ba10702 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.cpp +++ b/Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.cpp @@ -45,15 +45,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsGeometry3.h" #include "plgDispatch.h" #include "hsResMgr.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnMessage/plRefMsg.h" -#include "../plMessage/plAgeLoadedMsg.h" -#include "../pnSceneObject/plSceneObject.h" +#include "pnMessage/plTimeMsg.h" +#include "pnMessage/plRefMsg.h" +#include "plMessage/plAgeLoadedMsg.h" +#include "pnSceneObject/plSceneObject.h" #include "hsTimer.h" -#include "../plMath/plRandom.h" -#include "../pnMessage/plEnableMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plMessage/plLoadCloneMsg.h" +#include "plMath/plRandom.h" +#include "pnMessage/plEnableMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plMessage/plLoadCloneMsg.h" //#include "../plPipeline/plDebugGeometry.h" diff --git a/Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.h b/Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.h index 505d78a9..79797c32 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.h +++ b/Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef OBJECT_FLOCKER_H #define OBJECT_FLOCKER_H -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" class hsStream; class hsResMgr; diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plAnimDebugList.cpp b/Sources/Plasma/FeatureLib/pfAnimation/plAnimDebugList.cpp index a6bd335a..11ae6029 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plAnimDebugList.cpp +++ b/Sources/Plasma/FeatureLib/pfAnimation/plAnimDebugList.cpp @@ -44,14 +44,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTemplates.h" #include "hsTimer.h" #include "plAnimDebugList.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plLayerAnimation.h" -#include "../plAvatar/plAGMasterMod.h" -#include "../plAvatar/plAGAnimInstance.h" -#include "../plAvatar/plAGAnim.h" -#include "../plResMgr/plKeyFinder.h" -#include "../plPipeline/plDebugText.h" +#include "pnSceneObject/plSceneObject.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plLayerAnimation.h" +#include "plAvatar/plAGMasterMod.h" +#include "plAvatar/plAGAnimInstance.h" +#include "plAvatar/plAGAnim.h" +#include "plResMgr/plKeyFinder.h" +#include "plPipeline/plDebugText.h" void plAnimDebugList::AddObjects(char *subString) { diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plBlower.cpp b/Sources/Plasma/FeatureLib/pfAnimation/plBlower.cpp index 41300036..5d0367a3 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plBlower.cpp +++ b/Sources/Plasma/FeatureLib/pfAnimation/plBlower.cpp @@ -44,9 +44,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plBlower.h" #include "plgDispatch.h" #include "hsFastMath.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnMessage/plTimeMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnMessage/plTimeMsg.h" #include "hsTimer.h" plRandom plBlower::fRandom; diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plBlower.h b/Sources/Plasma/FeatureLib/pfAnimation/plBlower.h index f6a63bd9..73129967 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plBlower.h +++ b/Sources/Plasma/FeatureLib/pfAnimation/plBlower.h @@ -43,9 +43,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plBlower_inc #define plBlower_inc -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" #include "hsGeometry3.h" -#include "../plMath/plRandom.h" +#include "plMath/plRandom.h" #include "hsTemplates.h" class plSceneObject; diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plFilterCoordInterface.h b/Sources/Plasma/FeatureLib/pfAnimation/plFilterCoordInterface.h index 49a61fd4..4156d280 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plFilterCoordInterface.h +++ b/Sources/Plasma/FeatureLib/pfAnimation/plFilterCoordInterface.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plFilterCoordInterface_inc #define plFilterCoordInterface_inc -#include "../pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plCoordinateInterface.h" class plFilterCoordInterface : public plCoordinateInterface { diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plFollowMod.cpp b/Sources/Plasma/FeatureLib/pfAnimation/plFollowMod.cpp index e1ddd4f8..07af95af 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plFollowMod.cpp +++ b/Sources/Plasma/FeatureLib/pfAnimation/plFollowMod.cpp @@ -43,12 +43,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plFollowMod.h" #include "plgDispatch.h" -#include "../pnNetCommon/plNetApp.h" -#include "../plMessage/plListenerMsg.h" -#include "../plMessage/plRenderMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnMessage/plRefMsg.h" +#include "pnNetCommon/plNetApp.h" +#include "plMessage/plListenerMsg.h" +#include "plMessage/plRenderMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnMessage/plRefMsg.h" #include "hsResMgr.h" #include "plPipeline.h" diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plFollowMod.h b/Sources/Plasma/FeatureLib/pfAnimation/plFollowMod.h index 77109181..92d7b456 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plFollowMod.h +++ b/Sources/Plasma/FeatureLib/pfAnimation/plFollowMod.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plFollowMod_inc #include "hsMatrix44.h" -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" class plSceneObject; class plMessage; diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plLightModifier.cpp b/Sources/Plasma/FeatureLib/pfAnimation/plLightModifier.cpp index f633e42e..7b97760c 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plLightModifier.cpp +++ b/Sources/Plasma/FeatureLib/pfAnimation/plLightModifier.cpp @@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plLightModifier.h" -#include "../plGLight/plLightInfo.h" -#include "../plInterp/plController.h" +#include "plGLight/plLightInfo.h" +#include "plInterp/plController.h" #include "hsStream.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plLightModifier.h b/Sources/Plasma/FeatureLib/pfAnimation/plLightModifier.h index fc176e42..edbe9904 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plLightModifier.h +++ b/Sources/Plasma/FeatureLib/pfAnimation/plLightModifier.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLightModifier_inc #define plLightModifier_inc -#include "../../PubUtilLib/plModifier/plSimpleModifier.h" +#include "plModifier/plSimpleModifier.h" #include "hsGeometry3.h" class plController; diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plLineFollowMod.cpp b/Sources/Plasma/FeatureLib/pfAnimation/plLineFollowMod.cpp index 8ac68991..7738e22e 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plLineFollowMod.cpp +++ b/Sources/Plasma/FeatureLib/pfAnimation/plLineFollowMod.cpp @@ -43,22 +43,22 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plLineFollowMod.h" #include "plStereizer.h" -#include "../plInterp/plAnimPath.h" +#include "plInterp/plAnimPath.h" #include "hsResMgr.h" -#include "../pnMessage/plRefMsg.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnSceneObject/plDrawInterface.h" +#include "pnMessage/plRefMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plDrawInterface.h" #include "plgDispatch.h" -#include "../plMessage/plListenerMsg.h" -#include "../plMessage/plRenderMsg.h" -#include "../pnMessage/plTimeMsg.h" +#include "plMessage/plListenerMsg.h" +#include "plMessage/plRenderMsg.h" +#include "pnMessage/plTimeMsg.h" #include "hsBounds.h" #include "plPipeline.h" #include "hsFastMath.h" -#include "../pnMessage/plPlayerPageMsg.h" -#include "../pnNetCommon/plNetApp.h" -#include "../plNetClient/plNetClientMgr.h" +#include "pnMessage/plPlayerPageMsg.h" +#include "pnNetCommon/plNetApp.h" +#include "plNetClient/plNetClientMgr.h" #include "hsTimer.h" plLineFollowMod::plLineFollowMod() diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plLineFollowMod.h b/Sources/Plasma/FeatureLib/pfAnimation/plLineFollowMod.h index a7c25475..102f60a6 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plLineFollowMod.h +++ b/Sources/Plasma/FeatureLib/pfAnimation/plLineFollowMod.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLineFollowMod_inc #define plLineFollowMod_inc -#include "../pnModifier/plMultiModifier.h" +#include "pnModifier/plMultiModifier.h" #include "hsGeometry3.h" #include "hsMatrix44.h" diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plRandomCommandMod.cpp b/Sources/Plasma/FeatureLib/pfAnimation/plRandomCommandMod.cpp index bf54da11..d535d9c9 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plRandomCommandMod.cpp +++ b/Sources/Plasma/FeatureLib/pfAnimation/plRandomCommandMod.cpp @@ -44,9 +44,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plRandomCommandMod.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../pnMessage/plEventCallbackMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "plMessage/plAnimCmdMsg.h" +#include "pnMessage/plEventCallbackMsg.h" #include "plgDispatch.h" #include "hsTimer.h" #include "hsUtils.h" diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plRandomCommandMod.h b/Sources/Plasma/FeatureLib/pfAnimation/plRandomCommandMod.h index 02f9f71b..1e39f2e4 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plRandomCommandMod.h +++ b/Sources/Plasma/FeatureLib/pfAnimation/plRandomCommandMod.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plRandomCommandMod_inc #define plRandomCommandMod_inc -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" #include "hsTemplates.h" class plRandomCommandMod : public plSingleModifier diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plStereizer.cpp b/Sources/Plasma/FeatureLib/pfAnimation/plStereizer.cpp index 99fb659f..790b6433 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plStereizer.cpp +++ b/Sources/Plasma/FeatureLib/pfAnimation/plStereizer.cpp @@ -48,11 +48,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plStereizer.h" #include "plLineFollowMod.h" -#include "../plMessage/plListenerMsg.h" +#include "plMessage/plListenerMsg.h" #include "plgDispatch.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" #include "hsFastMath.h" diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plStereizer.h b/Sources/Plasma/FeatureLib/pfAnimation/plStereizer.h index 38fbb9ba..09f2d6b5 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plStereizer.h +++ b/Sources/Plasma/FeatureLib/pfAnimation/plStereizer.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plStereizer_inc #define plStereizer_inc -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" #include "hsGeometry3.h" #include "hsMatrix44.h" diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plViewFaceModifier.cpp b/Sources/Plasma/FeatureLib/pfAnimation/plViewFaceModifier.cpp index 8d8c9e5d..434b2d35 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plViewFaceModifier.cpp +++ b/Sources/Plasma/FeatureLib/pfAnimation/plViewFaceModifier.cpp @@ -43,16 +43,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plViewFaceModifier.h" #include "plgDispatch.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" #include "hsFastMath.h" #include "plPipeline.h" -#include "../plMessage/plRenderMsg.h" -#include "../plMessage/plListenerMsg.h" -#include "../plMessage/plAvatarMsg.h" -#include "../plAvatar/plAvBrainHuman.h" -#include "../plAvatar/plArmatureMod.h" +#include "plMessage/plRenderMsg.h" +#include "plMessage/plListenerMsg.h" +#include "plMessage/plAvatarMsg.h" +#include "plAvatar/plAvBrainHuman.h" +#include "plAvatar/plArmatureMod.h" plViewFaceModifier::plViewFaceModifier() : fFacePoint(0,0,0), diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plViewFaceModifier.h b/Sources/Plasma/FeatureLib/pfAnimation/plViewFaceModifier.h index 78e2b59e..051ff64e 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plViewFaceModifier.h +++ b/Sources/Plasma/FeatureLib/pfAnimation/plViewFaceModifier.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsMatrix44.h" #include "hsBounds.h" -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" class plGenRefMsg; class plPipeline; diff --git a/Sources/Plasma/FeatureLib/pfAudio/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfAudio/CMakeLists.txt new file mode 100644 index 00000000..423240b0 --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfAudio/CMakeLists.txt @@ -0,0 +1,25 @@ +include_directories(../../CoreLib) +include_directories(../../FeatureLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) +include_directories(../../PubUtilLib) +#include_directories(../../PubUtilLib/inc) + +include_directories(${OPENSSL_INCLUDE_DIR}) +include_directories(${OPENAL_INCLUDE_DIR}) + +set(pfAudio_SOURCES + plListener.cpp + plRandomSoundMod.cpp +) + +set(pfAudio_HEADERS + pfAudioCreatable.h + plListener.h + plRandomSoundMod.h +) + +add_library(pfAudio STATIC ${pfAudio_SOURCES} ${pfAudio_HEADERS}) + +source_group("Source Files" FILES ${pfAudio_SOURCES}) +source_group("Header Files" FILES ${pfAudio_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfAudio/pfAudioCreatable.h b/Sources/Plasma/FeatureLib/pfAudio/pfAudioCreatable.h index 30f740e4..7fd4a9f5 100644 --- a/Sources/Plasma/FeatureLib/pfAudio/pfAudioCreatable.h +++ b/Sources/Plasma/FeatureLib/pfAudio/pfAudioCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pfAudioCreatable_inc #define pfAudioCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plListener.h" diff --git a/Sources/Plasma/FeatureLib/pfAudio/plListener.cpp b/Sources/Plasma/FeatureLib/pfAudio/plListener.cpp index d6178216..12a223db 100644 --- a/Sources/Plasma/FeatureLib/pfAudio/plListener.cpp +++ b/Sources/Plasma/FeatureLib/pfAudio/plListener.cpp @@ -43,21 +43,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plListener.h" #include "plgDispatch.h" -#include "../plAudio/plAudioSystem.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnMessage/plAudioSysMsg.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnSceneObject/plSimulationInterface.h" -#include "../pfCamera/plVirtualCamNeu.h" -#include "../plMessage/plListenerMsg.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plPipeline/plDebugText.h" - -#include "../plAvatar/plAvatarMgr.h" -#include "../plAvatar/plArmatureMod.h" -#include "../plAvatar/plPhysicalControllerCore.h" +#include "plAudio/plAudioSystem.h" +#include "pnMessage/plTimeMsg.h" +#include "pnMessage/plAudioSysMsg.h" +#include "pnKeyedObject/plKey.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plSimulationInterface.h" +#include "pfCamera/plVirtualCamNeu.h" +#include "plMessage/plListenerMsg.h" +#include "plNetClient/plNetClientMgr.h" +#include "plPipeline/plDebugText.h" + +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plArmatureMod.h" +#include "plAvatar/plAvCallbackAction.h" hsBool plListener::fPrintDbgInfo = false; @@ -325,4 +325,4 @@ hsBool plListener::MsgReceive(plMessage* msg) } return plSingleModifier::MsgReceive(msg); -} \ No newline at end of file +} diff --git a/Sources/Plasma/FeatureLib/pfAudio/plListener.h b/Sources/Plasma/FeatureLib/pfAudio/plListener.h index 1d7c982a..83269e6d 100644 --- a/Sources/Plasma/FeatureLib/pfAudio/plListener.h +++ b/Sources/Plasma/FeatureLib/pfAudio/plListener.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plListener_h #define plListener_h -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" class plSceneObject; diff --git a/Sources/Plasma/FeatureLib/pfAudio/plRandomSoundMod.cpp b/Sources/Plasma/FeatureLib/pfAudio/plRandomSoundMod.cpp index d19a73af..b29156ec 100644 --- a/Sources/Plasma/FeatureLib/pfAudio/plRandomSoundMod.cpp +++ b/Sources/Plasma/FeatureLib/pfAudio/plRandomSoundMod.cpp @@ -42,16 +42,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plRandomSoundMod.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plAudioInterface.h" -#include "../pnMessage/plSoundMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plAudio/plAudioSystem.h" -#include "../plAudio/plSound.h" -#include "../plAudio/plWin32GroupedSound.h" // EEK BAD +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plAudioInterface.h" +#include "pnMessage/plSoundMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plAudio/plAudioSystem.h" +#include "plAudio/plSound.h" +#include "plAudio/plWin32GroupedSound.h" // EEK BAD #include "plgDispatch.h" #include "hsTimer.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" plRandomSoundModGroup::plRandomSoundModGroup() : fNumSounds(0), fIndices(nil), fGroupedIdx(-1), fCurrent(-1) { diff --git a/Sources/Plasma/FeatureLib/pfAudio/plRandomSoundMod.h b/Sources/Plasma/FeatureLib/pfAudio/plRandomSoundMod.h index 409b5159..87c0d409 100644 --- a/Sources/Plasma/FeatureLib/pfAudio/plRandomSoundMod.h +++ b/Sources/Plasma/FeatureLib/pfAudio/plRandomSoundMod.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plRandomSoundMod_inc #define plRandomSoundMod_inc -#include "../pfAnimation/plRandomCommandMod.h" +#include "pfAnimation/plRandomCommandMod.h" class plSound; struct hsPoint3; diff --git a/Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.h index 340a4e33..5dca3d42 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plSimpleModifier_inc #define plSimpleModifier_inc -#include "../pnModifier/plModifier.h" -#include "../pnNetCommon/plSynchedValue.h" +#include "pnModifier/plModifier.h" +#include "pnNetCommon/plSynchedValue.h" #include "../plInterp/plAnimTimeConvert.h" class plSceneObject; From 9939eac3423d79c6c67b70169d26d90f82e847f5 Mon Sep 17 00:00:00 2001 From: Zrax Date: Thu, 7 Apr 2011 18:17:35 -0700 Subject: [PATCH 02/18] Add target configurations from the sln to the root-level cmake project (cherry picked from commit 4b594c6e2eabd1ffad8d8c7fceeafaee7e3967b3) --- CMakeLists.txt | 70 ++++++++++++------- .../PubUtilLib/plEncryption/plChecksum.h | 2 +- 2 files changed, 45 insertions(+), 27 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 61e1a5db..1149cdab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,26 +1,44 @@ -project(CyanWorldsEngine) -cmake_minimum_required(VERSION 2.8) - -# Find all 3rd-party libraries that are required -find_package(OpenSSL REQUIRED) -find_package(OpenAL REQUIRED) - -option(EXTERNAL_RELEASE "Is this release intended for the general public?" OFF) - -# TODO: are there any other build types which are useful for us? -add_definitions(-DBUILD_TYPE_LIVE) - -if(EXTERNAL_RELEASE) - add_definitions(-DPLASMA_EXTERNAL_RELEASE) -endif(EXTERNAL_RELEASE) - -if(CMAKE_BUILD_TYPE STREQUAL Debug) - add_definitions(-D_DEBUG) -endif(CMAKE_BUILD_TYPE STREQUAL Debug) - -if(MSVC) - add_definitions(-D_CRT_SECURE_NO_WARNINGS) -endif(MSVC) - -add_subdirectory(Sources/Plasma) -# add_subdirectory(Sources/Tools) +project(CyanWorldsEngine) +cmake_minimum_required(VERSION 2.8) + +# Find all 3rd-party libraries that are required +find_package(OpenSSL REQUIRED) +find_package(OpenAL REQUIRED) + +option(EXTERNAL_RELEASE "Is this release intended for the general public?" OFF) + +#TODO: Don't hard code this +add_definitions(-DBUILD_TYPE=BUILD_TYPE_LIVE) + +if(EXTERNAL_RELEASE) + add_definitions(-DPLASMA_EXTERNAL_RELEASE) +endif(EXTERNAL_RELEASE) + +set(PLASMA_TARGETS Client + CACHE STRING "Which set of plasma targets to build and use") +set_property(CACHE PLASMA_TARGETS PROPERTY STRINGS + "Client" "Server" "Patcher" "Ethereal" "NoAvMsgs") + +if(PLASMA_TARGETS STREQUAL "Patcher") + add_definitions(-DPATCHER) +endif(PLASMA_TARGETS STREQUAL "Patcher") + +if(PLASMA_TARGETS STREQUAL "Server") + add_definitions(-DSERVER) +endif(PLASMA_TARGETS STREQUAL "Server") + +if(PLASMA_TARGETS STREQUAL "NoAvMsgs") + add_definitions(-DNO_AV_MSGS) +endif(PLASMA_TARGETS STREQUAL "NoAvMsgs") + +if(PLASMA_TARGETS STREQUAL "Ethereal") + add_definitions(-DSTREAM_LOGGER) +endif(PLASMA_TARGETS STREQUAL "Ethereal") + +if(MSVC) + add_definitions(-D_CRT_SECURE_NO_WARNINGS) + add_definitions(-D_SCL_SECURE_NO_WARNINGS) +endif(MSVC) + +add_subdirectory(Sources/Plasma) +# add_subdirectory(Sources/Tools) diff --git a/Sources/Plasma/PubUtilLib/plEncryption/plChecksum.h b/Sources/Plasma/PubUtilLib/plEncryption/plChecksum.h index e1ffea90..56a779c2 100644 --- a/Sources/Plasma/PubUtilLib/plEncryption/plChecksum.h +++ b/Sources/Plasma/PubUtilLib/plEncryption/plChecksum.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define PL_CHECKSUM_H #include "hsTypes.h" -#include "openssl/md5.h" +#include class plChecksum { From f9c5434ec9819d607b2f2443ac3ab27f15cbc5a3 Mon Sep 17 00:00:00 2001 From: Zrax Date: Thu, 7 Apr 2011 19:33:24 -0700 Subject: [PATCH 03/18] First part of PubUtilLib cmakification (cherry picked from commit bead11fb28b4af457e5e16053209450641f8a9e4) --- Sources/Plasma/CMakeLists.txt | 9 +- .../plAgeDescription/CMakeLists.txt | 21 ++++ .../plAgeDescription/plAgeDescription.cpp | 6 +- .../plAgeDescription/plAgeDescription.h | 6 +- .../plAgeDescription/plAgeManifest.cpp | 6 +- .../plAgeDescription/plAgeManifest.h | 6 +- .../PubUtilLib/plAgeLoader/CMakeLists.txt | 26 ++++ .../PubUtilLib/plAgeLoader/plAgeLoader.cpp | 40 +++---- .../PubUtilLib/plAgeLoader/plAgeLoader.h | 12 +- .../plAgeLoader/plAgeLoaderCreatable.h | 2 +- .../plAgeLoader/plAgeLoaderPaging.cpp | 18 +-- .../plAgeLoader/plBackgroundDownloader.cpp | 40 +++---- .../PubUtilLib/plAgeLoader/plResPatcher.cpp | 32 ++--- .../PubUtilLib/plAgeLoader/plResPatcher.h | 6 +- .../PubUtilLib/plAudible/CMakeLists.txt | 24 ++++ .../PubUtilLib/plAudible/plAudibleCreatable.h | 2 +- .../PubUtilLib/plAudible/plAudibleNull.cpp | 4 +- .../PubUtilLib/plAudible/plWinAudible.cpp | 38 +++--- .../plAudible/plWinAudibleProxy.cpp | 4 +- .../PubUtilLib/plAudible/plWinAudibleProxy.h | 2 +- .../Plasma/PubUtilLib/plAvatar/CMakeLists.txt | 108 +++++++++++++++++ .../Plasma/PubUtilLib/plAvatar/plAGAnim.cpp | 2 +- Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.h | 2 +- .../PubUtilLib/plAvatar/plAGAnimInstance.cpp | 10 +- .../PubUtilLib/plAvatar/plAGAnimInstance.h | 2 +- .../PubUtilLib/plAvatar/plAGApplicator.h | 2 +- .../Plasma/PubUtilLib/plAvatar/plAGChannel.h | 2 +- .../PubUtilLib/plAvatar/plAGMasterMod.cpp | 12 +- .../PubUtilLib/plAvatar/plAGMasterMod.h | 4 +- .../plAvatar/plAGMasterSDLModifier.cpp | 10 +- .../plAvatar/plAGMasterSDLModifier.h | 2 +- .../PubUtilLib/plAvatar/plAGModifier.cpp | 6 +- .../Plasma/PubUtilLib/plAvatar/plAGModifier.h | 4 +- .../PubUtilLib/plAvatar/plAnimStage.cpp | 12 +- .../Plasma/PubUtilLib/plAvatar/plAnimStage.h | 2 +- .../PubUtilLib/plAvatar/plArmatureEffects.cpp | 16 +-- .../PubUtilLib/plAvatar/plArmatureEffects.h | 2 +- .../PubUtilLib/plAvatar/plArmatureMod.cpp | 112 +++++++++--------- .../PubUtilLib/plAvatar/plArmatureMod.h | 4 +- .../PubUtilLib/plAvatar/plAvBehaviors.cpp | 4 +- .../PubUtilLib/plAvatar/plAvBehaviors.h | 4 +- .../Plasma/PubUtilLib/plAvatar/plAvBrain.cpp | 6 +- .../Plasma/PubUtilLib/plAvatar/plAvBrain.h | 2 +- .../PubUtilLib/plAvatar/plAvBrainClimb.cpp | 12 +- .../PubUtilLib/plAvatar/plAvBrainClimb.h | 2 +- .../PubUtilLib/plAvatar/plAvBrainCoop.cpp | 12 +- .../PubUtilLib/plAvatar/plAvBrainCritter.cpp | 12 +- .../PubUtilLib/plAvatar/plAvBrainCritter.h | 2 +- .../PubUtilLib/plAvatar/plAvBrainDrive.cpp | 6 +- .../PubUtilLib/plAvatar/plAvBrainGeneric.cpp | 22 ++-- .../PubUtilLib/plAvatar/plAvBrainHuman.cpp | 42 +++---- .../plAvBrainRideAnimatedPhysical.cpp | 2 +- .../PubUtilLib/plAvatar/plAvBrainSwim.cpp | 22 ++-- .../PubUtilLib/plAvatar/plAvBrainSwim.h | 2 +- Sources/Plasma/PubUtilLib/plAvatar/plAvDefs.h | 2 +- .../plAvatar/plAvLadderModifier.cpp | 24 ++-- .../PubUtilLib/plAvatar/plAvLadderModifier.h | 4 +- Sources/Plasma/PubUtilLib/plAvatar/plAvTask.h | 2 +- .../PubUtilLib/plAvatar/plAvTaskBrain.cpp | 2 +- .../PubUtilLib/plAvatar/plAvTaskSeek.cpp | 12 +- .../Plasma/PubUtilLib/plAvatar/plAvTaskSeek.h | 2 +- .../PubUtilLib/plAvatar/plAvatarClothing.cpp | 60 +++++----- .../PubUtilLib/plAvatar/plAvatarClothing.h | 6 +- .../PubUtilLib/plAvatar/plAvatarCreatable.h | 2 +- .../PubUtilLib/plAvatar/plAvatarMgr.cpp | 48 ++++---- .../Plasma/PubUtilLib/plAvatar/plAvatarMgr.h | 4 +- .../plAvatar/plAvatarSDLModifier.cpp | 22 ++-- .../PubUtilLib/plAvatar/plAvatarSDLModifier.h | 2 +- .../PubUtilLib/plAvatar/plAvatarTasks.cpp | 26 ++-- .../PubUtilLib/plAvatar/plAvatarTasks.h | 6 +- .../plAvatar/plClothingSDLModifier.cpp | 8 +- .../plAvatar/plClothingSDLModifier.h | 2 +- .../PubUtilLib/plAvatar/plCoopCoordinator.cpp | 16 +-- .../PubUtilLib/plAvatar/plCoopCoordinator.h | 2 +- .../PubUtilLib/plAvatar/plMatrixChannel.cpp | 16 +-- .../PubUtilLib/plAvatar/plMatrixChannel.h | 2 +- .../plAvatar/plMultistageBehMod.cpp | 12 +- .../PubUtilLib/plAvatar/plMultistageBehMod.h | 2 +- .../PubUtilLib/plAvatar/plNPCSpawnMod.cpp | 10 +- .../PubUtilLib/plAvatar/plNPCSpawnMod.h | 2 +- .../PubUtilLib/plAvatar/plOneShotMod.cpp | 2 +- .../Plasma/PubUtilLib/plAvatar/plOneShotMod.h | 4 +- .../PubUtilLib/plAvatar/plPointChannel.cpp | 14 +-- .../PubUtilLib/plAvatar/plQuatChannel.cpp | 10 +- .../PubUtilLib/plAvatar/plScalarChannel.cpp | 8 +- .../PubUtilLib/plAvatar/plSeekPointMod.h | 4 +- .../PubUtilLib/plAvatar/plSittingModifier.cpp | 24 ++-- .../PubUtilLib/plAvatar/plSittingModifier.h | 4 +- .../Plasma/PubUtilLib/plAvatar/plSwimRegion.h | 2 +- .../PubUtilLib/plCompression/CMakeLists.txt | 21 ++++ .../PubUtilLib/plCompression/plZlibStream.cpp | 2 +- .../PubUtilLib/plContainer/CMakeLists.txt | 20 ++++ .../PubUtilLib/plContainer/hsStringTable.cpp | 2 +- .../PubUtilLib/plDrawable/CMakeLists.txt | 107 +++++++++++++++++ .../plDrawable/plAccessGeometry.cpp | 6 +- .../plDrawable/plActivePrintShape.cpp | 4 +- .../Plasma/PubUtilLib/plDrawable/plAuxSpan.h | 2 +- .../PubUtilLib/plDrawable/plClusterGroup.cpp | 12 +- .../PubUtilLib/plDrawable/plClusterGroup.h | 2 +- .../Plasma/PubUtilLib/plDrawable/plCutter.cpp | 12 +- .../Plasma/PubUtilLib/plDrawable/plCutter.h | 4 +- .../plDrawable/plDrawableCreatable.h | 2 +- .../plDrawable/plDrawableGenerator.cpp | 2 +- .../PubUtilLib/plDrawable/plDrawableSpans.cpp | 42 +++---- .../plDrawable/plDrawableSpansExport.cpp | 22 ++-- .../PubUtilLib/plDrawable/plDynaBulletMgr.cpp | 6 +- .../PubUtilLib/plDrawable/plDynaDecalMgr.cpp | 42 +++---- .../PubUtilLib/plDrawable/plDynaDecalMgr.h | 2 +- .../PubUtilLib/plDrawable/plDynaFootMgr.cpp | 10 +- .../PubUtilLib/plDrawable/plDynaPuddleMgr.cpp | 6 +- .../PubUtilLib/plDrawable/plDynaRippleMgr.cpp | 12 +- .../plDrawable/plDynaRippleMgrVS.cpp | 16 +-- .../plDrawable/plDynaTorpedoMgr.cpp | 4 +- .../plDrawable/plDynaTorpedoVSMgr.cpp | 6 +- .../PubUtilLib/plDrawable/plDynaWakeMgr.cpp | 14 +-- .../plDrawable/plFixedWaterState7.h | 2 +- .../PubUtilLib/plDrawable/plGeoSpanDice.cpp | 2 +- .../PubUtilLib/plDrawable/plGeometrySpan.cpp | 4 +- .../plDrawable/plInstanceDrawInterface.cpp | 6 +- .../plDrawable/plInstanceDrawInterface.h | 2 +- .../PubUtilLib/plDrawable/plMorphDelta.h | 2 +- .../PubUtilLib/plDrawable/plMorphSequence.cpp | 8 +- .../PubUtilLib/plDrawable/plMorphSequence.h | 2 +- .../plDrawable/plMorphSequenceSDLMod.cpp | 6 +- .../plDrawable/plMorphSequenceSDLMod.h | 2 +- .../plDrawable/plParticleFiller.cpp | 12 +- .../PubUtilLib/plDrawable/plPrintShape.h | 2 +- .../PubUtilLib/plDrawable/plProxyGen.cpp | 16 +-- .../Plasma/PubUtilLib/plDrawable/plProxyGen.h | 2 +- .../PubUtilLib/plDrawable/plSharedMesh.h | 4 +- .../PubUtilLib/plDrawable/plSpaceTree.cpp | 4 +- .../PubUtilLib/plDrawable/plSpaceTree.h | 2 +- .../plDrawable/plSpaceTreeMaker.cpp | 6 +- .../PubUtilLib/plDrawable/plSpanTypes.cpp | 8 +- .../PubUtilLib/plDrawable/plSpanTypes.h | 2 +- .../PubUtilLib/plDrawable/plVisLOSMgr.cpp | 10 +- .../PubUtilLib/plDrawable/plWaveSet7.cpp | 50 ++++---- .../Plasma/PubUtilLib/plDrawable/plWaveSet7.h | 2 +- .../PubUtilLib/plDrawable/plWaveSetBase.cpp | 2 +- .../PubUtilLib/plDrawable/plWaveSetBase.h | 2 +- .../PubUtilLib/plEncryption/CMakeLists.txt | 18 +++ 141 files changed, 1021 insertions(+), 675 deletions(-) create mode 100644 Sources/Plasma/PubUtilLib/plAgeDescription/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plAgeLoader/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plAudible/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plAvatar/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plCompression/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plContainer/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plDrawable/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plEncryption/CMakeLists.txt 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}) From e88d8ae8d125a8f0e81dd8106895a112e215494e Mon Sep 17 00:00:00 2001 From: Zrax Date: Thu, 7 Apr 2011 20:24:35 -0700 Subject: [PATCH 04/18] PubUtilLib -> cmake part II (cherry picked from commit 7f39558b23d6cff1a1e41c19b2e043551c38660d) --- CMakeLists.txt | 1 + Sources/Plasma/PubUtilLib/CMakeLists.txt | 23 ++++++++++ .../PubUtilLib/plCompression/CMakeLists.txt | 41 ++++++++--------- .../Plasma/PubUtilLib/plFile/CMakeLists.txt | 41 +++++++++++++++++ .../Plasma/PubUtilLib/plFile/plFileUtils.cpp | 2 +- Sources/Plasma/PubUtilLib/plGImage/plBitmap.h | 2 +- .../Plasma/PubUtilLib/plGLight/CMakeLists.txt | 37 +++++++++++++++ .../plGLight/plDirectShadowMaster.cpp | 2 +- .../PubUtilLib/plGLight/plGLightCreatable.h | 2 +- .../PubUtilLib/plGLight/plLightInfo.cpp | 46 +++++++++---------- .../Plasma/PubUtilLib/plGLight/plLightInfo.h | 4 +- .../PubUtilLib/plGLight/plLightProxy.cpp | 6 +-- .../Plasma/PubUtilLib/plGLight/plLightProxy.h | 2 +- .../PubUtilLib/plGLight/plLightSpace.cpp | 4 +- .../Plasma/PubUtilLib/plGLight/plLightSpace.h | 2 +- .../plGLight/plPointShadowMaster.cpp | 2 +- .../PubUtilLib/plGLight/plShadowCaster.cpp | 16 +++---- .../PubUtilLib/plGLight/plShadowCaster.h | 2 +- .../PubUtilLib/plGLight/plShadowMaster.cpp | 10 ++-- .../PubUtilLib/plGLight/plShadowMaster.h | 2 +- .../Plasma/PubUtilLib/plInterp/CMakeLists.txt | 31 +++++++++++++ .../Plasma/PubUtilLib/plInterp/hsInterp.cpp | 2 +- Sources/Plasma/PubUtilLib/plInterp/hsKeys.h | 2 +- .../Plasma/PubUtilLib/plInterp/plAnimPath.h | 4 +- .../PubUtilLib/plInterp/plAnimTimeConvert.cpp | 14 +++--- .../PubUtilLib/plInterp/plAnimTimeConvert.h | 4 +- .../PubUtilLib/plInterp/plController.cpp | 2 +- .../Plasma/PubUtilLib/plInterp/plController.h | 2 +- .../PubUtilLib/plInterp/plInterpCreatable.h | 2 +- .../PubUtilLib/plInterp/plModulator.cpp | 2 +- .../Plasma/PubUtilLib/plInterp/plModulator.h | 2 +- .../PubUtilLib/plIntersect/CMakeLists.txt | 31 +++++++++++++ .../PubUtilLib/plIntersect/plHardRegion.cpp | 2 +- .../plIntersect/plIntersectCreatable.h | 2 +- .../PubUtilLib/plIntersect/plRegionBase.h | 2 +- .../PubUtilLib/plIntersect/plSoftVolume.cpp | 2 +- .../PubUtilLib/plIntersect/plVolumeIsect.cpp | 2 +- .../PubUtilLib/plIntersect/plVolumeIsect.h | 2 +- .../Plasma/PubUtilLib/plJPEG/CMakeLists.txt | 20 ++++++++ Sources/Plasma/PubUtilLib/plJPEG/plJPEG.cpp | 8 ++-- .../PubUtilLib/plModifier/plSDLModifier.h | 4 +- .../Plasma/PubUtilLib/plSurface/hsGMaterial.h | 2 +- 42 files changed, 287 insertions(+), 104 deletions(-) create mode 100644 Sources/Plasma/PubUtilLib/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plFile/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plGLight/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plInterp/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plIntersect/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plJPEG/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 1149cdab..f763e040 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,7 @@ cmake_minimum_required(VERSION 2.8) # Find all 3rd-party libraries that are required find_package(OpenSSL REQUIRED) find_package(OpenAL REQUIRED) +find_package(ZLIB REQUIRED) option(EXTERNAL_RELEASE "Is this release intended for the general public?" OFF) diff --git a/Sources/Plasma/PubUtilLib/CMakeLists.txt b/Sources/Plasma/PubUtilLib/CMakeLists.txt new file mode 100644 index 00000000..ee5e5c36 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/CMakeLists.txt @@ -0,0 +1,23 @@ +add_definitions(-D_LIB) + +add_subdirectory(plAgeDescription) +add_subdirectory(plAgeLoader) +add_subdirectory(plAudible) +#add_subdirectory(plAudio) # TODO: DirectX +#add_subdirectory(plAudioCore) # TODO: DirectX +add_subdirectory(plAvatar) +add_subdirectory(plCompression) +add_subdirectory(plContainer) +#add_subdirectory(plDeviceSelector) # Not being used by any current slns +add_subdirectory(plDrawable) +add_subdirectory(plEncryption) +add_subdirectory(plFile) +#add_subdirectory(plGClip) # Not being used by any current slns +#add_subdirectory(plGeometry) # Not being used by any current slns +#add_subdirectory(plGImage) +add_subdirectory(plGLight) +#add_subdirectory(plGRenderProcs) # Not being used by any current slns +#add_subdirectory(plInputCore) # TODO: DirectX +add_subdirectory(plInterp) +add_subdirectory(plIntersect) +add_subdirectory(plJPEG) diff --git a/Sources/Plasma/PubUtilLib/plCompression/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plCompression/CMakeLists.txt index 248b3c9e..f7d6a83d 100644 --- a/Sources/Plasma/PubUtilLib/plCompression/CMakeLists.txt +++ b/Sources/Plasma/PubUtilLib/plCompression/CMakeLists.txt @@ -1,21 +1,20 @@ -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}) +include_directories("../../CoreLib") + +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/plFile/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plFile/CMakeLists.txt new file mode 100644 index 00000000..8c12d140 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plFile/CMakeLists.txt @@ -0,0 +1,41 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +include_directories(${ZLIB_INCLUDE_DIR}) + +set(plFile_SOURCES + hsFiles.cpp + plBrowseFolder.cpp + plEncryptedStream.cpp + plFileUtils.cpp + plInitFileReader.cpp + plSecureStream.cpp + plStreamSource.cpp +) + +if(WIN32) + set(plFile_SOURCES ${plFile_SOURCES} hsFiles_Win.cpp) +elseif(APPLE) + set(plFile_SOURCES "${plFile_SOURCES} hsFiles_Mac.cpp") +#elseif(PS2) +# set(plFile_SOURCES "${plFile_SOURCES} hsFiles_PS2.cpp") +else(WIN32) + set(plFile_SOURCES "${plFile_SOURCES} hsFiles_Unix.cpp") +endif(WIN32) + +set(plFile_HEADERS + hsFiles.h + plBrowseFolder.h + plEncryptedStream.h + plFileUtils.h + plInitFileReader.h + plSecureStream.h + plStreamSource.h +) + +add_library(plFile STATIC ${plFile_SOURCES} ${plFile_HEADERS}) +target_link_libraries(plFile ${ZLIB_LIBRARIES}) + +source_group("Source Files" FILES ${plFile_SOURCES}) +source_group("Header Files" FILES ${plFile_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plFile/plFileUtils.cpp b/Sources/Plasma/PubUtilLib/plFile/plFileUtils.cpp index 7b3a5100..0ce2bc95 100644 --- a/Sources/Plasma/PubUtilLib/plFile/plFileUtils.cpp +++ b/Sources/Plasma/PubUtilLib/plFile/plFileUtils.cpp @@ -57,7 +57,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStringTokenizer.h" #include "hsWindows.h" -#include "../plUnifiedTime/plUnifiedTime.h" +#include "plUnifiedTime/plUnifiedTime.h" #include "plSecureStream.h" // for the default key diff --git a/Sources/Plasma/PubUtilLib/plGImage/plBitmap.h b/Sources/Plasma/PubUtilLib/plGImage/plBitmap.h index c0afe237..0af50caa 100644 --- a/Sources/Plasma/PubUtilLib/plGImage/plBitmap.h +++ b/Sources/Plasma/PubUtilLib/plGImage/plBitmap.h @@ -55,7 +55,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plBitmap_h #define _plBitmap_h -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" class hsResMgr; class plFilterMask; diff --git a/Sources/Plasma/PubUtilLib/plGLight/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plGLight/CMakeLists.txt new file mode 100644 index 00000000..a18a8e23 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plGLight/CMakeLists.txt @@ -0,0 +1,37 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +include_directories(${OPENSSL_INCLUDE_DIR}) + +set(plGLight_SOURCES + plDirectShadowMaster.cpp + plLightInfo.cpp + plLightProxy.cpp + plLightSpace.cpp + plPerspDirSlave.cpp + plPointShadowMaster.cpp + plShadowCaster.cpp + plShadowMaster.cpp + plShadowSlave.cpp +) + +set(plGLight_HEADERS + plDirectShadowMaster.h + plGLightCreatable.h + plLightInfo.h + plLightKonstants.h + plLightProxy.h + plLightSpace.h + plPerspDirSlave.h + plPointShadowMaster.h + plShadowCaster.h + plShadowMaster.h + plShadowSlave.h +) + +add_library(plGLight STATIC ${plGLight_SOURCES} ${plGLight_HEADERS}) + +source_group("Source Files" FILES ${plGLight_SOURCES}) +source_group("Header Files" FILES ${plGLight_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plGLight/plDirectShadowMaster.cpp b/Sources/Plasma/PubUtilLib/plGLight/plDirectShadowMaster.cpp index da0ec2a2..84696255 100644 --- a/Sources/Plasma/PubUtilLib/plGLight/plDirectShadowMaster.cpp +++ b/Sources/Plasma/PubUtilLib/plGLight/plDirectShadowMaster.cpp @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plShadowSlave.h" #include "plPerspDirSlave.h" #include "plShadowCaster.h" -#include "../plMessage/plShadowCastMsg.h" +#include "plMessage/plShadowCastMsg.h" #include "plLightInfo.h" diff --git a/Sources/Plasma/PubUtilLib/plGLight/plGLightCreatable.h b/Sources/Plasma/PubUtilLib/plGLight/plGLightCreatable.h index 179b4668..dadc4784 100644 --- a/Sources/Plasma/PubUtilLib/plGLight/plGLightCreatable.h +++ b/Sources/Plasma/PubUtilLib/plGLight/plGLightCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plGLightCreatable_inc #define plGLightCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plLightInfo.h" diff --git a/Sources/Plasma/PubUtilLib/plGLight/plLightInfo.cpp b/Sources/Plasma/PubUtilLib/plGLight/plLightInfo.cpp index 77294eaf..1f8182be 100644 --- a/Sources/Plasma/PubUtilLib/plGLight/plLightInfo.cpp +++ b/Sources/Plasma/PubUtilLib/plGLight/plLightInfo.cpp @@ -46,40 +46,40 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsBounds.h" #include "hsStream.h" #include "hsResMgr.h" -#include "../pnMessage/plNodeRefMsg.h" +#include "pnMessage/plNodeRefMsg.h" #include "plgDispatch.h" -#include "../plIntersect/plVolumeIsect.h" -#include "../plDrawable/plSpaceTree.h" -#include "../plDrawable/plDrawableGenerator.h" -#include "../plDrawable/plDrawableSpans.h" -#include "../plPipeline/hsGDeviceRef.h" -#include "../plPipeline/plRenderTarget.h" +#include "plIntersect/plVolumeIsect.h" +#include "plDrawable/plSpaceTree.h" +#include "plDrawable/plDrawableGenerator.h" +#include "plDrawable/plDrawableSpans.h" +#include "plPipeline/hsGDeviceRef.h" +#include "plPipeline/plRenderTarget.h" #include "hsFastMath.h" -#include "../pnSceneObject/plDrawInterface.h" -#include "../plSurface/plLayerInterface.h" -#include "../plSurface/plLayer.h" -#include "../plSurface/hsGMaterial.h" -#include "../plGImage/plMipmap.h" -#include "../plMessage/plRenderMsg.h" -#include "../plMessage/plRenderRequestMsg.h" -#include "../plScene/plRenderRequest.h" +#include "pnSceneObject/plDrawInterface.h" +#include "plSurface/plLayerInterface.h" +#include "plSurface/plLayer.h" +#include "plSurface/hsGMaterial.h" +#include "plGImage/plMipmap.h" +#include "plMessage/plRenderMsg.h" +#include "plMessage/plRenderRequestMsg.h" +#include "plScene/plRenderRequest.h" #include "plPipeline.h" -#include "../plIntersect/plSoftVolume.h" -#include "../plPipeline/plPipeDebugFlags.h" -#include "../pnMessage/plPipeResMakeMsg.h" +#include "plIntersect/plSoftVolume.h" +#include "plPipeline/plPipeDebugFlags.h" +#include "pnMessage/plPipeResMakeMsg.h" -#include "../plScene/plVisRegion.h" -#include "../plScene/plVisMgr.h" +#include "plScene/plVisRegion.h" +#include "plScene/plVisMgr.h" // heinous -#include "../plNetClient/plNetClientMgr.h" -#include "../pnMessage/plEnableMsg.h" +#include "plNetClient/plNetClientMgr.h" +#include "pnMessage/plEnableMsg.h" static hsScalar kMaxYon = 1000.f; static hsScalar kMinHither = 1.f; #include "plLightProxy.h" -#include "../plDrawable/plDrawableGenerator.h" +#include "plDrawable/plDrawableGenerator.h" plLightInfo::plLightInfo() : fSceneNode(nil), diff --git a/Sources/Plasma/PubUtilLib/plGLight/plLightInfo.h b/Sources/Plasma/PubUtilLib/plGLight/plLightInfo.h index b520cd45..b5f0ec43 100644 --- a/Sources/Plasma/PubUtilLib/plGLight/plLightInfo.h +++ b/Sources/Plasma/PubUtilLib/plGLight/plLightInfo.h @@ -43,10 +43,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLightInfo_inc #define plLightInfo_inc -#include "../pnSceneObject/plObjInterface.h" +#include "pnSceneObject/plObjInterface.h" #include "hsMatrix44.h" #include "hsColorRGBA.h" -#include "../plIntersect/plVolumeIsect.h" +#include "plIntersect/plVolumeIsect.h" #include "hsBitVector.h" class hsStream; diff --git a/Sources/Plasma/PubUtilLib/plGLight/plLightProxy.cpp b/Sources/Plasma/PubUtilLib/plGLight/plLightProxy.cpp index efcb7d3a..eaef27ef 100644 --- a/Sources/Plasma/PubUtilLib/plGLight/plLightProxy.cpp +++ b/Sources/Plasma/PubUtilLib/plGLight/plLightProxy.cpp @@ -43,9 +43,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plLightProxy.h" #include "plLightInfo.h" -#include "../plDrawable/plDrawableSpans.h" -#include "../plDrawable/plDrawableGenerator.h" -#include "../pnMessage/plProxyDrawMsg.h" +#include "plDrawable/plDrawableSpans.h" +#include "plDrawable/plDrawableGenerator.h" +#include "pnMessage/plProxyDrawMsg.h" plLightProxy::plLightProxy() : plProxyGen(hsColorRGBA().Set(0,0,0,1.f), hsColorRGBA().Set(0.5f,1.0,0.5f,1.f), 0.2f), diff --git a/Sources/Plasma/PubUtilLib/plGLight/plLightProxy.h b/Sources/Plasma/PubUtilLib/plGLight/plLightProxy.h index fe9acf37..9ae68f2e 100644 --- a/Sources/Plasma/PubUtilLib/plGLight/plLightProxy.h +++ b/Sources/Plasma/PubUtilLib/plGLight/plLightProxy.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLightProxy_inc #define plLightProxy_inc -#include "../plDrawable/plProxyGen.h" +#include "plDrawable/plProxyGen.h" class plLightInfo; diff --git a/Sources/Plasma/PubUtilLib/plGLight/plLightSpace.cpp b/Sources/Plasma/PubUtilLib/plGLight/plLightSpace.cpp index 7e621476..56d19c8b 100644 --- a/Sources/Plasma/PubUtilLib/plGLight/plLightSpace.cpp +++ b/Sources/Plasma/PubUtilLib/plGLight/plLightSpace.cpp @@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plLightSpace.h" #include "hsStream.h" #include "hsResMgr.h" -#include "../plMessage/plLightRefMsg.h" -#include "../plMessage/plCollideMsg.h" +#include "plMessage/plLightRefMsg.h" +#include "plMessage/plCollideMsg.h" #include "plgDispatch.h" diff --git a/Sources/Plasma/PubUtilLib/plGLight/plLightSpace.h b/Sources/Plasma/PubUtilLib/plGLight/plLightSpace.h index 9e69aa52..f5c1f2c1 100644 --- a/Sources/Plasma/PubUtilLib/plGLight/plLightSpace.h +++ b/Sources/Plasma/PubUtilLib/plGLight/plLightSpace.h @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com class hsStream; class hsResMgr; -#include "../pnModifier/plMultiModifier.h" +#include "pnModifier/plMultiModifier.h" class plLightSpace : public plMultiModifier { diff --git a/Sources/Plasma/PubUtilLib/plGLight/plPointShadowMaster.cpp b/Sources/Plasma/PubUtilLib/plGLight/plPointShadowMaster.cpp index ff44524a..6100e712 100644 --- a/Sources/Plasma/PubUtilLib/plGLight/plPointShadowMaster.cpp +++ b/Sources/Plasma/PubUtilLib/plGLight/plPointShadowMaster.cpp @@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPointShadowMaster.h" #include "plShadowSlave.h" #include "plShadowCaster.h" -#include "../plMessage/plShadowCastMsg.h" +#include "plMessage/plShadowCastMsg.h" #include "plLightInfo.h" diff --git a/Sources/Plasma/PubUtilLib/plGLight/plShadowCaster.cpp b/Sources/Plasma/PubUtilLib/plGLight/plShadowCaster.cpp index 6e2b855b..e415a0ae 100644 --- a/Sources/Plasma/PubUtilLib/plGLight/plShadowCaster.cpp +++ b/Sources/Plasma/PubUtilLib/plGLight/plShadowCaster.cpp @@ -42,18 +42,18 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plShadowCaster.h" -#include "../plMessage/plShadowCastMsg.h" +#include "plMessage/plShadowCastMsg.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plDrawInterface.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plDrawInterface.h" -#include "../plDrawable/plDrawableSpans.h" -#include "../plDrawable/plSpanTypes.h" +#include "plDrawable/plDrawableSpans.h" +#include "plDrawable/plSpanTypes.h" -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plLayerInterface.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plLayerInterface.h" -#include "../plMessage/plRenderMsg.h" +#include "plMessage/plRenderMsg.h" #include "plgDispatch.h" diff --git a/Sources/Plasma/PubUtilLib/plGLight/plShadowCaster.h b/Sources/Plasma/PubUtilLib/plGLight/plShadowCaster.h index 0b950735..51f2b471 100644 --- a/Sources/Plasma/PubUtilLib/plGLight/plShadowCaster.h +++ b/Sources/Plasma/PubUtilLib/plGLight/plShadowCaster.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plShadowCaster_inc #define plShadowCaster_inc -#include "../pnModifier/plMultiModifier.h" +#include "pnModifier/plMultiModifier.h" #include "hsBounds.h" #include "hsTemplates.h" diff --git a/Sources/Plasma/PubUtilLib/plGLight/plShadowMaster.cpp b/Sources/Plasma/PubUtilLib/plGLight/plShadowMaster.cpp index f99146fd..2c5e0648 100644 --- a/Sources/Plasma/PubUtilLib/plGLight/plShadowMaster.cpp +++ b/Sources/Plasma/PubUtilLib/plGLight/plShadowMaster.cpp @@ -47,13 +47,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plLightInfo.h" #include "plShadowCaster.h" -#include "../plIntersect/plVolumeIsect.h" -#include "../plMessage/plShadowCastMsg.h" -#include "../plMessage/plRenderMsg.h" +#include "plIntersect/plVolumeIsect.h" +#include "plMessage/plShadowCastMsg.h" +#include "plMessage/plRenderMsg.h" -#include "../plDrawable/plDrawableSpans.h" +#include "plDrawable/plDrawableSpans.h" -#include "../plScene/plVisMgr.h" +#include "plScene/plVisMgr.h" #include "hsBounds.h" #include "plgDispatch.h" diff --git a/Sources/Plasma/PubUtilLib/plGLight/plShadowMaster.h b/Sources/Plasma/PubUtilLib/plGLight/plShadowMaster.h index 492764d7..877f4b91 100644 --- a/Sources/Plasma/PubUtilLib/plGLight/plShadowMaster.h +++ b/Sources/Plasma/PubUtilLib/plGLight/plShadowMaster.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plShadowMaster_inc #define plShadowMaster_inc -#include "../pnSceneObject/plObjInterface.h" +#include "pnSceneObject/plObjInterface.h" class plShadowCaster; class plShadowSlave; diff --git a/Sources/Plasma/PubUtilLib/plInterp/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plInterp/CMakeLists.txt new file mode 100644 index 00000000..75588728 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plInterp/CMakeLists.txt @@ -0,0 +1,31 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plInterp_SOURCES + hsInterp.cpp + hsKeys.cpp + plAnimPath.cpp + plAnimTimeConvert.cpp + plATCEaseCurves.cpp + plController.cpp + plModulator.cpp +) + +set(plInterp_HEADERS + hsInterp.h + hsKeys.h + hsTimedValue.h + plAnimEaseTypes.h + plAnimPath.h + plAnimTimeConvert.h + plController.h + plInterpCreatable.h + plModulator.h +) + +add_library(plInterp STATIC ${plInterp_SOURCES} ${plInterp_HEADERS}) + +source_group("Source Files" FILES ${plInterp_SOURCES}) +source_group("Header Files" FILES ${plInterp_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plInterp/hsInterp.cpp b/Sources/Plasma/PubUtilLib/plInterp/hsInterp.cpp index 092e7496..0bf0659b 100644 --- a/Sources/Plasma/PubUtilLib/plInterp/hsInterp.cpp +++ b/Sources/Plasma/PubUtilLib/plInterp/hsInterp.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "hsInterp.h" -#include "../plTransform/hsAffineParts.h" +#include "plTransform/hsAffineParts.h" #include "hsColorRGBA.h" #include "hsPoint2.h" diff --git a/Sources/Plasma/PubUtilLib/plInterp/hsKeys.h b/Sources/Plasma/PubUtilLib/plInterp/hsKeys.h index 10620618..85753331 100644 --- a/Sources/Plasma/PubUtilLib/plInterp/hsKeys.h +++ b/Sources/Plasma/PubUtilLib/plInterp/hsKeys.h @@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" #include "hsGeometry3.h" #include "hsQuat.h" -#include "../plTransform/hsAffineParts.h" +#include "plTransform/hsAffineParts.h" #include "hsMatrix33.h" #include "hsMatrix44.h" diff --git a/Sources/Plasma/PubUtilLib/plInterp/plAnimPath.h b/Sources/Plasma/PubUtilLib/plInterp/plAnimPath.h index bbff05a4..51e23c0d 100644 --- a/Sources/Plasma/PubUtilLib/plInterp/plAnimPath.h +++ b/Sources/Plasma/PubUtilLib/plInterp/plAnimPath.h @@ -46,8 +46,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTemplates.h" #include "hsGeometry3.h" #include "hsMatrix44.h" -#include "../plTransform/hsAffineParts.h" -#include "../pnFactory/plCreatable.h" +#include "plTransform/hsAffineParts.h" +#include "pnFactory/plCreatable.h" class plCompoundController; diff --git a/Sources/Plasma/PubUtilLib/plInterp/plAnimTimeConvert.cpp b/Sources/Plasma/PubUtilLib/plInterp/plAnimTimeConvert.cpp index d0f5e4e7..d92797fa 100644 --- a/Sources/Plasma/PubUtilLib/plInterp/plAnimTimeConvert.cpp +++ b/Sources/Plasma/PubUtilLib/plInterp/plAnimTimeConvert.cpp @@ -42,17 +42,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plAnimEaseTypes.h" #include "plAnimTimeConvert.h" -#include "../plAvatar/plAGAnim.h" +#include "plAvatar/plAGAnim.h" #include "hsTimer.h" #include "hsStream.h" -#include "../pnMessage/plEventCallbackMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plAvatar/plAGMasterSDLModifier.h" -#include "../plAvatar/plAGMasterMod.h" -#include "../plModifier/plLayerSDLModifier.h" -#include "../plSurface/plLayerAnimation.h" +#include "pnMessage/plEventCallbackMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plAvatar/plAGMasterSDLModifier.h" +#include "plAvatar/plAGMasterMod.h" +#include "plModifier/plLayerSDLModifier.h" +#include "plSurface/plLayerAnimation.h" #include "hsResMgr.h" #include "plgDispatch.h" diff --git a/Sources/Plasma/PubUtilLib/plInterp/plAnimTimeConvert.h b/Sources/Plasma/PubUtilLib/plInterp/plAnimTimeConvert.h index 71776910..b9a44d08 100644 --- a/Sources/Plasma/PubUtilLib/plInterp/plAnimTimeConvert.h +++ b/Sources/Plasma/PubUtilLib/plInterp/plAnimTimeConvert.h @@ -42,9 +42,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAnimTimeConvert_inc #define plAnimTimeConvert_inc -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" #include "hsTemplates.h" -#include "../pnNetCommon/plSynchedValue.h" +#include "pnNetCommon/plSynchedValue.h" #pragma warning (disable: 4284) diff --git a/Sources/Plasma/PubUtilLib/plInterp/plController.cpp b/Sources/Plasma/PubUtilLib/plInterp/plController.cpp index 9592e48b..96c8d677 100644 --- a/Sources/Plasma/PubUtilLib/plInterp/plController.cpp +++ b/Sources/Plasma/PubUtilLib/plInterp/plController.cpp @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsInterp.h" #include "hsResMgr.h" -#include "../plTransform/hsEuler.h" +#include "plTransform/hsEuler.h" #include "plAnimTimeConvert.h" ///////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plInterp/plController.h b/Sources/Plasma/PubUtilLib/plInterp/plController.h index 73dac023..2dc40083 100644 --- a/Sources/Plasma/PubUtilLib/plInterp/plController.h +++ b/Sources/Plasma/PubUtilLib/plInterp/plController.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define HSCONTROLLER_inc #include "HeadSpin.h" -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" #include "hsColorRGBA.h" #include "hsKeys.h" #include "hsTemplates.h" diff --git a/Sources/Plasma/PubUtilLib/plInterp/plInterpCreatable.h b/Sources/Plasma/PubUtilLib/plInterp/plInterpCreatable.h index b31b0a11..0b1333e6 100644 --- a/Sources/Plasma/PubUtilLib/plInterp/plInterpCreatable.h +++ b/Sources/Plasma/PubUtilLib/plInterp/plInterpCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plInterpCreatable_inc #define plInterpCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plController.h" diff --git a/Sources/Plasma/PubUtilLib/plInterp/plModulator.cpp b/Sources/Plasma/PubUtilLib/plInterp/plModulator.cpp index fe73ed63..98301aba 100644 --- a/Sources/Plasma/PubUtilLib/plInterp/plModulator.cpp +++ b/Sources/Plasma/PubUtilLib/plInterp/plModulator.cpp @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plController.h" -#include "../plIntersect/plVolumeIsect.h" +#include "plIntersect/plVolumeIsect.h" plModulator::plModulator() : fVolume(nil), diff --git a/Sources/Plasma/PubUtilLib/plInterp/plModulator.h b/Sources/Plasma/PubUtilLib/plInterp/plModulator.h index 5045ea33..7b5115b0 100644 --- a/Sources/Plasma/PubUtilLib/plInterp/plModulator.h +++ b/Sources/Plasma/PubUtilLib/plInterp/plModulator.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plModulator_inc #define plModulator_inc -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" struct hsMatrix44; struct hsPoint3; diff --git a/Sources/Plasma/PubUtilLib/plIntersect/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plIntersect/CMakeLists.txt new file mode 100644 index 00000000..71c771fa --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plIntersect/CMakeLists.txt @@ -0,0 +1,31 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plIntersect_SOURCES + plClosest.cpp + plHardRegion.cpp + plHardRegionPlanes.cpp + plHardRegionTypes.cpp + plSoftVolume.cpp + plSoftVolumeTypes.cpp + plVolumeIsect.cpp +) + +set(plIntersect_HEADERS + plClosest.h + plHardRegion.h + plHardRegionPlanes.h + plHardRegionTypes.h + plIntersectCreatable.h + plRegionBase.h + plSoftVolume.h + plSoftVolumeTypes.h + plVolumeIsect.h +) + +add_library(plIntersect STATIC ${plIntersect_SOURCES} ${plIntersect_HEADERS}) + +source_group("Source Files" FILES ${plIntersect_SOURCES}) +source_group("Header Files" FILES ${plIntersect_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plIntersect/plHardRegion.cpp b/Sources/Plasma/PubUtilLib/plIntersect/plHardRegion.cpp index 728a8930..d525cd46 100644 --- a/Sources/Plasma/PubUtilLib/plIntersect/plHardRegion.cpp +++ b/Sources/Plasma/PubUtilLib/plIntersect/plHardRegion.cpp @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plHardRegion.h" #include "plgDispatch.h" -#include "../plMessage/plRenderMsg.h" +#include "plMessage/plRenderMsg.h" #include "plPipeline.h" plHardRegion::plHardRegion() diff --git a/Sources/Plasma/PubUtilLib/plIntersect/plIntersectCreatable.h b/Sources/Plasma/PubUtilLib/plIntersect/plIntersectCreatable.h index ffca59d0..53834b70 100644 --- a/Sources/Plasma/PubUtilLib/plIntersect/plIntersectCreatable.h +++ b/Sources/Plasma/PubUtilLib/plIntersect/plIntersectCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plIntersectCreatable_inc #define plIntersectCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plVolumeIsect.h" diff --git a/Sources/Plasma/PubUtilLib/plIntersect/plRegionBase.h b/Sources/Plasma/PubUtilLib/plIntersect/plRegionBase.h index ef8b392d..15f40835 100644 --- a/Sources/Plasma/PubUtilLib/plIntersect/plRegionBase.h +++ b/Sources/Plasma/PubUtilLib/plIntersect/plRegionBase.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plRegionBase_inc #define plRegionBase_inc -#include "../pnSceneObject/plObjInterface.h" +#include "pnSceneObject/plObjInterface.h" struct hsPoint3; diff --git a/Sources/Plasma/PubUtilLib/plIntersect/plSoftVolume.cpp b/Sources/Plasma/PubUtilLib/plIntersect/plSoftVolume.cpp index 2616f2ef..2c756c04 100644 --- a/Sources/Plasma/PubUtilLib/plIntersect/plSoftVolume.cpp +++ b/Sources/Plasma/PubUtilLib/plIntersect/plSoftVolume.cpp @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plSoftVolume.h" #include "plgDispatch.h" -#include "../plMessage/plListenerMsg.h" +#include "plMessage/plListenerMsg.h" plSoftVolume::plSoftVolume() : fListenState(0), diff --git a/Sources/Plasma/PubUtilLib/plIntersect/plVolumeIsect.cpp b/Sources/Plasma/PubUtilLib/plIntersect/plVolumeIsect.cpp index 145654f4..084d29d7 100644 --- a/Sources/Plasma/PubUtilLib/plIntersect/plVolumeIsect.cpp +++ b/Sources/Plasma/PubUtilLib/plIntersect/plVolumeIsect.cpp @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsFastMath.h" #include "hsStream.h" #include "hsResMgr.h" -#include "../plIntersect/plClosest.h" +#include "plIntersect/plClosest.h" static const hsScalar kDefLength = 5.f; diff --git a/Sources/Plasma/PubUtilLib/plIntersect/plVolumeIsect.h b/Sources/Plasma/PubUtilLib/plIntersect/plVolumeIsect.h index 8bfca5e6..9b43c050 100644 --- a/Sources/Plasma/PubUtilLib/plIntersect/plVolumeIsect.h +++ b/Sources/Plasma/PubUtilLib/plIntersect/plVolumeIsect.h @@ -48,7 +48,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" class hsBounds3Ext; diff --git a/Sources/Plasma/PubUtilLib/plJPEG/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plJPEG/CMakeLists.txt new file mode 100644 index 00000000..edddc038 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plJPEG/CMakeLists.txt @@ -0,0 +1,20 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +find_package(JPEG REQUIRED) +include_directories(${JPEG_INCLUDE_DIR}) + +set(plJPEG_SOURCES + plJPEG.cpp +) + +set(plJPEG_HEADERS + plJPEG.h +) + +add_library(plJPEG STATIC ${plJPEG_SOURCES} ${plJPEG_HEADERS}) + +source_group("Source Files" FILES ${plJPEG_SOURCES}) +source_group("Header Files" FILES ${plJPEG_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plJPEG/plJPEG.cpp b/Sources/Plasma/PubUtilLib/plJPEG/plJPEG.cpp index a4f58b2b..fb72e8a8 100644 --- a/Sources/Plasma/PubUtilLib/plJPEG/plJPEG.cpp +++ b/Sources/Plasma/PubUtilLib/plJPEG/plJPEG.cpp @@ -55,17 +55,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "hsExceptions.h" #include "hsUtils.h" -#include "../plGImage/plMipmap.h" +#include "plGImage/plMipmap.h" #ifdef IJL_SDK_AVAILABLE #ifndef HS_BUILD_FOR_WIN32 #error Currently the JPEG libraries don't build for anything but Win32. If you're building this on a non-Win32 platform....WHY?? #endif -#include "../../../../../StaticSDKs/Win32/IJL/include/ijl.h" +#include #else -#include "jpeglib.h" -#include "jerror.h" +#include +#include #endif //// Local Statics //////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.h index 7394025d..3a8d7748 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.h @@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plSDLModifier_inc #define plSDLModifier_inc -#include "../pnModifier/plSingleModifier.h" -#include "../pnNetCommon/plSDLTypes.h" +#include "pnModifier/plSingleModifier.h" +#include "pnNetCommon/plSDLTypes.h" // // Base class for modifiers which send/recv State Desc Language (SDL) messages diff --git a/Sources/Plasma/PubUtilLib/plSurface/hsGMaterial.h b/Sources/Plasma/PubUtilLib/plSurface/hsGMaterial.h index 46470f49..c1cf3ecb 100644 --- a/Sources/Plasma/PubUtilLib/plSurface/hsGMaterial.h +++ b/Sources/Plasma/PubUtilLib/plSurface/hsGMaterial.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define hsGCompMatDefined #include "hsTemplates.h" -#include "../pnNetCommon/plSynchedObject.h" +#include "pnNetCommon/plSynchedObject.h" #include "hsGMatState.h" #include "hsColorRGBA.h" From d760c45eaafb51df54536e636831b441c7dded7c Mon Sep 17 00:00:00 2001 From: Zrax Date: Thu, 7 Apr 2011 21:24:11 -0700 Subject: [PATCH 05/18] PubUtilLib part III (cherry picked from commit 82a4fc867cfc2eaff37417898de8789c4d803c54) --- Sources/Plasma/PubUtilLib/CMakeLists.txt | 77 +++++++--- .../Plasma/PubUtilLib/plMath/CMakeLists.txt | 24 ++++ .../PubUtilLib/plMessage/CMakeLists.txt | 131 ++++++++++++++++++ .../Plasma/PubUtilLib/plMessage/plAIMsg.cpp | 2 +- Sources/Plasma/PubUtilLib/plMessage/plAIMsg.h | 2 +- .../PubUtilLib/plMessage/plAccountUpdateMsg.h | 2 +- .../PubUtilLib/plMessage/plActivatorMsg.h | 2 +- .../PubUtilLib/plMessage/plAgeLoadedMsg.h | 4 +- .../plMessage/plAngularVelocityMsg.h | 4 +- .../PubUtilLib/plMessage/plAnimCmdMsg.h | 6 +- .../PubUtilLib/plMessage/plAvCoopMsg.cpp | 4 +- .../Plasma/PubUtilLib/plMessage/plAvCoopMsg.h | 2 +- .../PubUtilLib/plMessage/plAvatarFootMsg.h | 2 +- .../PubUtilLib/plMessage/plAvatarMsg.cpp | 6 +- .../Plasma/PubUtilLib/plMessage/plAvatarMsg.h | 6 +- .../Plasma/PubUtilLib/plMessage/plBulletMsg.h | 2 +- .../Plasma/PubUtilLib/plMessage/plCCRMsg.cpp | 6 +- .../Plasma/PubUtilLib/plMessage/plCCRMsg.h | 4 +- .../plMessage/plCaptureRenderMsg.cpp | 4 +- .../PubUtilLib/plMessage/plCaptureRenderMsg.h | 2 +- .../PubUtilLib/plMessage/plClimbEventMsg.h | 2 +- .../Plasma/PubUtilLib/plMessage/plClimbMsg.h | 2 +- .../PubUtilLib/plMessage/plCollideMsg.h | 2 +- .../PubUtilLib/plMessage/plCondRefMsg.h | 2 +- .../plMessage/plConnectedToVaultMsg.h | 2 +- .../PubUtilLib/plMessage/plConsoleMsg.h | 2 +- .../plMessage/plDeviceRecreateMsg.h | 2 +- .../plMessage/plDynaDecalEnableMsg.h | 4 +- .../PubUtilLib/plMessage/plDynamicEnvMapMsg.h | 2 +- .../PubUtilLib/plMessage/plDynamicTextMsg.h | 2 +- .../PubUtilLib/plMessage/plExcludeRegionMsg.h | 2 +- .../PubUtilLib/plMessage/plInputEventMsg.cpp | 2 +- .../PubUtilLib/plMessage/plInputEventMsg.h | 4 +- .../plMessage/plInputIfaceMgrMsg.cpp | 2 +- .../PubUtilLib/plMessage/plInputIfaceMgrMsg.h | 4 +- .../PubUtilLib/plMessage/plInterestingPing.h | 2 +- .../Plasma/PubUtilLib/plMessage/plLOSHitMsg.h | 2 +- .../PubUtilLib/plMessage/plLOSRequestMsg.cpp | 2 +- .../PubUtilLib/plMessage/plLOSRequestMsg.h | 4 +- .../Plasma/PubUtilLib/plMessage/plLayRefMsg.h | 2 +- .../PubUtilLib/plMessage/plLightRefMsg.h | 2 +- .../plMessage/plLinearVelocityMsg.h | 4 +- .../PubUtilLib/plMessage/plLinkToAgeMsg.cpp | 4 +- .../PubUtilLib/plMessage/plLinkToAgeMsg.h | 8 +- .../PubUtilLib/plMessage/plListenerMsg.cpp | 4 +- .../PubUtilLib/plMessage/plListenerMsg.h | 2 +- .../PubUtilLib/plMessage/plLoadAgeMsg.h | 4 +- .../PubUtilLib/plMessage/plLoadAvatarMsg.cpp | 6 +- .../PubUtilLib/plMessage/plLoadAvatarMsg.h | 2 +- .../PubUtilLib/plMessage/plLoadCloneMsg.cpp | 2 +- .../PubUtilLib/plMessage/plLoadCloneMsg.h | 4 +- .../Plasma/PubUtilLib/plMessage/plMatRefMsg.h | 2 +- .../PubUtilLib/plMessage/plMatrixUpdateMsg.h | 2 +- .../PubUtilLib/plMessage/plMemberUpdateMsg.h | 2 +- .../PubUtilLib/plMessage/plMeshRefMsg.h | 2 +- .../PubUtilLib/plMessage/plMessageCreatable.h | 2 +- .../Plasma/PubUtilLib/plMessage/plMovieMsg.h | 4 +- .../PubUtilLib/plMessage/plMultistageMsg.h | 2 +- .../PubUtilLib/plMessage/plNCAgeJoinerMsg.h | 2 +- .../PubUtilLib/plMessage/plNetClientMgrMsg.h | 2 +- .../PubUtilLib/plMessage/plNetCommMsgs.h | 8 +- .../PubUtilLib/plMessage/plNetOwnershipMsg.h | 4 +- .../PubUtilLib/plMessage/plNetVoiceListMsg.h | 2 +- .../PubUtilLib/plMessage/plNodeCleanupMsg.h | 2 +- .../PubUtilLib/plMessage/plOneShotCallbacks.h | 2 +- .../plMessage/plParticleUpdateMsg.h | 2 +- .../Plasma/PubUtilLib/plMessage/plPickedMsg.h | 2 +- .../PubUtilLib/plMessage/plPreloaderMsg.h | 2 +- .../Plasma/PubUtilLib/plMessage/plRenderMsg.h | 2 +- .../plMessage/plRenderRequestMsg.cpp | 4 +- .../PubUtilLib/plMessage/plRenderRequestMsg.h | 2 +- .../plMessage/plReplaceGeometryMsg.h | 2 +- .../PubUtilLib/plMessage/plResMgrHelperMsg.h | 4 +- .../PubUtilLib/plMessage/plResponderMsg.h | 2 +- .../plMessage/plRideAnimatedPhysMsg.h | 2 +- .../PubUtilLib/plMessage/plRippleShapeMsg.h | 2 +- .../plMessage/plRoomLoadNotifyMsg.h | 2 +- .../PubUtilLib/plMessage/plShadowCastMsg.h | 2 +- .../plMessage/plSimInfluenceMsg.cpp | 4 +- .../PubUtilLib/plMessage/plSimInfluenceMsg.h | 4 +- .../PubUtilLib/plMessage/plSimStateMsg.cpp | 2 +- .../PubUtilLib/plMessage/plSimStateMsg.h | 2 +- .../PubUtilLib/plMessage/plSpawnModMsg.h | 4 +- .../PubUtilLib/plMessage/plSpawnRequestMsg.h | 2 +- .../Plasma/PubUtilLib/plMessage/plSwimMsg.h | 2 +- .../PubUtilLib/plMessage/plSynchEnableMsg.cpp | 2 +- .../PubUtilLib/plMessage/plSynchEnableMsg.h | 2 +- .../PubUtilLib/plMessage/plTimerCallbackMsg.h | 2 +- .../PubUtilLib/plMessage/plTransitionMsg.h | 2 +- .../PubUtilLib/plMessage/plTriggerMsg.h | 2 +- .../PubUtilLib/plMessage/plVaultNotifyMsg.h | 6 +- .../PubUtilLib/plNetClientComm/CMakeLists.txt | 21 +++ .../plNetClientComm/plNetClientComm.cpp | 30 ++-- .../plNetClientComm/plNetClientComm.h | 10 +- .../plNetClientRecorder/CMakeLists.txt | 19 +++ .../plNetClientRecorder.cpp | 18 +-- .../plNetClientStatsRecorder.cpp | 18 +-- .../plNetClientStreamRecorder.cpp | 18 +-- .../plNetCommon/plNetCommonHelpers.h | 6 +- .../plNetCommon/plNetServerSessionInfo.h | 8 +- .../PubUtilLib/plNetGameLib/CMakeLists.txt | 35 +++++ .../plNetGameLib/Private/plNglAllIncludes.h | 2 +- .../PubUtilLib/plNetMessage/plNetMessage.h | 24 ++-- Sources/Plasma/PubUtilLib/plUUID/plUUID.h | 4 +- 104 files changed, 480 insertions(+), 219 deletions(-) create mode 100644 Sources/Plasma/PubUtilLib/plMath/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plMessage/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plNetClientComm/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plNetClientRecorder/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plNetGameLib/CMakeLists.txt diff --git a/Sources/Plasma/PubUtilLib/CMakeLists.txt b/Sources/Plasma/PubUtilLib/CMakeLists.txt index ee5e5c36..7bd7c42b 100644 --- a/Sources/Plasma/PubUtilLib/CMakeLists.txt +++ b/Sources/Plasma/PubUtilLib/CMakeLists.txt @@ -1,23 +1,54 @@ -add_definitions(-D_LIB) - -add_subdirectory(plAgeDescription) -add_subdirectory(plAgeLoader) -add_subdirectory(plAudible) -#add_subdirectory(plAudio) # TODO: DirectX -#add_subdirectory(plAudioCore) # TODO: DirectX -add_subdirectory(plAvatar) -add_subdirectory(plCompression) -add_subdirectory(plContainer) -#add_subdirectory(plDeviceSelector) # Not being used by any current slns -add_subdirectory(plDrawable) -add_subdirectory(plEncryption) -add_subdirectory(plFile) -#add_subdirectory(plGClip) # Not being used by any current slns -#add_subdirectory(plGeometry) # Not being used by any current slns -#add_subdirectory(plGImage) -add_subdirectory(plGLight) -#add_subdirectory(plGRenderProcs) # Not being used by any current slns -#add_subdirectory(plInputCore) # TODO: DirectX -add_subdirectory(plInterp) -add_subdirectory(plIntersect) -add_subdirectory(plJPEG) +add_definitions(-D_LIB) + +add_subdirectory(plAgeDescription) +add_subdirectory(plAgeLoader) +add_subdirectory(plAudible) +#add_subdirectory(plAudio) # TODO: DirectX +#add_subdirectory(plAudioCore) # TODO: DirectX +add_subdirectory(plAvatar) +add_subdirectory(plCompression) +add_subdirectory(plContainer) +#add_subdirectory(plDeviceSelector) # Not being used by any current slns +add_subdirectory(plDrawable) +add_subdirectory(plEncryption) +add_subdirectory(plFile) +#add_subdirectory(plGClip) # Not being used by any current slns +#add_subdirectory(plGeometry) # Not being used by any current slns +#add_subdirectory(plGImage) +add_subdirectory(plGLight) +#add_subdirectory(plGRenderProcs) # Not being used by any current slns +#add_subdirectory(plInputCore) # TODO: DirectX +add_subdirectory(plInterp) +add_subdirectory(plIntersect) +add_subdirectory(plJPEG) +add_subdirectory(plMath) +add_subdirectory(plMessage) +#add_subdirectory(plModifier) # TODO: PhysX +#add_subdirectory(plNetClient) # TODO: STLport +add_subdirectory(plNetClientComm) +add_subdirectory(plNetClientRecorder) +#add_subdirectory(plNetCommon) # TODO: STLport +add_subdirectory(plNetGameLib) +#add_subdirectory(plNetMessage) +#add_subdirectory(plNetTransport) +#add_subdirectory(plParticleSystem) +#add_subdirectory(plPhysical) +#add_subdirectory(plPhysX) +#add_subdirectory(plPipeline) +#add_subdirectory(plProgressMgr) +#add_subdirectory(plResMgr) +#add_subdirectory(plScene) +#add_subdirectory(plSDL) +#add_subdirectory(plSDLBrowser) # Not being used by any current slns +#add_subdirectory(plSockets) +#add_subdirectory(plStatGather) +#add_subdirectory(plStatusLog) +#add_subdirectory(plStreamLogger) +#add_subdirectory(plSurface) +#add_subdirectory(plTransform) +#add_subdirectory(plUnifiedTime) +#add_subdirectory(plUUID) +#add_subdirectory(plVault) +#add_subdirectory(plWinStrBlock) # Not being used by any current slns +#add_subdirectory(plWndCtrls) # Not being used by any current slns +#add_subdirectory(PubUtilInc) diff --git a/Sources/Plasma/PubUtilLib/plMath/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plMath/CMakeLists.txt new file mode 100644 index 00000000..72e12ffe --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plMath/CMakeLists.txt @@ -0,0 +1,24 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plMath_SOURCES + hsNoiseFunc.cpp + hsRadixSort.cpp + plAvg.cpp + plTriUtils.cpp +) + +set(plMath_HEADERS + hsNoiseFunc.h + hsRadixSort.h + hsSearchVersion.h + plAvg.h + plRandom.h + plTriUtils.h +) + +add_library(plMath STATIC ${plMath_SOURCES} ${plMath_HEADERS}) + +source_group("Source Files" FILES ${plMath_SOURCES}) +source_group("Header Files" FILES ${plMath_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plMessage/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plMessage/CMakeLists.txt new file mode 100644 index 00000000..36a3376f --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plMessage/CMakeLists.txt @@ -0,0 +1,131 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plMessage_SOURCES + plAccountUpdateMsg.cpp + plAIMsg.cpp + plAnimCmdMsg.cpp + plAvatarMsg.cpp + plAvCoopMsg.cpp + plBulletMsg.cpp + plCaptureRenderMsg.cpp + plCCRMsg.cpp + plClimbMsg.cpp + plCollideMsg.cpp + plDynaDecalEnableMsg.cpp + plDynamicEnvMapMsg.cpp + plDynamicTextMsg.cpp + plInputEventMsg.cpp + plInputIfaceMgrMsg.cpp + plLayRefMsg.cpp + plLinkToAgeMsg.cpp + plListenerMsg.cpp + plLoadAgeMsg.cpp + plLoadAvatarMsg.cpp + plLoadCloneMsg.cpp + plLOSHitMsg.cpp + plLOSRequestMsg.cpp + plMatrixUpdateMsg.cpp + plMultistageMsg.cpp + plNCAgeJoinerMsg.cpp + plNetClientMgrMsg.cpp + plNetCommMsgs.cpp + plNetVoiceListMsg.cpp + plOneShotCallbacks.cpp + plOneShotMsg.cpp + plRenderRequestMsg.cpp + plRideAnimatedPhysMsg.cpp + plRippleShapeMsg.cpp + plSimInfluenceMsg.cpp + plSimStateMsg.cpp + plSwimMsg.cpp + plSynchEnableMsg.cpp + plTransitionMsg.cpp + plVaultNotifyMsg.cpp +) + +set(plMessage_HEADERS + plAccountUpdateMsg.h + plActivatorMsg.h + plAgeLoadedMsg.h + plAIMsg.h + plAngularVelocityMsg.h + plAnimCmdMsg.h + plAvatarFootMsg.h + plAvatarMsg.h + plAvCoopMsg.h + plBulletMsg.h + plCaptureRenderMsg.h + plCCRMessageCreatable.h + plCCRMsg.h + plClimbEventMsg.h + plClimbMsg.h + plCollideMsg.h + plCondRefMsg.h + plConnectedToVaultMsg.h + plConsoleMsg.h + plDeviceRecreateMsg.h + plDynaDecalEnableMsg.h + plDynamicEnvMapMsg.h + plDynamicTextMsg.h + plElementRefMsg.h + plExcludeRegionMsg.h + plInputEventMsg.h + plInputIfaceMgrMsg.h + plInterestingPing.h + plLayRefMsg.h + plLightRefMsg.h + plLinearVelocityMsg.h + plLinkToAgeMsg.h + plListenerMsg.h + plLoadAgeMsg.h + plLoadAvatarMsg.h + plLoadCloneMsg.h + plLOSHitMsg.h + plLOSRequestMsg.h + plMatRefMsg.h + plMatrixUpdateMsg.h + plMemberUpdateMsg.h + plMeshRefMsg.h + plMessageCreatable.h + plMovieMsg.h + plMultistageMsg.h + plNCAgeJoinerMsg.h + plNetClientMgrMsg.h + plNetCommMsgs.h + plNetOwnershipMsg.h + plNetVoiceListMsg.h + plNodeCleanupMsg.h + plOneShotCallbacks.h + plOneShotMsg.h + plParticleUpdateMsg.h + plPickedMsg.h + plPreloaderMsg.h + plRenderMsg.h + plRenderRequestMsg.h + plReplaceGeometryMsg.h + plResMgrHelperMsg.h + plResponderMsg.h + plRideAnimatedPhysMsg.h + plRippleShapeMsg.h + plRoomLoadNotifyMsg.h + plShadowCastMsg.h + plSimInfluenceMsg.h + plSimStateMsg.h + plSpawnModMsg.h + plSpawnRequestMsg.h + plSwimMsg.h + plSynchEnableMsg.h + plTimerCallbackMsg.h + plTransitionMsg.h + plTriggerMsg.h + plUniqueIdsMsg.h + plVaultNotifyMsg.h +) + +add_library(plMessage STATIC ${plMessage_SOURCES} ${plMessage_HEADERS}) + +source_group("Source Files" FILES ${plMessage_SOURCES}) +source_group("Header Files" FILES ${plMessage_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAIMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plAIMsg.cpp index 8a96043c..63b65e52 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plAIMsg.cpp +++ b/Sources/Plasma/PubUtilLib/plMessage/plAIMsg.cpp @@ -47,7 +47,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "hsStream.h" -#include "..\plAvatar\plArmatureMod.h" +#include "plAvatar/plArmatureMod.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAIMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plAIMsg.h index a3865657..908339f1 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plAIMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plAIMsg.h @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef NO_AV_MSGS #include "hsGeometry3.h" -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plAvBrainCritter; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAccountUpdateMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plAccountUpdateMsg.h index 6a98b94b..bd50e828 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plAccountUpdateMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plAccountUpdateMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAccountUpdateMsg_inc #define plAccountUpdateMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class hsStream; class hsResMgr; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plActivatorMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plActivatorMsg.h index 8a2be228..ea14f18a 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plActivatorMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plActivatorMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plActivatorMsg_inc #define plActivatorMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsGeometry3.h" class hsStream; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAgeLoadedMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plAgeLoadedMsg.h index f57a34b9..e9849850 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plAgeLoadedMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plAgeLoadedMsg.h @@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAgeLoadedMsg_INC #define plAgeLoadedMsg_INC -#include "../pnUtils/pnUtils.h" -#include "../pnMessage/plMessage.h" +#include "pnUtils/pnUtils.h" +#include "pnMessage/plMessage.h" // // A msg sent locally when pending pages are done loading or unloading. diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAngularVelocityMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plAngularVelocityMsg.h index 0d9bed8c..bb65bc7c 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plAngularVelocityMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plAngularVelocityMsg.h @@ -39,8 +39,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "../../NucleusLib/pnMessage/plSimulationMsg.h" -#include "../../CoreLib/hsGeometry3.h" +#include "pnMessage/plSimulationMsg.h" +#include "hsGeometry3.h" class plAngularVelocityMsg : public plSimulationMsg { public: diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAnimCmdMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plAnimCmdMsg.h index c0444e10..4ce85d4c 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plAnimCmdMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plAnimCmdMsg.h @@ -43,12 +43,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAnimCmdMsg_inc #define plAnimCmdMsg_inc -#include "../pnMessage/plMessageWithCallbacks.h" +#include "pnMessage/plMessageWithCallbacks.h" #include "hsBitVector.h" #include "hsTemplates.h" #include "hsGeometry3.h" -#include "../plInterp/plAnimEaseTypes.h" -#include "../plInterp/plAnimTimeConvert.h" +#include "plInterp/plAnimEaseTypes.h" +#include "plInterp/plAnimTimeConvert.h" class plAGAnimInstance; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAvCoopMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plAvCoopMsg.cpp index 8b6ebb12..dea3ab81 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plAvCoopMsg.cpp +++ b/Sources/Plasma/PubUtilLib/plMessage/plAvCoopMsg.cpp @@ -50,8 +50,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" // other -#include "../plAvatar/plAvatarMgr.h" -#include "../plAvatar/plCoopCoordinator.h" +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plCoopCoordinator.h" // plAvCoopMsg ----------- // ------------ diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAvCoopMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plAvCoopMsg.h index 71a60a40..9523add0 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plAvCoopMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plAvCoopMsg.h @@ -51,7 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // INCLUDES // ///////////////////////////////////////////////////////////////////////////////////////// -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" ///////////////////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAvatarFootMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plAvatarFootMsg.h index 5b57e8c2..4fd27701 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plAvatarFootMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plAvatarFootMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAvatarFootMsg_inc #define plAvatarFootMsg_inc -#include "../pnMessage/plEventCallbackMsg.h" +#include "pnMessage/plEventCallbackMsg.h" class hsStream; class hsResMgr; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.cpp index 41bd7759..17f5f53b 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.cpp +++ b/Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.cpp @@ -45,11 +45,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnSceneObject/plSceneObject.h" +#include "pnKeyedObject/plKey.h" +#include "pnSceneObject/plSceneObject.h" #ifndef SERVER -#include "../plAvatar/plAvBrain.h" +#include "plAvatar/plAvBrain.h" #endif diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.h index 32ba1151..8c84bd7f 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.h @@ -44,10 +44,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAvatarMsg_inc #define plAvatarMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsBitVector.h" -#include "../plAvatar/plArmatureMod.h" -#include "../pnMessage/plEventCallbackMsg.h" +#include "plAvatar/plArmatureMod.h" +#include "pnMessage/plEventCallbackMsg.h" class plSceneObject; class hsStream; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plBulletMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plBulletMsg.h index b33247ae..85d3ee36 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plBulletMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plBulletMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plBulletMsg_inc #define plBulletMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsGeometry3.h" class plBulletMsg : public plMessage diff --git a/Sources/Plasma/PubUtilLib/plMessage/plCCRMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plCCRMsg.cpp index a681c3ef..fb4740a5 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plCCRMsg.cpp +++ b/Sources/Plasma/PubUtilLib/plMessage/plCCRMsg.cpp @@ -42,9 +42,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "plCCRMsg.h" -#include "../pnNetCommon/plNetApp.h" -#include "../plResMgr/plResManager.h" -#include "../plNetCommon/plNetCommon.h" +#include "pnNetCommon/plNetApp.h" +#include "plResMgr/plResManager.h" +#include "plNetCommon/plNetCommon.h" void plCCRPetitionMsg::Read(hsStream* stream, hsResMgr* mgr) { diff --git a/Sources/Plasma/PubUtilLib/plMessage/plCCRMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plCCRMsg.h index 82d141ad..163f1db2 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plCCRMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plCCRMsg.h @@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plCCRMsg_h #define plCCRMsg_h -#include "../pnMessage/plMessage.h" -#include "../plNetCommon/plNetCommon.h" +#include "pnMessage/plMessage.h" +#include "plNetCommon/plNetCommon.h" // // Abstract Baseclass for CCR messages. diff --git a/Sources/Plasma/PubUtilLib/plMessage/plCaptureRenderMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plCaptureRenderMsg.cpp index 309dbff7..22e019aa 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plCaptureRenderMsg.cpp +++ b/Sources/Plasma/PubUtilLib/plMessage/plCaptureRenderMsg.cpp @@ -42,9 +42,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plCaptureRenderMsg.h" -#include "../plGImage/plMipmap.h" +#include "plGImage/plMipmap.h" plCaptureRenderMsg::~plCaptureRenderMsg() { hsRefCnt_SafeUnRef(fMipmap); -} \ No newline at end of file +} diff --git a/Sources/Plasma/PubUtilLib/plMessage/plCaptureRenderMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plCaptureRenderMsg.h index 98f25a46..c0275bfd 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plCaptureRenderMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plCaptureRenderMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plCaptureRenderMsg_inc #define plCaptureRenderMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plMipmap; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plClimbEventMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plClimbEventMsg.h index fbe67eb5..1a41539a 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plClimbEventMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plClimbEventMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plClimbEventMsg_h_inc #define plClimbEventMsg_h_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" diff --git a/Sources/Plasma/PubUtilLib/plMessage/plClimbMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plClimbMsg.h index 4927d010..a4766070 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plClimbMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plClimbMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plClimbMsg_h #define plClimbMsg_h -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" /** \class plClimbMsg Things you can say with a climb message: diff --git a/Sources/Plasma/PubUtilLib/plMessage/plCollideMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plCollideMsg.h index 502c19a7..ae284f65 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plCollideMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plCollideMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PLCOLLIDEMSG_INC #define PLCOLLIDEMSG_INC -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plCollideMsg : public plMessage { diff --git a/Sources/Plasma/PubUtilLib/plMessage/plCondRefMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plCondRefMsg.h index 14a0a5d1..05dbb227 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plCondRefMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plCondRefMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plCondRefMsg_inc #define plCondRefMsg_inc -#include "../pnMessage/plRefMsg.h" +#include "pnMessage/plRefMsg.h" #include "hsStream.h" class hsResMgr; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plConnectedToVaultMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plConnectedToVaultMsg.h index cbc059f5..4fa237fd 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plConnectedToVaultMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plConnectedToVaultMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plConnectedToVaultMsg_INC #define plConnectedToVaultMsg_INC -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" // // A msg sent locally (once) when the client has successfully connected to the vault. diff --git a/Sources/Plasma/PubUtilLib/plMessage/plConsoleMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plConsoleMsg.h index 56724790..da4a2311 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plConsoleMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plConsoleMsg.h @@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plConsoleMsg_inc #define plConsoleMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plEventCallbackMsg; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plDeviceRecreateMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plDeviceRecreateMsg.h index 382c5ecd..16a1e685 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plDeviceRecreateMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plDeviceRecreateMsg.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plDeviceRecreateMsg_h #define _plDeviceRecreateMsg_h -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plPipeline; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plDynaDecalEnableMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plDynaDecalEnableMsg.h index 9e1ba91b..f27f8297 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plDynaDecalEnableMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plDynaDecalEnableMsg.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plDynaDecalEnableMsg_inc #define plDynaDecalEnableMsg_inc -#include "../pnMessage/plMessage.h" -#include "../pnKeyedObject/plKey.h" +#include "pnMessage/plMessage.h" +#include "pnKeyedObject/plKey.h" class hsStream; class hsResMgr; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plDynamicEnvMapMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plDynamicEnvMapMsg.h index 3c408702..455ecf84 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plDynamicEnvMapMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plDynamicEnvMapMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plDynamicEnvMapMsg_inc #define plDynamicEnvMapMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsGeometry3.h" #include "hsColorRGBA.h" diff --git a/Sources/Plasma/PubUtilLib/plMessage/plDynamicTextMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plDynamicTextMsg.h index 743b5173..c75b2b7e 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plDynamicTextMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plDynamicTextMsg.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plDynamicTextMsg_h #define _plDynamicTextMsg_h -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsColorRGBA.h" class plDynamicTextMap; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plExcludeRegionMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plExcludeRegionMsg.h index c1055820..ffd45542 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plExcludeRegionMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plExcludeRegionMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plExcludeRegionMsg_inc #define plExcludeRegionMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class hsStream; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plInputEventMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plInputEventMsg.cpp index 5ae463bd..89f54929 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plInputEventMsg.cpp +++ b/Sources/Plasma/PubUtilLib/plMessage/plInputEventMsg.cpp @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plInputEventMsg.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include "hsResMgr.h" #include "hsBitVector.h" diff --git a/Sources/Plasma/PubUtilLib/plMessage/plInputEventMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plInputEventMsg.h index 708f30e1..e2f21c86 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plInputEventMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plInputEventMsg.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plInputEventMsg_inc #define plInputEventMsg_inc -#include "../pnMessage/plMessage.h" -#include "../pnInputCore/plControlDefinition.h" +#include "pnMessage/plMessage.h" +#include "pnInputCore/plControlDefinition.h" #include "hsGeometry3.h" #include "hsStream.h" #include "hsUtils.h" diff --git a/Sources/Plasma/PubUtilLib/plMessage/plInputIfaceMgrMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plInputIfaceMgrMsg.cpp index 9d7f539d..1b7e1116 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plInputIfaceMgrMsg.cpp +++ b/Sources/Plasma/PubUtilLib/plMessage/plInputIfaceMgrMsg.cpp @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plInputIfaceMgrMsg.h" -#include "../plInputCore/plInputInterface.h" +#include "plInputCore/plInputInterface.h" #include "hsResMgr.h" #include "hsRefCnt.h" diff --git a/Sources/Plasma/PubUtilLib/plMessage/plInputIfaceMgrMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plInputIfaceMgrMsg.h index 43d0c9cd..b861eeba 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plInputIfaceMgrMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plInputIfaceMgrMsg.h @@ -51,8 +51,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsStream.h" #include "hsResMgr.h" -#include "../pnMessage/plMessage.h" -#include "../pnUtils/pnUtils.h" +#include "pnMessage/plMessage.h" +#include "pnUtils/pnUtils.h" class plInputInterface; class plInputIfaceMgrMsg : public plMessage diff --git a/Sources/Plasma/PubUtilLib/plMessage/plInterestingPing.h b/Sources/Plasma/PubUtilLib/plMessage/plInterestingPing.h index 40c21023..f5c74672 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plInterestingPing.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plInterestingPing.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plInterestingPing_inc #define plInterestingPing_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsGeometry3.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLOSHitMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plLOSHitMsg.h index 4ff6b9fc..2166416c 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plLOSHitMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plLOSHitMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLOSHitMsg_inc #define plLOSHitMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsStream.h" #include "hsResMgr.h" #include "hsGeometry3.h" diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLOSRequestMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plLOSRequestMsg.cpp index 899d3adb..c2dbfe54 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plLOSRequestMsg.cpp +++ b/Sources/Plasma/PubUtilLib/plMessage/plLOSRequestMsg.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plLOSRequestMsg.h" #include "hsResMgr.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plUoid.h" plLOSRequestMsg::plLOSRequestMsg() : fRequestID(0), diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLOSRequestMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plLOSRequestMsg.h index 60a1be0c..b4ee9b8a 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plLOSRequestMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plLOSRequestMsg.h @@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLOSRequestMsg_inc #define plLOSRequestMsg_inc -#include "../pnMessage/plMessage.h" -#include "../plPhysical/plSimDefs.h" +#include "pnMessage/plMessage.h" +#include "plPhysical/plSimDefs.h" #include "hsGeometry3.h" class plLOSRequestMsg : public plMessage diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLayRefMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plLayRefMsg.h index 633f8cb5..a67a0b37 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plLayRefMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plLayRefMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLayRefMsg_inc #define plLayRefMsg_inc -#include "../pnMessage/plRefMsg.h" +#include "pnMessage/plRefMsg.h" class hsStream; class hsResMgr; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLightRefMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plLightRefMsg.h index 1078bab0..28898c31 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plLightRefMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plLightRefMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLightRefMsg_inc #define plLightRefMsg_inc -#include "../pnMessage/plRefMsg.h" +#include "pnMessage/plRefMsg.h" class hsKeyedObject; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLinearVelocityMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plLinearVelocityMsg.h index 095935a8..b182c6ed 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plLinearVelocityMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plLinearVelocityMsg.h @@ -39,8 +39,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "../../NucleusLib/pnMessage/plSimulationMsg.h" -#include "../../CoreLib/hsGeometry3.h" +#include "pnMessage/plSimulationMsg.h" +#include "hsGeometry3.h" class plLinearVelocityMsg : public plSimulationMsg { public: diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.cpp index f8e17b9f..f162dec4 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.cpp +++ b/Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.cpp @@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "hsUtils.h" #include "plgDispatch.h" -#include "../plNetCommon/plNetServerSessionInfo.h" -#include "../plNetCommon/plNetCommon.h" +#include "plNetCommon/plNetServerSessionInfo.h" +#include "plNetCommon/plNetCommon.h" #include "hsBitVector.h" diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.h index 380252b3..029d70cb 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.h @@ -42,10 +42,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLinkToAgeMsg_INC #define plLinkToAgeMsg_INC -#include "../pnMessage/plMessageWithCallbacks.h" -#include "../pnMessage/plEventCallbackMsg.h" -#include "../plNetCommon/plNetServerSessionInfo.h" -#include "../plNetCommon/plNetCommonHelpers.h" +#include "pnMessage/plMessageWithCallbacks.h" +#include "pnMessage/plEventCallbackMsg.h" +#include "plNetCommon/plNetServerSessionInfo.h" +#include "plNetCommon/plNetCommonHelpers.h" #include "hsUtils.h" //////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plMessage/plListenerMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plListenerMsg.cpp index d8691e1a..8ef206dc 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plListenerMsg.cpp +++ b/Sources/Plasma/PubUtilLib/plMessage/plListenerMsg.cpp @@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "plListenerMsg.h" #include "hsResMgr.h" -#include "../pnKeyedObject/plUoid.h" -#include "../pnKeyedObject/plFixedKey.h" +#include "pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plFixedKey.h" void plListenerMsg::Read(hsStream* s, hsResMgr* mgr) diff --git a/Sources/Plasma/PubUtilLib/plMessage/plListenerMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plListenerMsg.h index 6c2ae2fa..908235ed 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plListenerMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plListenerMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plListenerMsg_inc #define plListenerMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsGeometry3.h" class plListenerMsg : public plMessage diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLoadAgeMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plLoadAgeMsg.h index a4d1551a..5e9472c8 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plLoadAgeMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plLoadAgeMsg.h @@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLoadAgeMsg_INC #define plLoadAgeMsg_INC -#include "../pnMessage/plMessage.h" -#include "../plUUID/plUUID.h" +#include "pnMessage/plMessage.h" +#include "plUUID/plUUID.h" #include "hsUtils.h" // diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLoadAvatarMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plLoadAvatarMsg.cpp index 0218c9ef..091d205c 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plLoadAvatarMsg.cpp +++ b/Sources/Plasma/PubUtilLib/plMessage/plLoadAvatarMsg.cpp @@ -45,10 +45,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "plLoadAvatarMsg.h" #include "hsResMgr.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnNetCommon/plSynchedObject.h" +#include "pnNetCommon/plNetApp.h" +#include "pnNetCommon/plSynchedObject.h" -#include "../plAvatar/plAvatarTasks.h" +#include "plAvatar/plAvatarTasks.h" ////////////////// diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLoadAvatarMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plLoadAvatarMsg.h index 5ca1b060..05e837cc 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plLoadAvatarMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plLoadAvatarMsg.h @@ -47,7 +47,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plLoadCloneMsg.h" #include "hsUtils.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plUoid.h" class plAvTask; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLoadCloneMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plLoadCloneMsg.cpp index 697646c6..5fffbb5b 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plLoadCloneMsg.cpp +++ b/Sources/Plasma/PubUtilLib/plMessage/plLoadCloneMsg.cpp @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" // other -#include "../pnNetCommon/plNetApp.h" +#include "pnNetCommon/plNetApp.h" #include "hsTypes.h" diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLoadCloneMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plLoadCloneMsg.h index 47cf5cb1..f03dceb3 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plLoadCloneMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plLoadCloneMsg.h @@ -46,9 +46,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plLoadCloneMsgMsg_INC -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" // #include "hsUtils.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plUoid.h" /** \class plLoadCloneMsg Tell the net client manager to allocate a new object based on copying an diff --git a/Sources/Plasma/PubUtilLib/plMessage/plMatRefMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plMatRefMsg.h index 0c2a55c0..e3483cf1 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plMatRefMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plMatRefMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plMatRefMsg_inc #define plMatRefMsg_inc -#include "../pnMessage/plRefMsg.h" +#include "pnMessage/plRefMsg.h" class plMatRefMsg : public plGenRefMsg { diff --git a/Sources/Plasma/PubUtilLib/plMessage/plMatrixUpdateMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plMatrixUpdateMsg.h index e0f95f4a..fa78608d 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plMatrixUpdateMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plMatrixUpdateMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plMatrixUpdateMsg_inc #define plMatrixUpdateMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsMatrix44.h" class plMatrixUpdateMsg : public plMessage diff --git a/Sources/Plasma/PubUtilLib/plMessage/plMemberUpdateMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plMemberUpdateMsg.h index e4151666..43966fd0 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plMemberUpdateMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plMemberUpdateMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plMemberUpdateMsg_INC #define plMemberUpdateMsg_INC -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsUtils.h" // diff --git a/Sources/Plasma/PubUtilLib/plMessage/plMeshRefMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plMeshRefMsg.h index b40c167d..e974b5a3 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plMeshRefMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plMeshRefMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plMeshRefMsg_inc #define plMeshRefMsg_inc -#include "../pnMessage/plRefMsg.h" +#include "pnMessage/plRefMsg.h" #include "hsStream.h" class hsResMgr; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plMessageCreatable.h b/Sources/Plasma/PubUtilLib/plMessage/plMessageCreatable.h index 25dac2e2..7258c1a8 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plMessageCreatable.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plMessageCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plMessageCreatable_inc #define plMessageCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plInterestingPing.h" diff --git a/Sources/Plasma/PubUtilLib/plMessage/plMovieMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plMovieMsg.h index fdeb74b0..9b72e2f8 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plMovieMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plMovieMsg.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plMovieMsg_inc #define plMovieMsg_inc -#include "../pnMessage/plMessage.h" -#include "../pnKeyedObject/plFixedKey.h" +#include "pnMessage/plMessage.h" +#include "pnKeyedObject/plFixedKey.h" #include "hsPoint2.h" #include "hsTemplates.h" diff --git a/Sources/Plasma/PubUtilLib/plMessage/plMultistageMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plMultistageMsg.h index 0b9753dd..0a91aa5b 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plMultistageMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plMultistageMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plMultistageMsg_inc #define plMultistageMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsBitVector.h" // Messages sent to a MultistageModifier. diff --git a/Sources/Plasma/PubUtilLib/plMessage/plNCAgeJoinerMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plNCAgeJoinerMsg.h index 0a380b9e..4d6c1ff9 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plNCAgeJoinerMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plNCAgeJoinerMsg.h @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PLASMA20_SOURCES_PLASMA_PUBUTILLIB_PLMESSAGE_PLNCAGEJOINERMSG_H #define PLASMA20_SOURCES_PLASMA_PUBUTILLIB_PLMESSAGE_PLNCAGEJOINERMSG_H -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plNCAgeJoinerMsg : public plMessage { diff --git a/Sources/Plasma/PubUtilLib/plMessage/plNetClientMgrMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plNetClientMgrMsg.h index d84c3bdb..70749cf3 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plNetClientMgrMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plNetClientMgrMsg.h @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PLASMA20_SOURCES_PLASMA_PUBUTILLIB_PLMESSAGE_PLNETCLIENTMGRMSG_H #define PLASMA20_SOURCES_PLASMA_PUBUTILLIB_PLMESSAGE_PLNETCLIENTMGRMSG_H -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plNetClientMgrMsg : public plMessage { diff --git a/Sources/Plasma/PubUtilLib/plMessage/plNetCommMsgs.h b/Sources/Plasma/PubUtilLib/plMessage/plNetCommMsgs.h index f8d55641..99c3c2bb 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plNetCommMsgs.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plNetCommMsgs.h @@ -49,10 +49,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define PLASMA20_SOURCES_PLASMA_PUBUTILLIB_PLMESSAGE_PLNETCOMMMSGS_H -#include "../pnUtils/pnUtils.h" -#include "../pnNetBase/pnNetBase.h" -#include "../pnMessage/plMessage.h" -#include "../pnNetProtocol/pnNetProtocol.h" +#include "pnUtils/pnUtils.h" +#include "pnNetBase/pnNetBase.h" +#include "pnMessage/plMessage.h" +#include "pnNetProtocol/pnNetProtocol.h" class plNetCommReplyMsg : public plMessage { diff --git a/Sources/Plasma/PubUtilLib/plMessage/plNetOwnershipMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plNetOwnershipMsg.h index ad00ef2b..e1bd9014 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plNetOwnershipMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plNetOwnershipMsg.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plNetOwnershipMsg_INC #include "hsStlUtils.h" -#include "../pnMessage/plMessage.h" -#include "../plNetMessage/plNetMessage.h" +#include "pnMessage/plMessage.h" +#include "plNetMessage/plNetMessage.h" // // A msg sent locally when this client changes ownership of a group of objects diff --git a/Sources/Plasma/PubUtilLib/plMessage/plNetVoiceListMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plNetVoiceListMsg.h index d83e6281..72ed53fc 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plNetVoiceListMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plNetVoiceListMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plNetVoiceListMsg_inc #define plNetVoiceListMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsTemplates.h" class plNetVoiceListMsg : public plMessage diff --git a/Sources/Plasma/PubUtilLib/plMessage/plNodeCleanupMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plNodeCleanupMsg.h index 8d020514..1f4fbdd4 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plNodeCleanupMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plNodeCleanupMsg.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plNodeCleanupMsg_h #define _plNodeCleanupMsg_h -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plNodeCleanupMsg : public plMessage { diff --git a/Sources/Plasma/PubUtilLib/plMessage/plOneShotCallbacks.h b/Sources/Plasma/PubUtilLib/plMessage/plOneShotCallbacks.h index 5998c59a..e576bb26 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plOneShotCallbacks.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plOneShotCallbacks.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStlUtils.h" #include "hsRefCnt.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" class hsStream; class hsResMgr; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plParticleUpdateMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plParticleUpdateMsg.h index 051c25a5..5eef2a2f 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plParticleUpdateMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plParticleUpdateMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plParticleUpdateMsg_inc #define plParticleUpdateMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsResMgr.h" #include "hsStream.h" #include "hsBitVector.h" diff --git a/Sources/Plasma/PubUtilLib/plMessage/plPickedMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plPickedMsg.h index 6c09c1ff..27c20b95 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plPickedMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plPickedMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPickedMsg_inc #define plPickedMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsGeometry3.h" diff --git a/Sources/Plasma/PubUtilLib/plMessage/plPreloaderMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plPreloaderMsg.h index da60a98a..afb24105 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plPreloaderMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plPreloaderMsg.h @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PLASMA20_SOURCES_PLASMA_PUBUTILLIB_PLMESSAGE_PLPRELOADERMSG_H #define PLASMA20_SOURCES_PLASMA_PUBUTILLIB_PLMESSAGE_PLPRELOADERMSG_H -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plPreloaderMsg : public plMessage { public: diff --git a/Sources/Plasma/PubUtilLib/plMessage/plRenderMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plRenderMsg.h index 812df545..5239e33f 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plRenderMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plRenderMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plRenderMsg_inc #define plRenderMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plPipeline; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plRenderRequestMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plRenderRequestMsg.cpp index 577fdd9c..f36b32a7 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plRenderRequestMsg.cpp +++ b/Sources/Plasma/PubUtilLib/plMessage/plRenderRequestMsg.cpp @@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plRenderRequestMsg.h" -#include "../pnKeyedObject/plUoid.h" -#include "../pnKeyedObject/plFixedKey.h" +#include "pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plFixedKey.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/PubUtilLib/plMessage/plRenderRequestMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plRenderRequestMsg.h index 5755f2d1..094d5324 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plRenderRequestMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plRenderRequestMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plRenderRequestMsg_inc #define plRenderRequestMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsRefCnt.h" class plRenderRequest; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plReplaceGeometryMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plReplaceGeometryMsg.h index fe016543..7897407c 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plReplaceGeometryMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plReplaceGeometryMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plReplaceGeometryMsg_inc #define plReplaceGeometryMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plSharedMesh; class hsGMaterial; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plResMgrHelperMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plResMgrHelperMsg.h index 79a2422f..8b1ff388 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plResMgrHelperMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plResMgrHelperMsg.h @@ -45,8 +45,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsStream.h" -#include "../pnMessage/plMessage.h" -#include "../plResMgr/plResManagerHelper.h" +#include "pnMessage/plMessage.h" +#include "plResMgr/plResManagerHelper.h" class plResManagerHelper; class plResMgrHelperMsg : public plMessage diff --git a/Sources/Plasma/PubUtilLib/plMessage/plResponderMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plResponderMsg.h index 56cf5b03..1dbed889 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plResponderMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plResponderMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plResponderMsg_inc #define plResponderMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" // Derive your message from this class if you need to know the key of the avatar // that activated your responder diff --git a/Sources/Plasma/PubUtilLib/plMessage/plRideAnimatedPhysMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plRideAnimatedPhysMsg.h index dbe573d9..764a4395 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plRideAnimatedPhysMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plRideAnimatedPhysMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PL_RIDE_ANIMATED_PHYS_MSG #define PL_RIDE_ANIMATED_PHYS_MSG -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plRideAnimatedPhysMsg : public plMessage { diff --git a/Sources/Plasma/PubUtilLib/plMessage/plRippleShapeMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plRippleShapeMsg.h index 8e1d16f1..991d6f7e 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plRippleShapeMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plRippleShapeMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plRippleShapeMsg_inc #define plRippleShapeMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plPrintShape; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plRoomLoadNotifyMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plRoomLoadNotifyMsg.h index 0da01e59..bb87e8bb 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plRoomLoadNotifyMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plRoomLoadNotifyMsg.h @@ -51,7 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // Its up to the receiver to decide if they are interested in that particular room // -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plRoomLoadNotifyMsg : public plMessage { diff --git a/Sources/Plasma/PubUtilLib/plMessage/plShadowCastMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plShadowCastMsg.h index 96e71a92..f5707708 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plShadowCastMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plShadowCastMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plShadowCastMsg_inc #define plShadowCastMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plPipeline; class plShadowCaster; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plSimInfluenceMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plSimInfluenceMsg.cpp index 0af7aa91..da166d76 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plSimInfluenceMsg.cpp +++ b/Sources/Plasma/PubUtilLib/plMessage/plSimInfluenceMsg.cpp @@ -39,8 +39,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "../plMessage/plSimInfluenceMsg.h" -#include "../../CoreLib/hsStream.h" +#include "plMessage/plSimInfluenceMsg.h" +#include "hsStream.h" /* void plSimInfluenceMsg::Read(hsStream *stream, hsResMgr *mgr) diff --git a/Sources/Plasma/PubUtilLib/plMessage/plSimInfluenceMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plSimInfluenceMsg.h index 204d6f06..3a51c671 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plSimInfluenceMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plSimInfluenceMsg.h @@ -45,8 +45,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PLSIMINFLUENCEMSG_H #define PLSIMINFLUENCEMSG_H /* -#include "../../NucleusLib/pnMessage/plSimulationMsg.h" -#include "../../CoreLib/hsGeometry3.h" +#include "pnMessage/plSimulationMsg.h" +#include "hsGeometry3.h" //////////// // diff --git a/Sources/Plasma/PubUtilLib/plMessage/plSimStateMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plSimStateMsg.cpp index eead4707..9d3b9fe2 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plSimStateMsg.cpp +++ b/Sources/Plasma/PubUtilLib/plMessage/plSimStateMsg.cpp @@ -39,7 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "../plMessage/plSimStateMsg.h" +#include "plMessage/plSimStateMsg.h" #include "hsResMgr.h" void plSubWorldMsg::Read(hsStream *stream, hsResMgr *mgr) diff --git a/Sources/Plasma/PubUtilLib/plMessage/plSimStateMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plSimStateMsg.h index c3958118..9ba77fac 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plSimStateMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plSimStateMsg.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PLSIMSTATEMSG_INC #define PLSIMSTATEMSG_INC -#include "../pnMessage/plSimulationMsg.h" +#include "pnMessage/plSimulationMsg.h" // use a nil key to return to main world // otherwise pass in the key of the world you're going to. diff --git a/Sources/Plasma/PubUtilLib/plMessage/plSpawnModMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plSpawnModMsg.h index 719b549b..7be544e1 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plSpawnModMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plSpawnModMsg.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plSpawnModMsg_inc #define plSpawnModMsg_inc -#include "../pnMessage/plMessage.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnMessage/plMessage.h" +#include "pnKeyedObject/plUoid.h" #include "hsGeometry3.h" class hsStream; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plSpawnRequestMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plSpawnRequestMsg.h index 4ec3746e..6ab4042f 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plSpawnRequestMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plSpawnRequestMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plSpawnRequestMsg_inc #define plSpawnRequestMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class hsStream; class hsResMgr; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plSwimMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plSwimMsg.h index fd4eec4f..95487496 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plSwimMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plSwimMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plSwimMsg_h #define plSwimMsg_h -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" /** \class plSwimMsg You're either entering the pool, or leaving. Those are the only swim messages right now. diff --git a/Sources/Plasma/PubUtilLib/plMessage/plSynchEnableMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plSynchEnableMsg.cpp index da98f048..097d6065 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plSynchEnableMsg.cpp +++ b/Sources/Plasma/PubUtilLib/plMessage/plSynchEnableMsg.cpp @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plSynchEnableMsg.h" -#include "../pnNetCommon/plNetApp.h" +#include "pnNetCommon/plNetApp.h" plSynchEnableMsg::plSynchEnableMsg(bool push, bool enable) : fPush(push), fEnable(enable) { diff --git a/Sources/Plasma/PubUtilLib/plMessage/plSynchEnableMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plSynchEnableMsg.h index ee8bdda6..669789c8 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plSynchEnableMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plSynchEnableMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plSynchEnableMsg_h #define plSynchEnableMsg_h -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" // // Push or pop a cmd to enable/disable dirty state tracking. diff --git a/Sources/Plasma/PubUtilLib/plMessage/plTimerCallbackMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plTimerCallbackMsg.h index 0427bd44..77a313a7 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plTimerCallbackMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plTimerCallbackMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plTimerCallbackMsg_inc #define plTimerCallbackMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsStream.h" class hsResMgr; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plTransitionMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plTransitionMsg.h index b6abaa85..dc54521c 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plTransitionMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plTransitionMsg.h @@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsStream.h" -#include "../pnMessage/plMessageWithCallbacks.h" +#include "pnMessage/plMessageWithCallbacks.h" class plTransitionMsg : public plMessageWithCallbacks { diff --git a/Sources/Plasma/PubUtilLib/plMessage/plTriggerMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plTriggerMsg.h index b5de339f..df9cfd12 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plTriggerMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plTriggerMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plTriggerMsg_inc #define plTriggerMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plTriggerMsg : public plMessage diff --git a/Sources/Plasma/PubUtilLib/plMessage/plVaultNotifyMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plVaultNotifyMsg.h index 65430305..a5e32145 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plVaultNotifyMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plVaultNotifyMsg.h @@ -42,9 +42,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plVaultNotifyMsg_h_inc #define plVaultNotifyMsg_h_inc -#include "../pnMessage/plMessage.h" -#include "../plNetCommon/plNetCommonHelpers.h" -#include "../plNetCommon/plNetCommon.h" +#include "pnMessage/plMessage.h" +#include "plNetCommon/plNetCommonHelpers.h" +#include "plNetCommon/plNetCommon.h" class plVaultNotifyMsg : public plMessage { diff --git a/Sources/Plasma/PubUtilLib/plNetClientComm/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plNetClientComm/CMakeLists.txt new file mode 100644 index 00000000..77339ecf --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plNetClientComm/CMakeLists.txt @@ -0,0 +1,21 @@ +include_directories("../../CoreLib") +include_directories("../../FeatureLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +include_directories(${OPENSSL_INCLUDE_DIR}) + +set(plNetClientComm_SOURCES + plNetClientComm.cpp +) + +set(plNetClientComm_HEADERS + plNetClientComm.h + plNetClientCommCreatable.h +) + +add_library(plNetClientComm STATIC ${plNetClientComm_SOURCES} ${plNetClientComm_HEADERS}) + +source_group("Source Files" FILES ${plNetClientComm_SOURCES}) +source_group("Header Files" FILES ${plNetClientComm_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.cpp b/Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.cpp index 135be4de..d0f85d71 100644 --- a/Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.cpp @@ -47,21 +47,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNetClientComm.h" -#include "../pnAsyncCore/pnAsyncCore.h" -#include "../pnProduct/pnProduct.h" -#include "../pnNetCli/pnNetCli.h" -#include "../plNetGameLib/plNetGameLib.h" -#include "../pnIni/pnIni.h" - -#include "../plMessage/plNetCommMsgs.h" -#include "../plMessage/plNetClientMgrMsg.h" -#include "../plNetMessage/plNetMessage.h" -#include "../plNetCommon/plNetCommon.h" -#include "../plVault/plVault.h" -#include "../plMessage/plAccountUpdateMsg.h" -#include "../plNetClient/plNetClientMgr.h" - -#include "../../FeatureLib/pfMessage/pfKIMsg.h" +#include "pnAsyncCore/pnAsyncCore.h" +#include "pnProduct/pnProduct.h" +#include "pnNetCli/pnNetCli.h" +#include "plNetGameLib/plNetGameLib.h" +#include "pnIni/pnIni.h" + +#include "plMessage/plNetCommMsgs.h" +#include "plMessage/plNetClientMgrMsg.h" +#include "plNetMessage/plNetMessage.h" +#include "plNetCommon/plNetCommon.h" +#include "plVault/plVault.h" +#include "plMessage/plAccountUpdateMsg.h" +#include "plNetClient/plNetClientMgr.h" + +#include "pfMessage/pfKIMsg.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.h b/Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.h index 5e38eabc..91cc7cdd 100644 --- a/Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.h +++ b/Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.h @@ -54,11 +54,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" -#include "../pnUtils/pnUtils.h" -#include "../pnNetBase/pnNetBase.h" -#include "../plNetCommon/plNetServerSessionInfo.h" -#include "../plNetCommon/plNetCommonHelpers.h" -#include "../plMessage/plNetCommMsgs.h" +#include "pnUtils/pnUtils.h" +#include "pnNetBase/pnNetBase.h" +#include "plNetCommon/plNetServerSessionInfo.h" +#include "plNetCommon/plNetCommonHelpers.h" +#include "plMessage/plNetCommMsgs.h" class plNetMessage; diff --git a/Sources/Plasma/PubUtilLib/plNetClientRecorder/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plNetClientRecorder/CMakeLists.txt new file mode 100644 index 00000000..9387185b --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plNetClientRecorder/CMakeLists.txt @@ -0,0 +1,19 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plNetClientRecorder_SOURCES + plNetClientRecorder.cpp + plNetClientStatsRecorder.cpp + plNetClientStreamRecorder.cpp +) + +set(plNetClientRecorder_HEADERS + plNetClientRecorder.h +) + +add_library(plNetClientRecorder STATIC ${plNetClientRecorder_SOURCES} ${plNetClientRecorder_HEADERS}) + +source_group("Source Files" FILES ${plNetClientRecorder_SOURCES}) +source_group("Header Files" FILES ${plNetClientRecorder_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plNetClientRecorder/plNetClientRecorder.cpp b/Sources/Plasma/PubUtilLib/plNetClientRecorder/plNetClientRecorder.cpp index 05c2458e..c232bb27 100644 --- a/Sources/Plasma/PubUtilLib/plNetClientRecorder/plNetClientRecorder.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClientRecorder/plNetClientRecorder.cpp @@ -43,20 +43,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "hsTimer.h" -#include "../plNetMessage/plNetMessage.h" +#include "plNetMessage/plNetMessage.h" #include "plCreatableIndex.h" #include "hsResMgr.h" #include "plgDispatch.h" -#include "../plSDL/plSDL.h" -#include "../pnNetCommon/plNetApp.h" +#include "plSDL/plSDL.h" +#include "pnNetCommon/plNetApp.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../plMessage/plLoadAvatarMsg.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../plMessage/plAgeLoadedMsg.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "plMessage/plLoadAvatarMsg.h" +#include "pnMessage/plNotifyMsg.h" +#include "plMessage/plAgeLoadedMsg.h" -#include "../plStatusLog/plStatusLog.h" -#include "../plFile/hsFiles.h" +#include "plStatusLog/plStatusLog.h" +#include "plFile/hsFiles.h" plNetClientRecorder::plNetClientRecorder(TimeWrapper* timeWrapper) : fTimeWrapper(timeWrapper) diff --git a/Sources/Plasma/PubUtilLib/plNetClientRecorder/plNetClientStatsRecorder.cpp b/Sources/Plasma/PubUtilLib/plNetClientRecorder/plNetClientStatsRecorder.cpp index d93169dd..ba2facf6 100644 --- a/Sources/Plasma/PubUtilLib/plNetClientRecorder/plNetClientStatsRecorder.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClientRecorder/plNetClientStatsRecorder.cpp @@ -41,19 +41,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plNetClientRecorder.h" #include "hsStream.h" -#include "../plNetMessage/plNetMessage.h" +#include "plNetMessage/plNetMessage.h" #include "plCreatableIndex.h" #include "plgDispatch.h" -#include "../plSDL/plSDL.h" -#include "../pnNetCommon/plNetApp.h" +#include "plSDL/plSDL.h" +#include "pnNetCommon/plNetApp.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../plMessage/plLoadAvatarMsg.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../plMessage/plAgeLoadedMsg.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "plMessage/plLoadAvatarMsg.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "pnMessage/plNotifyMsg.h" +#include "plMessage/plAgeLoadedMsg.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" plNetClientStatsRecorder::plNetClientStatsRecorder(TimeWrapper* timeWrapper) : diff --git a/Sources/Plasma/PubUtilLib/plNetClientRecorder/plNetClientStreamRecorder.cpp b/Sources/Plasma/PubUtilLib/plNetClientRecorder/plNetClientStreamRecorder.cpp index 91d12be3..62fb8b38 100644 --- a/Sources/Plasma/PubUtilLib/plNetClientRecorder/plNetClientStreamRecorder.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClientRecorder/plNetClientStreamRecorder.cpp @@ -41,20 +41,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plNetClientRecorder.h" #include "hsStream.h" -#include "../plNetMessage/plNetMessage.h" +#include "plNetMessage/plNetMessage.h" #include "plCreatableIndex.h" #include "hsResMgr.h" #include "plgDispatch.h" -#include "../plSDL/plSDL.h" -#include "../pnNetCommon/plNetApp.h" +#include "plSDL/plSDL.h" +#include "pnNetCommon/plNetApp.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../plMessage/plLoadAvatarMsg.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../plMessage/plAgeLoadedMsg.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "plMessage/plLoadAvatarMsg.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "pnMessage/plNotifyMsg.h" +#include "plMessage/plAgeLoadedMsg.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" plNetClientStreamRecorder::plNetClientStreamRecorder(TimeWrapper* timeWrapper) : plNetClientLoggingRecorder(timeWrapper), diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.h b/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.h index b1e0b534..a7229ff7 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.h +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.h @@ -45,9 +45,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsStlUtils.h" #include "hsTimer.h" -#include "../pnNetCommon/pnNetCommon.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnFactory/plCreatable.h" +#include "pnNetCommon/pnNetCommon.h" +#include "pnNetCommon/plNetApp.h" +#include "pnFactory/plCreatable.h" //////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.h b/Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.h index 33152de8..6a3bb976 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.h +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.h @@ -44,10 +44,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsStlUtils.h" -#include "../pnFactory/plCreatable.h" -#include "../pnNetCommon/plNetServers.h" -#include "../plNetCommon/plSpawnPointInfo.h" -#include "../plUUID/plUUID.h" +#include "pnFactory/plCreatable.h" +#include "pnNetCommon/plNetServers.h" +#include "plNetCommon/plSpawnPointInfo.h" +#include "plUUID/plUUID.h" class hsStream; diff --git a/Sources/Plasma/PubUtilLib/plNetGameLib/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plNetGameLib/CMakeLists.txt new file mode 100644 index 00000000..b955b145 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plNetGameLib/CMakeLists.txt @@ -0,0 +1,35 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +include_directories(${OPENSSL_INCLUDE_DIR}) + +set(plNetGameLib_PRIVATE + Private/plNglAllIncludes.h + Private/plNglAuth.h + Private/plNglAuth.cpp + Private/plNglCore.h + Private/plNglCore.cpp + Private/plNglCsr.h + Private/plNglCsr.cpp + Private/plNglFile.h + Private/plNglFile.cpp + Private/plNglGame.h + Private/plNglGame.cpp + Private/plNglGateKeeper.h + Private/plNglGateKeeper.cpp + Private/plNglMisc.cpp + Private/plNglTrans.cpp +) + +set(plNetGameLib_HEADERS + Intern.h + Pch.h + plNetGameLib.h +) + +add_library(plNetGameLib STATIC ${plNetGameLib_PRIVATE} ${plNetGameLib_HEADERS}) + +source_group("Private" FILES ${plNetGameLib_PRIVATE}) +source_group("Header Files" FILES ${plNetGameLib_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAllIncludes.h b/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAllIncludes.h index a4bbe0ee..0220752f 100644 --- a/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAllIncludes.h +++ b/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAllIncludes.h @@ -52,7 +52,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // libs on which we rely -#include "../pnGameMgr/pnGameMgr.h" +#include "pnGameMgr/pnGameMgr.h" #include "plNglCore.h" #include "plNglAuth.h" diff --git a/Sources/Plasma/PubUtilLib/plNetMessage/plNetMessage.h b/Sources/Plasma/PubUtilLib/plNetMessage/plNetMessage.h index aee848d3..7e457948 100644 --- a/Sources/Plasma/PubUtilLib/plNetMessage/plNetMessage.h +++ b/Sources/Plasma/PubUtilLib/plNetMessage/plNetMessage.h @@ -49,21 +49,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsBitVector.h" #include "hsTemplates.h" #include "plGeneric.h" -#include "../pnNetCommon/plNetServers.h" -#include "../pnNetCommon/plNetGroup.h" -#include "../pnFactory/plCreatable.h" -#include "../pnFactory/plFactory.h" -#include "../plUnifiedTime/plClientUnifiedTime.h" -#include "../plNetCommon/plNetServerSessionInfo.h" -#include "../plNetCommon/plNetCommon.h" -#include "../plNetCommon/plNetCommonHelpers.h" -#include "../plNetCommon/plNetCommonConstants.h" - -#include "../plStreamLogger/plStreamLogger.h" +#include "pnNetCommon/plNetServers.h" +#include "pnNetCommon/plNetGroup.h" +#include "pnFactory/plCreatable.h" +#include "pnFactory/plFactory.h" +#include "plUnifiedTime/plClientUnifiedTime.h" +#include "plNetCommon/plNetServerSessionInfo.h" +#include "plNetCommon/plNetCommon.h" +#include "plNetCommon/plNetCommonHelpers.h" +#include "plNetCommon/plNetCommonConstants.h" + +#include "plStreamLogger/plStreamLogger.h" #include "plNetMsgHelpers.h" -#include "../pnNetBase/pnNetBase.h" +#include "pnNetBase/pnNetBase.h" #include diff --git a/Sources/Plasma/PubUtilLib/plUUID/plUUID.h b/Sources/Plasma/PubUtilLib/plUUID/plUUID.h index 2c181580..81f42989 100644 --- a/Sources/Plasma/PubUtilLib/plUUID/plUUID.h +++ b/Sources/Plasma/PubUtilLib/plUUID/plUUID.h @@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsStlUtils.h" -#include "../pnUtils/pnUtils.h" -#include "../pnFactory/plCreatable.h" +#include "pnUtils/pnUtils.h" +#include "pnFactory/plCreatable.h" class hsStream; From a5181b716eb22db9a471da2195d59a3cfc900382 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Fri, 8 Apr 2011 01:29:34 -0400 Subject: [PATCH 06/18] Start CMake-ifying NucleusLib (cherry picked from commit 93ac5b22a91f2576edc6add576b3c879725bcf09) --- .gitignore | 1 + Sources/Plasma/NucleusLib/CMakeLists.txt | 9 +++ .../NucleusLib/pnAddrInfo/CMakeLists.txt | 14 ++++ .../NucleusLib/pnAsyncCore/CMakeLists.txt | 22 +++++++ .../NucleusLib/pnAsyncCoreExe/CMakeLists.txt | 64 +++++++++++++++++++ .../Plasma/NucleusLib/pnCrash/CMakeLists.txt | 16 +++++ .../NucleusLib/pnCrashExe/CMakeLists.txt | 28 ++++++++ .../pnCrashExe/Win32/pnCreError.cpp | 8 --- .../Plasma/NucleusLib/pnCsrCli/CMakeLists.txt | 16 +++++ .../Plasma/NucleusLib/pnCsrNet/CMakeLists.txt | 16 +++++ .../NucleusLib/pnDispatch/CMakeLists.txt | 19 ++++++ .../NucleusLib/pnDispatch/plDispatch.cpp | 14 ++-- .../Plasma/NucleusLib/pnDispatch/plDispatch.h | 2 +- .../pnDispatch/pnDispatchCreatable.h | 2 +- .../NucleusLib/pnFactory/CMakeLists.txt | 18 ++++++ .../Plasma/NucleusLib/pnFactory/plFactory.cpp | 2 +- 16 files changed, 233 insertions(+), 18 deletions(-) create mode 100644 .gitignore create mode 100644 Sources/Plasma/NucleusLib/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnAddrInfo/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnAsyncCore/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnAsyncCoreExe/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnCrash/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnCrashExe/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnCsrCli/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnCsrNet/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnDispatch/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnFactory/CMakeLists.txt diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..07ed7069 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +build/* \ No newline at end of file diff --git a/Sources/Plasma/NucleusLib/CMakeLists.txt b/Sources/Plasma/NucleusLib/CMakeLists.txt new file mode 100644 index 00000000..0ea09368 --- /dev/null +++ b/Sources/Plasma/NucleusLib/CMakeLists.txt @@ -0,0 +1,9 @@ +add_subdirectory(pnAddrInfo) +add_subdirectory(pnAsyncCore) +add_subdirectory(pnAsyncCoreExe) +add_subdirectory(pnCrash) +add_subdirectory(pnCrashExe) +add_subdirectory(pnCsrCli) +add_subdirectory(pnCsrNet) +add_subdirectory(pnDispatch) +add_subdirectory(pnFactory) diff --git a/Sources/Plasma/NucleusLib/pnAddrInfo/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnAddrInfo/CMakeLists.txt new file mode 100644 index 00000000..680ebac7 --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnAddrInfo/CMakeLists.txt @@ -0,0 +1,14 @@ +include_directories(../../CoreLib) + +set(pnAddrInfo_SOURCES + pnAddrInfo.cpp +) + +set(pnAddrInfo_HEADERS + pnAddrInfo.h +) + +add_library(pnAddrInfo STATIC ${pnAddrInfo_SOURCES} ${pnAddrInfo_HEADERS}) + +source_group("Source Files" FILES ${pnAddrInfo_SOURCES}) +source_group("Header Files" FILES ${pnAddrInfo_HEADERS}) \ No newline at end of file diff --git a/Sources/Plasma/NucleusLib/pnAsyncCore/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnAsyncCore/CMakeLists.txt new file mode 100644 index 00000000..492111ff --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnAsyncCore/CMakeLists.txt @@ -0,0 +1,22 @@ +include_directories(../../CoreLib) +include_directories(../../NucleusLib) + +set(pnAsyncCore_HEADERS + Pch.h +) + +set(pnAsyncCore_PRIVATE + pnAsyncCore.h + Private/pnAcAllIncludes.h + Private/pnAcCore.h + Private/pnAcIo.h + Private/pnAcLog.cpp + Private/pnAcLog.h + Private/pnAcThread.h + Private/pnAcTimer.h +) + +add_library(pnAsyncCore STATIC ${pnAsyncCore_PRIVATE} ${pnAsyncCore_HEADERS}) + +source_group("Header Files" FILES ${pnAsyncCore_HEADERS}) +source_group("Private" FILES ${pnAsyncCore_PRIVATE}) \ No newline at end of file diff --git a/Sources/Plasma/NucleusLib/pnAsyncCoreExe/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnAsyncCoreExe/CMakeLists.txt new file mode 100644 index 00000000..0fe44fb0 --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnAsyncCoreExe/CMakeLists.txt @@ -0,0 +1,64 @@ +include_directories(../../CoreLib) +include_directories(../../NucleusLib) + +set(pnAsyncCoreExe_SOURCES + pnAceCore.cpp + pnAceIo.cpp + pnAceLog.cpp + pnAceThread.cpp + pnAceTimer.cpp +) + +set(pnAsyncCoreExe_HEADERS + Pch.h +) + +set(pnAysncCoreExe_PRIVATE + Private/pnAceInt.h +) + +# I would do platform specific stuff here, +# but Pch.h just includes everything, so... + +set(pnAysncCoreExe_PRIVATE_NT + Private/Nt/pnAceNt.cpp + Private/Nt/pnAceNt.h + Private/Nt/pnAceNtFile.cpp + Private/Nt/pnAceNtInt.h + Private/Nt/pnAceNtSocket.cpp + Private/Nt/pnAceNtThread.cpp +) + +set(pnAsyncCoreExe_PRIVATE_UNIX + Private/Unix/pnAceUx.h +) + +set(pnAsyncCoreExe_PRIVATE_W9X + Private/W9x/pnAceW9x.cpp + Private/W9x/pnAceW9x.h + Private/W9x/pnAceW9xFile.cpp + Private/W9x/pnAceW9xInt.h + Private/W9x/pnAceW9xSocket.cpp + Private/W9x/pnAceW9xThread.cpp +) + +set(pnAsyncCoreExe_PRIVATE_WIN32 + Private/Win32/pnAceW32Dns.cpp + Private/Win32/pnAceW32Thread.cpp +) + +# End questionable part + +add_library(pnAsyncCoreExe STATIC + ${pnAsyncCoreExe_SOURCES} ${pnAsyncCoreExe_HEADERS} + ${pnAsyncCoreExe_PRIVATE} ${pnAysncCoreExe_PRIVATE_NT} + ${pnAsyncCoreExe_PRIVATE_UNIX} ${pnAsyncCoreExe_PRIVATE_W9X} + ${pnAsyncCoreExe_PRIVATE_WIN32}) + +source_group("Source Files" FILES ${pnAsyncCoreExe_SOURCES}) +source_group("Header Files" FILES ${pnAsyncCoreExe_HEADERS}) +source_group("Private" FILES ${pnAsyncCoreExe_PRIVATE}) +source_group("Private\\Nt" FILES ${pnAysncCoreExe_PRIVATE_NT}) +source_group("Private\\Unix" FILES ${pnAsyncCoreExe_PRIVATE_UNIX}) +source_group("Private\\W9x" FILES ${pnAsyncCoreExe_PRIVATE_W9X}) +source_group("Private\\Win32" FILES ${pnAsyncCoreExe_PRIVATE_WIN32}) \ No newline at end of file diff --git a/Sources/Plasma/NucleusLib/pnCrash/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnCrash/CMakeLists.txt new file mode 100644 index 00000000..855787ba --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnCrash/CMakeLists.txt @@ -0,0 +1,16 @@ +include_directories(../../CoreLib) +include_directories(../../NucleusLib) + +set(pnCrash_SOURCES + pnCrash.cpp +) + +set(pnCrash_HEADERS + Pch.h + pnCrash.h +) + +add_library(pnCrash STATIC ${pnCrash_SOURCES} ${pnCrash_HEADERS}) + +source_group("Source Files" FILES ${pnCrash_SOURCES}) +source_group("Header Files" FILES ${pnCrash_HEADERS}) \ No newline at end of file diff --git a/Sources/Plasma/NucleusLib/pnCrashExe/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnCrashExe/CMakeLists.txt new file mode 100644 index 00000000..7ad94a57 --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnCrashExe/CMakeLists.txt @@ -0,0 +1,28 @@ +include_directories(../../CoreLib) +include_directories(../../NucleusLib) + +set(pnCrashExe_SOURCES + +) + +set(pnCrashExe_HEADERS + Pch.h +) + +if(WIN32 AND NOT CYGWIN) + set (pnCrashExe_SOURCES ${pnCrashExe_SOURCES} + Win32/pnCreError.cpp + Win32/pnCreGui.cpp + Win32/pnCreMail.cpp + Win32/pnCreTools.cpp + ) + + set (pnCrashExe_HEADERS ${pnCrashExe_HEADERS} + Win32/W32Int.h + ) +endif(WIN32 AND NOT CYGWIN) + +add_library(pnCrashExe STATIC ${pnCrashExe_SOURCES} ${pnCrashExe_HEADERS}) + +source_group("Source Files" FILES ${pnCrashExe_SOURCES}) +source_group("Header Files" FILES ${pnCrashExe_HEADERS}) \ No newline at end of file diff --git a/Sources/Plasma/NucleusLib/pnCrashExe/Win32/pnCreError.cpp b/Sources/Plasma/NucleusLib/pnCrashExe/Win32/pnCreError.cpp index 2023da2f..66dc57e5 100644 --- a/Sources/Plasma/NucleusLib/pnCrashExe/Win32/pnCreError.cpp +++ b/Sources/Plasma/NucleusLib/pnCrashExe/Win32/pnCreError.cpp @@ -173,8 +173,6 @@ static void ReplaceEmailParams (EmailParams * newParams) { //============================================================================ static EmailParams * GetEmailParamsIncRef () { - ref(GetEmailParamsIncRef); - EmailParams * params; SAFE_CRITSECT_ENTER(); @@ -275,8 +273,6 @@ static unsigned ProcessErrorLog ( const char programName[], const char errorType[] ) { - ref(programName); - ref(errorType); LogWriteToDisk(log); @@ -686,8 +682,6 @@ static LONG ProcessException (const char occasion[], EXCEPTION_POINTERS * ep) { //============================================================================ static LONG WINAPI ExceptionFilter (EXCEPTION_POINTERS * ep) { - ref(ExceptionFilter); - LONG result = ProcessException("Unhandled Exception", ep); // If the instruction pointer is inside CrashFunc then this exception @@ -799,8 +793,6 @@ static void ProcessDeadlock_CS (const char occasion[], bool crashIt = true) { //============================================================================ static void DeadlockCheckProc (void *) { - ref(DeadlockCheckProc); - while (s_running) { Sleep(5 * 1000); diff --git a/Sources/Plasma/NucleusLib/pnCsrCli/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnCsrCli/CMakeLists.txt new file mode 100644 index 00000000..da5b045d --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnCsrCli/CMakeLists.txt @@ -0,0 +1,16 @@ +include_directories(../../CoreLib) +include_directories(../../NucleusLib) + +set(pnCsrCli_SOURCES + pnCsrCli.cpp +) + +set(pnCsrCli_HEADERS + Pch.h + pnCsrCli.h +) + +add_library(pnCsrCli STATIC ${pnCsrCli_SOURCES} ${pnCsrCli_HEADERS}) + +source_group("Source Files" FILES ${pnCsrCli_SOURCES}) +source_group("Header Files" FILES ${pnCsrCli_HEADERS}) \ No newline at end of file diff --git a/Sources/Plasma/NucleusLib/pnCsrNet/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnCsrNet/CMakeLists.txt new file mode 100644 index 00000000..b942717b --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnCsrNet/CMakeLists.txt @@ -0,0 +1,16 @@ +include_directories(../../CoreLib) +include_directories(../../NucleusLib) + +set(pnCsrNet_SOURCES + pnCsrNet.cpp +) + +set(pnCsrNet_HEADERS + Pch.h + pnCsrNet.h +) + +add_library(pnCsrNet STATIC ${pnCsrNet_SOURCES} ${pnCsrNet_HEADERS}) + +source_group("Source Files" FILES ${pnCsrNet_SOURCES}) +source_group("Header Files" FILES ${pnCsrNet_HEADERS}) \ No newline at end of file diff --git a/Sources/Plasma/NucleusLib/pnDispatch/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnDispatch/CMakeLists.txt new file mode 100644 index 00000000..381d8318 --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnDispatch/CMakeLists.txt @@ -0,0 +1,19 @@ +include_directories(../../CoreLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) + +set(pnDispatch_SOURCES + plDispatch.cpp + plDispatchLogBase.cpp +) + +set(pnDispatch_HEADERS + plDispatch.h + plDispatchLogBase.h + pnDispatchCreatable.h +) + +add_library(pnDispatch STATIC ${pnDispatch_SOURCES} ${pnDispatch_HEADERS}) + +source_group("Source Files" FILES ${pnDispatch_SOURCES}) +source_group("Header Files" FILES ${pnDispatch_HEADERS}) \ No newline at end of file diff --git a/Sources/Plasma/NucleusLib/pnDispatch/plDispatch.cpp b/Sources/Plasma/NucleusLib/pnDispatch/plDispatch.cpp index a2076b89..c8cf74d8 100644 --- a/Sources/Plasma/NucleusLib/pnDispatch/plDispatch.cpp +++ b/Sources/Plasma/NucleusLib/pnDispatch/plDispatch.cpp @@ -44,15 +44,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "plDispatch.h" #define PLMESSAGE_PRIVATE -#include "../pnMessage/plMessage.h" -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnMessage/plMessage.h" +#include "pnKeyedObject/hsKeyedObject.h" #include "hsTimer.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnKeyedObject/plKey.h" +#include "pnMessage/plTimeMsg.h" +#include "pnKeyedObject/plKey.h" #include "plDispatchLogBase.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnNetCommon/plSynchedObject.h" -#include "../pnNetCommon/pnNetCommon.h" +#include "pnNetCommon/plNetApp.h" +#include "pnNetCommon/plSynchedObject.h" +#include "pnNetCommon/pnNetCommon.h" #include "hsThread.h" #include "plProfile.h" diff --git a/Sources/Plasma/NucleusLib/pnDispatch/plDispatch.h b/Sources/Plasma/NucleusLib/pnDispatch/plDispatch.h index 8be138fb..ba3e7f03 100644 --- a/Sources/Plasma/NucleusLib/pnDispatch/plDispatch.h +++ b/Sources/Plasma/NucleusLib/pnDispatch/plDispatch.h @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStlUtils.h" #include "plgDispatch.h" #include "hsThread.h" -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #pragma warning(disable: 4284) diff --git a/Sources/Plasma/NucleusLib/pnDispatch/pnDispatchCreatable.h b/Sources/Plasma/NucleusLib/pnDispatch/pnDispatchCreatable.h index 41f8b55c..a91dfdf5 100644 --- a/Sources/Plasma/NucleusLib/pnDispatch/pnDispatchCreatable.h +++ b/Sources/Plasma/NucleusLib/pnDispatch/pnDispatchCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pnDispatchCreatable_inc #define pnDispatchCreatable_inc -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" #include "plDispatch.h" diff --git a/Sources/Plasma/NucleusLib/pnFactory/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnFactory/CMakeLists.txt new file mode 100644 index 00000000..c636c17f --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnFactory/CMakeLists.txt @@ -0,0 +1,18 @@ +include_directories(../../CoreLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) + +set(pnFactory_SOURCES + plFactory.cpp +) + +set(pnFactory_HEADERS + plCreatable.h + plCreator.h + plFactory.h +) + +add_library(pnFactory STATIC ${pnFactory_SOURCES} ${pnFactory_HEADERS}) + +source_group("Source Files" FILES ${pnFactory_SOURCES}) +source_group("Header Files" FILES ${pnFactory_HEADERS}) \ No newline at end of file diff --git a/Sources/Plasma/NucleusLib/pnFactory/plFactory.cpp b/Sources/Plasma/NucleusLib/pnFactory/plFactory.cpp index 7b671b06..32c12dc3 100644 --- a/Sources/Plasma/NucleusLib/pnFactory/plFactory.cpp +++ b/Sources/Plasma/NucleusLib/pnFactory/plFactory.cpp @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsUtils.h" // For class names -#include "../NucleusLib/inc/plCreatableStrings.h" +#include "plCreatableStrings.h" static plFactory* theFactory = nil; From 24fa42f9ab1700d4d9cd0d30142067b615733c1c Mon Sep 17 00:00:00 2001 From: Zrax Date: Thu, 7 Apr 2011 23:37:07 -0700 Subject: [PATCH 07/18] PubUtilLib Part IV (cherry picked from commit 3bf6b7e182396f613859a18cb6dcf484727f6226) --- CMakeLists.txt | 4 + Sources/Plasma/PubUtilLib/CMakeLists.txt | 39 +++++---- .../Plasma/PubUtilLib/inc/plAllCreatables.h | 54 ++++++------- .../PubUtilLib/plNetCommon/plNetMember.h | 2 +- .../PubUtilLib/plNetGameLib/CMakeLists.txt | 68 ++++++++-------- .../PubUtilLib/plNetMessage/CMakeLists.txt | 22 +++++ .../PubUtilLib/plNetMessage/plNetMessage.cpp | 22 ++--- .../plNetMessage/plNetMessageCreatable.h | 2 +- .../plNetMessage/plNetMsgHelpers.cpp | 10 +-- .../PubUtilLib/plNetMessage/plNetMsgHelpers.h | 12 +-- .../PubUtilLib/plNetTransport/CMakeLists.txt | 21 +++++ .../plNetTransport/plNetTransport.cpp | 4 +- .../plNetTransport/plNetTransportMember.h | 4 +- .../plParticleSystem/CMakeLists.txt | 34 ++++++++ .../plParticleSystem/plBoundInterface.h | 2 +- .../plParticleSystem/plConvexVolume.h | 2 +- .../PubUtilLib/plParticleSystem/plParticle.h | 2 +- .../plParticleSystem/plParticleApplicator.cpp | 8 +- .../plParticleSystem/plParticleApplicator.h | 4 +- .../plParticleSystem/plParticleCreatable.h | 2 +- .../plParticleSystem/plParticleEffect.cpp | 4 +- .../plParticleSystem/plParticleEffect.h | 2 +- .../plParticleSystem/plParticleEmitter.cpp | 12 +-- .../plParticleSystem/plParticleEmitter.h | 4 +- .../plParticleSystem/plParticleGenerator.cpp | 8 +- .../plParticleSystem/plParticleGenerator.h | 2 +- .../plParticleSystem/plParticleSDLMod.cpp | 6 +- .../plParticleSystem/plParticleSDLMod.h | 2 +- .../plParticleSystem/plParticleSystem.cpp | 20 ++--- .../plParticleSystem/plParticleSystem.h | 8 +- .../PubUtilLib/plPhysical/CMakeLists.txt | 33 ++++++++ .../plPhysical/plCollisionDetector.cpp | 36 +++++---- .../plPhysical/plDetectorModifier.h | 4 +- .../plPhysical/plPhysicalCreatable.h | 2 +- .../PubUtilLib/plPhysical/plPhysicalProxy.cpp | 12 +-- .../PubUtilLib/plPhysical/plPhysicalProxy.h | 2 +- .../plPhysical/plPhysicalSDLModifier.cpp | 12 +-- .../plPhysical/plPhysicalSDLModifier.h | 2 +- .../plPhysical/plPhysicalSndGroup.cpp | 6 +- .../plPhysical/plPhysicalSndGroup.h | 4 +- .../plPhysical/plPhysicsSoundMgr.cpp | 8 +- .../plPhysical/plPickingDetector.cpp | 16 ++-- .../PubUtilLib/plProgressMgr/CMakeLists.txt | 17 ++++ .../Plasma/PubUtilLib/plResMgr/CMakeLists.txt | 39 +++++++++ .../PubUtilLib/plResMgr/plKeyFinder.cpp | 2 +- .../Plasma/PubUtilLib/plResMgr/plKeyFinder.h | 4 +- .../PubUtilLib/plResMgr/plLocalization.cpp | 2 +- .../Plasma/PubUtilLib/plResMgr/plPageInfo.cpp | 2 +- .../Plasma/PubUtilLib/plResMgr/plPageInfo.h | 2 +- .../PubUtilLib/plResMgr/plRegistryHelpers.h | 2 +- .../PubUtilLib/plResMgr/plRegistryKeyList.h | 2 +- .../PubUtilLib/plResMgr/plRegistryNode.cpp | 8 +- .../PubUtilLib/plResMgr/plResManager.cpp | 32 ++++---- .../plResMgr/plResManagerHelper.cpp | 20 ++--- .../PubUtilLib/plResMgr/plResManagerHelper.h | 2 +- .../PubUtilLib/plResMgr/plResMgrCreatable.h | 2 +- .../Plasma/PubUtilLib/plResMgr/plVersion.cpp | 2 +- .../Plasma/PubUtilLib/plSDL/CMakeLists.txt | 39 +++++++++ Sources/Plasma/PubUtilLib/plSDL/plSDL.h | 8 +- Sources/Plasma/PubUtilLib/plSDL/plSDLMgr.cpp | 4 +- .../Plasma/PubUtilLib/plSDL/plSDLParser.cpp | 8 +- .../plSDL/plStateChangeNotifier.cpp | 4 +- .../PubUtilLib/plSDL/plStateDataRecord.cpp | 4 +- .../PubUtilLib/plSDL/plStateDescriptor.cpp | 2 +- .../PubUtilLib/plSDL/plStateVariable.cpp | 24 +++--- .../PubUtilLib/plSDL/plVarDescriptor.cpp | 8 +- .../Plasma/PubUtilLib/plScene/CMakeLists.txt | 38 +++++++++ .../Plasma/PubUtilLib/plScene/plOccluder.cpp | 12 +-- .../Plasma/PubUtilLib/plScene/plOccluder.h | 2 +- .../PubUtilLib/plScene/plOccluderProxy.cpp | 6 +- .../PubUtilLib/plScene/plOccluderProxy.h | 2 +- .../PubUtilLib/plScene/plPageTreeMgr.cpp | 8 +- .../PubUtilLib/plScene/plPostEffectMod.cpp | 12 +-- .../PubUtilLib/plScene/plPostEffectMod.h | 2 +- .../PubUtilLib/plScene/plRelevanceMgr.cpp | 2 +- .../PubUtilLib/plScene/plRelevanceMgr.h | 2 +- .../PubUtilLib/plScene/plRelevanceRegion.cpp | 2 +- .../PubUtilLib/plScene/plRelevanceRegion.h | 2 +- .../PubUtilLib/plScene/plRenderRequest.cpp | 4 +- .../PubUtilLib/plScene/plRenderRequest.h | 4 +- .../PubUtilLib/plScene/plSceneCreatable.h | 2 +- .../Plasma/PubUtilLib/plScene/plSceneNode.cpp | 22 ++--- .../Plasma/PubUtilLib/plScene/plSceneNode.h | 2 +- Sources/Plasma/PubUtilLib/plScene/plVisMgr.h | 2 +- .../Plasma/PubUtilLib/plScene/plVisRegion.cpp | 4 +- .../Plasma/PubUtilLib/plScene/plVisRegion.h | 2 +- .../PubUtilLib/plSockets/CMakeLists.txt | 34 ++++++++ .../plSockets/plOutgoingUdpSocket.cpp | 2 +- .../plSockets/plTcpListenSocket.cpp | 2 +- .../PubUtilLib/plSockets/plTcpSocket.cpp | 2 +- .../PubUtilLib/plStatGather/CMakeLists.txt | 24 ++++++ .../PubUtilLib/plStatGather/plAutoProfile.cpp | 40 ++++----- .../PubUtilLib/plStatGather/plAutoProfile.h | 2 +- .../plStatGather/plCalculatedProfiles.cpp | 2 +- .../plStatGather/plProfileManagerFull.cpp | 12 +-- .../PubUtilLib/plStatusLog/CMakeLists.txt | 21 +++++ .../PubUtilLib/plStatusLog/plStatusLog.cpp | 14 ++-- .../PubUtilLib/plStreamLogger/CMakeLists.txt | 16 ++++ .../PubUtilLib/plSurface/CMakeLists.txt | 81 +++++++++++++++++++ .../PubUtilLib/plSurface/hsGMaterial.cpp | 2 +- .../PubUtilLib/plSurface/plGrassShaderMod.cpp | 26 +++--- .../PubUtilLib/plSurface/plGrassShaderMod.h | 2 +- .../Plasma/PubUtilLib/plSurface/plLayer.cpp | 10 +-- .../PubUtilLib/plSurface/plLayerAnimation.cpp | 26 +++--- .../PubUtilLib/plSurface/plLayerAnimation.h | 2 +- .../PubUtilLib/plSurface/plLayerInterface.cpp | 4 +- .../PubUtilLib/plSurface/plLayerInterface.h | 4 +- .../Plasma/PubUtilLib/plSurface/plShader.cpp | 2 +- .../Plasma/PubUtilLib/plSurface/plShader.h | 2 +- .../PubUtilLib/plSurface/plSurfaceCreatable.h | 2 +- .../PubUtilLib/plTransform/CMakeLists.txt | 21 +++++ .../PubUtilLib/plTransform/hsAffineParts.cpp | 2 +- .../Plasma/PubUtilLib/plUUID/CMakeLists.txt | 20 +++++ .../PubUtilLib/plUnifiedTime/CMakeLists.txt | 21 +++++ .../plUnifiedTime/plClientUnifiedTime.cpp | 4 +- .../Plasma/PubUtilLib/plVault/CMakeLists.txt | 30 +++++++ Sources/Plasma/PubUtilLib/plVault/Pch.h | 24 +++--- .../PubUtilLib/plVault/plDniCoordinateInfo.h | 2 +- Sources/Plasma/PubUtilLib/plVault/plVault.h | 8 +- 119 files changed, 940 insertions(+), 420 deletions(-) create mode 100644 Sources/Plasma/PubUtilLib/plNetMessage/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plNetTransport/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plParticleSystem/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plPhysical/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plProgressMgr/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plResMgr/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plSDL/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plScene/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plSockets/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plStatGather/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plStatusLog/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plStreamLogger/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plSurface/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plTransform/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plUUID/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plUnifiedTime/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plVault/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index f763e040..90101ddb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,10 @@ set(PLASMA_TARGETS Client set_property(CACHE PLASMA_TARGETS PROPERTY STRINGS "Client" "Server" "Patcher" "Ethereal" "NoAvMsgs") +if(PLASMA_TARGETS STREQUAL "Client") + add_definitions(-DCLIENT) +endif(PLASMA_TARGETS STREQUAL "Client") + if(PLASMA_TARGETS STREQUAL "Patcher") add_definitions(-DPATCHER) endif(PLASMA_TARGETS STREQUAL "Patcher") diff --git a/Sources/Plasma/PubUtilLib/CMakeLists.txt b/Sources/Plasma/PubUtilLib/CMakeLists.txt index 7bd7c42b..e8da53cc 100644 --- a/Sources/Plasma/PubUtilLib/CMakeLists.txt +++ b/Sources/Plasma/PubUtilLib/CMakeLists.txt @@ -29,26 +29,25 @@ add_subdirectory(plNetClientComm) add_subdirectory(plNetClientRecorder) #add_subdirectory(plNetCommon) # TODO: STLport add_subdirectory(plNetGameLib) -#add_subdirectory(plNetMessage) -#add_subdirectory(plNetTransport) -#add_subdirectory(plParticleSystem) -#add_subdirectory(plPhysical) -#add_subdirectory(plPhysX) -#add_subdirectory(plPipeline) -#add_subdirectory(plProgressMgr) -#add_subdirectory(plResMgr) -#add_subdirectory(plScene) -#add_subdirectory(plSDL) +add_subdirectory(plNetMessage) +add_subdirectory(plNetTransport) +add_subdirectory(plParticleSystem) +add_subdirectory(plPhysical) +#add_subdirectory(plPhysX) # TODO: PhysX +#add_subdirectory(plPipeline) # TODO: Bink, DirectX +add_subdirectory(plProgressMgr) +add_subdirectory(plResMgr) +add_subdirectory(plScene) +add_subdirectory(plSDL) #add_subdirectory(plSDLBrowser) # Not being used by any current slns -#add_subdirectory(plSockets) -#add_subdirectory(plStatGather) -#add_subdirectory(plStatusLog) -#add_subdirectory(plStreamLogger) -#add_subdirectory(plSurface) -#add_subdirectory(plTransform) -#add_subdirectory(plUnifiedTime) -#add_subdirectory(plUUID) -#add_subdirectory(plVault) +add_subdirectory(plSockets) +add_subdirectory(plStatGather) +add_subdirectory(plStatusLog) +add_subdirectory(plStreamLogger) +add_subdirectory(plSurface) +add_subdirectory(plTransform) +add_subdirectory(plUnifiedTime) +add_subdirectory(plUUID) +add_subdirectory(plVault) #add_subdirectory(plWinStrBlock) # Not being used by any current slns #add_subdirectory(plWndCtrls) # Not being used by any current slns -#add_subdirectory(PubUtilInc) diff --git a/Sources/Plasma/PubUtilLib/inc/plAllCreatables.h b/Sources/Plasma/PubUtilLib/inc/plAllCreatables.h index b3232877..ea68261f 100644 --- a/Sources/Plasma/PubUtilLib/inc/plAllCreatables.h +++ b/Sources/Plasma/PubUtilLib/inc/plAllCreatables.h @@ -43,33 +43,33 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAllCreatables_inc #define plAllCreatables_inc -#include "../plGImage/plGImageCreatable.h" -#include "../plGLight/plGLightCreatable.h" -#include "../plInterp/plInterpCreatable.h" -#include "../plInputCore/plInputCoreCreatable.h" -#include "../plPipeline/plPipelineCreatable.h" -#include "../plResMgr/plResMgrCreatable.h" -#include "../plSurface/plSurfaceCreatable.h" -#include "../plNetClient/plNetClientCreatable.h" -#include "../plNetClientComm/plNetClientCommCreatable.h" -#include "../plMessage/plMessageCreatable.h" -#include "../plAudible/plAudibleCreatable.h" -#include "../plDrawable/plDrawableCreatable.h" -#include "../plPhysical/plPhysicalCreatable.h" -#include "../plModifier/plModifierCreatable.h" -#include "../plScene/plSceneCreatable.h" -#include "../plPhysX/plPhysXCreatable.h" -#include "../plAudio/plAudioCreatable.h" -#include "../plAudioCore/plAudioCoreCreatable.h" -#include "../plParticleSystem/plParticleCreatable.h" -#include "../plNetCommon/plNetCommonCreatable.h" -#include "../plVault/plVaultCreatable.h" -#include "../plAvatar/plAvatarCreatable.h" -#include "../plIntersect/plIntersectCreatable.h" -#include "../plNetMessage/plNetMessageCreatable.h" -#include "../plStatGather/plStatGatherCreatable.h" -#include "../plSDL/plSDLCreatable.h" -#include "../plAgeLoader/plAgeLoaderCreatable.h" +#include "plGImage/plGImageCreatable.h" +#include "plGLight/plGLightCreatable.h" +#include "plInterp/plInterpCreatable.h" +#include "plInputCore/plInputCoreCreatable.h" +#include "plPipeline/plPipelineCreatable.h" +#include "plResMgr/plResMgrCreatable.h" +#include "plSurface/plSurfaceCreatable.h" +#include "plNetClient/plNetClientCreatable.h" +#include "plNetClientComm/plNetClientCommCreatable.h" +#include "plMessage/plMessageCreatable.h" +#include "plAudible/plAudibleCreatable.h" +#include "plDrawable/plDrawableCreatable.h" +#include "plPhysical/plPhysicalCreatable.h" +#include "plModifier/plModifierCreatable.h" +#include "plScene/plSceneCreatable.h" +#include "plPhysX/plPhysXCreatable.h" +#include "plAudio/plAudioCreatable.h" +#include "plAudioCore/plAudioCoreCreatable.h" +#include "plParticleSystem/plParticleCreatable.h" +#include "plNetCommon/plNetCommonCreatable.h" +#include "plVault/plVaultCreatable.h" +#include "plAvatar/plAvatarCreatable.h" +#include "plIntersect/plIntersectCreatable.h" +#include "plNetMessage/plNetMessageCreatable.h" +#include "plStatGather/plStatGatherCreatable.h" +#include "plSDL/plSDLCreatable.h" +#include "plAgeLoader/plAgeLoaderCreatable.h" #endif // plAllCreatables_inc \ No newline at end of file diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetMember.h b/Sources/Plasma/PubUtilLib/plNetCommon/plNetMember.h index 1a7ed768..eca69514 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetMember.h +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plNetMember.h @@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsConfig.h" #include "hsUtils.h" #include "hsStlUtils.h" -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" class plNetApp; class plNetGenericServer; diff --git a/Sources/Plasma/PubUtilLib/plNetGameLib/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plNetGameLib/CMakeLists.txt index b955b145..094b38dc 100644 --- a/Sources/Plasma/PubUtilLib/plNetGameLib/CMakeLists.txt +++ b/Sources/Plasma/PubUtilLib/plNetGameLib/CMakeLists.txt @@ -1,35 +1,33 @@ -include_directories("../../CoreLib") -include_directories("../../NucleusLib/inc") -include_directories("../../NucleusLib") -include_directories("../../PubUtilLib") - -include_directories(${OPENSSL_INCLUDE_DIR}) - -set(plNetGameLib_PRIVATE - Private/plNglAllIncludes.h - Private/plNglAuth.h - Private/plNglAuth.cpp - Private/plNglCore.h - Private/plNglCore.cpp - Private/plNglCsr.h - Private/plNglCsr.cpp - Private/plNglFile.h - Private/plNglFile.cpp - Private/plNglGame.h - Private/plNglGame.cpp - Private/plNglGateKeeper.h - Private/plNglGateKeeper.cpp - Private/plNglMisc.cpp - Private/plNglTrans.cpp -) - -set(plNetGameLib_HEADERS - Intern.h - Pch.h - plNetGameLib.h -) - -add_library(plNetGameLib STATIC ${plNetGameLib_PRIVATE} ${plNetGameLib_HEADERS}) - -source_group("Private" FILES ${plNetGameLib_PRIVATE}) -source_group("Header Files" FILES ${plNetGameLib_HEADERS}) +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plNetGameLib_PRIVATE + Private/plNglAllIncludes.h + Private/plNglAuth.h + Private/plNglAuth.cpp + Private/plNglCore.h + Private/plNglCore.cpp + Private/plNglCsr.h + Private/plNglCsr.cpp + Private/plNglFile.h + Private/plNglFile.cpp + Private/plNglGame.h + Private/plNglGame.cpp + Private/plNglGateKeeper.h + Private/plNglGateKeeper.cpp + Private/plNglMisc.cpp + Private/plNglTrans.cpp +) + +set(plNetGameLib_HEADERS + Intern.h + Pch.h + plNetGameLib.h +) + +add_library(plNetGameLib STATIC ${plNetGameLib_PRIVATE} ${plNetGameLib_HEADERS}) + +source_group("Private" FILES ${plNetGameLib_PRIVATE}) +source_group("Header Files" FILES ${plNetGameLib_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plNetMessage/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plNetMessage/CMakeLists.txt new file mode 100644 index 00000000..6252b877 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plNetMessage/CMakeLists.txt @@ -0,0 +1,22 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plNetMessage_SOURCES + plNetMessage.cpp + plNetMsgHelpers.cpp +) + +set(plNetMessage_HEADERS + plNetCommonMessage.h + plNetMessage.h + plNetMessageCreatable.h + plNetMsgHelpers.h + plNetMsgVersion.h +) + +add_library(plNetMessage STATIC ${plNetMessage_SOURCES} ${plNetMessage_HEADERS}) + +source_group("Source Files" FILES ${plNetMessage_SOURCES}) +source_group("Header Files" FILES ${plNetMessage_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plNetMessage/plNetMessage.cpp b/Sources/Plasma/PubUtilLib/plNetMessage/plNetMessage.cpp index 030fb068..9cf3517e 100644 --- a/Sources/Plasma/PubUtilLib/plNetMessage/plNetMessage.cpp +++ b/Sources/Plasma/PubUtilLib/plNetMessage/plNetMessage.cpp @@ -46,17 +46,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNetMsgVersion.h" #include "plCreatableIndex.h" -#include "../pnKeyedObject/plKeyImp.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnNetCommon/plNetSharedState.h" -#include "../pnMessage/plMessage.h" -#include "../pnNetCommon/pnNetCommon.h" -#include "../pnNetCommon/plGenericVar.h" -#include "../pnFactory/plFactory.h" - -#include "../plVault/plVault.h" -#include "../plNetCommon/plNetCommon.h" -#include "../plSDL/plSDL.h" +#include "pnKeyedObject/plKeyImp.h" +#include "pnKeyedObject/plKey.h" +#include "pnNetCommon/plNetSharedState.h" +#include "pnMessage/plMessage.h" +#include "pnNetCommon/pnNetCommon.h" +#include "pnNetCommon/plGenericVar.h" +#include "pnFactory/plFactory.h" + +#include "plVault/plVault.h" +#include "plNetCommon/plNetCommon.h" +#include "plSDL/plSDL.h" #if defined(HS_BUILD_FOR_UNIX) #include diff --git a/Sources/Plasma/PubUtilLib/plNetMessage/plNetMessageCreatable.h b/Sources/Plasma/PubUtilLib/plNetMessage/plNetMessageCreatable.h index a2d7fc51..9a88f844 100644 --- a/Sources/Plasma/PubUtilLib/plNetMessage/plNetMessageCreatable.h +++ b/Sources/Plasma/PubUtilLib/plNetMessage/plNetMessageCreatable.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // kept separate for a reason -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plNetMessage.h" // NON CREATABLES diff --git a/Sources/Plasma/PubUtilLib/plNetMessage/plNetMsgHelpers.cpp b/Sources/Plasma/PubUtilLib/plNetMessage/plNetMsgHelpers.cpp index c9cb6023..040ecce8 100644 --- a/Sources/Plasma/PubUtilLib/plNetMessage/plNetMsgHelpers.cpp +++ b/Sources/Plasma/PubUtilLib/plNetMessage/plNetMsgHelpers.cpp @@ -41,11 +41,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plNetMsgHelpers.h" #include "plNetMessage.h" -#include "../plCompression/plZlibCompress.h" -#include "../pnNetCommon/plNetServers.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnMessage/plMessage.h" +#include "plCompression/plZlibCompress.h" +#include "pnNetCommon/plNetServers.h" +#include "pnNetCommon/plNetApp.h" +#include "pnKeyedObject/plKey.h" +#include "pnMessage/plMessage.h" #include "hsStream.h" #include diff --git a/Sources/Plasma/PubUtilLib/plNetMessage/plNetMsgHelpers.h b/Sources/Plasma/PubUtilLib/plNetMessage/plNetMsgHelpers.h index 4bfbfd17..56cc4b2c 100644 --- a/Sources/Plasma/PubUtilLib/plNetMessage/plNetMsgHelpers.h +++ b/Sources/Plasma/PubUtilLib/plNetMessage/plNetMsgHelpers.h @@ -51,12 +51,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsUtils.h" #include "hsStream.h" #include "hsStlUtils.h" -#include "../pnNetCommon/pnNetCommon.h" -#include "../pnFactory/plCreatable.h" -#include "../pnKeyedObject/plUoid.h" -#include "../pnKeyedObject/plKey.h" -#include "../plUnifiedTime/plUnifiedTime.h" -#include "../plNetCommon/plClientGuid.h" +#include "pnNetCommon/pnNetCommon.h" +#include "pnFactory/plCreatable.h" +#include "pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plKey.h" +#include "plUnifiedTime/plUnifiedTime.h" +#include "plNetCommon/plClientGuid.h" #include class plKey; diff --git a/Sources/Plasma/PubUtilLib/plNetTransport/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plNetTransport/CMakeLists.txt new file mode 100644 index 00000000..c2032867 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plNetTransport/CMakeLists.txt @@ -0,0 +1,21 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +include_directories(${OPENSSL_INCLUDE_DIR}) + +set(plNetTransport_SOURCES + plNetTransport.cpp + plNetTransportMember.cpp +) + +set(plNetTransport_HEADERS + plNetTransport.h + plNetTransportMember.h +) + +add_library(plNetTransport STATIC ${plNetTransport_SOURCES} ${plNetTransport_HEADERS}) + +source_group("Source Files" FILES ${plNetTransport_SOURCES}) +source_group("Header Files" FILES ${plNetTransport_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransport.cpp b/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransport.cpp index d37033fb..77bdaa66 100644 --- a/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransport.cpp +++ b/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransport.cpp @@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTimer.h" #include "plNetTransport.h" #include "plNetTransportMember.h" -#include "../plNetMessage/plNetMessage.h" -#include "../plNetClient/plNetClientMgr.h" +#include "plNetMessage/plNetMessage.h" +#include "plNetClient/plNetClientMgr.h" #include plNetTransport::~plNetTransport() diff --git a/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransportMember.h b/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransportMember.h index b252e2e1..cbb87b78 100644 --- a/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransportMember.h +++ b/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransportMember.h @@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsConfig.h" #include "hsStlUtils.h" -#include "../plNetCommon/plNetMember.h" -#include "../pnKeyedObject/plKey.h" +#include "plNetCommon/plNetMember.h" +#include "pnKeyedObject/plKey.h" // // This represents a participant in the game, ie. another diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plParticleSystem/CMakeLists.txt new file mode 100644 index 00000000..24f2e5b2 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/CMakeLists.txt @@ -0,0 +1,34 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plParticleSystem_SOURCES + plBoundInterface.cpp + plConvexVolume.cpp + plParticleApplicator.cpp + plParticleEffect.cpp + plParticleEmitter.cpp + plParticleGenerator.cpp + plParticleSDLMod.cpp + plParticleSystem.cpp +) + +set(plParticleSystem_HEADERS + plBoundInterface.h + plConvexVolume.h + plEffectTargetInfo.h + plParticle.h + plParticleApplicator.h + plParticleCreatable.h + plParticleEffect.h + plParticleEmitter.h + plParticleGenerator.h + plParticleSDLMod.h + plParticleSystem.h +) + +add_library(plParticleSystem STATIC ${plParticleSystem_SOURCES} ${plParticleSystem_HEADERS}) + +source_group("Source Files" FILES ${plParticleSystem_SOURCES}) +source_group("Header Files" FILES ${plParticleSystem_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plBoundInterface.h b/Sources/Plasma/PubUtilLib/plParticleSystem/plBoundInterface.h index fc0722e9..9cbdef09 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plBoundInterface.h +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plBoundInterface.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plBoundInterface_inc #define plBoundInterface_inc -#include "../pnSceneObject/plObjInterface.h" +#include "pnSceneObject/plObjInterface.h" class plConvexVolume; struct hsMatrix44; diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plConvexVolume.h b/Sources/Plasma/PubUtilLib/plParticleSystem/plConvexVolume.h index 8677d172..7ad67238 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plConvexVolume.h +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plConvexVolume.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plConvexVolume_inc #define plConvexVolume_inc -#include "../pnSceneObject/plObjInterface.h" +#include "pnSceneObject/plObjInterface.h" struct hsPlane3; struct hsPoint3; diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticle.h b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticle.h index c5553dea..e4f4b8d7 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticle.h +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticle.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plParticle_inc #include "hsGeometry3.h" -#include "../CoreLib/hsColorRGBA.h" +#include "hsColorRGBA.h" // The meat of the particle. These classes, in combination with the plParticleEmitter that spawned it, // should contain everything specific to a particle, necessary to build a renderable poly to represent a diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleApplicator.cpp b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleApplicator.cpp index 84ec1a8f..72f07a27 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleApplicator.cpp +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleApplicator.cpp @@ -42,10 +42,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plParticleSystem.h" #include "plParticleGenerator.h" #include "plParticleApplicator.h" -#include "../plAvatar/plScalarChannel.h" -#include "../plAvatar/plAGModifier.h" -#include "../plMessage/plParticleUpdateMsg.h" -#include "../pnSceneObject/plSceneObject.h" +#include "plAvatar/plScalarChannel.h" +#include "plAvatar/plAGModifier.h" +#include "plMessage/plParticleUpdateMsg.h" +#include "pnSceneObject/plSceneObject.h" #define PI 3.14159 diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleApplicator.h b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleApplicator.h index c33fbe2c..11a16df2 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleApplicator.h +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleApplicator.h @@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PLPARTICLEAPPLICATOR_INC #define PLPARTICLEAPPLICATOR_INC -#include "../plAvatar/plAGChannel.h" -#include "../plAvatar/plAGApplicator.h" +#include "plAvatar/plAGChannel.h" +#include "plAvatar/plAGApplicator.h" class plParticleSystem; diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleCreatable.h b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleCreatable.h index 3cf5419e..f46a6fb7 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleCreatable.h +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plParticleCreatable_inc #define plParticleCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plParticleSystem.h" #include "plParticleEffect.h" diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEffect.cpp b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEffect.cpp index 6ed677d9..69463732 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEffect.cpp +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEffect.cpp @@ -49,9 +49,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "plPipeline.h" #include "hsFastMath.h" -#include "../plMath/plRandom.h" +#include "plMath/plRandom.h" #include "plParticleSystem.h" -#include "../plMessage/plParticleUpdateMsg.h" +#include "plMessage/plParticleUpdateMsg.h" /////////////////////////////////////////////////////////////////////////////////////////// plParticleCollisionEffect::plParticleCollisionEffect() diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEffect.h b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEffect.h index d4ca1412..7894734e 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEffect.h +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEffect.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plParticleEffect_inc #define plParticleEffect_inc -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include "hsMatrix44.h" class plEffectTargetInfo; diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEmitter.cpp b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEmitter.cpp index 0face349..3374e546 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEmitter.cpp +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEmitter.cpp @@ -42,17 +42,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsUtils.h" #include "hsResMgr.h" -#include "../pnMessage/plRefMsg.h" -#include "../plMessage/plParticleUpdateMsg.h" +#include "pnMessage/plRefMsg.h" +#include "plMessage/plParticleUpdateMsg.h" #include "plParticleGenerator.h" #include "plParticleEmitter.h" #include "plParticleSystem.h" #include "plParticle.h" #include "plParticleEffect.h" -#include "../CoreLib/hsColorRGBA.h" -#include "../plInterp/plController.h" -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plLayerInterface.h" +#include "hsColorRGBA.h" +#include "plInterp/plController.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plLayerInterface.h" #include "plProfile.h" #include "hsFastMath.h" diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEmitter.h b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEmitter.h index 04ad3ca1..2ebe9527 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEmitter.h +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEmitter.h @@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsGeometry3.h" #include "hsBounds.h" -#include "../pnNetCommon/plSynchedValue.h" -#include "../CoreLib/hsColorRGBA.h" +#include "pnNetCommon/plSynchedValue.h" +#include "hsColorRGBA.h" class hsBounds3Ext; class plParticleSystem; diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleGenerator.cpp b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleGenerator.cpp index 817457da..78899542 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleGenerator.cpp +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleGenerator.cpp @@ -48,11 +48,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plParticleSystem.h" #include "plParticleEmitter.h" #include "plParticleGenerator.h" -#include "../CoreLib/hsColorRGBA.h" -#include "../plMessage/plParticleUpdateMsg.h" -#include "../plInterp/plController.h" +#include "hsColorRGBA.h" +#include "plMessage/plParticleUpdateMsg.h" +#include "plInterp/plController.h" #include "hsResMgr.h" -#include "../plMath/plRandom.h" +#include "plMath/plRandom.h" static const hsScalar DEFAULT_INVERSE_MASS = 1.f; diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleGenerator.h b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleGenerator.h index 6a3e3a1f..55322a4b 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleGenerator.h +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleGenerator.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plParticleGenerator_inc #include "hsGeometry3.h" -#include "../pnNetCommon/plSynchedValue.h" +#include "pnNetCommon/plSynchedValue.h" class plParticleEmitter; class plScalarController; diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSDLMod.cpp b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSDLMod.cpp index 150205f5..57249dd4 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSDLMod.cpp +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSDLMod.cpp @@ -42,9 +42,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plParticleSDLMod.h" #include "plParticleSystem.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../plSDL/plSDL.h" -#include "../pnKeyedObject/plKey.h" +#include "pnSceneObject/plSceneObject.h" +#include "plSDL/plSDL.h" +#include "pnKeyedObject/plKey.h" // static vars char plParticleSDLMod::kStrNumParticles[]="numParticles"; diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSDLMod.h b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSDLMod.h index 68d5d3ff..7d1a360a 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSDLMod.h +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSDLMod.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plParticleSDLMod_inc #define plParticleSDLMod_inc -#include "../plModifier/plSDLModifier.h" +#include "plModifier/plSDLModifier.h" // // This modifier is responsible for sending and recving diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSystem.cpp b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSystem.cpp index f330c4db..ef8d51d9 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSystem.cpp +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSystem.cpp @@ -49,21 +49,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plgDispatch.h" #include "hsResMgr.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plDrawInterface.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnMessage/plTimeMsg.h" -#include "../plMessage/plRenderMsg.h" -#include "../plMessage/plAgeLoadedMsg.h" -#include "../plMessage/plParticleUpdateMsg.h" -#include "../plInterp/plController.h" -#include "../plSurface/hsGMaterial.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plDrawInterface.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnMessage/plTimeMsg.h" +#include "plMessage/plRenderMsg.h" +#include "plMessage/plAgeLoadedMsg.h" +#include "plMessage/plParticleUpdateMsg.h" +#include "plInterp/plController.h" +#include "plSurface/hsGMaterial.h" #include "plPipeline.h" #include "hsTimer.h" #include "plProfile.h" #include "plTweak.h" -#include "../plDrawable/plParticleFiller.h" +#include "plDrawable/plParticleFiller.h" plProfile_CreateCounter("Num Particles", "Particles", NumParticles); diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSystem.h b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSystem.h index 5e83257f..124e2811 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSystem.h +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSystem.h @@ -44,10 +44,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTemplates.h" #include "hsGeometry3.h" -#include "../../NucleusLib/pnModifier/plModifier.h" -#include "../pnNetCommon/plSynchedValue.h" -#include "../CoreLib/hsColorRGBA.h" -#include "../CoreLib/hsMatrix44.h" +#include "pnModifier/plModifier.h" +#include "pnNetCommon/plSynchedValue.h" +#include "hsColorRGBA.h" +#include "hsMatrix44.h" #include "plEffectTargetInfo.h" class plPipeline; diff --git a/Sources/Plasma/PubUtilLib/plPhysical/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plPhysical/CMakeLists.txt new file mode 100644 index 00000000..df927167 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plPhysical/CMakeLists.txt @@ -0,0 +1,33 @@ +include_directories("../../CoreLib") +include_directories("../../FeatureLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +include_directories(${OPENAL_INCLUDE_DIR}) + +set(plPhysical_SOURCES + plCollisionDetector.cpp + plPhysicalProxy.cpp + plPhysicalSDLModifier.cpp + plPhysicalSndGroup.cpp + plPhysicsSoundMgr.cpp + plPickingDetector.cpp +) + +set(plPhysical_HEADERS + plCollisionDetector.h + plDetectorModifier.h + plPhysicalCreatable.h + plPhysicalProxy.h + plPhysicalSDLModifier.h + plPhysicalSndGroup.h + plPhysicsSoundMgr.h + plPickingDetector.h + plSimDefs.h +) + +add_library(plPhysical STATIC ${plPhysical_SOURCES} ${plPhysical_HEADERS}) + +source_group("Source Files" FILES ${plPhysical_SOURCES}) +source_group("Header Files" FILES ${plPhysical_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.cpp b/Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.cpp index 212a2e37..d251d550 100644 --- a/Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.cpp +++ b/Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.cpp @@ -42,31 +42,39 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plCollisionDetector.h" -#include "../plMessage/plCollideMsg.h" +#include "plMessage/plCollideMsg.h" #include "plgDispatch.h" -#include "../plMessage/plActivatorMsg.h" -#include "../pnMessage/plCameraMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../plMessage/plInputIfaceMgrMsg.h" -#include "../pnInputCore/plControlEventCodes.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnNetCommon/plNetApp.h" -#include "../plNetClient/plNetLinkingMgr.h" +#include "plMessage/plActivatorMsg.h" +#include "pnMessage/plCameraMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "plMessage/plInputIfaceMgrMsg.h" +#include "pnInputCore/plControlEventCodes.h" +#include "pnNetCommon/plNetApp.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnNetCommon/plNetApp.h" +#include "plNetClient/plNetLinkingMgr.h" #include "plPhysical.h" -#include "../pnMessage/plPlayerPageMsg.h" -#include "../plMessage/plSimStateMsg.h" +#include "pnMessage/plPlayerPageMsg.h" +#include "plMessage/plSimStateMsg.h" +<<<<<<< HEAD:Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.cpp #include "../pnSceneObject/plCoordinateInterface.h" #include "../plAvatar/plArmatureMod.h" #include "../plAvatar/plAvatarMgr.h" #include "../plAvatar/plAvBrainHuman.h" #include "../plAvatar/plAvBrainDrive.h" #include "../plAvatar/plPhysicalControllerCore.h" - -#include "../plModifier/plDetectorLog.h" +======= +#include "pnSceneObject/plCoordinateInterface.h" +#include "plAvatar/plArmatureMod.h" +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plAvBrainHuman.h" +#include "plAvatar/plAvBrainDrive.h" +>>>>>>> 3bf6b7e18 (PubUtilLib Part IV):MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.cpp + +#include "plModifier/plDetectorLog.h" #ifdef USE_PHYSX_COLLISION_FLUTTER_WORKAROUND #include "../plPhysX/plSimulationMgr.h" diff --git a/Sources/Plasma/PubUtilLib/plPhysical/plDetectorModifier.h b/Sources/Plasma/PubUtilLib/plPhysical/plDetectorModifier.h index 26cbb567..059e1feb 100644 --- a/Sources/Plasma/PubUtilLib/plPhysical/plDetectorModifier.h +++ b/Sources/Plasma/PubUtilLib/plPhysical/plDetectorModifier.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plDetectorModifier_inc #define plDetectorModifier_inc -#include "../pnModifier/plSingleModifier.h" -#include "../pnMessage/plObjRefMsg.h" +#include "pnModifier/plSingleModifier.h" +#include "pnMessage/plObjRefMsg.h" #include "hsStream.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalCreatable.h b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalCreatable.h index a3a06154..16664ef7 100644 --- a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalCreatable.h +++ b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPhysicalCreatable_inc #define plPhysicalCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plDetectorModifier.h" diff --git a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalProxy.cpp b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalProxy.cpp index 1270b959..095106a9 100644 --- a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalProxy.cpp +++ b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalProxy.cpp @@ -41,13 +41,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plPhysicalProxy.h" #include "plPhysical.h" -#include "../plPhysX/plPXPhysicalControllerCore.h" -#include "../plDrawable/plDrawableSpans.h" -#include "../plDrawable/plDrawableGenerator.h" -#include "../pnMessage/plProxyDrawMsg.h" +#include "plPhysX/plPXPhysicalControllerCore.h" +#include "plDrawable/plDrawableSpans.h" +#include "plDrawable/plDrawableGenerator.h" +#include "pnMessage/plProxyDrawMsg.h" -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plLayer.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plLayer.h" plPhysicalProxy::plPhysicalProxy() : plProxyGen(hsColorRGBA().Set(0,0,0,1.f), hsColorRGBA().Set(1.f,0.8f,0.2f,1.f), 0.5f), diff --git a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalProxy.h b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalProxy.h index faaa3a22..492275fa 100644 --- a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalProxy.h +++ b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalProxy.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPhysicalProxy_inc #define plPhysicalProxy_inc -#include "../plDrawable/plProxyGen.h" +#include "plDrawable/plProxyGen.h" class plDrawableSpans; class hsGMaterial; diff --git a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSDLModifier.cpp b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSDLModifier.cpp index d04dae49..8ad3b747 100644 --- a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSDLModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSDLModifier.cpp @@ -43,13 +43,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsGeometry3.h" #include "plPhysical.h" -#include "../plSDL/plSDL.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plSimulationInterface.h" -#include "../pnNetCommon/plNetApp.h" +#include "plSDL/plSDL.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plSimulationInterface.h" +#include "pnNetCommon/plNetApp.h" #include "hsQuat.h" -//#include "../plHavok1/plSimulationMgr.h" -#include "../plStatusLog/plStatusLog.h" +//#include "plHavok1/plSimulationMgr.h" +#include "plStatusLog/plStatusLog.h" // static vars static const char* kStrLinear = "linear"; diff --git a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSDLModifier.h b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSDLModifier.h index a8509a3c..39d15dc5 100644 --- a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSDLModifier.h +++ b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSDLModifier.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPhysicalSDLModifier_inc #define plPhysicalSDLModifier_inc -#include "../plModifier/plSDLModifier.h" +#include "plModifier/plSDLModifier.h" class plStateDataRecord; class plStatusLog; diff --git a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSndGroup.cpp b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSndGroup.cpp index a3e8d8a3..1b2f390e 100644 --- a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSndGroup.cpp +++ b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSndGroup.cpp @@ -51,9 +51,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "plPhysicalSndGroup.h" -#include "../plAudio/plSound.h" -#include "../pnMessage/plRefMsg.h" -#include "../plMessage/plAnimCmdMsg.h" +#include "plAudio/plSound.h" +#include "pnMessage/plRefMsg.h" +#include "plMessage/plAnimCmdMsg.h" plPhysicalSndGroup::plPhysicalSndGroup() : fPlayingSlideSound(false) diff --git a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSndGroup.h b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSndGroup.h index 8df510d4..c6e1679b 100644 --- a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSndGroup.h +++ b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicalSndGroup.h @@ -55,8 +55,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsTemplates.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/plUoid.h" class plSound; class plPhysicalSndGroup : public hsKeyedObject diff --git a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicsSoundMgr.cpp b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicsSoundMgr.cpp index 0759ae86..e9664b50 100644 --- a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicsSoundMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicsSoundMgr.cpp @@ -44,10 +44,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTimer.h" #include "plPhysicsSoundMgr.h" #include "plPhysicalSndGroup.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../plStatusLog/plStatusLog.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../FeatureLib/pfAudio/plRandomSoundMod.h" +#include "pnKeyedObject/plFixedKey.h" +#include "plStatusLog/plStatusLog.h" +#include "plMessage/plAnimCmdMsg.h" +#include "pfAudio/plRandomSoundMod.h" #define MIN_VOLUME 0.0001f diff --git a/Sources/Plasma/PubUtilLib/plPhysical/plPickingDetector.cpp b/Sources/Plasma/PubUtilLib/plPhysical/plPickingDetector.cpp index 3d47df65..404d7caa 100644 --- a/Sources/Plasma/PubUtilLib/plPhysical/plPickingDetector.cpp +++ b/Sources/Plasma/PubUtilLib/plPhysical/plPickingDetector.cpp @@ -41,14 +41,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "plPickingDetector.h" -#include "../plMessage/plActivatorMsg.h" -#include "../plMessage/plPickedMsg.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../pnMessage/plFakeOutMsg.h" -#include "../pnNetCommon/plNetApp.h" +#include "plMessage/plActivatorMsg.h" +#include "plMessage/plPickedMsg.h" +#include "pnNetCommon/plNetApp.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnKeyedObject/plKey.h" +#include "pnMessage/plObjRefMsg.h" +#include "pnMessage/plFakeOutMsg.h" +#include "pnNetCommon/plNetApp.h" #include "plgDispatch.h" diff --git a/Sources/Plasma/PubUtilLib/plProgressMgr/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plProgressMgr/CMakeLists.txt new file mode 100644 index 00000000..fdc4afa2 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plProgressMgr/CMakeLists.txt @@ -0,0 +1,17 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plProgressMgr_SOURCES + plProgressMgr.cpp +) + +set(plProgressMgr_HEADERS + plProgressMgr.h +) + +add_library(plProgressMgr STATIC ${plProgressMgr_SOURCES} ${plProgressMgr_HEADERS}) + +source_group("Source Files" FILES ${plProgressMgr_SOURCES}) +source_group("Header Files" FILES ${plProgressMgr_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plResMgr/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plResMgr/CMakeLists.txt new file mode 100644 index 00000000..17424816 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plResMgr/CMakeLists.txt @@ -0,0 +1,39 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plResMgr_SOURCES + plBSDiffBuffer.cpp + plDiffBuffer.cpp + plKeyFinder.cpp + plLocalization.cpp + plPageInfo.cpp + plRegistryHelpers.cpp + plRegistryKeyList.cpp + plRegistryNode.cpp + plResManager.cpp + plResManagerHelper.cpp + plVersion.cpp +) + +set(plResMgr_HEADERS + plBSDiffBuffer.h + plDiffBuffer.h + plKeyFinder.h + plLocalization.h + plPageInfo.h + plRegistryHelpers.h + plRegistryKeyList.h + plRegistryNode.h + plResManager.h + plResManagerHelper.h + plResMgrCreatable.h + plResMgrSettings.h + plVersion.h +) + +add_library(plResMgr STATIC ${plResMgr_SOURCES} ${plResMgr_HEADERS}) + +source_group("Source Files" FILES ${plResMgr_SOURCES}) +source_group("Header Files" FILES ${plResMgr_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.cpp b/Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.cpp index df145b78..d7ecbb53 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.cpp +++ b/Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.cpp @@ -51,7 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plRegistryNode.h" #include "plRegistryKeyList.h" #include "plPageInfo.h" -#include "../pnFactory/plFactory.h" +#include "pnFactory/plFactory.h" #include "hsUtils.h" #include "plCreatableIndex.h" diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.h b/Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.h index ef7d4934..319aab3b 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.h +++ b/Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.h @@ -64,8 +64,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com //---------------------------- #include "hsTypes.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plUoid.h" #include "hsStlUtils.h" #include diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plLocalization.cpp b/Sources/Plasma/PubUtilLib/plResMgr/plLocalization.cpp index f8efd087..16513665 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plLocalization.cpp +++ b/Sources/Plasma/PubUtilLib/plResMgr/plLocalization.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "plLocalization.h" -#include "../plFile/plFileUtils.h" +#include "plFile/plFileUtils.h" #include "hsUtils.h" plLocalization::Language plLocalization::fLanguage = plLocalization::kEnglish; diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plPageInfo.cpp b/Sources/Plasma/PubUtilLib/plResMgr/plPageInfo.cpp index e587979a..531bced4 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plPageInfo.cpp +++ b/Sources/Plasma/PubUtilLib/plResMgr/plPageInfo.cpp @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPageInfo.h" #include "hsUtils.h" #include "hsStream.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plUoid.h" #include "plVersion.h" static UInt32 sCurrPageInfoVersion = 6; diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plPageInfo.h b/Sources/Plasma/PubUtilLib/plResMgr/plPageInfo.h index 302ff02a..c2ab1d70 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plPageInfo.h +++ b/Sources/Plasma/PubUtilLib/plResMgr/plPageInfo.h @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define _plPageInfo_h #include "hsTypes.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plUoid.h" #include class hsStream; diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plRegistryHelpers.h b/Sources/Plasma/PubUtilLib/plResMgr/plRegistryHelpers.h index 6b7dce83..8bf27b59 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plRegistryHelpers.h +++ b/Sources/Plasma/PubUtilLib/plResMgr/plRegistryHelpers.h @@ -53,7 +53,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define _plRegistryHelpers_h #include "hsTypes.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include class plKey; diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plRegistryKeyList.h b/Sources/Plasma/PubUtilLib/plResMgr/plRegistryKeyList.h index adbbe72e..65c3edbe 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plRegistryKeyList.h +++ b/Sources/Plasma/PubUtilLib/plResMgr/plRegistryKeyList.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plRegistryKeyList_h_inc #include "hsTypes.h" -#include "../pnKeyedObject/plKeyImp.h" +#include "pnKeyedObject/plKeyImp.h" #include #include diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plRegistryNode.cpp b/Sources/Plasma/PubUtilLib/plResMgr/plRegistryNode.cpp index 8c8954b5..4bb2239a 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plRegistryNode.cpp +++ b/Sources/Plasma/PubUtilLib/plResMgr/plRegistryNode.cpp @@ -43,10 +43,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plRegistryKeyList.h" #include "plRegistryHelpers.h" -#include "../pnKeyedObject/plKeyImp.h" -#include "../plStatusLog/plStatusLog.h" -#include "../pnFactory/plFactory.h" -#include "../plFile/plFileUtils.h" +#include "pnKeyedObject/plKeyImp.h" +#include "plStatusLog/plStatusLog.h" +#include "pnFactory/plFactory.h" +#include "plFile/plFileUtils.h" #include "hsStlUtils.h" #include "plVersion.h" diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plResManager.cpp b/Sources/Plasma/PubUtilLib/plResMgr/plResManager.cpp index 40abbff0..48ab6ba5 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plResManager.cpp +++ b/Sources/Plasma/PubUtilLib/plResMgr/plResManager.cpp @@ -47,24 +47,24 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsSTLStream.h" #include "hsTimer.h" -#include "../pnTimer/plTimerCallbackManager.h" +#include "pnTimer/plTimerCallbackManager.h" #include "hsStlUtils.h" -#include "../plScene/plSceneNode.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnKeyedObject/plKeyImp.h" -#include "../pnDispatch/plDispatch.h" -#include "../plStatusLog/plStatusLog.h" -#include "../pnMessage/plRefMsg.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../plMessage/plAgeLoadedMsg.h" -#include "../pnMessage/plClientMsg.h" -#include "../plFile/hsFiles.h" -#include "../plFile/plFileUtils.h" -#include "../pnFactory/plCreator.h" -#include "../pnNetCommon/plSynchedObject.h" -#include "../pnNetCommon/plNetApp.h" +#include "plScene/plSceneNode.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnKeyedObject/plKeyImp.h" +#include "pnDispatch/plDispatch.h" +#include "plStatusLog/plStatusLog.h" +#include "pnMessage/plRefMsg.h" +#include "pnMessage/plObjRefMsg.h" +#include "plMessage/plAgeLoadedMsg.h" +#include "pnMessage/plClientMsg.h" +#include "plFile/hsFiles.h" +#include "plFile/plFileUtils.h" +#include "pnFactory/plCreator.h" +#include "pnNetCommon/plSynchedObject.h" +#include "pnNetCommon/plNetApp.h" hsBool gDataServerLocal = false; diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plResManagerHelper.cpp b/Sources/Plasma/PubUtilLib/plResMgr/plResManagerHelper.cpp index 40098a3e..d726dc5e 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plResManagerHelper.cpp +++ b/Sources/Plasma/PubUtilLib/plResMgr/plResManagerHelper.cpp @@ -58,9 +58,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com //#include "plRegistry.h" #include "plResMgrSettings.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../plMessage/plResMgrHelperMsg.h" -#include "../plStatusLog/plStatusLog.h" +#include "pnKeyedObject/plFixedKey.h" +#include "plMessage/plResMgrHelperMsg.h" +#include "plStatusLog/plStatusLog.h" #include "hsTimer.h" #ifdef MCN_RESMGR_DEBUGGING @@ -68,13 +68,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com static const int kLogSize = 40; static const float kUpdateDelay = 0.5f; -#include "../plInputCore/plInputInterface.h" -#include "../plInputCore/plInputDevice.h" -#include "../plInputCore/plInputInterfaceMgr.h" -#include "../pnInputCore/plInputMap.h" -#include "../plMessage/plInputEventMsg.h" -#include "../plMessage/plInputIfaceMgrMsg.h" -#include "../pnKeyedObject/plKeyImp.h" +#include "plInputCore/plInputInterface.h" +#include "plInputCore/plInputDevice.h" +#include "plInputCore/plInputInterfaceMgr.h" +#include "pnInputCore/plInputMap.h" +#include "plMessage/plInputEventMsg.h" +#include "plMessage/plInputIfaceMgrMsg.h" +#include "pnKeyedObject/plKeyImp.h" #endif diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plResManagerHelper.h b/Sources/Plasma/PubUtilLib/plResMgr/plResManagerHelper.h index c41cfd75..bed12926 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plResManagerHelper.h +++ b/Sources/Plasma/PubUtilLib/plResMgr/plResManagerHelper.h @@ -56,7 +56,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsTemplates.h" #include "plRegistryHelpers.h" -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" // Defined as a project setting so we can do this right //#define MCN_RESMGR_DEBUGGING diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plResMgrCreatable.h b/Sources/Plasma/PubUtilLib/plResMgr/plResMgrCreatable.h index a2a33dc7..d84cd2b0 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plResMgrCreatable.h +++ b/Sources/Plasma/PubUtilLib/plResMgr/plResMgrCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plResMgrCreatable_inc #define plResMgrCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plResManagerHelper.h" diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plVersion.cpp b/Sources/Plasma/PubUtilLib/plResMgr/plVersion.cpp index 31e30121..48228557 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plVersion.cpp +++ b/Sources/Plasma/PubUtilLib/plResMgr/plVersion.cpp @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plVersion.h" -#include "../pnFactory/plFactory.h" +#include "pnFactory/plFactory.h" #include #include "plCreatableIndex.h" diff --git a/Sources/Plasma/PubUtilLib/plSDL/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plSDL/CMakeLists.txt new file mode 100644 index 00000000..6282a24d --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plSDL/CMakeLists.txt @@ -0,0 +1,39 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plSDL_SOURCES + plSDLMgr.cpp + plSDLParser.cpp + plStateChangeNotifier.cpp + plStateDataRecord.cpp + plStateDescriptor.cpp + plStateVariable.cpp + plVarDescriptor.cpp +) + +set(plSDL_HEADERS + plSDL.h + plSDLCreatable.h + plSDLDescriptor.h +) + +set(plSDL_SDLFILES + SDL/animation.sdl + SDL/avatar.sdl + SDL/cloneMessage.sdl + SDL/clothing.sdl + SDL/morph.sdl + SDL/particle.sdl + SDL/physical.sdl + SDL/responder.sdl + SDL/sound.sdl + SDL/xregion.sdl +) + +add_library(plSDL STATIC ${plSDL_SOURCES} ${plSDL_HEADERS} ${plSDL_SDLFILES}) + +source_group("Source Files" FILES ${plSDL_SOURCES}) +source_group("Header Files" FILES ${plSDL_HEADERS}) +source_group("SDL" FILES ${plSDL_SDLFILES}) diff --git a/Sources/Plasma/PubUtilLib/plSDL/plSDL.h b/Sources/Plasma/PubUtilLib/plSDL/plSDL.h index 66f146d2..e2459ec4 100644 --- a/Sources/Plasma/PubUtilLib/plSDL/plSDL.h +++ b/Sources/Plasma/PubUtilLib/plSDL/plSDL.h @@ -50,11 +50,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsUtils.h" #include "hsStlUtils.h" -#include "../pnFactory/plCreatable.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnFactory/plCreatable.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plUoid.h" -#include "../plUnifiedTime/plUnifiedTime.h" +#include "plUnifiedTime/plUnifiedTime.h" namespace plSDL { diff --git a/Sources/Plasma/PubUtilLib/plSDL/plSDLMgr.cpp b/Sources/Plasma/PubUtilLib/plSDL/plSDLMgr.cpp index 936c8667..99d67cf9 100644 --- a/Sources/Plasma/PubUtilLib/plSDL/plSDLMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plSDL/plSDLMgr.cpp @@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "hsStlUtils.h" #include "plSDL.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnNetCommon/pnNetCommon.h" +#include "pnNetCommon/plNetApp.h" +#include "pnNetCommon/pnNetCommon.h" #include ///////////////////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plSDL/plSDLParser.cpp b/Sources/Plasma/PubUtilLib/plSDL/plSDLParser.cpp index ac0b9403..515f39ef 100644 --- a/Sources/Plasma/PubUtilLib/plSDL/plSDLParser.cpp +++ b/Sources/Plasma/PubUtilLib/plSDL/plSDLParser.cpp @@ -42,10 +42,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsStlUtils.h" #include "plSDL.h" -#include "../plFile/hsFiles.h" -#include "../plFile/plStreamSource.h" -#include "../pnNetCommon/pnNetCommon.h" -#include "../pnNetCommon/plNetApp.h" +#include "plFile/hsFiles.h" +#include "plFile/plStreamSource.h" +#include "pnNetCommon/pnNetCommon.h" +#include "pnNetCommon/plNetApp.h" static const int kTokenLen=256; diff --git a/Sources/Plasma/PubUtilLib/plSDL/plStateChangeNotifier.cpp b/Sources/Plasma/PubUtilLib/plSDL/plStateChangeNotifier.cpp index 79fb159b..d86174de 100644 --- a/Sources/Plasma/PubUtilLib/plSDL/plStateChangeNotifier.cpp +++ b/Sources/Plasma/PubUtilLib/plSDL/plStateChangeNotifier.cpp @@ -40,8 +40,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plSDL.h" -#include "../pnMessage/plSDLNotificationMsg.h" -#include "algorithm" +#include "pnMessage/plSDLNotificationMsg.h" +#include // static UInt32 plStateChangeNotifier::fCurrentPlayerID = 0; diff --git a/Sources/Plasma/PubUtilLib/plSDL/plStateDataRecord.cpp b/Sources/Plasma/PubUtilLib/plSDL/plStateDataRecord.cpp index 231863c3..7cdb265e 100644 --- a/Sources/Plasma/PubUtilLib/plSDL/plStateDataRecord.cpp +++ b/Sources/Plasma/PubUtilLib/plSDL/plStateDataRecord.cpp @@ -46,8 +46,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStlUtils.h" #include "plSDL.h" -#include "../plNetMessage/plNetMessage.h" -#include "../pnNetCommon/plNetApp.h" +#include "plNetMessage/plNetMessage.h" +#include "pnNetCommon/plNetApp.h" const char* plSDL::kAgeSDLObjectName = {"AgeSDLHook"}; diff --git a/Sources/Plasma/PubUtilLib/plSDL/plStateDescriptor.cpp b/Sources/Plasma/PubUtilLib/plSDL/plStateDescriptor.cpp index 7ab207b5..f8c8c97b 100644 --- a/Sources/Plasma/PubUtilLib/plSDL/plStateDescriptor.cpp +++ b/Sources/Plasma/PubUtilLib/plSDL/plStateDescriptor.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsStream.h" #include "plSDL.h" -#include "../pnNetCommon/plNetApp.h" +#include "pnNetCommon/plNetApp.h" const UInt8 plStateDescriptor::kVersion=1; // for Read/Write format diff --git a/Sources/Plasma/PubUtilLib/plSDL/plStateVariable.cpp b/Sources/Plasma/PubUtilLib/plSDL/plStateVariable.cpp index eee3ceda..4d0d1036 100644 --- a/Sources/Plasma/PubUtilLib/plSDL/plStateVariable.cpp +++ b/Sources/Plasma/PubUtilLib/plSDL/plStateVariable.cpp @@ -45,21 +45,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStlUtils.h" #include "plSDL.h" -#include "../pnProduct/pnProduct.h" -#include "../pnFactory/plCreatable.h" -#include "../pnKeyedObject/plUoid.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plKeyImp.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnNetCommon/pnNetCommon.h" +#include "pnProduct/pnProduct.h" +#include "pnFactory/plCreatable.h" +#include "pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKeyImp.h" +#include "pnNetCommon/plNetApp.h" +#include "pnNetCommon/pnNetCommon.h" -#include "../plResMgr/plResManager.h" -#include "../plResMgr/plKeyFinder.h" -#include "../plUnifiedTime/plClientUnifiedTime.h" +#include "plResMgr/plResManager.h" +#include "plResMgr/plKeyFinder.h" +#include "plUnifiedTime/plClientUnifiedTime.h" -#include "../plResMgr/plResManager.h" -#include "../plUnifiedTime/plClientUnifiedTime.h" +#include "plResMgr/plResManager.h" +#include "plUnifiedTime/plClientUnifiedTime.h" /***************************************************************************** diff --git a/Sources/Plasma/PubUtilLib/plSDL/plVarDescriptor.cpp b/Sources/Plasma/PubUtilLib/plSDL/plVarDescriptor.cpp index 41484a23..65e69271 100644 --- a/Sources/Plasma/PubUtilLib/plSDL/plVarDescriptor.cpp +++ b/Sources/Plasma/PubUtilLib/plSDL/plVarDescriptor.cpp @@ -43,11 +43,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plSDL.h" #include "hsStlUtils.h" -#include "../pnKeyedObject/plUoid.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnMessage/plMessage.h" +#include "pnKeyedObject/plUoid.h" +#include "pnNetCommon/plNetApp.h" +#include "pnMessage/plMessage.h" -#include "../plUnifiedTime/plUnifiedTime.h" +#include "plUnifiedTime/plUnifiedTime.h" const UInt8 plVarDescriptor::kVersion=3; // for Read/Write format diff --git a/Sources/Plasma/PubUtilLib/plScene/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plScene/CMakeLists.txt new file mode 100644 index 00000000..a3271cc8 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plScene/CMakeLists.txt @@ -0,0 +1,38 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plScene_SOURCES + plCullPoly.cpp + plOccluder.cpp + plOccluderProxy.cpp + plPageTreeMgr.cpp + plPostEffectMod.cpp + plRelevanceMgr.cpp + plRelevanceRegion.cpp + plRenderRequest.cpp + plSceneNode.cpp + plVisMgr.cpp + plVisRegion.cpp +) + +set(plScene_HEADERS + plCullPoly.h + plOccluder.h + plOccluderProxy.h + plPageTreeMgr.h + plPostEffectMod.h + plRelevanceMgr.h + plRelevanceRegion.h + plRenderRequest.h + plSceneCreatable.h + plSceneNode.h + plVisMgr.h + plVisRegion.h +) + +add_library(plScene STATIC ${plScene_SOURCES} ${plScene_HEADERS}) + +source_group("Source Files" FILES ${plScene_SOURCES}) +source_group("Header Files" FILES ${plScene_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plScene/plOccluder.cpp b/Sources/Plasma/PubUtilLib/plScene/plOccluder.cpp index 3b538a4a..09ae8f62 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plOccluder.cpp +++ b/Sources/Plasma/PubUtilLib/plScene/plOccluder.cpp @@ -44,12 +44,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plOccluder.h" #include "hsStream.h" #include "plOccluderProxy.h" -#include "../plDrawable/plDrawableGenerator.h" -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plLayerInterface.h" -#include "../plSurface/plLayer.h" -#include "../pnMessage/plNodeRefMsg.h" -#include "../pnKeyedObject/plKey.h" +#include "plDrawable/plDrawableGenerator.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plLayerInterface.h" +#include "plSurface/plLayer.h" +#include "pnMessage/plNodeRefMsg.h" +#include "pnKeyedObject/plKey.h" #include "hsResMgr.h" #include "plgDispatch.h" #include "plVisRegion.h" diff --git a/Sources/Plasma/PubUtilLib/plScene/plOccluder.h b/Sources/Plasma/PubUtilLib/plScene/plOccluder.h index 03cdfa39..7b5c434c 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plOccluder.h +++ b/Sources/Plasma/PubUtilLib/plScene/plOccluder.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plOccluder_inc #define plOccluder_inc -#include "../pnSceneObject/plObjInterface.h" +#include "pnSceneObject/plObjInterface.h" #include "hsTemplates.h" #include "hsMatrix44.h" #include "plCullPoly.h" diff --git a/Sources/Plasma/PubUtilLib/plScene/plOccluderProxy.cpp b/Sources/Plasma/PubUtilLib/plScene/plOccluderProxy.cpp index 2c931849..7723be5d 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plOccluderProxy.cpp +++ b/Sources/Plasma/PubUtilLib/plScene/plOccluderProxy.cpp @@ -43,9 +43,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plOccluderProxy.h" #include "plOccluder.h" -#include "../plDrawable/plDrawableSpans.h" -#include "../plDrawable/plDrawableGenerator.h" -#include "../pnMessage/plProxyDrawMsg.h" +#include "plDrawable/plDrawableSpans.h" +#include "plDrawable/plDrawableGenerator.h" +#include "pnMessage/plProxyDrawMsg.h" plOccluderProxy::plOccluderProxy() : plProxyGen(hsColorRGBA().Set(0.2f,0.2f,0.8f,1.f), hsColorRGBA().Set(1.f,0.5f,0.5f,1.f), 0.5f), diff --git a/Sources/Plasma/PubUtilLib/plScene/plOccluderProxy.h b/Sources/Plasma/PubUtilLib/plScene/plOccluderProxy.h index 97d4aec7..6050aaaf 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plOccluderProxy.h +++ b/Sources/Plasma/PubUtilLib/plScene/plOccluderProxy.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plOccluderProxy_inc #define plOccluderProxy_inc -#include "../plDrawable/plProxyGen.h" +#include "plDrawable/plProxyGen.h" class plOccluder; class plDrawableSpans; diff --git a/Sources/Plasma/PubUtilLib/plScene/plPageTreeMgr.cpp b/Sources/Plasma/PubUtilLib/plScene/plPageTreeMgr.cpp index 20d54a88..f4d44488 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plPageTreeMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plScene/plPageTreeMgr.cpp @@ -42,12 +42,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plPageTreeMgr.h" -#include "../plDrawable/plSpaceTreeMaker.h" -#include "../plDrawable/plSpaceTree.h" +#include "plDrawable/plSpaceTreeMaker.h" +#include "plDrawable/plSpaceTree.h" #include "plDrawable.h" -#include "../plScene/plSceneNode.h" +#include "plScene/plSceneNode.h" #include "plPipeline.h" -#include "../plMath/hsRadixSort.h" +#include "plMath/hsRadixSort.h" #include "plCullPoly.h" #include "plOccluder.h" #include "hsFastMath.h" diff --git a/Sources/Plasma/PubUtilLib/plScene/plPostEffectMod.cpp b/Sources/Plasma/PubUtilLib/plScene/plPostEffectMod.cpp index 6e2ebbf2..4a13b892 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plPostEffectMod.cpp +++ b/Sources/Plasma/PubUtilLib/plScene/plPostEffectMod.cpp @@ -46,15 +46,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plSceneNode.h" #include "plRenderRequest.h" -#include "../plPipeline/plRenderTarget.h" +#include "plPipeline/plRenderTarget.h" -#include "../plMessage/plRenderRequestMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plMessage/plRenderMsg.h" +#include "plMessage/plRenderRequestMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plMessage/plRenderMsg.h" -#include "../pnMessage/plRefMsg.h" +#include "pnMessage/plRefMsg.h" -#include "../pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plSceneObject.h" #include "plDrawable.h" #include "plPipeline.h" #include "plgDispatch.h" diff --git a/Sources/Plasma/PubUtilLib/plScene/plPostEffectMod.h b/Sources/Plasma/PubUtilLib/plScene/plPostEffectMod.h index 7046dc77..d4c58616 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plPostEffectMod.h +++ b/Sources/Plasma/PubUtilLib/plScene/plPostEffectMod.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPostEffectMod_inc #define plPostEffectMod_inc -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" #include "hsMatrix44.h" #include "hsBitVector.h" diff --git a/Sources/Plasma/PubUtilLib/plScene/plRelevanceMgr.cpp b/Sources/Plasma/PubUtilLib/plScene/plRelevanceMgr.cpp index 74460b75..abef64bc 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plRelevanceMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plScene/plRelevanceMgr.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plRelevanceMgr.h" #include "plRelevanceRegion.h" -#include "../plIntersect/plRegionBase.h" +#include "plIntersect/plRegionBase.h" #include "hsStream.h" #include "hsStringTokenizer.h" diff --git a/Sources/Plasma/PubUtilLib/plScene/plRelevanceMgr.h b/Sources/Plasma/PubUtilLib/plScene/plRelevanceMgr.h index e60e6e2c..b1451ea0 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plRelevanceMgr.h +++ b/Sources/Plasma/PubUtilLib/plScene/plRelevanceMgr.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plRelevanceMgr_inc #define plRelevanceMgr_inc -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include "hsGeometry3.h" #include "hsTemplates.h" #include "hsBitVector.h" diff --git a/Sources/Plasma/PubUtilLib/plScene/plRelevanceRegion.cpp b/Sources/Plasma/PubUtilLib/plScene/plRelevanceRegion.cpp index 58136d7a..4c0fe83a 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plRelevanceRegion.cpp +++ b/Sources/Plasma/PubUtilLib/plScene/plRelevanceRegion.cpp @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "plRelevanceRegion.h" #include "plRelevanceMgr.h" -#include "../plIntersect/plRegionBase.h" +#include "plIntersect/plRegionBase.h" void plRelevanceRegion::Read(hsStream* s, hsResMgr* mgr) { diff --git a/Sources/Plasma/PubUtilLib/plScene/plRelevanceRegion.h b/Sources/Plasma/PubUtilLib/plScene/plRelevanceRegion.h index de0dc074..194dfafd 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plRelevanceRegion.h +++ b/Sources/Plasma/PubUtilLib/plScene/plRelevanceRegion.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plRelevanceRegion_inc #define plRelevanceRegion_inc -#include "../pnSceneObject/plObjInterface.h" +#include "pnSceneObject/plObjInterface.h" class plRelevanceMgr; class plRegionBase; diff --git a/Sources/Plasma/PubUtilLib/plScene/plRenderRequest.cpp b/Sources/Plasma/PubUtilLib/plScene/plRenderRequest.cpp index dd0885c5..30a32d14 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plRenderRequest.cpp +++ b/Sources/Plasma/PubUtilLib/plScene/plRenderRequest.cpp @@ -43,11 +43,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plRenderRequest.h" #include "plPageTreeMgr.h" -#include "../plPipeline/plRenderTarget.h" +#include "plPipeline/plRenderTarget.h" #include "hsFastMath.h" #include "hsStream.h" #include "plPipeline.h" -#include "../plMessage/plRenderRequestMsg.h" +#include "plMessage/plRenderRequestMsg.h" #include "plgDispatch.h" #include "plVisMgr.h" diff --git a/Sources/Plasma/PubUtilLib/plScene/plRenderRequest.h b/Sources/Plasma/PubUtilLib/plScene/plRenderRequest.h index b84131ad..c6f01ab5 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plRenderRequest.h +++ b/Sources/Plasma/PubUtilLib/plScene/plRenderRequest.h @@ -49,8 +49,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsRefCnt.h" #include "hsBitVector.h" -#include "../pnKeyedObject/plKey.h" -#include "../plMessage/plRenderRequestMsg.h" +#include "pnKeyedObject/plKey.h" +#include "plMessage/plRenderRequestMsg.h" class plRenderTarget; class plPageTreeMgr; diff --git a/Sources/Plasma/PubUtilLib/plScene/plSceneCreatable.h b/Sources/Plasma/PubUtilLib/plScene/plSceneCreatable.h index 2fa35eac..e919521e 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plSceneCreatable.h +++ b/Sources/Plasma/PubUtilLib/plScene/plSceneCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plSceneCreatable_inc #define plSceneCreatable_inc -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" #include "plSceneNode.h" diff --git a/Sources/Plasma/PubUtilLib/plScene/plSceneNode.cpp b/Sources/Plasma/PubUtilLib/plScene/plSceneNode.cpp index d623d4cd..c27461da 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plSceneNode.cpp +++ b/Sources/Plasma/PubUtilLib/plScene/plSceneNode.cpp @@ -43,31 +43,31 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plSceneNode.h" -#include "../pnDispatch/plDispatch.h" -#include "../plMessage/plNodeCleanupMsg.h" -#include "../pnMessage/plNodeRefMsg.h" +#include "pnDispatch/plDispatch.h" +#include "plMessage/plNodeCleanupMsg.h" +#include "pnMessage/plNodeRefMsg.h" #include "hsStream.h" #include "hsResMgr.h" -#include "../pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plSceneObject.h" #include "plDrawable.h" #include "plPhysical.h" #include "plAudible.h" -#include "../plGLight/plLightInfo.h" -#include "../pnMessage/plRefMsg.h" +#include "plGLight/plLightInfo.h" +#include "pnMessage/plRefMsg.h" #include "plPipeline.h" -#include "../pnKeyedObject/plKey.h" -#include "../plDrawable/plSpaceTreeMaker.h" -#include "../plDrawable/plSpaceTree.h" +#include "pnKeyedObject/plKey.h" +#include "plDrawable/plSpaceTreeMaker.h" +#include "plDrawable/plSpaceTree.h" #include "plPageTreeMgr.h" #include "plOccluder.h" //MFHORSE //BLACK // temp hack for debugging -#include "../plDrawable/plDrawableSpans.h" -#include "../pnKeyedObject/plKeyImp.h" +#include "plDrawable/plDrawableSpans.h" +#include "pnKeyedObject/plKeyImp.h" plSceneNode::plSceneNode() : fDepth(0), diff --git a/Sources/Plasma/PubUtilLib/plScene/plSceneNode.h b/Sources/Plasma/PubUtilLib/plScene/plSceneNode.h index 43cf1e89..d271d72f 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plSceneNode.h +++ b/Sources/Plasma/PubUtilLib/plScene/plSceneNode.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plSceneNode_inc #define plSceneNode_inc -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include "hsTemplates.h" diff --git a/Sources/Plasma/PubUtilLib/plScene/plVisMgr.h b/Sources/Plasma/PubUtilLib/plScene/plVisMgr.h index 396efd93..b8bdf37f 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plVisMgr.h +++ b/Sources/Plasma/PubUtilLib/plScene/plVisMgr.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plVisMgr_inc #define plVisMgr_inc -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include "hsTemplates.h" #include "hsBitVector.h" diff --git a/Sources/Plasma/PubUtilLib/plScene/plVisRegion.cpp b/Sources/Plasma/PubUtilLib/plScene/plVisRegion.cpp index f9de8749..cc5d3865 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plVisRegion.cpp +++ b/Sources/Plasma/PubUtilLib/plScene/plVisRegion.cpp @@ -48,8 +48,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plVisMgr.h" -#include "../pnMessage/plEnableMsg.h" -#include "../plIntersect/plRegionBase.h" +#include "pnMessage/plEnableMsg.h" +#include "plIntersect/plRegionBase.h" plVisRegion::plVisRegion() : fIndex(0), diff --git a/Sources/Plasma/PubUtilLib/plScene/plVisRegion.h b/Sources/Plasma/PubUtilLib/plScene/plVisRegion.h index 15706c99..d39148a9 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plVisRegion.h +++ b/Sources/Plasma/PubUtilLib/plScene/plVisRegion.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plVisRegion_inc #define plVisRegion_inc -#include "../pnSceneObject/plObjInterface.h" +#include "pnSceneObject/plObjInterface.h" class hsStream; class hsResMgr; diff --git a/Sources/Plasma/PubUtilLib/plSockets/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plSockets/CMakeLists.txt new file mode 100644 index 00000000..1b687afd --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plSockets/CMakeLists.txt @@ -0,0 +1,34 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plSockets_SOURCES + plBufferedSocketReader.cpp + plBufferedSocketWriter.cpp + plFdSet.cpp + plMemBuffer.cpp + plNet.cpp + plOutgoingUdpSocket.cpp + plRingBuffer.cpp + plSocket.cpp + plTcpListenSocket.cpp + plTcpSocket.cpp +) + +set(plSockets_HEADERS + plBufferedSocketReader.h + plBufferedSocketWriter.h + plFdSet.h + plMemBuffer.h + plNet.h + plOutgoingUdpSocket.h + plRingBuffer.h + plSocket.h + plTcpListenSocket.h + plTcpSocket.h +) + +add_library(plSockets STATIC ${plSockets_SOURCES} ${plSockets_HEADERS}) + +source_group("Source Files" FILES ${plSockets_SOURCES}) +source_group("Header Files" FILES ${plSockets_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plSockets/plOutgoingUdpSocket.cpp b/Sources/Plasma/PubUtilLib/plSockets/plOutgoingUdpSocket.cpp index ae7b9831..775d62f5 100644 --- a/Sources/Plasma/PubUtilLib/plSockets/plOutgoingUdpSocket.cpp +++ b/Sources/Plasma/PubUtilLib/plSockets/plOutgoingUdpSocket.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plOutgoingUdpSocket.h" #include "plFdSet.h" -#include "../pnNetCommon/plNetAddress.h" +#include "pnNetCommon/plNetAddress.h" #if HS_BUILD_FOR_UNIX #include diff --git a/Sources/Plasma/PubUtilLib/plSockets/plTcpListenSocket.cpp b/Sources/Plasma/PubUtilLib/plSockets/plTcpListenSocket.cpp index ee9b33eb..17bac46e 100644 --- a/Sources/Plasma/PubUtilLib/plSockets/plTcpListenSocket.cpp +++ b/Sources/Plasma/PubUtilLib/plSockets/plTcpListenSocket.cpp @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plTcpListenSocket.h" -#include "../pnNetCommon/plNetAddress.h" +#include "pnNetCommon/plNetAddress.h" // Initialize a socket for listening diff --git a/Sources/Plasma/PubUtilLib/plSockets/plTcpSocket.cpp b/Sources/Plasma/PubUtilLib/plSockets/plTcpSocket.cpp index b6165a1c..c6180732 100644 --- a/Sources/Plasma/PubUtilLib/plSockets/plTcpSocket.cpp +++ b/Sources/Plasma/PubUtilLib/plSockets/plTcpSocket.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plTcpSocket.h" #include "plFdSet.h" -#include "../pnNetCommon/plNetAddress.h" +#include "pnNetCommon/plNetAddress.h" #if HS_BUILD_FOR_UNIX #include diff --git a/Sources/Plasma/PubUtilLib/plStatGather/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plStatGather/CMakeLists.txt new file mode 100644 index 00000000..06552397 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plStatGather/CMakeLists.txt @@ -0,0 +1,24 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +include_directories(${OPENSSL_INCLUDE_DIR}) + +set(plStatGather_SOURCES + plAutoProfile.cpp + plCalculatedProfiles.cpp + plProfileManagerFull.cpp +) + +set(plStatGather_HEADERS + plAutoProfile.h + plCalculatedProfiles.h + plProfileManagerFull.h + plStatGatherCreatable.h +) + +add_library(plStatGather STATIC ${plStatGather_SOURCES} ${plStatGather_HEADERS}) + +source_group("Source Files" FILES ${plStatGather_SOURCES}) +source_group("Header Files" FILES ${plStatGather_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plStatGather/plAutoProfile.cpp b/Sources/Plasma/PubUtilLib/plStatGather/plAutoProfile.cpp index 86e72b84..e398b4bc 100644 --- a/Sources/Plasma/PubUtilLib/plStatGather/plAutoProfile.cpp +++ b/Sources/Plasma/PubUtilLib/plStatGather/plAutoProfile.cpp @@ -42,35 +42,35 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAutoProfile.h" #include "plgDispatch.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plNetClient/plNetLinkingMgr.h" +#include "plNetClient/plNetClientMgr.h" +#include "plNetClient/plNetLinkingMgr.h" #include "hsStream.h" #include "hsTimer.h" -#include "../plMessage/plAgeLoadedMsg.h" -#include "../pnTimer/plTimerCallbackManager.h" -#include "../plMessage/plTimerCallbackMsg.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plAvatar/plArmatureMod.h" -#include "../plModifier/plSpawnModifier.h" -#include "../plMessage/plConsoleMsg.h" -#include "../pnMessage/plClientMsg.h" -#include "../plAgeLoader/plAgeLoader.h" +#include "plMessage/plAgeLoadedMsg.h" +#include "pnTimer/plTimerCallbackManager.h" +#include "plMessage/plTimerCallbackMsg.h" +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plArmatureMod.h" +#include "plModifier/plSpawnModifier.h" +#include "plMessage/plConsoleMsg.h" +#include "pnMessage/plClientMsg.h" +#include "plAgeLoader/plAgeLoader.h" #include "plProfileManagerFull.h" -#include "../plFile/plFileUtils.h" +#include "plFile/plFileUtils.h" -#include "../plPipeline/plDebugText.h" -#include "../pnMessage/plTimeMsg.h" +#include "plPipeline/plDebugText.h" +#include "pnMessage/plTimeMsg.h" -#include "../plStatusLog/plStatusLog.h" -#include "../plVault/plVault.h" +#include "plStatusLog/plStatusLog.h" +#include "plVault/plVault.h" -#include "../plContainer/plConfigInfo.h" // for plStringList +#include "plContainer/plConfigInfo.h" // for plStringList // For taking screenshots -#include "../plGImage/plMipmap.h" -#include "../Apps/plClient/plClient.h" -#include "../plJPEG/plJPEG.h" +#include "plGImage/plMipmap.h" +#include "../../Apps/plClient/plClient.h" +#include "plJPEG/plJPEG.h" #include "plPipeline.h" #include diff --git a/Sources/Plasma/PubUtilLib/plStatGather/plAutoProfile.h b/Sources/Plasma/PubUtilLib/plStatGather/plAutoProfile.h index 906d81bc..32602c21 100644 --- a/Sources/Plasma/PubUtilLib/plStatGather/plAutoProfile.h +++ b/Sources/Plasma/PubUtilLib/plStatGather/plAutoProfile.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAutoProfile_h_inc #define plAutoProfile_h_inc -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" class plAutoProfile : public hsKeyedObject { diff --git a/Sources/Plasma/PubUtilLib/plStatGather/plCalculatedProfiles.cpp b/Sources/Plasma/PubUtilLib/plStatGather/plCalculatedProfiles.cpp index cacd3d9e..fba4d88a 100644 --- a/Sources/Plasma/PubUtilLib/plStatGather/plCalculatedProfiles.cpp +++ b/Sources/Plasma/PubUtilLib/plStatGather/plCalculatedProfiles.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plProfile.h" #include "plProfileManager.h" -#include "../plNetClient/plNetClientMgr.h" +#include "plNetClient/plNetClientMgr.h" #include "hsTimer.h" plProfile_CreateCounter("Age Upload BitsPerSec", "Network", UploadAgeBitsPerSec); diff --git a/Sources/Plasma/PubUtilLib/plStatGather/plProfileManagerFull.cpp b/Sources/Plasma/PubUtilLib/plStatGather/plProfileManagerFull.cpp index f2f26392..a78665fb 100644 --- a/Sources/Plasma/PubUtilLib/plStatGather/plProfileManagerFull.cpp +++ b/Sources/Plasma/PubUtilLib/plStatGather/plProfileManagerFull.cpp @@ -42,15 +42,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plProfileManagerFull.h" #include "plProfileManager.h" -#include "../plPipeline/plDebugText.h" -#include "../plPipeline/plPlates.h" +#include "plPipeline/plDebugText.h" +#include "plPipeline/plPlates.h" #include "plCalculatedProfiles.h" #include "hsStream.h" -#include "../pnUtils/pnUtils.h" -#include "../plUnifiedTime/plUnifiedTime.h" -#include "../plFile/plFileUtils.h" +#include "pnUtils/pnUtils.h" +#include "plUnifiedTime/plUnifiedTime.h" +#include "plFile/plFileUtils.h" plProfileManagerFull::plProfileManagerFull() : fVars(plProfileManager::Instance().fVars), @@ -443,7 +443,7 @@ const wchar* plProfileManagerFull::GetProfilePath() plFileUtils::CreateDir(profilePath); wchar buff[256]; - swprintf(buff, L"%02d-%02d-%04d_%02d-%02d//", + swprintf(buff, 256, L"%02d-%02d-%04d_%02d-%02d//", curTime.GetMonth(), curTime.GetDay(), curTime.GetYear(), diff --git a/Sources/Plasma/PubUtilLib/plStatusLog/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plStatusLog/CMakeLists.txt new file mode 100644 index 00000000..00188017 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plStatusLog/CMakeLists.txt @@ -0,0 +1,21 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plStatusLog_SOURCES + plEncryptLogLine.cpp + plLoggable.cpp + plStatusLog.cpp +) + +set(plStatusLog_HEADERS + plEncryptLogLine.h + plLoggable.h + plStatusLog.h +) + +add_library(plStatusLog STATIC ${plStatusLog_SOURCES} ${plStatusLog_HEADERS}) + +source_group("Source Files" FILES ${plStatusLog_SOURCES}) +source_group("Header Files" FILES ${plStatusLog_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp b/Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp index c25fe6e5..1fe415a8 100644 --- a/Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp +++ b/Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp @@ -61,16 +61,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTemplates.h" #include "hsTimer.h" #include "hsStlUtils.h" -#include "../plFile/plFileUtils.h" +#include "plFile/plFileUtils.h" #include "plStatusLog.h" #include "plPipeline.h" -#include "../plPipeline/plDebugText.h" +#include "plPipeline/plDebugText.h" #include "hsStlUtils.h" -#include "../plFile/hsFiles.h" -#include "../plUnifiedTime/plUnifiedTime.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnUtils/pnUtils.h" -#include "../pnProduct/pnProduct.h" +#include "plFile/hsFiles.h" +#include "plUnifiedTime/plUnifiedTime.h" +#include "pnNetCommon/plNetApp.h" +#include "pnUtils/pnUtils.h" +#include "pnProduct/pnProduct.h" #include "plEncryptLogLine.h" diff --git a/Sources/Plasma/PubUtilLib/plStreamLogger/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plStreamLogger/CMakeLists.txt new file mode 100644 index 00000000..16783c9d --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plStreamLogger/CMakeLists.txt @@ -0,0 +1,16 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plStreamLogger_SOURCES + plStreamLogger.cpp +) + +set(plStreamLogger_HEADERS + plStreamLogger.h +) + +add_library(plStreamLogger STATIC ${plStreamLogger_SOURCES} ${plStreamLogger_HEADERS}) + +source_group("Source Files" FILES ${plStreamLogger_SOURCES}) +source_group("Header Files" FILES ${plStreamLogger_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plSurface/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plSurface/CMakeLists.txt new file mode 100644 index 00000000..4b0c57d7 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plSurface/CMakeLists.txt @@ -0,0 +1,81 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plSurface_SOURCES + hsGMaterial.cpp + plGrassShaderMod.cpp + plLayer.cpp + plLayerAnimation.cpp + plLayerDepth.cpp + plLayerInterface.cpp + plLayerMultiply.cpp + plLayerOr.cpp + plLayerShadowBase.cpp + plShader.cpp + plShaderTable.cpp +) + +set(plSurface_HEADERS + hsGMaterial.h + plGrassShaderMod.h + plLayer.h + plLayerAnimation.h + plLayerDepth.h + plLayerInterface.h + plLayerMultiply.h + plLayerOr.h + plLayerShadowBase.h + plShader.h + plShaderTable.h + plSurfaceCreatable.h +) + +set(plSurface_SHADERS + ps_BiasNormals.h + ps_CaddAAdd.h + ps_CaddAbase.h + ps_CaddAMult.h + ps_CalphaAadd.h + ps_CalphaAbase.h + ps_CalphaAMult.h + ps_CbaseAbase.h + ps_CmultAAdd.h + ps_CmultAbase.h + ps_CmultAMult.h + ps_CompCosines.h + ps_GrassShader.h + ps_MoreCosines.h + ps_ShoreLeave6.h + ps_WaveDecEnv.h + ps_WaveFixed.h + ps_WaveGraph.h + ps_WaveGrid.h + ps_WaveRip.h + vs_BiasNormals.h + vs_CompCosines.h + vs_GrassShader.h + vs_ShoreLeave6.h + vs_ShoreLeave7.h + vs_WaveDec1Lay.h + vs_WaveDec1Lay_7.h + vs_WaveDec2Lay11.h + vs_WaveDec2Lay11_7.h + vs_WaveDec2Lay12.h + vs_WaveDec2Lay12_7.h + vs_WaveDecEnv.h + vs_WaveDecEnv_7.h + vs_WaveFixedFin6.h + vs_WaveFixedFin7.h + vs_WaveGraph2.h + vs_WaveGridFin.h + vs_WaveRip.h + vs_WaveRip7.h +) + +add_library(plSurface STATIC ${plSurface_SOURCES} ${plSurface_HEADERS} ${plSurface_SHADERS}) + +source_group("Source Files" FILES ${plSurface_SOURCES}) +source_group("Header Files" FILES ${plSurface_HEADERS}) +source_group("Shaders" FILES ${plSurface_SHADERS}) diff --git a/Sources/Plasma/PubUtilLib/plSurface/hsGMaterial.cpp b/Sources/Plasma/PubUtilLib/plSurface/hsGMaterial.cpp index 958a47b0..6bc7806f 100644 --- a/Sources/Plasma/PubUtilLib/plSurface/hsGMaterial.cpp +++ b/Sources/Plasma/PubUtilLib/plSurface/hsGMaterial.cpp @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "plLayerInterface.h" #include "plLayer.h" -#include "../plMessage/plMatRefMsg.h" +#include "plMessage/plMatRefMsg.h" #include "plProfile.h" plProfile_CreateTimer("MaterialAnims", "Animation", MaterialAnims); diff --git a/Sources/Plasma/PubUtilLib/plSurface/plGrassShaderMod.cpp b/Sources/Plasma/PubUtilLib/plSurface/plGrassShaderMod.cpp index c53947d0..85c33e16 100644 --- a/Sources/Plasma/PubUtilLib/plSurface/plGrassShaderMod.cpp +++ b/Sources/Plasma/PubUtilLib/plSurface/plGrassShaderMod.cpp @@ -45,23 +45,23 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "plgDispatch.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plUoid.h" -//#include "../pnSceneObject/plDrawInterface.h" +//#include "pnSceneObject/plDrawInterface.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../plMessage/plMatRefMsg.h" -#include "../plMessage/plAgeLoadedMsg.h" -#include "../plMessage/plLayRefMsg.h" +#include "pnMessage/plObjRefMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "plMessage/plMatRefMsg.h" +#include "plMessage/plAgeLoadedMsg.h" +#include "plMessage/plLayRefMsg.h" -#include "../plDrawable/plAccessGeometry.h" -#include "../plDrawable/plAccessSpan.h" -#include "../plDrawable/plAccessVtxSpan.h" +#include "plDrawable/plAccessGeometry.h" +#include "plDrawable/plAccessSpan.h" +#include "plDrawable/plAccessVtxSpan.h" -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plShader.h" -#include "../plSurface/plLayer.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plShader.h" +#include "plSurface/plLayer.h" void plGrassWave::Write(hsStream *s) { diff --git a/Sources/Plasma/PubUtilLib/plSurface/plGrassShaderMod.h b/Sources/Plasma/PubUtilLib/plSurface/plGrassShaderMod.h index 7048fa77..069cbf03 100644 --- a/Sources/Plasma/PubUtilLib/plSurface/plGrassShaderMod.h +++ b/Sources/Plasma/PubUtilLib/plSurface/plGrassShaderMod.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PLGRASSSHADERMOD_INC #define PLGRASSSHADERMOD_INC -#include "../pnModifier/plModifier.h" +#include "pnModifier/plModifier.h" class plSceneObject; class hsGMaterial; diff --git a/Sources/Plasma/PubUtilLib/plSurface/plLayer.cpp b/Sources/Plasma/PubUtilLib/plSurface/plLayer.cpp index 647da88a..30960c63 100644 --- a/Sources/Plasma/PubUtilLib/plSurface/plLayer.cpp +++ b/Sources/Plasma/PubUtilLib/plSurface/plLayer.cpp @@ -42,19 +42,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plLayer.h" -#include "../plMessage/plAnimCmdMsg.h" +#include "plMessage/plAnimCmdMsg.h" #include "hsStream.h" #include "hsResMgr.h" #include "hsMatrix44.h" #include "hsGMatState.inl" -#include "../plMessage/plLayRefMsg.h" -#include "../plGImage/plBitmap.h" -#include "../plPipeline/hsGDeviceRef.h" +#include "plMessage/plLayRefMsg.h" +#include "plGImage/plBitmap.h" +#include "plPipeline/hsGDeviceRef.h" #include "plShader.h" #include "plPipeline.h" #include "plgDispatch.h" -#include "../pnMessage/plPipeResMakeMsg.h" +#include "pnMessage/plPipeResMakeMsg.h" plLayer::plLayer() { diff --git a/Sources/Plasma/PubUtilLib/plSurface/plLayerAnimation.cpp b/Sources/Plasma/PubUtilLib/plSurface/plLayerAnimation.cpp index e979677a..8c7a9389 100644 --- a/Sources/Plasma/PubUtilLib/plSurface/plLayerAnimation.cpp +++ b/Sources/Plasma/PubUtilLib/plSurface/plLayerAnimation.cpp @@ -43,21 +43,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsTimer.h" #include "plLayerAnimation.h" -#include "../pnKeyedObject/plKey.h" - -#include "../plInterp/plController.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../pnMessage/plSDLModifierMsg.h" -#include "../plModifier/plLayerSDLModifier.h" -#include "../pnMessage/plCameraMsg.h" -#include "../plNetClient/plLinkEffectsMgr.h" +#include "pnKeyedObject/plKey.h" + +#include "plInterp/plController.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "pnMessage/plSDLModifierMsg.h" +#include "plModifier/plLayerSDLModifier.h" +#include "pnMessage/plCameraMsg.h" +#include "plNetClient/plLinkEffectsMgr.h" #include "plgDispatch.h" #include "hsResMgr.h" -#include "../plModifier/plSDLModifier.h" -#include "../plSDL/plSDL.h" -#include "../pnMessage/plSDLNotificationMsg.h" -#include "../plMessage/plAvatarMsg.h" +#include "plModifier/plSDLModifier.h" +#include "plSDL/plSDL.h" +#include "pnMessage/plSDLNotificationMsg.h" +#include "plMessage/plAvatarMsg.h" plLayerAnimationBase::plLayerAnimationBase() : diff --git a/Sources/Plasma/PubUtilLib/plSurface/plLayerAnimation.h b/Sources/Plasma/PubUtilLib/plSurface/plLayerAnimation.h index c9f66ea8..2f468275 100644 --- a/Sources/Plasma/PubUtilLib/plSurface/plLayerAnimation.h +++ b/Sources/Plasma/PubUtilLib/plSurface/plLayerAnimation.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plLayerAnimation_inc #include "plLayerInterface.h" -#include "../plInterp/plAnimTimeConvert.h" +#include "plInterp/plAnimTimeConvert.h" class plMessage; class plController; diff --git a/Sources/Plasma/PubUtilLib/plSurface/plLayerInterface.cpp b/Sources/Plasma/PubUtilLib/plSurface/plLayerInterface.cpp index 873a11a8..0ac74757 100644 --- a/Sources/Plasma/PubUtilLib/plSurface/plLayerInterface.cpp +++ b/Sources/Plasma/PubUtilLib/plSurface/plLayerInterface.cpp @@ -42,12 +42,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plLayerInterface.h" -#include "../plMessage/plLayRefMsg.h" +#include "plMessage/plLayRefMsg.h" #include "plLayer.h" #include "hsMatrix44.h" #include "hsGMatState.h" #include "hsResMgr.h" -#include "../pnNetCommon/plSDLTypes.h" +#include "pnNetCommon/plSDLTypes.h" plLayerInterface::plLayerInterface() : fUnderLay(nil), diff --git a/Sources/Plasma/PubUtilLib/plSurface/plLayerInterface.h b/Sources/Plasma/PubUtilLib/plSurface/plLayerInterface.h index eabe2c9b..4e829782 100644 --- a/Sources/Plasma/PubUtilLib/plSurface/plLayerInterface.h +++ b/Sources/Plasma/PubUtilLib/plSurface/plLayerInterface.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLayerInterface_inc #define plLayerInterface_inc -#include "../pnNetCommon/plSynchedValue.h" -#include "../pnNetCommon/plSynchedObject.h" +#include "pnNetCommon/plSynchedValue.h" +#include "pnNetCommon/plSynchedObject.h" #include "hsGMatState.h" struct hsMatrix44; diff --git a/Sources/Plasma/PubUtilLib/plSurface/plShader.cpp b/Sources/Plasma/PubUtilLib/plSurface/plShader.cpp index 106c2387..6d62616e 100644 --- a/Sources/Plasma/PubUtilLib/plSurface/plShader.cpp +++ b/Sources/Plasma/PubUtilLib/plSurface/plShader.cpp @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsMatrix44.h" #include "hsColorRGBA.h" -#include "../plPipeline/hsGDeviceRef.h" +#include "plPipeline/hsGDeviceRef.h" // Little shader const helper diff --git a/Sources/Plasma/PubUtilLib/plSurface/plShader.h b/Sources/Plasma/PubUtilLib/plSurface/plShader.h index f8ed121a..c159eee1 100644 --- a/Sources/Plasma/PubUtilLib/plSurface/plShader.h +++ b/Sources/Plasma/PubUtilLib/plSurface/plShader.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plShader_inc #define plShader_inc -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include "hsTemplates.h" #include "hsGeometry3.h" #include "hsMatrix44.h" diff --git a/Sources/Plasma/PubUtilLib/plSurface/plSurfaceCreatable.h b/Sources/Plasma/PubUtilLib/plSurface/plSurfaceCreatable.h index 951c13f4..4d9bb0a2 100644 --- a/Sources/Plasma/PubUtilLib/plSurface/plSurfaceCreatable.h +++ b/Sources/Plasma/PubUtilLib/plSurface/plSurfaceCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plSurfaceCreatable_inc #define plSurfaceCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "hsGMaterial.h" diff --git a/Sources/Plasma/PubUtilLib/plTransform/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plTransform/CMakeLists.txt new file mode 100644 index 00000000..f0cd243b --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plTransform/CMakeLists.txt @@ -0,0 +1,21 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plTransform_SOURCES + hsAffineParts.cpp + hsEuler.cpp + mat_decomp.cpp +) + +set(plTransform_HEADERS + hsAffineParts.h + hsEuler.h + mat_decomp.h +) + +add_library(plTransform STATIC ${plTransform_SOURCES} ${plTransform_HEADERS}) + +source_group("Source Files" FILES ${plTransform_SOURCES}) +source_group("Header Files" FILES ${plTransform_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plTransform/hsAffineParts.cpp b/Sources/Plasma/PubUtilLib/plTransform/hsAffineParts.cpp index 7638d879..feeba114 100644 --- a/Sources/Plasma/PubUtilLib/plTransform/hsAffineParts.cpp +++ b/Sources/Plasma/PubUtilLib/plTransform/hsAffineParts.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" #include "hsAffineParts.h" -#include "../plInterp/hsInterp.h" +#include "plInterp/hsInterp.h" #include "hsStream.h" #include "plProfile.h" diff --git a/Sources/Plasma/PubUtilLib/plUUID/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plUUID/CMakeLists.txt new file mode 100644 index 00000000..7aa05914 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plUUID/CMakeLists.txt @@ -0,0 +1,20 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plUUID_SOURCES + plUUID.cpp +) + +if(WIN32) + set(plUUID_SOURCES ${plUUID_SOURCES} plUUID_Win32.cpp) +endif(WIN32) + +set(plUUID_HEADERS + plUUID.h +) + +add_library(plUUID STATIC ${plUUID_SOURCES} ${plUUID_HEADERS}) + +source_group("Source Files" FILES ${plUUID_SOURCES}) +source_group("Header Files" FILES ${plUUID_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plUnifiedTime/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plUnifiedTime/CMakeLists.txt new file mode 100644 index 00000000..c21b43b4 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plUnifiedTime/CMakeLists.txt @@ -0,0 +1,21 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plUnifiedTime_SOURCES + plClientUnifiedTime.cpp + plTimeSpan.cpp + plUnifiedTime.cpp +) + +set(plUnifiedTime_HEADERS + plClientUnifiedTime.h + plTimeSpan.h + plUnifiedTime.h +) + +add_library(plUnifiedTime STATIC ${plUnifiedTime_SOURCES} ${plUnifiedTime_HEADERS}) + +source_group("Source Files" FILES ${plUnifiedTime_SOURCES}) +source_group("Header Files" FILES ${plUnifiedTime_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plUnifiedTime/plClientUnifiedTime.cpp b/Sources/Plasma/PubUtilLib/plUnifiedTime/plClientUnifiedTime.cpp index 339c53e7..5480eedc 100644 --- a/Sources/Plasma/PubUtilLib/plUnifiedTime/plClientUnifiedTime.cpp +++ b/Sources/Plasma/PubUtilLib/plUnifiedTime/plClientUnifiedTime.cpp @@ -45,8 +45,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plClientUnifiedTime.h" #if 0 -#include "../plNetClient/plNetObjectDebugger.h" -#include "../plNetClient/plNetClientMgr.h" +#include "plNetClient/plNetObjectDebugger.h" +#include "plNetClient/plNetClientMgr.h" #endif // static diff --git a/Sources/Plasma/PubUtilLib/plVault/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plVault/CMakeLists.txt new file mode 100644 index 00000000..2433fdbd --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plVault/CMakeLists.txt @@ -0,0 +1,30 @@ +include_directories("../../CoreLib") +include_directories("../../FeatureLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plVault_SOURCES + plDniCoordinateInfo.cpp + plVault.cpp + plVaultClientApi.cpp + plVaultConstants.cpp + plVaultNodeAccess.cpp +) + +set(plVault_HEADERS + Intern.h + Pch.h + plAgeInfoSource.h + plDniCoordinateInfo.h + plVault.h + plVaultClientApi.h + plVaultConstants.h + plVaultCreatable.h + plVaultNodeAccess.h +) + +add_library(plVault STATIC ${plVault_SOURCES} ${plVault_HEADERS}) + +source_group("Source Files" FILES ${plVault_SOURCES}) +source_group("Header Files" FILES ${plVault_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plVault/Pch.h b/Sources/Plasma/PubUtilLib/plVault/Pch.h index 803c7980..6e2a77e0 100644 --- a/Sources/Plasma/PubUtilLib/plVault/Pch.h +++ b/Sources/Plasma/PubUtilLib/plVault/Pch.h @@ -66,24 +66,24 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStlUtils.h" #include "hsStringTokenizer.h" #include "hsGeometry3.h" -#include "../plSDL/plSDL.h" -#include "../plUnifiedTime/plUnifiedTime.h" -#include "../plNetCommon/plNetCommon.h" -#include "../plNetCommon/plNetServerSessionInfo.h" -#include "../plNetCommon/plSpawnPointInfo.h" -#include "../pnDispatch/plDispatch.h" +#include "plSDL/plSDL.h" +#include "plUnifiedTime/plUnifiedTime.h" +#include "plNetCommon/plNetCommon.h" +#include "plNetCommon/plNetServerSessionInfo.h" +#include "plNetCommon/plSpawnPointInfo.h" +#include "pnDispatch/plDispatch.h" #include "plDniCoordinateInfo.h" -#include "../plGImage/plMipmap.h" -#include "../plJPEG/plJPEG.h" -#include "../plMessage/plVaultNotifyMsg.h" -#include "../plNetClientComm/plNetClientComm.h" +#include "plGImage/plMipmap.h" +#include "plJPEG/plJPEG.h" +#include "plMessage/plVaultNotifyMsg.h" +#include "plNetClientComm/plNetClientComm.h" #define KI_CONSTANTS_ONLY -#include "../../FeatureLib/pfMessage/pfKIMsg.h" // for KI level constants =( +#include "pfMessage/pfKIMsg.h" // for KI level constants =( #undef KI_CONSTANTS_ONLY #pragma warning(pop) -#include "../plNetGameLib/plNetGameLib.h" +#include "plNetGameLib/plNetGameLib.h" #endif // def CLIENT diff --git a/Sources/Plasma/PubUtilLib/plVault/plDniCoordinateInfo.h b/Sources/Plasma/PubUtilLib/plVault/plDniCoordinateInfo.h index f2e933ec..6318e5e2 100644 --- a/Sources/Plasma/PubUtilLib/plVault/plDniCoordinateInfo.h +++ b/Sources/Plasma/PubUtilLib/plVault/plDniCoordinateInfo.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsConfig.h" #include "hsStlUtils.h" -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" /////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plVault/plVault.h b/Sources/Plasma/PubUtilLib/plVault/plVault.h index 7e408a18..76c8cce1 100644 --- a/Sources/Plasma/PubUtilLib/plVault/plVault.h +++ b/Sources/Plasma/PubUtilLib/plVault/plVault.h @@ -48,10 +48,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PLASMA20_SOURCES_PLASMA_PUBUTILLIB_PLVAULT_PLVAULT_H #define PLASMA20_SOURCES_PLASMA_PUBUTILLIB_PLVAULT_PLVAULT_H -#include "../pnUtils/pnUtils.h" -#include "../pnNetBase/pnNetBase.h" -#include "../pnNetProtocol/pnNetProtocol.h" -#include "../pnAsyncCore/pnAsyncCore.h" +#include "pnUtils/pnUtils.h" +#include "pnNetBase/pnNetBase.h" +#include "pnNetProtocol/pnNetProtocol.h" +#include "pnAsyncCore/pnAsyncCore.h" #include "plVaultConstants.h" #include "plVaultNodeAccess.h" From 27e7a1cda94d74da049cd6bb97941b46b424d71e Mon Sep 17 00:00:00 2001 From: Zrax Date: Fri, 8 Apr 2011 00:05:33 -0700 Subject: [PATCH 08/18] A few minor tweaks (apparently the -DCLIENT is not needed, and is ignored by plVault anyway :( ) (cherry picked from commit ff1320388e7f5b7d9ca780ade86b8949642eb987) --- CMakeLists.txt | 4 ---- Sources/Plasma/NucleusLib/CMakeLists.txt | 2 ++ Sources/Plasma/NucleusLib/pnAsyncCore/CMakeLists.txt | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 90101ddb..f763e040 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,10 +20,6 @@ set(PLASMA_TARGETS Client set_property(CACHE PLASMA_TARGETS PROPERTY STRINGS "Client" "Server" "Patcher" "Ethereal" "NoAvMsgs") -if(PLASMA_TARGETS STREQUAL "Client") - add_definitions(-DCLIENT) -endif(PLASMA_TARGETS STREQUAL "Client") - if(PLASMA_TARGETS STREQUAL "Patcher") add_definitions(-DPATCHER) endif(PLASMA_TARGETS STREQUAL "Patcher") diff --git a/Sources/Plasma/NucleusLib/CMakeLists.txt b/Sources/Plasma/NucleusLib/CMakeLists.txt index 0ea09368..d17fd048 100644 --- a/Sources/Plasma/NucleusLib/CMakeLists.txt +++ b/Sources/Plasma/NucleusLib/CMakeLists.txt @@ -1,3 +1,5 @@ +add_definitions(-D_LIB) + add_subdirectory(pnAddrInfo) add_subdirectory(pnAsyncCore) add_subdirectory(pnAsyncCoreExe) diff --git a/Sources/Plasma/NucleusLib/pnAsyncCore/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnAsyncCore/CMakeLists.txt index 492111ff..829c4b5d 100644 --- a/Sources/Plasma/NucleusLib/pnAsyncCore/CMakeLists.txt +++ b/Sources/Plasma/NucleusLib/pnAsyncCore/CMakeLists.txt @@ -3,10 +3,10 @@ include_directories(../../NucleusLib) set(pnAsyncCore_HEADERS Pch.h + pnAsyncCore.h ) set(pnAsyncCore_PRIVATE - pnAsyncCore.h Private/pnAcAllIncludes.h Private/pnAcCore.h Private/pnAcIo.h @@ -19,4 +19,4 @@ set(pnAsyncCore_PRIVATE add_library(pnAsyncCore STATIC ${pnAsyncCore_PRIVATE} ${pnAsyncCore_HEADERS}) source_group("Header Files" FILES ${pnAsyncCore_HEADERS}) -source_group("Private" FILES ${pnAsyncCore_PRIVATE}) \ No newline at end of file +source_group("Private" FILES ${pnAsyncCore_PRIVATE}) From afa3f2c67a96eec761ee5b1f2dc765c8624dd60c Mon Sep 17 00:00:00 2001 From: Branan Purvine-Riley Date: Fri, 8 Apr 2011 00:42:40 -0700 Subject: [PATCH 09/18] Finish the port of FeatureLib to CMake (cherry picked from commit 4134a68f2cdea6aa23cb132ae1ff6581817875e0) --- CMakeLists.txt | 6 +- Sources/Plasma/Apps/plClient/plClient.h | 6 +- Sources/Plasma/FeatureLib/CMakeLists.txt | 27 +- .../Plasma/FeatureLib/pfCCR/CMakeLists.txt | 18 + .../Plasma/FeatureLib/pfCamera/CMakeLists.txt | 29 ++ .../FeatureLib/pfCamera/pfCameraCreatable.h | 2 +- .../FeatureLib/pfCamera/pfCameraProxy.cpp | 6 +- .../FeatureLib/pfCamera/pfCameraProxy.h | 2 +- .../FeatureLib/pfCamera/plCameraBrain.cpp | 46 +-- .../FeatureLib/pfCamera/plCameraBrain.h | 2 +- .../FeatureLib/pfCamera/plCameraModifier.cpp | 32 +- .../FeatureLib/pfCamera/plCameraModifier.h | 2 +- .../pfCamera/plInterestingModifier.cpp | 10 +- .../pfCamera/plInterestingModifier.h | 4 +- .../FeatureLib/pfCamera/plVirtualCamNeu.cpp | 64 ++-- .../FeatureLib/pfCamera/plVirtualCamNeu.h | 2 +- .../FeatureLib/pfCharacter/CMakeLists.txt | 25 ++ .../FeatureLib/pfCharacter/pfMarkerInfo.cpp | 24 +- .../FeatureLib/pfCharacter/pfMarkerInfo.h | 4 +- .../FeatureLib/pfCharacter/pfMarkerMgr.cpp | 14 +- .../FeatureLib/pfCharacter/pfMarkerMgr.h | 2 +- .../FeatureLib/pfConditional/CMakeLists.txt | 40 ++ .../pfConditional/plANDConditionalObject.cpp | 8 +- .../pfConditional/plANDConditionalObject.h | 2 +- .../plActivatorConditionalObject.cpp | 8 +- .../plActivatorConditionalObject.h | 2 +- .../plAnimationEventConditionalObject.cpp | 8 +- .../plAnimationEventConditionalObject.h | 6 +- .../plConditionalObjectCreatable.h | 2 +- .../plControlEventConditionalObject.cpp | 6 +- .../plControlEventConditionalObject.h | 4 +- .../plFacingConditionalObject.cpp | 16 +- .../pfConditional/plFacingConditionalObject.h | 2 +- .../plKeyPressConditionalObject.cpp | 6 +- .../plKeyPressConditionalObject.h | 4 +- .../plLocalPlayerInBoxConditionalObject.cpp | 4 +- .../plLocalPlayerInBoxConditionalObject.h | 2 +- ...lPlayerIntersectPlaneConditionalObject.cpp | 4 +- ...calPlayerIntersectPlaneConditionalObject.h | 2 +- .../pfConditional/plORConditionalObject.cpp | 6 +- .../pfConditional/plORConditionalObject.h | 2 +- .../plObjectInBoxConditionalObject.cpp | 20 +- .../plObjectInBoxConditionalObject.h | 2 +- ...lObjectIntersectPlaneConditionalObject.cpp | 4 +- .../plObjectIntersectPlaneConditionalObject.h | 2 +- .../plPickedConditionalObject.cpp | 6 +- .../pfConditional/plPickedConditionalObject.h | 2 +- .../FeatureLib/pfConsole/CMakeLists.txt | 38 ++ .../pfConsole/pfAvatarConsoleCommands.cpp | 72 ++-- .../Plasma/FeatureLib/pfConsole/pfConsole.cpp | 26 +- .../Plasma/FeatureLib/pfConsole/pfConsole.h | 2 +- .../pfConsole/pfConsoleCommands.cpp | 244 ++++++------ .../pfConsole/pfConsoleCommandsNet.cpp | 60 +-- .../FeatureLib/pfConsole/pfConsoleEngine.cpp | 2 +- .../FeatureLib/pfConsole/pfDispatchLog.cpp | 16 +- .../FeatureLib/pfConsole/pfDispatchLog.h | 2 +- .../pfConsole/pfGameConsoleCommands.cpp | 30 +- .../Plasma/FeatureLib/pfCsrSrv/CMakeLists.txt | 19 + .../FeatureLib/pfGameGUIMgr/CMakeLists.txt | 67 ++++ .../pfGameGUIMgr/pfGUIButtonMod.cpp | 10 +- .../pfGameGUIMgr/pfGUICheckBoxCtrl.cpp | 10 +- .../pfGameGUIMgr/pfGUIClickMapCtrl.cpp | 6 +- .../pfGameGUIMgr/pfGUIControlHandlers.cpp | 2 +- .../pfGameGUIMgr/pfGUIControlMod.cpp | 30 +- .../FeatureLib/pfGameGUIMgr/pfGUIControlMod.h | 4 +- .../pfGameGUIMgr/pfGUICtrlGenerator.cpp | 36 +- .../pfGameGUIMgr/pfGUIDialogMod.cpp | 22 +- .../FeatureLib/pfGameGUIMgr/pfGUIDialogMod.h | 2 +- .../pfGameGUIMgr/pfGUIDialogNotifyProc.cpp | 2 +- .../pfGameGUIMgr/pfGUIDialogNotifyProc.h | 2 +- .../pfGameGUIMgr/pfGUIDragBarCtrl.cpp | 10 +- .../pfGameGUIMgr/pfGUIDraggableMod.cpp | 10 +- .../pfGameGUIMgr/pfGUIDynDisplayCtrl.cpp | 10 +- .../pfGameGUIMgr/pfGUIEditBoxMod.cpp | 14 +- .../FeatureLib/pfGameGUIMgr/pfGUIEditBoxMod.h | 4 +- .../FeatureLib/pfGameGUIMgr/pfGUIKnobCtrl.cpp | 22 +- .../pfGameGUIMgr/pfGUIListBoxMod.cpp | 12 +- .../pfGameGUIMgr/pfGUIListElement.cpp | 6 +- .../FeatureLib/pfGameGUIMgr/pfGUIMenuItem.cpp | 6 +- .../pfGameGUIMgr/pfGUIMultiLineEditCtrl.cpp | 10 +- .../pfGameGUIMgr/pfGUIMultiLineEditCtrl.h | 2 +- .../pfGameGUIMgr/pfGUIPopUpMenu.cpp | 34 +- .../pfGameGUIMgr/pfGUIProgressCtrl.cpp | 26 +- .../pfGameGUIMgr/pfGUIRadioGroupCtrl.cpp | 4 +- .../pfGameGUIMgr/pfGUITextBoxMod.cpp | 14 +- .../pfGameGUIMgr/pfGUIUpDownPairMod.cpp | 8 +- .../FeatureLib/pfGameGUIMgr/pfGameGUIMgr.cpp | 26 +- .../FeatureLib/pfGameGUIMgr/pfGameGUIMgr.h | 4 +- .../pfGameGUIMgr/pfGameGUIMgrCreatable.h | 2 +- .../FeatureLib/pfGameMgr/CMakeLists.txt | 35 ++ Sources/Plasma/FeatureLib/pfGameMgr/Pch.h | 22 +- .../Plasma/FeatureLib/pfGameMgr/pfGameMgr.h | 16 +- .../FeatureLib/pfGameScoreMgr/CMakeLists.txt | 17 + .../pfGameScoreMgr/pfGameScoreMgr.cpp | 6 +- .../pfGameScoreMgr/pfGameScoreMgr.h | 4 +- .../FeatureLib/pfJournalBook/CMakeLists.txt | 21 ++ .../pfJournalBook/pfJournalBook.cpp | 66 ++-- .../FeatureLib/pfJournalBook/pfJournalBook.h | 4 +- .../pfLocalizationMgr/CMakeLists.txt | 25 ++ .../pfLocalizationDataMgr.cpp | 15 +- .../FeatureLib/pfLoginDialog/CMakeLists.txt | 23 ++ .../pfLoginDialog/plLoginDialog.cpp | 12 +- .../FeatureLib/pfLoginDialog/plLoginDialog.h | 6 +- .../FeatureLib/pfMessage/CMakeLists.txt | 28 ++ .../FeatureLib/pfMessage/pfBackdoorMsg.h | 2 +- .../FeatureLib/pfMessage/pfGUINotifyMsg.h | 4 +- .../FeatureLib/pfMessage/pfGameGUIMsg.h | 2 +- .../Plasma/FeatureLib/pfMessage/pfKIMsg.cpp | 2 +- Sources/Plasma/FeatureLib/pfMessage/pfKIMsg.h | 2 +- .../Plasma/FeatureLib/pfMessage/pfMarkerMsg.h | 2 +- .../FeatureLib/pfMessage/pfMessageCreatable.h | 2 +- .../FeatureLib/pfMessage/pfMovieEventMsg.h | 2 +- .../pfMessage/plArmatureEffectMsg.cpp | 2 +- .../pfMessage/plArmatureEffectMsg.h | 2 +- .../FeatureLib/pfMessage/plClothingMsg.h | 4 +- .../Plasma/FeatureLib/pfPython/CMakeLists.txt | 357 ++++++++++++++++++ .../Games/BlueSpiral/pyBlueSpiralGame.h | 2 +- .../Games/BlueSpiral/pyBlueSpiralMsg.h | 2 +- .../Games/ClimbingWall/pyClimbingWallGame.h | 2 +- .../Games/ClimbingWall/pyClimbingWallMsg.h | 2 +- .../pfPython/Games/Heek/pyHeekGame.h | 2 +- .../pfPython/Games/Heek/pyHeekMsg.h | 2 +- .../pfPython/Games/Marker/pyMarkerGame.h | 2 +- .../pfPython/Games/Marker/pyMarkerMsg.h | 2 +- .../pfPython/Games/TicTacToe/pyTTTGame.h | 2 +- .../pfPython/Games/TicTacToe/pyTTTMsg.h | 2 +- .../pfPython/Games/VarSync/pyVarSyncGame.h | 2 +- .../pfPython/Games/VarSync/pyVarSyncMsg.h | 2 +- .../FeatureLib/pfPython/Games/pyGameCli.h | 2 +- .../FeatureLib/pfPython/Games/pyGameCliMsg.h | 2 +- .../FeatureLib/pfPython/Games/pyGameMgrMsg.h | 2 +- .../pfPython/cyAccountManagement.cpp | 2 +- .../pfPython/cyAccountManagementGlue.cpp | 2 +- .../FeatureLib/pfPython/cyAnimation.cpp | 4 +- .../Plasma/FeatureLib/pfPython/cyAvatar.cpp | 50 +-- Sources/Plasma/FeatureLib/pfPython/cyAvatar.h | 2 +- .../FeatureLib/pfPython/cyAvatarGlue.cpp | 2 +- .../Plasma/FeatureLib/pfPython/cyCamera.cpp | 14 +- Sources/Plasma/FeatureLib/pfPython/cyCamera.h | 2 +- Sources/Plasma/FeatureLib/pfPython/cyDraw.cpp | 2 +- Sources/Plasma/FeatureLib/pfPython/cyDraw.h | 2 +- .../FeatureLib/pfPython/cyInputInterface.cpp | 4 +- Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp | 116 +++--- Sources/Plasma/FeatureLib/pfPython/cyMisc.h | 2 +- .../FeatureLib/pfPython/cyMiscGlue2.cpp | 6 +- .../FeatureLib/pfPython/cyMiscGlue4.cpp | 4 +- .../FeatureLib/pfPython/cyParticleSys.cpp | 4 +- .../FeatureLib/pfPython/cyParticleSys.h | 2 +- .../Plasma/FeatureLib/pfPython/cyPhysics.cpp | 18 +- .../Plasma/FeatureLib/pfPython/cyPhysics.h | 2 +- .../FeatureLib/pfPython/cyPythonInterface.cpp | 4 +- .../FeatureLib/pfPython/plPythonFileMod.cpp | 88 ++--- .../FeatureLib/pfPython/plPythonFileMod.h | 2 +- .../FeatureLib/pfPython/plPythonPack.cpp | 6 +- .../FeatureLib/pfPython/plPythonParameter.h | 2 +- .../pfPython/plPythonSDLModifier.cpp | 12 +- .../FeatureLib/pfPython/plPythonSDLModifier.h | 2 +- .../FeatureLib/pfPython/pyAgeInfoStruct.h | 2 +- .../FeatureLib/pfPython/pyAgeLinkStruct.h | 2 +- .../Plasma/FeatureLib/pfPython/pyAgeVault.cpp | 14 +- .../FeatureLib/pfPython/pyAudioControl.cpp | 8 +- .../Plasma/FeatureLib/pfPython/pyCluster.cpp | 2 +- .../FeatureLib/pfPython/pyCritterBrain.cpp | 2 +- .../pfPython/pyCritterBrainGlue.cpp | 2 +- .../FeatureLib/pfPython/pyDniCoordinates.cpp | 4 +- .../pfPython/pyDniCoordinatesGlue.cpp | 2 +- .../FeatureLib/pfPython/pyDniInfoSource.cpp | 8 +- .../FeatureLib/pfPython/pyDrawControl.cpp | 12 +- .../FeatureLib/pfPython/pyDynamicText.cpp | 4 +- .../FeatureLib/pfPython/pyDynamicTextGlue.cpp | 2 +- .../FeatureLib/pfPython/pyGUIControl.cpp | 4 +- .../pfPython/pyGUIControlButton.cpp | 2 +- .../pfPython/pyGUIControlButtonGlue.cpp | 2 +- .../pfPython/pyGUIControlCheckBox.cpp | 4 +- .../pfPython/pyGUIControlClickMap.cpp | 4 +- .../pfPython/pyGUIControlDragBar.cpp | 2 +- .../pfPython/pyGUIControlDraggable.cpp | 4 +- .../pfPython/pyGUIControlDynamicText.cpp | 4 +- .../pfPython/pyGUIControlEditBox.cpp | 2 +- .../pfPython/pyGUIControlListBox.cpp | 8 +- .../pfPython/pyGUIControlMultiLineEdit.cpp | 2 +- .../pyGUIControlMultiLineEditGlue.cpp | 2 +- .../pfPython/pyGUIControlRadioGroup.cpp | 2 +- .../pfPython/pyGUIControlTextBox.cpp | 4 +- .../FeatureLib/pfPython/pyGUIControlTextBox.h | 2 +- .../FeatureLib/pfPython/pyGUIControlValue.cpp | 8 +- .../FeatureLib/pfPython/pyGUIDialog.cpp | 10 +- .../FeatureLib/pfPython/pyGUIPopUpMenu.cpp | 6 +- .../FeatureLib/pfPython/pyGUIPopUpMenu.h | 2 +- .../Plasma/FeatureLib/pfPython/pyGUISkin.cpp | 5 +- .../FeatureLib/pfPython/pyGameScore.cpp | 2 +- .../FeatureLib/pfPython/pyGameScoreGlue.cpp | 2 +- .../FeatureLib/pfPython/pyGrassShader.cpp | 2 +- .../Plasma/FeatureLib/pfPython/pyImage.cpp | 6 +- Sources/Plasma/FeatureLib/pfPython/pyImage.h | 2 +- .../FeatureLib/pfPython/pyJournalBook.cpp | 4 +- .../FeatureLib/pfPython/pyJournalBookGlue.cpp | 2 +- Sources/Plasma/FeatureLib/pfPython/pyKey.cpp | 6 +- Sources/Plasma/FeatureLib/pfPython/pyKey.h | 2 +- .../Plasma/FeatureLib/pfPython/pyKeyMap.cpp | 4 +- Sources/Plasma/FeatureLib/pfPython/pyKeyMap.h | 2 +- .../FeatureLib/pfPython/pyMarkerMgr.cpp | 2 +- .../FeatureLib/pfPython/pyMarkerMgrGlue.cpp | 2 +- .../FeatureLib/pfPython/pyMoviePlayer.cpp | 4 +- .../FeatureLib/pfPython/pyMoviePlayerGlue.cpp | 2 +- .../FeatureLib/pfPython/pyNetLinkingMgr.cpp | 6 +- .../pfPython/pyNetLinkingMgrGlue.cpp | 2 +- .../pfPython/pyNetServerSessionInfo.h | 4 +- .../Plasma/FeatureLib/pfPython/pyNotify.cpp | 2 +- Sources/Plasma/FeatureLib/pfPython/pyNotify.h | 2 +- Sources/Plasma/FeatureLib/pfPython/pySDL.cpp | 2 +- .../Plasma/FeatureLib/pfPython/pySDLGlue.cpp | 2 +- .../FeatureLib/pfPython/pySceneObject.cpp | 30 +- .../Plasma/FeatureLib/pfPython/pyScoreMgr.cpp | 6 +- .../FeatureLib/pfPython/pyScoreMgrGlue.cpp | 2 +- .../FeatureLib/pfPython/pySpawnPointInfo.h | 2 +- .../FeatureLib/pfPython/pyStatusLog.cpp | 2 +- .../FeatureLib/pfPython/pyStatusLogGlue.cpp | 2 +- .../Plasma/FeatureLib/pfPython/pyStream.cpp | 2 +- .../pfPython/pySwimCurrentInterface.cpp | 2 +- .../Plasma/FeatureLib/pfPython/pyVault.cpp | 16 +- .../pfPython/pyVaultAgeInfoListNode.cpp | 2 +- .../pfPython/pyVaultAgeInfoListNodeGlue.cpp | 2 +- .../pfPython/pyVaultAgeInfoNode.cpp | 2 +- .../pfPython/pyVaultAgeInfoNodeGlue.cpp | 2 +- .../pfPython/pyVaultAgeLinkNode.cpp | 4 +- .../FeatureLib/pfPython/pyVaultAgeLinkNode.h | 2 +- .../pfPython/pyVaultAgeLinkNodeGlue.cpp | 2 +- .../pfPython/pyVaultChronicleNode.cpp | 2 +- .../pfPython/pyVaultChronicleNodeGlue.cpp | 3 +- .../FeatureLib/pfPython/pyVaultFolderNode.cpp | 2 +- .../pfPython/pyVaultFolderNodeGlue.cpp | 2 +- .../FeatureLib/pfPython/pyVaultGlue.cpp | 4 +- .../FeatureLib/pfPython/pyVaultImageNode.cpp | 8 +- .../FeatureLib/pfPython/pyVaultImageNode.h | 2 +- .../pfPython/pyVaultImageNodeGlue.cpp | 2 +- .../pfPython/pyVaultMarkerGameNode.cpp | 2 +- .../pfPython/pyVaultMarkerGameNode.h | 2 +- .../pfPython/pyVaultMarkerGameNodeGlue.cpp | 2 +- .../FeatureLib/pfPython/pyVaultNode.cpp | 8 +- .../FeatureLib/pfPython/pyVaultNodeGlue.cpp | 2 +- .../FeatureLib/pfPython/pyVaultNodeRef.cpp | 2 +- .../pfPython/pyVaultNodeRefGlue.cpp | 2 +- .../pfPython/pyVaultPlayerInfoListNode.cpp | 2 +- .../pyVaultPlayerInfoListNodeGlue.cpp | 2 +- .../pfPython/pyVaultPlayerInfoNode.cpp | 2 +- .../pfPython/pyVaultPlayerInfoNodeGlue.cpp | 2 +- .../FeatureLib/pfPython/pyVaultPlayerNode.cpp | 20 +- .../FeatureLib/pfPython/pyVaultPlayerNode.h | 4 +- .../pfPython/pyVaultPlayerNodeGlue.cpp | 2 +- .../FeatureLib/pfPython/pyVaultSDLNode.cpp | 4 +- .../pfPython/pyVaultSDLNodeGlue.cpp | 2 +- .../FeatureLib/pfPython/pyVaultSystemNode.cpp | 2 +- .../pfPython/pyVaultSystemNodeGlue.cpp | 2 +- .../pfPython/pyVaultTextNoteNode.cpp | 2 +- .../pfPython/pyVaultTextNoteNodeGlue.cpp | 2 +- .../Plasma/FeatureLib/pfPython/pyWaveSet.cpp | 2 +- .../pfSecurePreloader/CMakeLists.txt | 22 ++ .../pfSecurePreloader/pfSecurePreloader.cpp | 24 +- .../pfSecurePreloader/pfSecurePreloader.h | 4 +- .../pfSecurePreloaderCreatable.h | 2 +- .../FeatureLib/pfStackTrace/CMakeLists.txt | 27 ++ .../FeatureLib/pfSurface/CMakeLists.txt | 34 ++ .../FeatureLib/pfSurface/pfSurfaceCreatable.h | 2 +- .../FeatureLib/pfSurface/plDistOpacityMod.cpp | 14 +- .../FeatureLib/pfSurface/plDistOpacityMod.h | 2 +- .../FeatureLib/pfSurface/plFadeOpacityLay.h | 2 +- .../FeatureLib/pfSurface/plFadeOpacityMod.cpp | 20 +- .../FeatureLib/pfSurface/plFadeOpacityMod.h | 2 +- .../FeatureLib/pfSurface/plGrabCubeMap.cpp | 10 +- .../FeatureLib/pfSurface/plGrabCubeMap.h | 2 +- .../FeatureLib/pfSurface/plLayerAVI.cpp | 2 +- .../FeatureLib/pfSurface/plLayerMovie.cpp | 6 +- .../FeatureLib/pfSurface/plLayerMovie.h | 4 +- 274 files changed, 1950 insertions(+), 1105 deletions(-) create mode 100644 Sources/Plasma/FeatureLib/pfCCR/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfCamera/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfCharacter/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfConditional/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfConsole/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfCsrSrv/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfGameGUIMgr/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfGameMgr/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfGameScoreMgr/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfJournalBook/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfLocalizationMgr/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfLoginDialog/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfMessage/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfSecurePreloader/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfStackTrace/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfSurface/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index f763e040..1adcbda7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,11 +4,15 @@ cmake_minimum_required(VERSION 2.8) # Find all 3rd-party libraries that are required find_package(OpenSSL REQUIRED) find_package(OpenAL REQUIRED) +find_package(PythonLibs REQUIRED) +find_package(ZLIB REQUIRED) +find_package(EXPAT REQUIRED) find_package(ZLIB REQUIRED) option(EXTERNAL_RELEASE "Is this release intended for the general public?" OFF) -#TODO: Don't hard code this +# TODO: are there any other build types which are useful for us? +>>>>>>> Finish the port of FeatureLib to CMake add_definitions(-DBUILD_TYPE=BUILD_TYPE_LIVE) if(EXTERNAL_RELEASE) diff --git a/Sources/Plasma/Apps/plClient/plClient.h b/Sources/Plasma/Apps/plClient/plClient.h index 1038a8f5..24cbaf02 100644 --- a/Sources/Plasma/Apps/plClient/plClient.h +++ b/Sources/Plasma/Apps/plClient/plClient.h @@ -52,9 +52,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTemplates.h" #include "hsUtils.h" #include "hsStlUtils.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnKeyedObject/plUoid.h" -#include "../plScene/plRenderRequest.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/plUoid.h" +#include "plScene/plRenderRequest.h" class plSceneNode; class plPipeline; diff --git a/Sources/Plasma/FeatureLib/CMakeLists.txt b/Sources/Plasma/FeatureLib/CMakeLists.txt index a60bb33a..12841ad1 100644 --- a/Sources/Plasma/FeatureLib/CMakeLists.txt +++ b/Sources/Plasma/FeatureLib/CMakeLists.txt @@ -1,2 +1,25 @@ -add_subdirectory(pfAnimation) -add_subdirectory(pfAudio) +add_definitions(-D_LIB) + +add_subdirectory(pfAnimation) +add_subdirectory(pfAudio) +add_subdirectory(pfCCR) +add_subdirectory(pfCamera) +add_subdirectory(pfCharacter) +add_subdirectory(pfConditional) +add_subdirectory(pfConsole) +add_subdirectory(pfCsrSrv) +add_subdirectory(pfGameGUIMgr) +add_subdirectory(pfGameMgr) +add_subdirectory(pfGameScoreMgr) +add_subdirectory(pfJournalBook) +# pfKI is apparently just a historical oddity at this point +# add_subdirectory(pfKI) +add_subdirectory(pfLocalizationMgr) +# This is missing required parts in other plasma libraries. +# Also not referenced by any sln file +# add_subdirectory(pfLoginDialog) +add_subdirectory(pfMessage) +add_subdirectory(pfPython) +add_subdirectory(pfSecurePreloader) +add_subdirectory(pfStackTrace) +add_subdirectory(pfSurface) diff --git a/Sources/Plasma/FeatureLib/pfCCR/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfCCR/CMakeLists.txt new file mode 100644 index 00000000..6fc5e1c9 --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfCCR/CMakeLists.txt @@ -0,0 +1,18 @@ +include_directories(../../CoreLib) +include_directories(../../NucleusLib/inc) + +set(pfCCR_SOURCES + plCCRMgr.cpp + plCCRVault.cpp +) + +set(pfCCR_HEADERS + plCCRCreatable.h + plCCRMgr.h + plCCRVault.h +) + +add_library(pfCCR STATIC ${pfCCR_SOURCES} ${pfCCR_HEADERS}) + +source_group("Source Files" FILES ${pfCCR_SOURCES}) +source_group("Header Files" FILES ${pfCCR_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfCamera/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfCamera/CMakeLists.txt new file mode 100644 index 00000000..f759c748 --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfCamera/CMakeLists.txt @@ -0,0 +1,29 @@ +include_directories(../../CoreLib) +include_directories(../../FeatureLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) +include_directories(../../PubUtilLib) + +include_directories(${OPENSSL_INCLUDE_DIR}) + +set(pfCamera_SOURCES + pfCameraProxy.cpp + plCameraBrain.cpp + plCameraModifier.cpp + plInterestingModifier.cpp + plVirtualCamNeu.cpp +) + +set(pfCamera_HEADERS + pfCameraCreatable.h + pfCameraProxy.h + plCameraBrain.h + plCameraModifier.h + plInterestingModifier.h + plVirtualCamNeu.h +) + +add_library(pfCamera STATIC ${pfCamera_SOURCES} ${pfCamera_HEADERS}) + +source_group("Source Files" FILES ${pfCamera_SOURCES}) +source_group("Header Files" FILES ${pfCamera_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfCamera/pfCameraCreatable.h b/Sources/Plasma/FeatureLib/pfCamera/pfCameraCreatable.h index cb71e899..a1f3c98f 100644 --- a/Sources/Plasma/FeatureLib/pfCamera/pfCameraCreatable.h +++ b/Sources/Plasma/FeatureLib/pfCamera/pfCameraCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pfCameraCreatable_inc #define pfCameraCreatable_inc -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" #include "plCameraBrain.h" diff --git a/Sources/Plasma/FeatureLib/pfCamera/pfCameraProxy.cpp b/Sources/Plasma/FeatureLib/pfCamera/pfCameraProxy.cpp index 4c29862e..7644d13c 100644 --- a/Sources/Plasma/FeatureLib/pfCamera/pfCameraProxy.cpp +++ b/Sources/Plasma/FeatureLib/pfCamera/pfCameraProxy.cpp @@ -43,9 +43,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "pfCameraProxy.h" #include "plVirtualCamNeu.h" -#include "../plDrawable/plDrawableGenerator.h" -#include "../pnMessage/plProxyDrawMsg.h" -#include "../plScene/plSceneNode.h" +#include "plDrawable/plDrawableGenerator.h" +#include "pnMessage/plProxyDrawMsg.h" +#include "plScene/plSceneNode.h" plCameraProxy::plCameraProxy() : 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/FeatureLib/pfCamera/pfCameraProxy.h b/Sources/Plasma/FeatureLib/pfCamera/pfCameraProxy.h index ea6e42a5..2e13c49d 100644 --- a/Sources/Plasma/FeatureLib/pfCamera/pfCameraProxy.h +++ b/Sources/Plasma/FeatureLib/pfCamera/pfCameraProxy.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plCameraProxy_inc #define plCameraProxy_inc -#include "../plDrawable/plProxyGen.h" +#include "plDrawable/plProxyGen.h" class plVirtualCam1; class plSceneNode; diff --git a/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.cpp b/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.cpp index 0d6a0298..901ceadb 100644 --- a/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.cpp +++ b/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.cpp @@ -48,29 +48,29 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plCameraModifier.h" #include "plVirtualCamNeu.h" #include "plgDispatch.h" -#include "../plInterp/plController.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnSceneObject/plSimulationInterface.h" -#include "../pnSceneObject/plDrawInterface.h" -#include "../plScene/plSceneNode.h" -#include "../pnMessage/plCameraMsg.h" -#include "../pnMessage/plPlayerPageMsg.h" -#include "../pnMessage/plEnableMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../plMessage/plInputEventMsg.h" -#include "../plMessage/plLOSRequestMsg.h" -#include "../plMessage/plLOSHitMsg.h" -#include "../plMessage/plAvatarMsg.h" -#include "../pnKeyedObject/plKey.h" -#include "../plInputCore/plInputDevice.h" -#include "../plInputCore/plInputManager.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pfAnimation/plLineFollowMod.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plAvatar/plArmatureMod.h" -#include "../plAvatar/plAvBrainHuman.h" -#include "../plNetClient/plNetClientMgr.h" +#include "plInterp/plController.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plSimulationInterface.h" +#include "pnSceneObject/plDrawInterface.h" +#include "plScene/plSceneNode.h" +#include "pnMessage/plCameraMsg.h" +#include "pnMessage/plPlayerPageMsg.h" +#include "pnMessage/plEnableMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "plMessage/plInputEventMsg.h" +#include "plMessage/plLOSRequestMsg.h" +#include "plMessage/plLOSHitMsg.h" +#include "plMessage/plAvatarMsg.h" +#include "pnKeyedObject/plKey.h" +#include "plInputCore/plInputDevice.h" +#include "plInputCore/plInputManager.h" +#include "pnNetCommon/plNetApp.h" +#include "pfAnimation/plLineFollowMod.h" +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plArmatureMod.h" +#include "plAvatar/plAvBrainHuman.h" +#include "plNetClient/plNetClientMgr.h" hsBool plCameraBrain1_FirstPerson::fDontFade = false; hsScalar plCameraBrain1::fFallAccel = 20.0f; diff --git a/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.h b/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.h index 518e7c32..628fcca9 100644 --- a/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.h +++ b/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plCameraBrain_inc #define plCameraBrain_inc -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include "hsMatrix44.h" #include "hsBitVector.h" #include "hsTemplates.h" diff --git a/Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.cpp b/Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.cpp index e5b72cbe..459a9300 100644 --- a/Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.cpp +++ b/Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.cpp @@ -46,24 +46,24 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plVirtualCamNeu.h" #include "hsTimer.h" #include "plgDispatch.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../plMessage/plInputEventMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../plInputCore/plInputDevice.h" -#include "../plInputCore/plInputManager.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "plMessage/plInputEventMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plFixedKey.h" +#include "plInputCore/plInputDevice.h" +#include "plInputCore/plInputManager.h" #include "hsResMgr.h" -#include "../pnMessage/plCameraMsg.h" -#include "../plPhysical/plSimDefs.h" +#include "pnMessage/plCameraMsg.h" +#include "plPhysical/plSimDefs.h" #include "plPhysical.h" -#include "../pnSceneObject/plSimulationInterface.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plAvatar/plArmatureMod.h" -#include "../plAvatar/plPhysicalControllerCore.h" +#include "pnSceneObject/plSimulationInterface.h" +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plArmatureMod.h" +#include "plAvatar/plPhysicalControllerCore.h" // new stuff @@ -491,4 +491,4 @@ void plCameraModifier1::SetTransform(hsPoint3 at) l2w.Make(&fFrom, &at, &up); l2w.GetInverse(&w2l); IGetTargetCoordinateInterface(0)->SetTransform( l2w, w2l ); -} \ No newline at end of file +} diff --git a/Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.h b/Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.h index 828c72dc..18780fcd 100644 --- a/Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.h +++ b/Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plCameraModifier_inc #define plCameraModifier_inc -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" #include "hsBitVector.h" #include "hsGeometry3.h" #include "hsTemplates.h" diff --git a/Sources/Plasma/FeatureLib/pfCamera/plInterestingModifier.cpp b/Sources/Plasma/FeatureLib/pfCamera/plInterestingModifier.cpp index 7d98e01b..45d51d20 100644 --- a/Sources/Plasma/FeatureLib/pfCamera/plInterestingModifier.cpp +++ b/Sources/Plasma/FeatureLib/pfCamera/plInterestingModifier.cpp @@ -43,13 +43,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsGeometry3.h" #include "plgDispatch.h" -#include "../pnSceneObject/plDrawInterface.h" -#include "../plMessage/plInterestingPing.h" +#include "pnSceneObject/plDrawInterface.h" +#include "plMessage/plInterestingPing.h" #include "hsBounds.h" #include "plInterestingModifier.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnKeyedObject/plKey.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnMessage/plTimeMsg.h" +#include "pnKeyedObject/plKey.h" hsScalar plInterestingModifier::fInterestRadius = 100.0f; diff --git a/Sources/Plasma/FeatureLib/pfCamera/plInterestingModifier.h b/Sources/Plasma/FeatureLib/pfCamera/plInterestingModifier.h index 445d7eef..0c2fa130 100644 --- a/Sources/Plasma/FeatureLib/pfCamera/plInterestingModifier.h +++ b/Sources/Plasma/FeatureLib/pfCamera/plInterestingModifier.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plInterestingModifier_inc #define plInterestingModifier_inc -#include "../pnModifier/plSingleModifier.h" -#include "../pnMessage/plMessage.h" +#include "pnModifier/plSingleModifier.h" +#include "pnMessage/plMessage.h" #include "hsResMgr.h" #include "hsGeometry3.h" #include "hsStream.h" diff --git a/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp b/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp index 9a379052..929f3ac7 100644 --- a/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp +++ b/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp @@ -46,41 +46,41 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPipeline.h" #include "pfCameraProxy.h" #include "plgDispatch.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plFixedKey.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plFixedKey.h" #include "hsMatrix44.h" -#include "../pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plSceneObject.h" #include "hsResMgr.h" #include "hsTimer.h" -#include "../plAudio/plAudioSystem.h" -#include "../plInputCore/plInputDevice.h" -#include "../plInputCore/plInputManager.h" -#include "../pnInputCore/plKeyDef.h" -#include "../plScene/plSceneNode.h" -#include "../plMessage/plAvatarMsg.h" -#include "../pnMessage/plWarpMsg.h" -#include "../pnMessage/plCameraMsg.h" -#include "../pnMessage/plEnableMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../pnMessage/plCmdIfaceModMsg.h" -#include "../pnMessage/plPlayerPageMsg.h" -#include "../plMessage/plInputEventMsg.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../plDrawable/plDrawableGenerator.h" -#include "../plScene/plSceneNode.h" -#include "../plInputCore/plDebugInputInterface.h" -#include "../plInputCore/plAvatarInputInterface.h" -#include "../plMessage/plInputIfaceMgrMsg.h" -#include "../plStatusLog/plStatusLog.h" -#include "../plPipeline/plPlates.h" -#include "../plGImage/plMipmap.h" -#include "../plSurface/plLayer.h" -#include "../plSurface/hsGMaterial.h" -#include "../pnNetCommon/plNetApp.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plAvatar/plAvBrainHuman.h" -#include "../plAvatar/plAvatarMgr.h" +#include "plAudio/plAudioSystem.h" +#include "plInputCore/plInputDevice.h" +#include "plInputCore/plInputManager.h" +#include "pnInputCore/plKeyDef.h" +#include "plScene/plSceneNode.h" +#include "plMessage/plAvatarMsg.h" +#include "pnMessage/plWarpMsg.h" +#include "pnMessage/plCameraMsg.h" +#include "pnMessage/plEnableMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "pnMessage/plObjRefMsg.h" +#include "pnMessage/plCmdIfaceModMsg.h" +#include "pnMessage/plPlayerPageMsg.h" +#include "plMessage/plInputEventMsg.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "plDrawable/plDrawableGenerator.h" +#include "plScene/plSceneNode.h" +#include "plInputCore/plDebugInputInterface.h" +#include "plInputCore/plAvatarInputInterface.h" +#include "plMessage/plInputIfaceMgrMsg.h" +#include "plStatusLog/plStatusLog.h" +#include "plPipeline/plPlates.h" +#include "plGImage/plMipmap.h" +#include "plSurface/plLayer.h" +#include "plSurface/hsGMaterial.h" +#include "pnNetCommon/plNetApp.h" +#include "plNetClient/plNetClientMgr.h" +#include "plAvatar/plAvBrainHuman.h" +#include "plAvatar/plAvatarMgr.h" #include "hsGeometry3.h" #include "hsConfig.h" diff --git a/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.h b/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.h index 61c4a94a..8ad1d906 100644 --- a/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.h +++ b/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plVirtualCam1_inc #define plVirtualCam1_inc -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include "hsMatrix44.h" #include "hsBitVector.h" diff --git a/Sources/Plasma/FeatureLib/pfCharacter/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfCharacter/CMakeLists.txt new file mode 100644 index 00000000..a7141dfb --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfCharacter/CMakeLists.txt @@ -0,0 +1,25 @@ +include_directories(../../CoreLib) +include_directories(../../FeatureLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) +include_directories(../../PubUtilLib) + +include_directories(${OPENSSL_INCLUDE_DIR}) + +set(pfCharacter_SOURCES + pfMarkerInfo.cpp + pfMarkerMgr.cpp + plPlayerModifier.cpp +) + +set(pfCharacter_HEADERS + pfCharacterCreatable.h + pfMarkerInfo.h + pfMarkerMgr.h + plPlayerModifier.h +) + +add_library(pfCharacter STATIC ${pfCharacter_SOURCES} ${pfCharacter_HEADERS}) + +source_group("Source Files" FILES ${pfCharacter_SOURCES}) +source_group("Header Files" FILES ${pfCharacter_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.cpp b/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.cpp index 533ba406..1b5daa39 100644 --- a/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.cpp +++ b/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.cpp @@ -42,21 +42,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfMarkerInfo.h" #include "pfMarkerMgr.h" -#include "../plModifier/plGameMarkerModifier.h" +#include "plModifier/plGameMarkerModifier.h" -#include "../plMessage/plLoadCloneMsg.h" -#include "../pnMessage/plWarpMsg.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../pnMessage/plEnableMsg.h" -#include "../pnMessage/plSoundMsg.h" -#include "../pnSceneObject/plAudioInterface.h" +#include "plMessage/plLoadCloneMsg.h" +#include "pnMessage/plWarpMsg.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "plMessage/plAnimCmdMsg.h" +#include "pnMessage/plEnableMsg.h" +#include "pnMessage/plSoundMsg.h" +#include "pnSceneObject/plAudioInterface.h" // For Init -#include "../pnMessage/plClientMsg.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../plResMgr/plResManager.h" -#include "../plResMgr/plKeyFinder.h" +#include "pnMessage/plClientMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "plResMgr/plResManager.h" +#include "plResMgr/plKeyFinder.h" plUoid pfMarkerInfo::fMarkerUoid; diff --git a/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.h b/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.h index 05590189..97522411 100644 --- a/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.h +++ b/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.h @@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pfMarkerInfo_h_inc #define pfMarkerInfo_h_inc -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plUoid.h" #include "hsGeometry3.h" class plMessage; diff --git a/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerMgr.cpp b/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerMgr.cpp index 9d183ade..2f13a9e9 100644 --- a/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerMgr.cpp +++ b/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerMgr.cpp @@ -40,17 +40,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pfMarkerMgr.h" -#include "../pfMessage/pfMarkerMsg.h" +#include "pfMessage/pfMarkerMsg.h" #include "pfMarkerInfo.h" -#include "../plModifier/plCloneSpawnModifier.h" -#include "../plStatusLog/plStatusLog.h" +#include "plModifier/plCloneSpawnModifier.h" +#include "plStatusLog/plStatusLog.h" -#include "../plMessage/plLoadCloneMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnMessage/plNotifyMsg.h" +#include "plMessage/plLoadCloneMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "pnMessage/plNotifyMsg.h" -#include "../plNetClient/plNetClientMgr.h" +#include "plNetClient/plNetClientMgr.h" #include "plgDispatch.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerMgr.h b/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerMgr.h index 7a8a01c8..291b78e0 100644 --- a/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerMgr.h +++ b/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerMgr.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pfMarkerMgr_h_inc #define pfMarkerMgr_h_inc -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include class plStatusLog; diff --git a/Sources/Plasma/FeatureLib/pfConditional/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfConditional/CMakeLists.txt new file mode 100644 index 00000000..86b562ab --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfConditional/CMakeLists.txt @@ -0,0 +1,40 @@ +include_directories(../../CoreLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) +include_directories(../../PubUtilLib) + +set(pfConditional_SOURCES + plActivatorConditionalObject.cpp + plANDConditionalObject.cpp + plAnimationEventConditionalObject.cpp + plControlEventConditionalObject.cpp + plFacingConditionalObject.cpp + plKeyPressConditionalObject.cpp + plLocalPlayerInBoxConditionalObject.cpp + plLocalPlayerIntersectPlaneConditionalObject.cpp + plObjectInBoxConditionalObject.cpp + plObjectIntersectPlaneConditionalObject.cpp + plORConditionalObject.cpp + plPickedConditionalObject.cpp +) + +set(pfConditional_HEADERS + plActivatorConditionalObject.h + plANDConditionalObject.h + plAnimationEventConditionalObject.h + plConditionalObjectCreatable.h + plControlEventConditionalObject.h + plFacingConditionalObject.h + plKeyPressConditionalObject.h + plLocalPlayerInBoxConditionalObject.h + plLocalPlayerIntersectPlaneConditionalObject.h + plObjectInBoxConditionalObject.h + plObjectIntersectPlaneConditionalObject.h + plORConditionalObject.h + plPickedConditionalObject.h +) + +add_library(pfConditional ${pfConditional_SOURCES} ${pfConditional_HEADERS}) + +source_group("Source Files" FILES ${pfConditional_SOURCES}) +source_group("Header Files" FILES ${pfConditional_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfConditional/plANDConditionalObject.cpp b/Sources/Plasma/FeatureLib/pfConditional/plANDConditionalObject.cpp index e640abe9..c583304d 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plANDConditionalObject.cpp +++ b/Sources/Plasma/FeatureLib/pfConditional/plANDConditionalObject.cpp @@ -41,11 +41,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "plANDConditionalObject.h" -#include "../plPhysical/plDetectorModifier.h" +#include "plPhysical/plDetectorModifier.h" #include "hsResMgr.h" -#include "../../NucleusLib/pnModifier/plConditionalObject.h" -#include "../../NucleusLib/pnModifier/plLogicModBase.h" -#include "../plMessage/plCondRefMsg.h" +#include "pnModifier/plConditionalObject.h" +#include "pnModifier/plLogicModBase.h" +#include "plMessage/plCondRefMsg.h" plANDConditionalObject::plANDConditionalObject() { diff --git a/Sources/Plasma/FeatureLib/pfConditional/plANDConditionalObject.h b/Sources/Plasma/FeatureLib/pfConditional/plANDConditionalObject.h index a74dcc44..706d2ebf 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plANDConditionalObject.h +++ b/Sources/Plasma/FeatureLib/pfConditional/plANDConditionalObject.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plANDConditionalObject_inc #define plANDConditionalObject_inc -#include "../../NucleusLib/pnModifier/plConditionalObject.h" +#include "pnModifier/plConditionalObject.h" #include "hsTemplates.h" class plANDConditionalObject : public plConditionalObject diff --git a/Sources/Plasma/FeatureLib/pfConditional/plActivatorConditionalObject.cpp b/Sources/Plasma/FeatureLib/pfConditional/plActivatorConditionalObject.cpp index a7d34e1d..f8450290 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plActivatorConditionalObject.cpp +++ b/Sources/Plasma/FeatureLib/pfConditional/plActivatorConditionalObject.cpp @@ -41,10 +41,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "plActivatorConditionalObject.h" -#include "../plPhysical/plDetectorModifier.h" -#include "../../NucleusLib/pnModifier/plLogicModBase.h" -#include "../plMessage/plActivatorMsg.h" -#include "../pnMessage/plNotifyMsg.h" +#include "plPhysical/plDetectorModifier.h" +#include "pnModifier/plLogicModBase.h" +#include "plMessage/plActivatorMsg.h" +#include "pnMessage/plNotifyMsg.h" plActivatorConditionalObject::plActivatorConditionalObject() diff --git a/Sources/Plasma/FeatureLib/pfConditional/plActivatorConditionalObject.h b/Sources/Plasma/FeatureLib/pfConditional/plActivatorConditionalObject.h index 9bff4a29..092e3198 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plActivatorConditionalObject.h +++ b/Sources/Plasma/FeatureLib/pfConditional/plActivatorConditionalObject.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plActivatorConditionalObject_inc #define plActivatorConditionalObject_inc -#include "../../NucleusLib/pnModifier/plConditionalObject.h" +#include "pnModifier/plConditionalObject.h" #include "hsTemplates.h" class plKey; diff --git a/Sources/Plasma/FeatureLib/pfConditional/plAnimationEventConditionalObject.cpp b/Sources/Plasma/FeatureLib/pfConditional/plAnimationEventConditionalObject.cpp index f40fac7f..1b5ff2ec 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plAnimationEventConditionalObject.cpp +++ b/Sources/Plasma/FeatureLib/pfConditional/plAnimationEventConditionalObject.cpp @@ -41,12 +41,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "plAnimationEventConditionalObject.h" -#include "../pnInputCore/plKeyDef.h" -#include "../plModifier/plSimpleModifier.h" -#include "../../NucleusLib/pnModifier/plLogicModBase.h" +#include "pnInputCore/plKeyDef.h" +#include "plModifier/plSimpleModifier.h" +#include "pnModifier/plLogicModBase.h" #include "plgDispatch.h" #include "hsResMgr.h" -#include "../plMessage/plAnimCmdMsg.h" +#include "plMessage/plAnimCmdMsg.h" plAnimationEventConditionalObject::plAnimationEventConditionalObject(plKey pTargetModifier) : fTarget(pTargetModifier), diff --git a/Sources/Plasma/FeatureLib/pfConditional/plAnimationEventConditionalObject.h b/Sources/Plasma/FeatureLib/pfConditional/plAnimationEventConditionalObject.h index b4520405..58710e71 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plAnimationEventConditionalObject.h +++ b/Sources/Plasma/FeatureLib/pfConditional/plAnimationEventConditionalObject.h @@ -43,9 +43,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAnimationEventConditionalObject_inc #define plAnimationEventConditionalObject_inc -#include "../pnModifier/plConditionalObject.h" -#include "../pnInputCore/plKeyDef.h" -#include "../pnMessage/plEventCallbackMsg.h" // AnimationEvent's defined here +#include "pnModifier/plConditionalObject.h" +#include "pnInputCore/plKeyDef.h" +#include "pnMessage/plEventCallbackMsg.h" // AnimationEvent's defined here class plAnimationEventConditionalObject : public plConditionalObject diff --git a/Sources/Plasma/FeatureLib/pfConditional/plConditionalObjectCreatable.h b/Sources/Plasma/FeatureLib/pfConditional/plConditionalObjectCreatable.h index 2cbd366e..3d0e0c56 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plConditionalObjectCreatable.h +++ b/Sources/Plasma/FeatureLib/pfConditional/plConditionalObjectCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plConditionalObjectCreatable_inc #define plConditionalObjectCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plANDConditionalObject.h" diff --git a/Sources/Plasma/FeatureLib/pfConditional/plControlEventConditionalObject.cpp b/Sources/Plasma/FeatureLib/pfConditional/plControlEventConditionalObject.cpp index 693b25eb..382e21ac 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plControlEventConditionalObject.cpp +++ b/Sources/Plasma/FeatureLib/pfConditional/plControlEventConditionalObject.cpp @@ -41,9 +41,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "plControlEventConditionalObject.h" -#include "../plPhysical/plDetectorModifier.h" -#include "../../NucleusLib/pnModifier/plLogicModBase.h" -#include "../plMessage/plInputEventMsg.h" +#include "plPhysical/plDetectorModifier.h" +#include "pnModifier/plLogicModBase.h" +#include "plMessage/plInputEventMsg.h" plControlEventConditionalObject::plControlEventConditionalObject() { diff --git a/Sources/Plasma/FeatureLib/pfConditional/plControlEventConditionalObject.h b/Sources/Plasma/FeatureLib/pfConditional/plControlEventConditionalObject.h index daa0ba61..06345bba 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plControlEventConditionalObject.h +++ b/Sources/Plasma/FeatureLib/pfConditional/plControlEventConditionalObject.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plControlEventConditionalObject_inc #define plControlEventConditionalObject_inc -#include "../../NucleusLib/pnModifier/plConditionalObject.h" -#include "../../NucleusLib/pnInputCore/plControlEventCodes.h" +#include "pnModifier/plConditionalObject.h" +#include "pnInputCore/plControlEventCodes.h" class plControlEventConditionalObject : public plConditionalObject diff --git a/Sources/Plasma/FeatureLib/pfConditional/plFacingConditionalObject.cpp b/Sources/Plasma/FeatureLib/pfConditional/plFacingConditionalObject.cpp index fd8bb3dd..1f33822b 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plFacingConditionalObject.cpp +++ b/Sources/Plasma/FeatureLib/pfConditional/plFacingConditionalObject.cpp @@ -42,14 +42,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plFacingConditionalObject.h" #include "plgDispatch.h" -#include "../../NucleusLib/pnModifier/plLogicModBase.h" -#include "../plMessage/plActivatorMsg.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../pnMessage/plFakeOutMsg.h" -#include "../pnNetCommon/plNetApp.h" +#include "pnModifier/plLogicModBase.h" +#include "plMessage/plActivatorMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnKeyedObject/plKey.h" +#include "pnMessage/plNotifyMsg.h" +#include "pnMessage/plFakeOutMsg.h" +#include "pnNetCommon/plNetApp.h" plFacingConditionalObject::plFacingConditionalObject() : fTolerance(-1.0f), diff --git a/Sources/Plasma/FeatureLib/pfConditional/plFacingConditionalObject.h b/Sources/Plasma/FeatureLib/pfConditional/plFacingConditionalObject.h index 3b108518..32661253 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plFacingConditionalObject.h +++ b/Sources/Plasma/FeatureLib/pfConditional/plFacingConditionalObject.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plFacingConditionalObject_inc #define plFacingConditionalObject_inc -#include "../../NucleusLib/pnModifier/plConditionalObject.h" +#include "pnModifier/plConditionalObject.h" class plSceneObject; diff --git a/Sources/Plasma/FeatureLib/pfConditional/plKeyPressConditionalObject.cpp b/Sources/Plasma/FeatureLib/pfConditional/plKeyPressConditionalObject.cpp index b7c52210..579c06df 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plKeyPressConditionalObject.cpp +++ b/Sources/Plasma/FeatureLib/pfConditional/plKeyPressConditionalObject.cpp @@ -41,9 +41,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "plKeyPressConditionalObject.h" -#include "../plPhysical/plDetectorModifier.h" -#include "../../NucleusLib/pnModifier/plLogicModBase.h" -#include "../plMessage/plInputEventMsg.h" +#include "plPhysical/plDetectorModifier.h" +#include "pnModifier/plLogicModBase.h" +#include "plMessage/plInputEventMsg.h" plKeyPressConditionalObject::plKeyPressConditionalObject() { diff --git a/Sources/Plasma/FeatureLib/pfConditional/plKeyPressConditionalObject.h b/Sources/Plasma/FeatureLib/pfConditional/plKeyPressConditionalObject.h index ede030a0..6e700c66 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plKeyPressConditionalObject.h +++ b/Sources/Plasma/FeatureLib/pfConditional/plKeyPressConditionalObject.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plKeyPressConditionalObject_inc #define plKeyPressConditionalObject_inc -#include "../../NucleusLib/pnModifier/plConditionalObject.h" -#include "../../NucleusLib/pnInputCore/plKeyDef.h" +#include "pnModifier/plConditionalObject.h" +#include "pnInputCore/plKeyDef.h" class plKeyPressConditionalObject : public plConditionalObject diff --git a/Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerInBoxConditionalObject.cpp b/Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerInBoxConditionalObject.cpp index 18d28eae..3038026e 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerInBoxConditionalObject.cpp +++ b/Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerInBoxConditionalObject.cpp @@ -41,8 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "plLocalPlayerInBoxConditionalObject.h" -#include "../../PubUtilLib/plPhysical/plDetectorModifier.h" -#include "../../NucleusLib/pnModifier/plLogicModBase.h" +#include "plPhysical/plDetectorModifier.h" +#include "pnModifier/plLogicModBase.h" plLocalPlayerInBoxConditionalObject::plLocalPlayerInBoxConditionalObject() { diff --git a/Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerInBoxConditionalObject.h b/Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerInBoxConditionalObject.h index 98c42b0a..2e45543e 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerInBoxConditionalObject.h +++ b/Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerInBoxConditionalObject.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLocalPlayerInBoxConditionalObject_inc #define plLocalPlayerInBoxConditionalObject_inc -#include "../../NucleusLib/pnModifier/plConditionalObject.h" +#include "pnModifier/plConditionalObject.h" class plKey; diff --git a/Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerIntersectPlaneConditionalObject.cpp b/Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerIntersectPlaneConditionalObject.cpp index de394430..fe190424 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerIntersectPlaneConditionalObject.cpp +++ b/Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerIntersectPlaneConditionalObject.cpp @@ -41,8 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "plLocalPlayerIntersectPlaneConditionalObject.h" -#include "../../PubUtilLib/plPhysical/plDetectorModifier.h" -#include "../../NucleusLib/pnModifier/plLogicModBase.h" +#include "plPhysical/plDetectorModifier.h" +#include "pnModifier/plLogicModBase.h" plLocalPlayerIntersectPlaneConditionalObject::plLocalPlayerIntersectPlaneConditionalObject() { diff --git a/Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerIntersectPlaneConditionalObject.h b/Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerIntersectPlaneConditionalObject.h index c9e14147..2502e57b 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerIntersectPlaneConditionalObject.h +++ b/Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerIntersectPlaneConditionalObject.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLocalPlayerIntersectPlaneConditionalObject_inc #define plLocalPlayerIntersectPlaneConditionalObject_inc -#include "../../NucleusLib/pnModifier/plConditionalObject.h" +#include "pnModifier/plConditionalObject.h" class plKey; diff --git a/Sources/Plasma/FeatureLib/pfConditional/plORConditionalObject.cpp b/Sources/Plasma/FeatureLib/pfConditional/plORConditionalObject.cpp index f09d3b44..824960fc 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plORConditionalObject.cpp +++ b/Sources/Plasma/FeatureLib/pfConditional/plORConditionalObject.cpp @@ -41,11 +41,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "plORConditionalObject.h" -#include "../plPhysical/plDetectorModifier.h" +#include "plPhysical/plDetectorModifier.h" #include "hsResMgr.h" -#include "../../NucleusLib/pnModifier/plLogicModBase.h" +#include "pnModifier/plLogicModBase.h" -#include "../plMessage/plCondRefMsg.h" +#include "plMessage/plCondRefMsg.h" plORConditionalObject::plORConditionalObject() diff --git a/Sources/Plasma/FeatureLib/pfConditional/plORConditionalObject.h b/Sources/Plasma/FeatureLib/pfConditional/plORConditionalObject.h index 1c24c5c5..79071bf9 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plORConditionalObject.h +++ b/Sources/Plasma/FeatureLib/pfConditional/plORConditionalObject.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plORConditionalObject_inc #define plORConditionalObject_inc -#include "../../NucleusLib/pnModifier/plConditionalObject.h" +#include "pnModifier/plConditionalObject.h" #include "hsTemplates.h" class plORConditionalObject : public plConditionalObject diff --git a/Sources/Plasma/FeatureLib/pfConditional/plObjectInBoxConditionalObject.cpp b/Sources/Plasma/FeatureLib/pfConditional/plObjectInBoxConditionalObject.cpp index ad359e5c..18d825cd 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plObjectInBoxConditionalObject.cpp +++ b/Sources/Plasma/FeatureLib/pfConditional/plObjectInBoxConditionalObject.cpp @@ -41,14 +41,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "plObjectInBoxConditionalObject.h" -#include "../../PubUtilLib/plPhysical/plDetectorModifier.h" -#include "../../NucleusLib/pnModifier/plLogicModBase.h" -#include "../../PubUtilLib/plMessage/plActivatorMsg.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../pnMessage/plFakeOutMsg.h" -#include "../pnNetCommon/plNetApp.h" -#include "../plAvatar/plArmatureMod.h" -#include "../pnSceneObject/plSceneObject.h" +#include "plPhysical/plDetectorModifier.h" +#include "pnModifier/plLogicModBase.h" +#include "plMessage/plActivatorMsg.h" +#include "pnMessage/plNotifyMsg.h" +#include "pnMessage/plFakeOutMsg.h" +#include "pnNetCommon/plNetApp.h" +#include "plAvatar/plArmatureMod.h" +#include "pnSceneObject/plSceneObject.h" bool plVolumeSensorConditionalObject::makeBriceHappyVar = true; @@ -293,8 +293,8 @@ void plVolumeSensorConditionalObject::Write(hsStream* stream, hsResMgr* mgr) stream->WriteSwap32(fType); stream->WriteBool(fFirst); } -#include "../pnMessage/plPlayerPageMsg.h" -#include "../../NucleusLib/inc/plgDispatch.h" +#include "pnMessage/plPlayerPageMsg.h" +#include "plgDispatch.h" hsBool plVolumeSensorConditionalObjectNoArbitration::MsgReceive(plMessage* msg) { plActivatorMsg* pActivateMsg = plActivatorMsg::ConvertNoRef(msg); diff --git a/Sources/Plasma/FeatureLib/pfConditional/plObjectInBoxConditionalObject.h b/Sources/Plasma/FeatureLib/pfConditional/plObjectInBoxConditionalObject.h index 9eab8eb4..b1a7c433 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plObjectInBoxConditionalObject.h +++ b/Sources/Plasma/FeatureLib/pfConditional/plObjectInBoxConditionalObject.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plObjectInBoxConditionalObject_inc #define plObjectInBoxConditionalObject_inc -#include "../../NucleusLib/pnModifier/plConditionalObject.h" +#include "pnModifier/plConditionalObject.h" #include "hsTemplates.h" class plKey; diff --git a/Sources/Plasma/FeatureLib/pfConditional/plObjectIntersectPlaneConditionalObject.cpp b/Sources/Plasma/FeatureLib/pfConditional/plObjectIntersectPlaneConditionalObject.cpp index b05b1719..7f60e3f4 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plObjectIntersectPlaneConditionalObject.cpp +++ b/Sources/Plasma/FeatureLib/pfConditional/plObjectIntersectPlaneConditionalObject.cpp @@ -41,8 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "plObjectIntersectPlaneConditionalObject.h" -#include "../../PubUtilLib/plPhysical/plDetectorModifier.h" -#include "../../NucleusLib/pnModifier/plLogicModBase.h" +#include "plPhysical/plDetectorModifier.h" +#include "pnModifier/plLogicModBase.h" plObjectIntersectPlaneConditionalObject::plObjectIntersectPlaneConditionalObject() { diff --git a/Sources/Plasma/FeatureLib/pfConditional/plObjectIntersectPlaneConditionalObject.h b/Sources/Plasma/FeatureLib/pfConditional/plObjectIntersectPlaneConditionalObject.h index 4896cf05..4499ef5c 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plObjectIntersectPlaneConditionalObject.h +++ b/Sources/Plasma/FeatureLib/pfConditional/plObjectIntersectPlaneConditionalObject.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plObjectIntersectPlaneConditionalObject_inc #define plObjectIntersectPlaneConditionalObject_inc -#include "../../NucleusLib/pnModifier/plConditionalObject.h" +#include "pnModifier/plConditionalObject.h" class plKey; diff --git a/Sources/Plasma/FeatureLib/pfConditional/plPickedConditionalObject.cpp b/Sources/Plasma/FeatureLib/pfConditional/plPickedConditionalObject.cpp index ec93098b..567e61ee 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plPickedConditionalObject.cpp +++ b/Sources/Plasma/FeatureLib/pfConditional/plPickedConditionalObject.cpp @@ -41,10 +41,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "plPickedConditionalObject.h" -#include "../../PubUtilLib/plPhysical/plDetectorModifier.h" -#include "../../NucleusLib/pnModifier/plLogicModBase.h" +#include "plPhysical/plDetectorModifier.h" +#include "pnModifier/plLogicModBase.h" -#include "../plMessage/plActivatorMsg.h" +#include "plMessage/plActivatorMsg.h" plPickedConditionalObject::plPickedConditionalObject() { diff --git a/Sources/Plasma/FeatureLib/pfConditional/plPickedConditionalObject.h b/Sources/Plasma/FeatureLib/pfConditional/plPickedConditionalObject.h index 8349d326..5dcd8d6e 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plPickedConditionalObject.h +++ b/Sources/Plasma/FeatureLib/pfConditional/plPickedConditionalObject.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPickedConditionalObject_inc #define plPickedConditionalObject_inc -#include "../../NucleusLib/pnModifier/plConditionalObject.h" +#include "pnModifier/plConditionalObject.h" class plKey; diff --git a/Sources/Plasma/FeatureLib/pfConsole/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfConsole/CMakeLists.txt new file mode 100644 index 00000000..01d7d616 --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfConsole/CMakeLists.txt @@ -0,0 +1,38 @@ +include_directories(../../CoreLib) +include_directories(../../FeatureLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) +include_directories(../../PubUtilLib) + +include_directories(${OPENSSL_INCLUDE_DIR}) +include_directories(${OPENAL_INCLUDE_DIR}) +include_directories(${PYTHON_INCLUDE_DIR}) + +set(pfConsole_SOURCES + pfAvatarConsoleCommands.cpp + pfCCRConsoleCommands.cpp + pfConsole.cpp + pfConsoleCmd.cpp + pfConsoleCommands.cpp + pfConsoleCommandsNet.cpp + pfConsoleContext.cpp + pfConsoleDirSrc.cpp + pfConsoleEngine.cpp + pfDispatchLog.cpp + pfGameConsoleCommands.cpp +) + +set(pfConsole_HEADERS + pfConsole.h + pfConsoleCmd.h + pfConsoleContext.h + pfConsoleCreatable.h + pfConsoleDirSrc.h + pfConsoleEngine.h + pfDispatchLog.h +) + +add_library(pfConsole STATIC ${pfConsole_SOURCES} ${pfConsole_HEADERS}) + +source_group("Source Files" FILES ${pfConsole_SOURCES}) +source_group("Header Files" FILES ${pfConsole_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfAvatarConsoleCommands.cpp b/Sources/Plasma/FeatureLib/pfConsole/pfAvatarConsoleCommands.cpp index f11a521f..36f55367 100644 --- a/Sources/Plasma/FeatureLib/pfConsole/pfAvatarConsoleCommands.cpp +++ b/Sources/Plasma/FeatureLib/pfConsole/pfAvatarConsoleCommands.cpp @@ -54,41 +54,41 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfConsole.h" #include "hsResMgr.h" -#include "../pfMessage/plArmatureEffectMsg.h" - -#include "../plMessage/plOneShotMsg.h" -#include "../plMessage/plAvatarMsg.h" -#include "../plMessage/plInputEventMsg.h" -#include "../plMessage/plSimStateMsg.h" -#include "../plMessage/plCCRMsg.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../pnMessage/plNotifyMsg.h" - -#include "../plModifier/plSpawnModifier.h" - -#include "../plResMgr/plKeyFinder.h" - -#include "../plAvatar/plArmatureMod.h" -#include "../plAvatar/plAvBrainCritter.h" -#include "../plAvatar/plAvBrainHuman.h" -#include "../plAvatar/plAvBrainSwim.h" -#include "../plAvatar/plAvBrainGeneric.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plAvatar/plSeekPointMod.h" -#include "../plAvatar/plOneShotMod.h" -#include "../plAvatar/plAGAnim.h" -#include "../plAvatar/plAvBrainUser.h" -#include "../plAvatar/plAvBrainHuman.h" -#include "../plAvatar/plNPCSpawnMod.h" -#include "../plAvatar/plAGAnimInstance.h" -#include "../plAvatar/plArmatureEffects.h" -#include "../plAvatar/plAvTaskSeek.h" +#include "pfMessage/plArmatureEffectMsg.h" + +#include "plMessage/plOneShotMsg.h" +#include "plMessage/plAvatarMsg.h" +#include "plMessage/plInputEventMsg.h" +#include "plMessage/plSimStateMsg.h" +#include "plMessage/plCCRMsg.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "pnMessage/plNotifyMsg.h" + +#include "plModifier/plSpawnModifier.h" + +#include "plResMgr/plKeyFinder.h" + +#include "plAvatar/plArmatureMod.h" +#include "plAvatar/plAvBrainCritter.h" +#include "plAvatar/plAvBrainHuman.h" +#include "plAvatar/plAvBrainSwim.h" +#include "plAvatar/plAvBrainGeneric.h" +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plSeekPointMod.h" +#include "plAvatar/plOneShotMod.h" +#include "plAvatar/plAGAnim.h" +#include "plAvatar/plAvBrainUser.h" +#include "plAvatar/plAvBrainHuman.h" +#include "plAvatar/plNPCSpawnMod.h" +#include "plAvatar/plAGAnimInstance.h" +#include "plAvatar/plArmatureEffects.h" +#include "plAvatar/plAvTaskSeek.h" //#include "../plHavok1/plSimulationMgr.h" -#include "../pnNetCommon/plNetApp.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plDrawable/plInstanceDrawInterface.h" -#include "../plDrawable/plDrawableSpans.h" +#include "pnNetCommon/plNetApp.h" +#include "plNetClient/plNetClientMgr.h" +#include "plDrawable/plInstanceDrawInterface.h" +#include "plDrawable/plDrawableSpans.h" #define PF_SANITY_CHECK( cond, msg ) { if( !( cond ) ) { PrintString( msg ); return; } } @@ -135,7 +135,7 @@ PF_CONSOLE_SUBGROUP( Avatar, LOD ) #endif // LIMIT_CONSOLE_COMMANDS -#include "../plAvatar/plAnimStage.h" +#include "plAvatar/plAnimStage.h" plAvBrainHuman * GetMainAvatarBrain() { @@ -456,7 +456,7 @@ PF_CONSOLE_CMD( Avatar, PopBrain, "", "Remove the topmost brain from the avatar. } } -#include "../plScene/plRelevanceMgr.h" +#include "plScene/plRelevanceMgr.h" PF_CONSOLE_CMD( Avatar, MarkRelevanceRegion, @@ -762,7 +762,7 @@ PF_CONSOLE_CMD( Avatar_LOD, GetLODDistance, "", "Get Distance for switching Ava -#include "../plAvatar/plAvBrainClimb.h" +#include "plAvatar/plAvBrainClimb.h" PF_CONSOLE_CMD( Avatar_Climb, Start, "string direction", "Specify initial mount direction: up, down, left, right") { diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp b/Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp index b4e03c91..314f45fc 100644 --- a/Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp +++ b/Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp @@ -47,26 +47,26 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfConsole.h" #include "pfConsoleEngine.h" -#include "../plPipeline/plDebugText.h" -#include "../plInputCore/plInputDevice.h" -#include "../plInputCore/plInputInterface.h" -#include "../plInputCore/plInputInterfaceMgr.h" -#include "../pnInputCore/plKeyMap.h" -#include "../pnInputCore/plKeyDef.h" -#include "../plMessage/plInputEventMsg.h" -#include "../plMessage/plConsoleMsg.h" -#include "../plMessage/plInputIfaceMgrMsg.h" -#include "../pnKeyedObject/plFixedKey.h" +#include "plPipeline/plDebugText.h" +#include "plInputCore/plInputDevice.h" +#include "plInputCore/plInputInterface.h" +#include "plInputCore/plInputInterfaceMgr.h" +#include "pnInputCore/plKeyMap.h" +#include "pnInputCore/plKeyDef.h" +#include "plMessage/plInputEventMsg.h" +#include "plMessage/plConsoleMsg.h" +#include "plMessage/plInputIfaceMgrMsg.h" +#include "pnKeyedObject/plFixedKey.h" #include "hsTimer.h" #include "plgDispatch.h" #include "plPipeline.h" #include "hsConfig.h" -#include "../pfPython/cyPythonInterface.h" -#include "../plNetClient/plNetClientMgr.h" +#include "pfPython/cyPythonInterface.h" +#include "plNetClient/plNetClientMgr.h" #ifndef PLASMA_EXTERNAL_RELEASE -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #endif // PLASMA_EXTERNAL_RELEASE diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfConsole.h b/Sources/Plasma/FeatureLib/pfConsole/pfConsole.h index 709b12b2..b8374a49 100644 --- a/Sources/Plasma/FeatureLib/pfConsole/pfConsole.h +++ b/Sources/Plasma/FeatureLib/pfConsole/pfConsole.h @@ -56,7 +56,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define _pfConsole_h #include "hsTypes.h" -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" class plPipeline; diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp b/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp index b6c7fb28..0219419e 100644 --- a/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp +++ b/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp @@ -53,123 +53,123 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfConsoleCmd.h" #include "plgDispatch.h" -#include "../plAgeLoader/plAgeLoader.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plPipeline/plDebugText.h" -#include "../plPipeline/plPipeDebugFlags.h" -#include "../plMessage/plMovieMsg.h" -#include "../plDrawable/plDrawableSpans.h" +#include "plAgeLoader/plAgeLoader.h" +#include "plNetClient/plNetClientMgr.h" +#include "plPipeline/plDebugText.h" +#include "plPipeline/plPipeDebugFlags.h" +#include "plMessage/plMovieMsg.h" +#include "plDrawable/plDrawableSpans.h" #include "plPipeline.h" -#include "../pfCamera/plCameraModifier.h" -#include "../pfCamera/plVirtualCamNeu.h" -#include "../pfCamera/plCameraBrain.h" -#include "../plResMgr/plResManager.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plKeyImp.h" -#include "../pnModifier/plLogicModBase.h" -#include "../plModifier/plSDLModifier.h" -#include "../plSDL/plSDL.h" -#include "../pfCharacter/plPlayerModifier.h" -#include "../plSurface/plLayerDepth.h" -#include "../plSurface/plLayerOr.h" -#include "../plSurface/plLayerOr.h" -#include "../plAudio/plAudioSystem.h" -#include "../plAudio/plVoiceChat.h" -#include "../plAudio/plWinMicLevel.h" -#include "../plPipeline/plFogEnvironment.h" -#include "../plPipeline/plPlates.h" -#include "../plPipeline/plDynamicEnvMap.h" -#include "../../NucleusLib/inc/hsTimer.h" -#include "../pnMessage/plClientMsg.h" -#include "../pnMessage/plEnableMsg.h" -#include "../pnMessage/plAudioSysMsg.h" -#include "../plMessage/plListenerMsg.h" -#include "../pfAudio/plListener.h" -#include "../plMessage/plAvatarMsg.h" -#include "../plMessage/plOneShotMsg.h" -#include "../plVault/plVault.h" +#include "pfCamera/plCameraModifier.h" +#include "pfCamera/plVirtualCamNeu.h" +#include "pfCamera/plCameraBrain.h" +#include "plResMgr/plResManager.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKeyImp.h" +#include "pnModifier/plLogicModBase.h" +#include "plModifier/plSDLModifier.h" +#include "plSDL/plSDL.h" +#include "pfCharacter/plPlayerModifier.h" +#include "plSurface/plLayerDepth.h" +#include "plSurface/plLayerOr.h" +#include "plSurface/plLayerOr.h" +#include "plAudio/plAudioSystem.h" +#include "plAudio/plVoiceChat.h" +#include "plAudio/plWinMicLevel.h" +#include "plPipeline/plFogEnvironment.h" +#include "plPipeline/plPlates.h" +#include "plPipeline/plDynamicEnvMap.h" +#include "hsTimer.h" +#include "pnMessage/plClientMsg.h" +#include "pnMessage/plEnableMsg.h" +#include "pnMessage/plAudioSysMsg.h" +#include "plMessage/plListenerMsg.h" +#include "pfAudio/plListener.h" +#include "plMessage/plAvatarMsg.h" +#include "plMessage/plOneShotMsg.h" +#include "plVault/plVault.h" #include "../../Apps/plClient/plClient.h" #include "pfConsole.h" #include "pfConsoleContext.h" -#include "../plResMgr/plKeyFinder.h" -#include "../plModifier/plSimpleModifier.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plAvatar/plAvatarTasks.h" -#include "../plAvatar/plAvBrainGeneric.h" +#include "plResMgr/plKeyFinder.h" +#include "plModifier/plSimpleModifier.h" +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plAvatarTasks.h" +#include "plAvatar/plAvBrainGeneric.h" //#include "../plHavok1/plSimulationMgr.h" -#include "../plMessage/plConsoleMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../pnMessage/plCameraMsg.h" -#include "../pnMessage/plSoundMsg.h" -#include "../pnMessage/plEventCallbackMsg.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../pfAnimation/plAnimDebugList.h" - -#include "../pnMessage/plNodeChangeMsg.h" -#include "../pnMessage/plProxyDrawMsg.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../pnMessage/plAttachMsg.h" -#include "../plMessage/plSimInfluenceMsg.h" -#include "../plMessage/plSimStateMsg.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../pfMessage/pfKIMsg.h" - -#include "../plInputCore/plInputInterfaceMgr.h" -#include "../plInputCore/plInputManager.h" -#include "../plInputCore/plInputDevice.h" -#include "../plInputCore/plAvatarInputInterface.h" -#include "../plMessage/plInputEventMsg.h" -#include "../pnInputCore/plKeyMap.h" - -#include "../plParticleSystem/plParticleSystem.h" -#include "../plParticleSystem/plConvexVolume.h" -#include "../plParticleSystem/plParticleEffect.h" -#include "../plParticleSystem/plParticleGenerator.h" -#include "../plSurface/hsGMaterial.h" -#include "../pnSceneObject/plDrawInterface.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../plScene/plSceneNode.h" -#include "../plScene/plPageTreeMgr.h" -#include "../plScene/plPostEffectMod.h" -#include "../pnMessage/plNodeRefMsg.h" +#include "plMessage/plConsoleMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "pnMessage/plCameraMsg.h" +#include "pnMessage/plSoundMsg.h" +#include "pnMessage/plEventCallbackMsg.h" +#include "pnMessage/plNotifyMsg.h" +#include "pfAnimation/plAnimDebugList.h" + +#include "pnMessage/plNodeChangeMsg.h" +#include "pnMessage/plProxyDrawMsg.h" +#include "pnMessage/plObjRefMsg.h" +#include "pnMessage/plAttachMsg.h" +#include "plMessage/plSimInfluenceMsg.h" +#include "plMessage/plSimStateMsg.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "pfMessage/pfKIMsg.h" + +#include "plInputCore/plInputInterfaceMgr.h" +#include "plInputCore/plInputManager.h" +#include "plInputCore/plInputDevice.h" +#include "plInputCore/plAvatarInputInterface.h" +#include "plMessage/plInputEventMsg.h" +#include "pnInputCore/plKeyMap.h" + +#include "plParticleSystem/plParticleSystem.h" +#include "plParticleSystem/plConvexVolume.h" +#include "plParticleSystem/plParticleEffect.h" +#include "plParticleSystem/plParticleGenerator.h" +#include "plSurface/hsGMaterial.h" +#include "pnSceneObject/plDrawInterface.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "plScene/plSceneNode.h" +#include "plScene/plPageTreeMgr.h" +#include "plScene/plPostEffectMod.h" +#include "pnMessage/plNodeRefMsg.h" //#include "../pnMessage/plWarpMsg.h" #include "hsResMgr.h" -#include "../plParticleSystem/plParticleSystem.h" -#include "../plMessage/plParticleUpdateMsg.h" +#include "plParticleSystem/plParticleSystem.h" +#include "plMessage/plParticleUpdateMsg.h" -#include "../plDrawable/plDynaBulletMgr.h" +#include "plDrawable/plDynaBulletMgr.h" -#include "../plGImage/plMipmap.h" -#include "../plGImage/plTGAWriter.h" +#include "plGImage/plMipmap.h" +#include "plGImage/plTGAWriter.h" -#include "../plGLight/plShadowCaster.h" -#include "../plGLight/plShadowMaster.h" +#include "plGLight/plShadowCaster.h" +#include "plGLight/plShadowMaster.h" // begin for agedefn test #include "hsStream.h" -#include "../plAgeDescription/plAgeDescription.h" -#include "../plUnifiedTime/plUnifiedTime.h" +#include "plAgeDescription/plAgeDescription.h" +#include "plUnifiedTime/plUnifiedTime.h" //end for agedefn test -#include "../../PubUtilLib/plFile/hsFiles.h" -#include "../../NucleusLib/pnSceneObject/plAudioInterface.h" +#include "plFile/hsFiles.h" +#include "pnSceneObject/plAudioInterface.h" -#include "../plStatusLog/plStatusLog.h" -#include "../pnTimer/pnBuildDates.h" +#include "plStatusLog/plStatusLog.h" +#include "pnTimer/pnBuildDates.h" #include "hsStlUtils.h" #include "hsTemplates.h" -#include "../Corelib/hsUtils.h" +#include "hsUtils.h" -#include "../pfPython/cyPythonInterface.h" -#include "../pfPython/plPythonSDLModifier.h" +#include "pfPython/cyPythonInterface.h" +#include "pfPython/plPythonSDLModifier.h" -#include "../plResMgr/plResManagerHelper.h" -#include "../plResMgr/plResMgrSettings.h" -#include "../plResMgr/plLocalization.h" +#include "plResMgr/plResManagerHelper.h" +#include "plResMgr/plResMgrSettings.h" +#include "plResMgr/plLocalization.h" #define PF_SANITY_CHECK( cond, msg ) { if( !( cond ) ) { PrintString( msg ); return; } } @@ -452,7 +452,7 @@ PF_CONSOLE_BASE_CMD( SampleCmd3, "int, ...", "Sample command #3" ) #ifndef LIMIT_CONSOLE_COMMANDS -#include "../plMessage/plTransitionMsg.h" +#include "plMessage/plTransitionMsg.h" PF_CONSOLE_BASE_CMD( FadeIn, "float len, bool hold", "Sample command #1" ) { @@ -511,7 +511,7 @@ PF_CONSOLE_BASE_CMD( DumpLogs, "string folderName", "Dumps all current logs to t PF_CONSOLE_GROUP( Stats ) -#include "../plStatGather/plProfileManagerFull.h" +#include "plStatGather/plProfileManagerFull.h" PF_CONSOLE_CMD( Stats, Show, // Group name, Function name "...", // Params @@ -641,7 +641,7 @@ PF_CONSOLE_CMD(Stats, RemoveDetailVar, "string stat", "Removes the specified var plProfileManagerFull::Instance().RemoveDetailVar(params[0]); } -#include "../plStatGather/plAutoProfile.h" +#include "plStatGather/plAutoProfile.h" PF_CONSOLE_CMD(Stats, AutoProfile, "...", "Performs an automated profile in all the ages. Optional: Specify an age name to do just that age") { @@ -1638,7 +1638,7 @@ PF_CONSOLE_CMD( Graphics_Renderer, TakeScreenshot, "...", "Takes a shot of the c } } -#include "../pfSurface/plGrabCubeMap.h" +#include "pfSurface/plGrabCubeMap.h" PF_CONSOLE_CMD( Graphics_Renderer, GrabCubeMap, "string sceneObject, string prefix", @@ -1672,7 +1672,7 @@ PF_CONSOLE_CMD( Graphics_Renderer, GrabCubeCam, grabCube.GrabCube(pfConsole::GetPipeline(), pos, pref, clearColor); } -#include "../plJPEG/plJPEG.h" +#include "plJPEG/plJPEG.h" PF_CONSOLE_CMD( Graphics_Renderer, TakeJPEGScreenshot, "...", "Takes a shot of the current frame and saves it to the given file" ) { @@ -1722,7 +1722,7 @@ PF_CONSOLE_CMD( Graphics_Renderer, TakeJPEGScreenshot, "...", "Takes a shot of t } } -#include "../plGImage/plAVIWriter.h" +#include "plGImage/plAVIWriter.h" PF_CONSOLE_CMD( Graphics_Renderer, AVIWrite, "...", "Saves each frame to an AVI file" ) { @@ -2504,7 +2504,7 @@ PF_CONSOLE_CMD( App, // groupName PrintString( str ); } -#include "../plInputCore/plSceneInputInterface.h" +#include "plInputCore/plSceneInputInterface.h" PF_CONSOLE_CMD( App, // groupName ShowLOS, // fxnName @@ -3315,7 +3315,7 @@ PF_CONSOLE_CMD(Logic, ListResponders, "", "Prints the names of the loaded respon } } -#include "../plModifier/plResponderModifier.h" +#include "plModifier/plResponderModifier.h" PF_CONSOLE_CMD(Logic, ResponderAnimCue, "", "Toggle box being drawn on screen when a responder starts an anim") { @@ -3330,7 +3330,7 @@ PF_CONSOLE_CMD(Logic, ResponderNoLog, "string prefix", "Don't log responders tha plResponderModifier::NoLogString(params[0]); } -#include "../plModifier/plDetectorLog.h" +#include "plModifier/plDetectorLog.h" PF_CONSOLE_CMD(Logic, WriteDetectorLog, "", "Write detector log to logfile") { DetectorDoLogfile(); @@ -4288,7 +4288,7 @@ PF_CONSOLE_CMD( Quality, PrintString(str); } -#include "../plSurface/plShaderTable.h" +#include "plSurface/plShaderTable.h" PF_CONSOLE_CMD( Quality, Cap, @@ -4315,10 +4315,10 @@ PF_CONSOLE_CMD( Quality, #ifndef LIMIT_CONSOLE_COMMANDS -#include "../plDrawable/plSharedMesh.h" -#include "../plDrawable/plAccessGeometry.h" -#include "../plDrawable/plMorphSequence.h" -#include "../plAvatar/plAvatarClothing.h" +#include "plDrawable/plSharedMesh.h" +#include "plDrawable/plAccessGeometry.h" +#include "plDrawable/plMorphSequence.h" +#include "plAvatar/plAvatarClothing.h" PF_CONSOLE_GROUP( Access ) @@ -4620,7 +4620,7 @@ PF_CONSOLE_CMD( Access, PrintString(str); } -#include "../pfSurface/plFadeOpacityMod.h" +#include "pfSurface/plFadeOpacityMod.h" PF_CONSOLE_CMD( Access, Fade, @@ -4664,7 +4664,7 @@ PF_CONSOLE_CMD( Access, } -#include "../plDrawable/plVisLOSMgr.h" +#include "plDrawable/plVisLOSMgr.h" static plSceneObject* losObj = nil; @@ -4751,7 +4751,7 @@ PF_CONSOLE_CMD( Access, } -#include "../plMessage/plBulletMsg.h" +#include "plMessage/plBulletMsg.h" plSceneObject* gunObj = nil; hsScalar gunRadius = 1.f; @@ -4871,8 +4871,8 @@ PF_CONSOLE_CMD( Access, #ifndef LIMIT_CONSOLE_COMMANDS -#include "../plDrawable/plWaveSet7.h" -#include "../plDrawable/plFixedWaterState7.h" +#include "plDrawable/plWaveSet7.h" +#include "plDrawable/plFixedWaterState7.h" PF_CONSOLE_GROUP( Wave ) PF_CONSOLE_SUBGROUP( Wave, Set) // Creates a sub-group under a given group @@ -5716,7 +5716,7 @@ PF_CONSOLE_CMD( SceneObject, Detach, // Group name, Function name #ifndef LIMIT_CONSOLE_COMMANDS -#include "../plPhysX/plPXPhysicalControllerCore.h" +#include "plPhysX/plPXPhysicalControllerCore.h" PF_CONSOLE_GROUP( Physics ) @@ -5952,7 +5952,7 @@ PF_CONSOLE_CMD( Physics, ClearLog, "", "Clear the physics log.") plSimulationMgr::ClearLog(); } */ -#include "../plPhysical/plPhysicalSDLModifier.h" +#include "plPhysical/plPhysicalSDLModifier.h" PF_CONSOLE_CMD(Physics, LogSDL, "int level", "Turn logging of physics SDL state on or off. 0=off 1=send/receive only 2=any attempt") { @@ -5960,7 +5960,7 @@ PF_CONSOLE_CMD(Physics, LogSDL, "int level", "Turn logging of physics SDL state plPhysicalSDLModifier::SetLogLevel(level); } -#include "../plPhysX/plSimulationMgr.h" +#include "plPhysX/plSimulationMgr.h" PF_CONSOLE_CMD(Physics, ExtraProfile, "", "Toggle extra simulation profiling") { char str[256]; @@ -6729,10 +6729,10 @@ PF_CONSOLE_CMD( Animation, //////////////////////////////////////////////////////////////////////// #ifndef LIMIT_CONSOLE_COMMANDS -#include "../plAvatar/plArmatureMod.h" -#include "../plAvatar/plAvatarClothing.h" -#include "../plAvatar/plClothingLayout.h" -#include "../pfMessage/plClothingMsg.h" +#include "plAvatar/plArmatureMod.h" +#include "plAvatar/plAvatarClothing.h" +#include "plAvatar/plClothingLayout.h" +#include "pfMessage/plClothingMsg.h" PF_CONSOLE_GROUP( Clothing ) // Defines a main command group @@ -7001,7 +7001,7 @@ PF_CONSOLE_CMD( KI, // Group name PF_CONSOLE_GROUP( Python ) // Defines a main command group -#include "../pfPython/cyMisc.h" +#include "pfPython/cyMisc.h" PF_CONSOLE_CMD( Python, // Group name SetLoggingLevel, // Function name @@ -7023,7 +7023,7 @@ PF_CONSOLE_CMD( Python, #endif -#include "../pfMessage/pfBackdoorMsg.h" +#include "pfMessage/pfBackdoorMsg.h" PF_CONSOLE_CMD( Python, Backdoor, "string target, ...", // Params diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp b/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp index 581a4a13..281850d7 100644 --- a/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp +++ b/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp @@ -53,52 +53,52 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfConsoleCmd.h" #include "plgDispatch.h" -#include "../plAgeLoader/plAgeLoader.h" -#include "../plNetClient/plNetObjectDebugger.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plNetClient/plNetLinkingMgr.h" -#include "../plAgeLoader/plResPatcher.h" -#include "../../NucleusLib/inc/hsResMgr.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plKeyImp.h" -#include "../pnModifier/plLogicModBase.h" -#include "../pfCharacter/plPlayerModifier.h" -#include "../../NucleusLib/inc/hsTimer.h" -#include "../pnMessage/plClientMsg.h" -#include "../pnMessage/plEnableMsg.h" -#include "../pnMessage/plAudioSysMsg.h" -#include "../plNetMessage/plNetMessage.h" -#include "../plMessage/plAvatarMsg.h" -#include "../plMessage/plOneShotMsg.h" -#include "../plMessage/plConsoleMsg.h" +#include "plAgeLoader/plAgeLoader.h" +#include "plNetClient/plNetObjectDebugger.h" +#include "plNetClient/plNetClientMgr.h" +#include "plNetClient/plNetLinkingMgr.h" +#include "plAgeLoader/plResPatcher.h" +#include "hsResMgr.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKeyImp.h" +#include "pnModifier/plLogicModBase.h" +#include "pfCharacter/plPlayerModifier.h" +#include "hsTimer.h" +#include "pnMessage/plClientMsg.h" +#include "pnMessage/plEnableMsg.h" +#include "pnMessage/plAudioSysMsg.h" +#include "plNetMessage/plNetMessage.h" +#include "plMessage/plAvatarMsg.h" +#include "plMessage/plOneShotMsg.h" +#include "plMessage/plConsoleMsg.h" #include "../../Apps/plClient/plClient.h" #include "pfConsole.h" -#include "../plResMgr/plKeyFinder.h" +#include "plResMgr/plKeyFinder.h" #include "hsResMgr.h" // begin for agedefn test #include "hsStream.h" -#include "../plAgeDescription/plAgeDescription.h" -#include "../plUnifiedTime/plUnifiedTime.h" +#include "plAgeDescription/plAgeDescription.h" +#include "plUnifiedTime/plUnifiedTime.h" //end for agedefn test -#include "../../PubUtilLib/plFile/hsFiles.h" +#include "plFile/hsFiles.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" #include "hsStlUtils.h" #include "hsTemplates.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" -#include "../plNetCommon/plSpawnPointInfo.h" +#include "plNetCommon/plSpawnPointInfo.h" -#include "../plSDL/plSDL.h" +#include "plSDL/plSDL.h" -#include "../plNetGameLib/plNetGameLib.h" +#include "plNetGameLib/plNetGameLib.h" -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #define PF_SANITY_CHECK( cond, msg ) { if( !( cond ) ) { PrintString( msg ); return; } } @@ -640,7 +640,7 @@ PF_CONSOLE_CMD( Net_DebugObject, // groupName plNetObjectDebugger::GetInstance()->ClearAllDebugObjects(); } -#include "../pfPython/plPythonSDLModifier.h" +#include "pfPython/plPythonSDLModifier.h" PF_CONSOLE_CMD( Net_DebugObject, // groupName DumpAgeSDLHook, // fxnName "bool dirtyOnly", // paramList diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfConsoleEngine.cpp b/Sources/Plasma/FeatureLib/pfConsole/pfConsoleEngine.cpp index a02ac118..f0681332 100644 --- a/Sources/Plasma/FeatureLib/pfConsole/pfConsoleEngine.cpp +++ b/Sources/Plasma/FeatureLib/pfConsole/pfConsoleEngine.cpp @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfConsoleCmd.h" #include "pfConsoleContext.h" -#include "../plFile/plEncryptedStream.h" +#include "plFile/plEncryptedStream.h" const Int32 pfConsoleEngine::fMaxNumParams = 16; diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.cpp b/Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.cpp index e1676082..8f520182 100644 --- a/Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.cpp +++ b/Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.cpp @@ -41,9 +41,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTimer.h" #include "pfDispatchLog.h" -#include "../plStatusLog/plStatusLog.h" -#include "../pnMessage/plMessage.h" -#include "../pnKeyedObject/plKey.h" +#include "plStatusLog/plStatusLog.h" +#include "pnMessage/plMessage.h" +#include "pnKeyedObject/plKey.h" #include "hsWindows.h" bool DumpSpecificMsgInfo(plMessage* msg, std::string& info); @@ -187,11 +187,11 @@ void plDispatchLog::RemoveFilterExactType(UInt16 type) ////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////// -#include "../pnMessage/plClientMsg.h" -#include "../pfMessage/pfKIMsg.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../plResMgr/plKeyFinder.h" -#include "../plResMgr/plPageInfo.h" +#include "pnMessage/plClientMsg.h" +#include "pfMessage/pfKIMsg.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "plResMgr/plKeyFinder.h" +#include "plResMgr/plPageInfo.h" static bool DumpSpecificMsgInfo(plMessage* msg, std::string& info) { diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.h b/Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.h index bdd50444..e3d3ec23 100644 --- a/Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.h +++ b/Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pfDispatchLog_inc #define pfDispatchLog_inc -#include "../pnDispatch/plDispatchLogBase.h" +#include "pnDispatch/plDispatchLogBase.h" #include "hsBitVector.h" class plStatusLog; diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfGameConsoleCommands.cpp b/Sources/Plasma/FeatureLib/pfConsole/pfGameConsoleCommands.cpp index 4147e9cb..c1f5c180 100644 --- a/Sources/Plasma/FeatureLib/pfConsole/pfGameConsoleCommands.cpp +++ b/Sources/Plasma/FeatureLib/pfConsole/pfGameConsoleCommands.cpp @@ -74,17 +74,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPipeline.h" #include "plgDispatch.h" -#include "../plGImage/plMipmap.h" -#include "../plGImage/plTGAWriter.h" -#include "../pfMessage/pfGameGUIMsg.h" -#include "../../NucleusLib/inc/hsResMgr.h" -#include "../pfGameGUIMgr/pfGUICtrlGenerator.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plAvatar/plAnimStage.h" -#include "../plAvatar/plAvBrainGeneric.h" -#include "../plAvatar/plAvBrainHuman.h" -#include "../plMessage/plAvatarMsg.h" -#include "../pnKeyedObject/plFixedKey.h" +#include "plGImage/plMipmap.h" +#include "plGImage/plTGAWriter.h" +#include "pfMessage/pfGameGUIMsg.h" +#include "hsResMgr.h" +#include "pfGameGUIMgr/pfGUICtrlGenerator.h" +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plAnimStage.h" +#include "plAvatar/plAvBrainGeneric.h" +#include "plAvatar/plAvBrainHuman.h" +#include "plMessage/plAvatarMsg.h" +#include "pnKeyedObject/plFixedKey.h" #define PF_SANITY_CHECK( cond, msg ) { if( !( cond ) ) { PrintString( msg ); return; } } @@ -234,7 +234,7 @@ PF_CONSOLE_CMD( Game, SwitchDialog, "string olddlgName, string newdlgName", "Hid PF_CONSOLE_SUBGROUP( Game, GUI ) -#include "../pfGameGUIMgr/pfGUICtrlGenerator.h" +#include "pfGameGUIMgr/pfGUICtrlGenerator.h" static hsColorRGBA sDynCtrlColor = hsColorRGBA().Set( 1, 1, 1, 1 ), sDynCtrlTextColor = hsColorRGBA().Set( 0, 0, 0, 1 ); @@ -275,7 +275,7 @@ PF_CONSOLE_CMD( Game_GUI, CreateDialog, "string name", "" ) //#include "../pfKI/pfKI.h" -#include "../pfMessage/pfKIMsg.h" +#include "pfMessage/pfKIMsg.h" PF_CONSOLE_CMD( Game, EnterChatMode, "", "Enters in-game chat mode" ) { @@ -393,7 +393,7 @@ PF_CONSOLE_CMD( Game, SetChatFadeDelay, "float delayInSecs", "Sets the time in s plgDispatch::MsgSend( msg ); } -#include "../plAvatar/plArmatureMod.h" +#include "plAvatar/plArmatureMod.h" PF_CONSOLE_CMD( Game, LimitAvatarLOD, "int newLOD", "Zero is (always) highest detail; 2 is (currently) lowest." ) { @@ -458,7 +458,7 @@ PF_CONSOLE_CMD( Game, SetLocalClientAsAdmin, "bool enable", "Makes chat messages } #endif -#include "../pfConditional/plObjectInBoxConditionalObject.h" +#include "pfConditional/plObjectInBoxConditionalObject.h" PF_CONSOLE_CMD( Game, BreakVolumeSensors, "bool break", "reverts to old broken volume sensor logic" ) { diff --git a/Sources/Plasma/FeatureLib/pfCsrSrv/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfCsrSrv/CMakeLists.txt new file mode 100644 index 00000000..bcd18325 --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfCsrSrv/CMakeLists.txt @@ -0,0 +1,19 @@ +include_directories(../../CoreLib) +include_directories(../../FeatureLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) +include_directories(../../PubUtilLib) + +set(pfCsrSrv_SOURCES + pfCsrSrv.cpp +) + +set(pfCsrSrv_HEADERS + Pch.h + pfCsrSrv.h +) + +add_library(pfCsrSrv STATIC ${pfCsrSrv_SOURCES} ${pfCsrSrv_HEADERS}) + +source_group("Source Files" FILES ${pfCsrSrv_SOURCES}) +source_group("Header Files" FILES ${pfCsrSrv_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfGameGUIMgr/CMakeLists.txt new file mode 100644 index 00000000..b66a9876 --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/CMakeLists.txt @@ -0,0 +1,67 @@ +include_directories(../../CoreLib) +include_directories(../../FeatureLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) +include_directories(../../PubUtilLib) + +set(pfGameGUIMgr_SOURCES + pfGameGUIMgr.cpp + pfGUIButtonMod.cpp + pfGUICheckBoxCtrl.cpp + pfGUIClickMapCtrl.cpp + pfGUIControlHandlers.cpp + pfGUIControlMod.cpp + pfGUICtrlGenerator.cpp + pfGUIDialogMod.cpp + pfGUIDialogNotifyProc.cpp + pfGUIDragBarCtrl.cpp + pfGUIDynDisplayCtrl.cpp + pfGUIEditBoxMod.cpp + pfGUIKnobCtrl.cpp + pfGUIListBoxMod.cpp + pfGUIListElement.cpp + pfGUIMenuItem.cpp + pfGUIMultiLineEditCtrl.cpp + pfGUIPopUpMenu.cpp + pfGUIProgressCtrl.cpp + pfGUIRadioGroupCtrl.cpp + pfGUITagDefs.cpp + pfGUITextBoxMod.cpp + pfGUIUpDownPairMod.cpp + pfGUIValueCtrl.cpp +) + +set(pfGameGUIMgr_HEADERS + pfGameGUIMgr.h + pfGameGUIMgrCreatable.h + pfGUIButtonMod.h + pfGUICheckBoxCtrl.h + pfGUIClickMapCtrl.h + pfGUIControlHandlers.h + pfGUIControlMod.h + pfGUICtrlGenerator.h + pfGUIDialogHandlers.h + pfGUIDialogMod.h + pfGUIDialogNotifyProc.cpp + pfGUIDragBarCtrl.h + pfGUIDraggableMod.h + pfGUIDynDisplayCtrl.h + pfGUIEditBoxMod.h + pfGUIKnobCtrl.h + pfGUIListBoxMod.h + pfGUIListElement.h + pfGUIMenuItem.h + pfGUIMultiLineEditCtrl.h + pfGUIPopUpMenu.h + pfGUIProgressCtrl.h + pfGUIRadioGroupCtrl.h + pfGUITagDefs.h + pfGUITextBoxMod.h + pfGUIUpDownPairMod.h + pfGUIValueCtrl.h +) + +add_library(pfGameGUIMgr STATIC ${pfGameGUIMgr_SOURCES} ${pfGameGUIMgr_HEADERS}) + +source_group("Source Files" FILES ${pfGameGUIMgr_SOURCES}) +source_group("Header Files" FILES ${pfGameGUIMgr_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIButtonMod.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIButtonMod.cpp index ecea7913..f780f2ee 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIButtonMod.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIButtonMod.cpp @@ -52,11 +52,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUIControlHandlers.h" #include "pfGUIDialogMod.h" -#include "../plInputCore/plInputInterface.h" -#include "../pnMessage/plRefMsg.h" -#include "../pfMessage/pfGameGUIMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plAvatar/plAGModifier.h" +#include "plInputCore/plInputInterface.h" +#include "pnMessage/plRefMsg.h" +#include "pfMessage/pfGameGUIMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plAvatar/plAGModifier.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUICheckBoxCtrl.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUICheckBoxCtrl.cpp index ca743081..f3dea959 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUICheckBoxCtrl.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUICheckBoxCtrl.cpp @@ -52,11 +52,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUICheckBoxCtrl.h" #include "pfGameGUIMgr.h" -#include "../plInputCore/plInputInterface.h" - #include "../pnMessage/plRefMsg.h" -#include "../pfMessage/pfGameGUIMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plAvatar/plAGModifier.h" +#include "plInputCore/plInputInterface.h" +#include "pnMessage/plRefMsg.h" +#include "pfMessage/pfGameGUIMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plAvatar/plAGModifier.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIClickMapCtrl.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIClickMapCtrl.cpp index f3bbf7f0..38ec8f65 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIClickMapCtrl.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIClickMapCtrl.cpp @@ -50,9 +50,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGameGUIMgr.h" #include "pfGUIDialogMod.h" -#include "../plInputCore/plInputInterface.h" -#include "../pnMessage/plRefMsg.h" -#include "../pfMessage/pfGameGUIMsg.h" +#include "plInputCore/plInputInterface.h" +#include "pnMessage/plRefMsg.h" +#include "pfMessage/pfGameGUIMsg.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlHandlers.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlHandlers.cpp index ecfa648b..23be469f 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlHandlers.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlHandlers.cpp @@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUIControlMod.h" #include "pfGUIDialogMod.h" -#include "../plMessage/plConsoleMsg.h" +#include "plMessage/plConsoleMsg.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlMod.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlMod.cpp index 2c4b61e3..a4773ae0 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlMod.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlMod.cpp @@ -53,23 +53,23 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUIDialogHandlers.h" #include "pfGUIListElement.h" // Includes dropTargetProc -#include "../pnMessage/plRefMsg.h" -#include "../pnMessage/plEnableMsg.h" -#include "../pfMessage/pfGameGUIMsg.h" -#include "../plMessage/plDeviceRecreateMsg.h" -#include "../pnSceneObject/plDrawInterface.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnSceneObject/plAudioInterface.h" - -#include "../plGImage/plDynamicTextMap.h" -#include "../plSurface/plLayer.h" -#include "../plMessage/plRenderMsg.h" -#include "../pnMessage/plSoundMsg.h" +#include "pnMessage/plRefMsg.h" +#include "pnMessage/plEnableMsg.h" +#include "pfMessage/pfGameGUIMsg.h" +#include "plMessage/plDeviceRecreateMsg.h" +#include "pnSceneObject/plDrawInterface.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plAudioInterface.h" + +#include "plGImage/plDynamicTextMap.h" +#include "plSurface/plLayer.h" +#include "plMessage/plRenderMsg.h" +#include "pnMessage/plSoundMsg.h" #include "plPipeline.h" -#include "../plDrawable/plAccessGeometry.h" -#include "../plDrawable/plAccessSpan.h" -#include "../plDrawable/plAccessVtxSpan.h" +#include "plDrawable/plAccessGeometry.h" +#include "plDrawable/plAccessSpan.h" +#include "plDrawable/plAccessVtxSpan.h" #include "pfGUIPopUpMenu.h" // For skin, can we move that please? Thank you diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlMod.h b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlMod.h index b31ab33e..93b637a9 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlMod.h +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlMod.h @@ -49,9 +49,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define _pfGUIControlMod_h -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" #include "hsBounds.h" -#include "../plMessage/plInputEventMsg.h" +#include "plMessage/plInputEventMsg.h" #include "pfGameGUIMgr.h" #include "hsColorRGBA.h" #include "hsRefCnt.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUICtrlGenerator.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUICtrlGenerator.cpp index fb988d9c..ea86b62c 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUICtrlGenerator.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUICtrlGenerator.cpp @@ -55,24 +55,24 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUIControlHandlers.h" #include "pfGUIMenuItem.h" -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plLayer.h" -#include "../plGImage/plMipmap.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../plDrawable/plDrawableSpans.h" -#include "../plDrawable/plDrawableGenerator.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plDrawInterface.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnMessage/plIntRefMsg.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../pnMessage/plNodeRefMsg.h" -#include "../plPipeline/plTextGenerator.h" -#include "../plScene/plPostEffectMod.h" -#include "../plScene/plSceneNode.h" -#include "../pnMessage/plClientMsg.h" -#include "../plMessage/plLayRefMsg.h" -#include "../pnMessage/plAttachMsg.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plLayer.h" +#include "plGImage/plMipmap.h" +#include "pnKeyedObject/plFixedKey.h" +#include "plDrawable/plDrawableSpans.h" +#include "plDrawable/plDrawableGenerator.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plDrawInterface.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnMessage/plIntRefMsg.h" +#include "pnMessage/plObjRefMsg.h" +#include "pnMessage/plNodeRefMsg.h" +#include "plPipeline/plTextGenerator.h" +#include "plScene/plPostEffectMod.h" +#include "plScene/plSceneNode.h" +#include "pnMessage/plClientMsg.h" +#include "plMessage/plLayRefMsg.h" +#include "pnMessage/plAttachMsg.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogMod.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogMod.cpp index ec7286f6..01848c2d 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogMod.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogMod.cpp @@ -52,18 +52,18 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUIDialogHandlers.h" #include "pfGUIDialogNotifyProc.h" #include "pfGUIListElement.h" -#include "../plScene/plPostEffectMod.h" +#include "plScene/plPostEffectMod.h" -#include "../pnMessage/plRefMsg.h" -#include "../pfMessage/pfGameGUIMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plScene/plSceneNode.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnSceneObject/plCoordinateInterface.h" +#include "pnMessage/plRefMsg.h" +#include "pfMessage/pfGameGUIMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plScene/plSceneNode.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnSceneObject/plCoordinateInterface.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" #include "plgDispatch.h" #include "hsResMgr.h" @@ -402,7 +402,7 @@ void pfGUIDialogMod::UpdateInterestingThings( hsScalar mouseX, hsScalar mouseY, //// HandleMouseEvent //////////////////////////////////////////////////////// #ifdef HS_DEBUGGING // Debugging bounds rects -#include "../plPipeline/plDebugText.h" +#include "plPipeline/plDebugText.h" #endif hsBool pfGUIDialogMod::HandleMouseEvent( pfGameGUIMgr::EventType event, hsScalar mouseX, hsScalar mouseY, diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogMod.h b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogMod.h index 4f00e2f7..1b4049db 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogMod.h +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogMod.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define _pfGUIDialogMod_h -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" #include "pfGameGUIMgr.h" #include "hsMatrix44.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogNotifyProc.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogNotifyProc.cpp index 544ad293..a5453ea7 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogNotifyProc.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogNotifyProc.cpp @@ -61,7 +61,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUIListBoxMod.h" #include "pfGUIEditBoxMod.h" -#include "../pfMessage/pfGUINotifyMsg.h" +#include "pfMessage/pfGUINotifyMsg.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogNotifyProc.h b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogNotifyProc.h index f04e2fcd..8bbaeee6 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogNotifyProc.h +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogNotifyProc.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define _pfGUIDialogNotifyProc_h #include "pfGUIDialogHandlers.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" class plGUIControlMod; diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDragBarCtrl.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDragBarCtrl.cpp index ca70c714..146caa35 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDragBarCtrl.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDragBarCtrl.cpp @@ -54,11 +54,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGameGUIMgr.h" #include "pfGUIDialogMod.h" -#include "../plInputCore/plInputInterface.h" -#include "../pnMessage/plRefMsg.h" -#include "../pfMessage/pfGameGUIMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plAvatar/plAGModifier.h" +#include "plInputCore/plInputInterface.h" +#include "pnMessage/plRefMsg.h" +#include "pfMessage/pfGameGUIMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plAvatar/plAGModifier.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDraggableMod.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDraggableMod.cpp index 9f2aecae..7a8e59a4 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDraggableMod.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDraggableMod.cpp @@ -49,11 +49,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUIDraggableMod.h" #include "pfGameGUIMgr.h" -#include "../pnMessage/plRefMsg.h" -#include "../pfMessage/pfGameGUIMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plAvatar/plAGModifier.h" -#include "../plInputCore/plInputInterface.h" +#include "pnMessage/plRefMsg.h" +#include "pfMessage/pfGameGUIMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plAvatar/plAGModifier.h" +#include "plInputCore/plInputInterface.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDynDisplayCtrl.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDynDisplayCtrl.cpp index eeb66986..833052bc 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDynDisplayCtrl.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDynDisplayCtrl.cpp @@ -49,11 +49,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUIDynDisplayCtrl.h" #include "pfGameGUIMgr.h" -#include "../pnMessage/plRefMsg.h" -#include "../plGImage/plDynamicTextMap.h" -#include "../plSurface/plLayerInterface.h" -#include "../plSurface/hsGMaterial.h" -#include "../plPipeline/plTextGenerator.h" +#include "pnMessage/plRefMsg.h" +#include "plGImage/plDynamicTextMap.h" +#include "plSurface/plLayerInterface.h" +#include "plSurface/hsGMaterial.h" +#include "plPipeline/plTextGenerator.h" #include "plPipeline.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIEditBoxMod.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIEditBoxMod.cpp index ba5412fa..e524a08a 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIEditBoxMod.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIEditBoxMod.cpp @@ -53,15 +53,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUIEditBoxMod.h" #include "pfGameGUIMgr.h" -#include "../pnMessage/plRefMsg.h" -#include "../pfMessage/pfGameGUIMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plAvatar/plAGModifier.h" -#include "../plGImage/plDynamicTextMap.h" +#include "pnMessage/plRefMsg.h" +#include "pfMessage/pfGameGUIMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plAvatar/plAGModifier.h" +#include "plGImage/plDynamicTextMap.h" #include "plgDispatch.h" #include "hsResMgr.h" -#include "../pnInputCore/plKeyMap.h" -#include "../plClipboard/plClipboard.h" +#include "pnInputCore/plKeyMap.h" +#include "plClipboard/plClipboard.h" #include diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIEditBoxMod.h b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIEditBoxMod.h index 7216968e..9e0aeb4c 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIEditBoxMod.h +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIEditBoxMod.h @@ -50,9 +50,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStlUtils.h" #include "pfGUIControlMod.h" -#include "../pnInputCore/plKeyDef.h" +#include "pnInputCore/plKeyDef.h" -#include "../plInputCore/plInputDevice.h" +#include "plInputCore/plInputDevice.h" class plMessage; class hsGMaterial; diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIKnobCtrl.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIKnobCtrl.cpp index 16ec5bb9..4263c213 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIKnobCtrl.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIKnobCtrl.cpp @@ -50,17 +50,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGameGUIMgr.h" #include "pfGUIDialogMod.h" -#include "../plInputCore/plInputInterface.h" -#include "../pnMessage/plRefMsg.h" -#include "../pfMessage/pfGameGUIMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -// #include "../plAvatar/plAGModifier.h" -#include "../plAvatar/plAGMasterMod.h" -#include "../plAvatar/plAGAnimInstance.h" -#include "../plSurface/plLayerAnimation.h" - -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" +#include "plInputCore/plInputInterface.h" +#include "pnMessage/plRefMsg.h" +#include "pfMessage/pfGameGUIMsg.h" +#include "plMessage/plAnimCmdMsg.h" +// #include "plAvatar/plAGModifier.h" +#include "plAvatar/plAGMasterMod.h" +#include "plAvatar/plAGAnimInstance.h" +#include "plSurface/plLayerAnimation.h" + +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIListBoxMod.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIListBoxMod.cpp index 34359191..8c640fb9 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIListBoxMod.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIListBoxMod.cpp @@ -53,12 +53,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUIControlHandlers.h" #include "pfGUIDialogMod.h" -#include "../pnMessage/plRefMsg.h" -#include "../pfMessage/pfGameGUIMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plAvatar/plAGModifier.h" -#include "../plGImage/plDynamicTextMap.h" -#include "../plInputCore/plInputInterface.h" +#include "pnMessage/plRefMsg.h" +#include "pfMessage/pfGameGUIMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plAvatar/plAGModifier.h" +#include "plGImage/plDynamicTextMap.h" +#include "plInputCore/plInputInterface.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIListElement.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIListElement.cpp index 031fab5c..f9f5a2f3 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIListElement.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIListElement.cpp @@ -51,9 +51,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUIPopUpMenu.h" // For skins -#include "../plGImage/plDynamicTextMap.h" -#include "../plGImage/hsCodecManager.h" -#include "../plPipeline/plDebugText.h" // To quickly and hackily get the screen size in pixels +#include "plGImage/plDynamicTextMap.h" +#include "plGImage/hsCodecManager.h" +#include "plPipeline/plDebugText.h" // To quickly and hackily get the screen size in pixels #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMenuItem.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMenuItem.cpp index c428294c..38d859fa 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMenuItem.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMenuItem.cpp @@ -54,9 +54,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUIDialogMod.h" #include "pfGUIPopUpMenu.h" -#include "../plInputCore/plInputInterface.h" -#include "../pnMessage/plRefMsg.h" -#include "../plGImage/plDynamicTextMap.h" +#include "plInputCore/plInputInterface.h" +#include "pnMessage/plRefMsg.h" +#include "plGImage/plDynamicTextMap.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMultiLineEditCtrl.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMultiLineEditCtrl.cpp index 40e3fb56..933e8f05 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMultiLineEditCtrl.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMultiLineEditCtrl.cpp @@ -53,11 +53,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUIDialogMod.h" #include "pfGUIDialogHandlers.h" -#include "../pnMessage/plRefMsg.h" -#include "../pfMessage/pfGameGUIMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plAvatar/plAGModifier.h" -#include "../plGImage/plDynamicTextMap.h" +#include "pnMessage/plRefMsg.h" +#include "pfMessage/pfGameGUIMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plAvatar/plAGModifier.h" +#include "plGImage/plDynamicTextMap.h" #include "plgDispatch.h" #include "hsResMgr.h" #include "../plClipboard/plClipboard.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMultiLineEditCtrl.h b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMultiLineEditCtrl.h index 3a4c621c..7fb9fcba 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMultiLineEditCtrl.h +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMultiLineEditCtrl.h @@ -51,7 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUIControlMod.h" #include "hsTemplates.h" -#include "../plInputCore/plInputDevice.h" +#include "plInputCore/plInputDevice.h" class plMessage; class hsGMaterial; diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIPopUpMenu.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIPopUpMenu.cpp index 70fd5418..87fb23fe 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIPopUpMenu.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIPopUpMenu.cpp @@ -62,24 +62,24 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plgDispatch.h" #include "hsResMgr.h" -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plLayer.h" -#include "../plGImage/plDynamicTextMap.h" -#include "../plMessage/plLayRefMsg.h" - -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plDrawInterface.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnMessage/plIntRefMsg.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../pnMessage/plNodeRefMsg.h" - -#include "../plScene/plPostEffectMod.h" -#include "../plScene/plSceneNode.h" -#include "../pnMessage/plClientMsg.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plLayer.h" +#include "plGImage/plDynamicTextMap.h" +#include "plMessage/plLayRefMsg.h" + +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plDrawInterface.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnMessage/plIntRefMsg.h" +#include "pnMessage/plObjRefMsg.h" +#include "pnMessage/plNodeRefMsg.h" + +#include "plScene/plPostEffectMod.h" +#include "plScene/plSceneNode.h" +#include "pnMessage/plClientMsg.h" #include "plViewTransform.h" -#include "../plPipeline/plDebugText.h" +#include "plPipeline/plDebugText.h" class pfPopUpKeyGenerator @@ -731,7 +731,7 @@ hsGMaterial *pfGUIPopUpMenu::ICreateDynMaterial( void ) //// Build /////////////////////////////////////////////////////////////////// // Constructs a shiny new pop-up menu at runtime, complete with trimmings -#include "../plJPEG/plJPEG.h" +#include "plJPEG/plJPEG.h" pfGUIPopUpMenu *pfGUIPopUpMenu::Build( const char *name, pfGUIDialogMod *parent, hsScalar x, hsScalar y, const plLocation &destLoc ) { diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIProgressCtrl.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIProgressCtrl.cpp index 3514509d..a42ee3ca 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIProgressCtrl.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIProgressCtrl.cpp @@ -50,19 +50,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGameGUIMgr.h" #include "pfGUIDialogMod.h" -#include "../plInputCore/plInputInterface.h" -#include "../pnMessage/plRefMsg.h" -#include "../pfMessage/pfGameGUIMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plMessage/plTimerCallbackMsg.h" -// #include "../plAvatar/plAGModifier.h" -#include "../plAvatar/plAGMasterMod.h" -#include "../plAvatar/plAGAnimInstance.h" -#include "../plSurface/plLayerAnimation.h" - -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnTimer/plTimerCallbackManager.h" +#include "plInputCore/plInputInterface.h" +#include "pnMessage/plRefMsg.h" +#include "pfMessage/pfGameGUIMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plMessage/plTimerCallbackMsg.h" +// #include "plAvatar/plAGModifier.h" +#include "plAvatar/plAGMasterMod.h" +#include "plAvatar/plAGAnimInstance.h" +#include "plSurface/plLayerAnimation.h" + +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnTimer/plTimerCallbackManager.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIRadioGroupCtrl.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIRadioGroupCtrl.cpp index 5f4bdfca..b4a8376f 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIRadioGroupCtrl.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIRadioGroupCtrl.cpp @@ -51,8 +51,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUICheckBoxCtrl.h" #include "pfGUIControlHandlers.h" -#include "../pnMessage/plRefMsg.h" -#include "../pfMessage/pfGameGUIMsg.h" +#include "pnMessage/plRefMsg.h" +#include "pfMessage/pfGameGUIMsg.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUITextBoxMod.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUITextBoxMod.cpp index 972030e3..2f75a1c2 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUITextBoxMod.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUITextBoxMod.cpp @@ -50,16 +50,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUITextBoxMod.h" #include "pfGameGUIMgr.h" -#include "../pnMessage/plRefMsg.h" -#include "../pfMessage/pfGameGUIMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plAvatar/plAGModifier.h" -#include "../plGImage/plDynamicTextMap.h" +#include "pnMessage/plRefMsg.h" +#include "pfMessage/pfGameGUIMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plAvatar/plAGModifier.h" +#include "plGImage/plDynamicTextMap.h" #include "plgDispatch.h" #include "hsResMgr.h" -#include "../plResMgr/plLocalization.h" +#include "plResMgr/plLocalization.h" -#include "../pfLocalizationMgr/pfLocalizationMgr.h" +#include "pfLocalizationMgr/pfLocalizationMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIUpDownPairMod.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIUpDownPairMod.cpp index 98dcc5e1..3ac1b91b 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIUpDownPairMod.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIUpDownPairMod.cpp @@ -51,10 +51,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUIButtonMod.h" #include "pfGUIControlHandlers.h" -#include "../pnMessage/plRefMsg.h" -#include "../pfMessage/pfGameGUIMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plAvatar/plAGModifier.h" +#include "pnMessage/plRefMsg.h" +#include "pfMessage/pfGameGUIMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plAvatar/plAGModifier.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgr.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgr.cpp index a329c311..b46b1a75 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgr.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgr.cpp @@ -59,21 +59,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUIControlMod.h" #include "pfGUIPopUpMenu.h" -#include "../pfMessage/pfGameGUIMsg.h" -#include "../plMessage/plInputEventMsg.h" -#include "../plMessage/plInputIfaceMgrMsg.h" -#include "../pnMessage/plClientMsg.h" -#include "../pnNetCommon/plSynchedObject.h" -#include "../plInputCore/plInputInterface.h" -#include "../plInputCore/plInputDevice.h" -#include "../plInputCore/plInputInterfaceMgr.h" -#include "../pnInputCore/plKeyMap.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnSceneObject/plSceneObject.h" // So we can get the target sceneNode of a dialog -#include "../plMessage/plConsoleMsg.h" +#include "pfMessage/pfGameGUIMsg.h" +#include "plMessage/plInputEventMsg.h" +#include "plMessage/plInputIfaceMgrMsg.h" +#include "pnMessage/plClientMsg.h" +#include "pnNetCommon/plSynchedObject.h" +#include "plInputCore/plInputInterface.h" +#include "plInputCore/plInputDevice.h" +#include "plInputCore/plInputInterfaceMgr.h" +#include "pnInputCore/plKeyMap.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnSceneObject/plSceneObject.h" // So we can get the target sceneNode of a dialog +#include "plMessage/plConsoleMsg.h" #include "plgDispatch.h" -#include "../plResMgr/plKeyFinder.h" +#include "plResMgr/plKeyFinder.h" #include "pfGUITagDefs.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgr.h b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgr.h index ac371bbc..9c362844 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgr.h +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgr.h @@ -56,8 +56,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsTemplates.h" -#include "../pnInputCore/plKeyDef.h" -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnInputCore/plKeyDef.h" +#include "pnKeyedObject/hsKeyedObject.h" #include class plPipeline; diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgrCreatable.h b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgrCreatable.h index bdb42a61..eb6b0ac4 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgrCreatable.h +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgrCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _pfGameGUIMgrCreatable_inc #define _pfGameGUIMgrCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "pfGameGUIMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameMgr/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfGameMgr/CMakeLists.txt new file mode 100644 index 00000000..fcd34cfe --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfGameMgr/CMakeLists.txt @@ -0,0 +1,35 @@ +include_directories(../../CoreLib) +include_directories(../../FeatureLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) +include_directories(../../PubUtilLib) + +include_directories(${OPENSSL_INCLUDE_DIR}) + +set(pfGameMgr_SOURCES + pfGameMgr.cpp + BlueSpiral/pfGmBlueSpiral.cpp + ClimbingWall/pfGmClimbingWall.cpp + Heek/pfGmHeek.cpp + Marker/pfGmMarker.cpp + TicTacToe/pfGmTicTacToe.cpp + VarSync/pfGmVarSync.cpp +) + +set(pfGameMgr_HEADERS + Intern.h + Pch.h + pfGameMgr.h + pfGameMgrCreatables.h + BlueSpiral/pfGmBlueSpiral.h + ClimbingWall/pfGmClimbingWall.h + Heek/pfGmHeek.h + Marker/pfGmMarker.h + TicTacToe/pfGmTicTacToe.h + VarSync/pfGmVarSync.cpp +) + +add_library(pfGameMgr ${pfGameMgr_SOURCES} ${pfGameMgr_HEADERS}) + +source_group("Source Files" FILES ${pfGameMgr_SOURCES}) +source_group("Header Files" FILES ${pfGameMgr_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfGameMgr/Pch.h b/Sources/Plasma/FeatureLib/pfGameMgr/Pch.h index e0792540..d866121d 100644 --- a/Sources/Plasma/FeatureLib/pfGameMgr/Pch.h +++ b/Sources/Plasma/FeatureLib/pfGameMgr/Pch.h @@ -51,20 +51,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define PLASMA20_SOURCES_PLASMA_FEATURELIB_PFGAMEMGR_PCH_H -#include "../pnUtils/pnUtils.h" -#include "../pnNetBase/pnNetBase.h" -#include "../pnAsyncCore/pnAsyncCore.h" -#include "../pnNetCli/pnNetCli.h" -#include "../pnProduct/pnProduct.h" -#include "../pnGameMgr/pnGameMgr.h" -#include "../plNetGameLib/plNetGameLib.h" +#include "pnUtils/pnUtils.h" +#include "pnNetBase/pnNetBase.h" +#include "pnAsyncCore/pnAsyncCore.h" +#include "pnNetCli/pnNetCli.h" +#include "pnProduct/pnProduct.h" +#include "pnGameMgr/pnGameMgr.h" +#include "plNetGameLib/plNetGameLib.h" #pragma warning(push, 0) // These includes produce lots of warnings on W4 -#include "../pnMessage/plMessage.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../pfConsole/pfConsole.h" +#include "pnMessage/plMessage.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "plNetClient/plNetClientMgr.h" +#include "pfConsole/pfConsole.h" #pragma warning(pop) #include "pfGameMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameMgr/pfGameMgr.h b/Sources/Plasma/FeatureLib/pfGameMgr/pfGameMgr.h index 7539da9c..549ecaa0 100644 --- a/Sources/Plasma/FeatureLib/pfGameMgr/pfGameMgr.h +++ b/Sources/Plasma/FeatureLib/pfGameMgr/pfGameMgr.h @@ -49,17 +49,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define PLASMA20_SOURCES_PLASMA_FEATURELIB_PFGAMEMGR_PFGAMEMGR_H -#include "../pnUtils/pnUtils.h" -#include "../pnNetBase/pnNetBase.h" -#include "../pnAsyncCore/pnAsyncCore.h" -#include "../pnNetCli/pnNetCli.h" -#include "../pnProduct/pnProduct.h" -#include "../plNetGameLib/plNetGameLib.h" +#include "pnUtils/pnUtils.h" +#include "pnNetBase/pnNetBase.h" +#include "pnAsyncCore/pnAsyncCore.h" +#include "pnNetCli/pnNetCli.h" +#include "pnProduct/pnProduct.h" +#include "plNetGameLib/plNetGameLib.h" #pragma warning(push, 0) // These includes produce lots of warnings on W4 -#include "../pnMessage/plMessage.h" -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnMessage/plMessage.h" +#include "pnKeyedObject/hsKeyedObject.h" #pragma warning(pop) diff --git a/Sources/Plasma/FeatureLib/pfGameScoreMgr/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfGameScoreMgr/CMakeLists.txt new file mode 100644 index 00000000..3702746b --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfGameScoreMgr/CMakeLists.txt @@ -0,0 +1,17 @@ +include_directories(../../CoreLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) +include_directories(../../PubUtilLib) + +set(pfGameScoreMgr_SOURCES + pfGameScoreMgr.cpp +) + +set(pfGameScoreMgr_HEADERS + pfGameScoreMgr.h +) + +add_library(pfGameScoreMgr STATIC ${pfGameScoreMgr_SOURCES} ${pfGameScoreMgr_HEADERS}) + +source_group("Source Files" FILES ${pfGameScoreMgr_SOURCES}) +source_group("Header Files" FILES ${pfGameScoreMgr_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfGameScoreMgr/pfGameScoreMgr.cpp b/Sources/Plasma/FeatureLib/pfGameScoreMgr/pfGameScoreMgr.cpp index 9a6b9f21..f715a89d 100644 --- a/Sources/Plasma/FeatureLib/pfGameScoreMgr/pfGameScoreMgr.cpp +++ b/Sources/Plasma/FeatureLib/pfGameScoreMgr/pfGameScoreMgr.cpp @@ -41,9 +41,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pfGameScoreMgr.h" -#include "../pnUtils/pnUtils.h" -#include "../plNetGameLib/plNetGameLib.h" -#include "../pnNetProtocol/pnNetProtocol.h" +#include "pnUtils/pnUtils.h" +#include "plNetGameLib/plNetGameLib.h" +#include "pnNetProtocol/pnNetProtocol.h" //============================================================================ pfGameScore::pfGameScore() diff --git a/Sources/Plasma/FeatureLib/pfGameScoreMgr/pfGameScoreMgr.h b/Sources/Plasma/FeatureLib/pfGameScoreMgr/pfGameScoreMgr.h index b1216988..b3c8711b 100644 --- a/Sources/Plasma/FeatureLib/pfGameScoreMgr/pfGameScoreMgr.h +++ b/Sources/Plasma/FeatureLib/pfGameScoreMgr/pfGameScoreMgr.h @@ -49,8 +49,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define PLASMA20_SOURCES_PLASMA_FEATURELIB_PFGAMESCOREMGR_PFGAMESCOREMGR_H #include "hsTypes.h" -#include "../pnNetBase/pnNetBase.h" -#include "../pnUtils/pnUtils.h" +#include "pnNetBase/pnNetBase.h" +#include "pnUtils/pnUtils.h" struct NetGameRank; diff --git a/Sources/Plasma/FeatureLib/pfJournalBook/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfJournalBook/CMakeLists.txt new file mode 100644 index 00000000..7397a43c --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfJournalBook/CMakeLists.txt @@ -0,0 +1,21 @@ +include_directories(../../CoreLib) +include_directories(../../FeatureLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) +include_directories(../../PubUtilLib) + +include_directories(${OPENSSL_INCLUDE_DIR}) + +set(pfJournalBook_SOURCES + pfJournalBook.cpp +) + +set(pfJournalBook_HEADERS + pfJournalBook.h + pfJournalBookCreatable.h +) + +add_library(pfJournalBook STATIC ${pfJournalBook_SOURCES} ${pfJournalBook_HEADERS}) + +source_group("Source Files" FILES ${pfJournalBook_SOURCES}) +source_group("Header Files" FILES ${pfJournalBook_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp b/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp index 4b29c28c..7623466d 100644 --- a/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp +++ b/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp @@ -54,48 +54,48 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "pcSmallRect.h" #include "plgDispatch.h" -#include "../pfGameGUIMgr/pfGUIDialogMod.h" -#include "../pfGameGUIMgr/pfGUIControlMod.h" -#include "../pfGameGUIMgr/pfGUICheckBoxCtrl.h" -#include "../pfGameGUIMgr/pfGUIDialogHandlers.h" -#include "../pfGameGUIMgr/pfGUIDynDisplayCtrl.h" -#include "../pfGameGUIMgr/pfGUIClickMapCtrl.h" -#include "../pfGameGUIMgr/pfGUIButtonMod.h" -#include "../pfGameGUIMgr/pfGUIProgressCtrl.h" -#include "../pfGameGUIMgr/pfGUIMultiLineEditCtrl.h" - -#include "../pfMessage/pfGUINotifyMsg.h" -#include "../plGImage/plMipmap.h" -#include "../plGImage/plDynamicTextMap.h" -#include "../plPipeline/hsGDeviceRef.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnMessage/plRefMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../plMessage/plLayRefMsg.h" -#include "../plMessage/plMatRefMsg.h" -#include "../plSurface/plLayerInterface.h" -#include "../plSurface/plLayer.h" -#include "../plSurface/hsGMaterial.h" -#include "../plAgeLoader/plAgeLoader.h" +#include "pfGameGUIMgr/pfGUIDialogMod.h" +#include "pfGameGUIMgr/pfGUIControlMod.h" +#include "pfGameGUIMgr/pfGUICheckBoxCtrl.h" +#include "pfGameGUIMgr/pfGUIDialogHandlers.h" +#include "pfGameGUIMgr/pfGUIDynDisplayCtrl.h" +#include "pfGameGUIMgr/pfGUIClickMapCtrl.h" +#include "pfGameGUIMgr/pfGUIButtonMod.h" +#include "pfGameGUIMgr/pfGUIProgressCtrl.h" +#include "pfGameGUIMgr/pfGUIMultiLineEditCtrl.h" + +#include "pfMessage/pfGUINotifyMsg.h" +#include "plGImage/plMipmap.h" +#include "plGImage/plDynamicTextMap.h" +#include "plPipeline/hsGDeviceRef.h" +#include "plMessage/plAnimCmdMsg.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnMessage/plRefMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "plMessage/plLayRefMsg.h" +#include "plMessage/plMatRefMsg.h" +#include "plSurface/plLayerInterface.h" +#include "plSurface/plLayer.h" +#include "plSurface/hsGMaterial.h" +#include "plAgeLoader/plAgeLoader.h" #ifdef USE_BINK_SDK -#include "../pfSurface/plLayerBink.h" +#include "pfSurface/plLayerBink.h" #endif // So we can do image searches in our local age -#include "../plNetClient/plNetClientMgr.h" -#include "../plResMgr/plKeyFinder.h" +#include "plNetClient/plNetClientMgr.h" +#include "plResMgr/plKeyFinder.h" // For notify sends -#include "../pnMessage/plNotifyMsg.h" -#include "../pnTimer/plTimerCallbackManager.h" -#include "../plMessage/plTimerCallbackMsg.h" +#include "pnMessage/plNotifyMsg.h" +#include "pnTimer/plTimerCallbackManager.h" +#include "plMessage/plTimerCallbackMsg.h" // For custom cursors -#include "../plInputCore/plInputInterface.h" +#include "plInputCore/plInputInterface.h" // For measuring text -#include "../plGImage/plFont.h" +#include "plGImage/plFont.h" // For SFX #include "hsTimer.h" @@ -2507,7 +2507,7 @@ void pfJournalBook::IFreeSource( void ) // image name. #ifndef PLASMA_EXTERNAL_RELEASE -#include "../plJPEG/plJPEG.h" +#include "plJPEG/plJPEG.h" #endif plKey pfJournalBook::IGetMipmapKey( const wchar_t *name, const plLocation &loc ) diff --git a/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.h b/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.h index 096d5a58..9e76ce53 100644 --- a/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.h +++ b/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.h @@ -169,8 +169,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTemplates.h" #include "hsColorRGBA.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/plUoid.h" diff --git a/Sources/Plasma/FeatureLib/pfLocalizationMgr/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfLocalizationMgr/CMakeLists.txt new file mode 100644 index 00000000..c2915b80 --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfLocalizationMgr/CMakeLists.txt @@ -0,0 +1,25 @@ +include_directories(../../CoreLib) +include_directories(../../PubUtilLib) + +include_directories(${EXPAT_INCLUDE_DIR}) + +add_definitions(-DXML_UNICODE_WCHAR_T) +add_definitions(-DXML_STATIC) +add_definitions(-DWIN32) + +set(pfLocalizationMgr_SOURCES + pfLocalizationDataMgr.cpp + pfLocalizationMgr.cpp + pfLocalizedString.cpp +) + +set(pfLocalizationMgr_HEADERS + pfLocalizationDataMgr.h + pfLocalizationMgr.h + pfLocalizedString.h +) + +add_library(pfLocalizationMgr STATIC ${pfLocalizationMgr_SOURCES} ${pfLocalizationMgr_HEADERS}) + +source_group("Source Files" FILES ${pfLocalizationMgr_SOURCES}) +source_group("Header Files" FILES ${pfLocalizationMgr_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizationDataMgr.cpp b/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizationDataMgr.cpp index 5507db20..5065d07a 100644 --- a/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizationDataMgr.cpp +++ b/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizationDataMgr.cpp @@ -48,17 +48,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsUtils.h" -#include "../plResMgr/plLocalization.h" +#include "plResMgr/plLocalization.h" -#include "../plFile/hsFiles.h" -#include "../plFile/plEncryptedStream.h" -#include "../plStatusLog/plStatusLog.h" +#include "plFile/hsFiles.h" +#include "plFile/plEncryptedStream.h" +#include "plStatusLog/plStatusLog.h" #include "pfLocalizedString.h" #include "pfLocalizationMgr.h" #include "pfLocalizationDataMgr.h" -#include "expat.h" +#include #include @@ -66,11 +66,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #endif -// Add ..\..\..\..\..\StaticSDKs\XPlatform\expat-1.95.7\StaticLibs\Win32 to your -// lib include path if you include this file. -#pragma comment(lib, "libexpatwMT.lib") - - ////////////////////////////////////////////////////////////////////// // // LocalizationXMLFile - a basic class for storing all the diff --git a/Sources/Plasma/FeatureLib/pfLoginDialog/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfLoginDialog/CMakeLists.txt new file mode 100644 index 00000000..6c60c8c3 --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfLoginDialog/CMakeLists.txt @@ -0,0 +1,23 @@ +include_directories(../../CoreLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) +include_directories(../../PubUtilLib) + +set(pfLoginDialog_SOURCES + plLoginDialog.cpp +) + +set(pfLoginDialog_HEADERS + plLoginDialog.h + resource.h +) + +set(pfLoginDialog_RESOURCES + pfLoginDialog.rc +) + +add_library(pfLoginDialog STATIC ${pfLoginDialog_SOURCES} ${pfLoginDialog_HEADERS} ${pfLoginDialog_RESOURCES}) + +source_group("Source Files" FILES ${pfLoginDialog_SOURCES}) +source_group("Header Files" FILES ${pfLoginDialog_HEADERS}) +source_group("Resource Files" FILES ${pfLoginDialog_RESOURCES}) diff --git a/Sources/Plasma/FeatureLib/pfLoginDialog/plLoginDialog.cpp b/Sources/Plasma/FeatureLib/pfLoginDialog/plLoginDialog.cpp index 840b3014..3fa093c1 100644 --- a/Sources/Plasma/FeatureLib/pfLoginDialog/plLoginDialog.cpp +++ b/Sources/Plasma/FeatureLib/pfLoginDialog/plLoginDialog.cpp @@ -41,12 +41,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plLoginDialog.h" #include "resource.h" -#include "../plNetCommon/plNetCommonConstants.h" -#include "../plNetMessage/plNetMessage.h" -#include "../plHttpServer/plHttpResponse.h" -#include "../plSDL/plSDL.h" -#include "../plFile/hsFiles.h" -#include "../plNetMessage/plNetCommonMessage.h" +#include "plNetCommon/plNetCommonConstants.h" +#include "plNetMessage/plNetMessage.h" +// #include "plHttpServer/plHttpResponse.h" +#include "plSDL/plSDL.h" +#include "plFile/hsFiles.h" +#include "plNetMessage/plNetCommonMessage.h" // 'this' : used in base member initializer list #pragma warning(disable:4355) diff --git a/Sources/Plasma/FeatureLib/pfLoginDialog/plLoginDialog.h b/Sources/Plasma/FeatureLib/pfLoginDialog/plLoginDialog.h index 9244e440..5378e175 100644 --- a/Sources/Plasma/FeatureLib/pfLoginDialog/plLoginDialog.h +++ b/Sources/Plasma/FeatureLib/pfLoginDialog/plLoginDialog.h @@ -42,9 +42,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLoginDialog_h_inc #define plLoginDialog_h_inc -#include "../plWndCtrls/plWndCtrls.h" -#include "../plEncryption/plChallengeResponse.h" -#include "../pnNetCommon/plNetAddress.h" +#include "plWndCtrls/plWndCtrls.h" +// #include "plEncryption/plChallengeResponse.h" +#include "pnNetCommon/plNetAddress.h" class plMainDialog; class plNetMsgAuthenticateChallenge; diff --git a/Sources/Plasma/FeatureLib/pfMessage/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfMessage/CMakeLists.txt new file mode 100644 index 00000000..1c6a581b --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfMessage/CMakeLists.txt @@ -0,0 +1,28 @@ +include_directories(../../CoreLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) +include_directories(../../PubUtilLib) + +set(pfMessage_SOURCES + pfKIMsg.cpp + pfMarkerMsg.cpp + pfMovieEventMsg.cpp + plArmatureEffectMsg.cpp + plClothingMsg.cpp +) + +set(pfMessage_HEADERS + pfBackdoorMsg.h + pfGameGUIMsg.h + pfKIMsg.h + pfMarkerMsg.h + pfMessageCreatable.h + pfMovieEventMsg.h + plArmatureEffectMsg.h + plClothingMsg.h +) + +add_library(pfMessage STATIC ${pfMessage_SOURCES} ${pfMessage_HEADERS}) + +source_group("Source Files" FILES ${pfMessage_SOURCES}) +source_group("Header Files" FILES ${pfMessage_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfMessage/pfBackdoorMsg.h b/Sources/Plasma/FeatureLib/pfMessage/pfBackdoorMsg.h index c7a3690c..00036eef 100644 --- a/Sources/Plasma/FeatureLib/pfMessage/pfBackdoorMsg.h +++ b/Sources/Plasma/FeatureLib/pfMessage/pfBackdoorMsg.h @@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsStream.h" -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class pfBackdoorMsg : public plMessage { diff --git a/Sources/Plasma/FeatureLib/pfMessage/pfGUINotifyMsg.h b/Sources/Plasma/FeatureLib/pfMessage/pfGUINotifyMsg.h index 901207e2..59307d8f 100644 --- a/Sources/Plasma/FeatureLib/pfMessage/pfGUINotifyMsg.h +++ b/Sources/Plasma/FeatureLib/pfMessage/pfGUINotifyMsg.h @@ -42,9 +42,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _pfGUINotifyMsg_h_ #define _pfGUINotifyMsg_h_ -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsResMgr.h" -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" #include "hsUtils.h" diff --git a/Sources/Plasma/FeatureLib/pfMessage/pfGameGUIMsg.h b/Sources/Plasma/FeatureLib/pfMessage/pfGameGUIMsg.h index 06f92384..0a578441 100644 --- a/Sources/Plasma/FeatureLib/pfMessage/pfGameGUIMsg.h +++ b/Sources/Plasma/FeatureLib/pfMessage/pfGameGUIMsg.h @@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsStream.h" -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class pfGameGUIMsg : public plMessage { diff --git a/Sources/Plasma/FeatureLib/pfMessage/pfKIMsg.cpp b/Sources/Plasma/FeatureLib/pfMessage/pfKIMsg.cpp index 88603c4f..773e549c 100644 --- a/Sources/Plasma/FeatureLib/pfMessage/pfKIMsg.cpp +++ b/Sources/Plasma/FeatureLib/pfMessage/pfKIMsg.cpp @@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // ////////////////////////////////////////////////////////////////////////////// -#include "../pfMessage/pfKIMsg.h" +#include "pfKIMsg.h" const char* pfKIMsg::kChronicleKILevel = "PlayerKILevel"; diff --git a/Sources/Plasma/FeatureLib/pfMessage/pfKIMsg.h b/Sources/Plasma/FeatureLib/pfMessage/pfKIMsg.h index 6c5d104e..7252637e 100644 --- a/Sources/Plasma/FeatureLib/pfMessage/pfKIMsg.h +++ b/Sources/Plasma/FeatureLib/pfMessage/pfKIMsg.h @@ -51,7 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsStlUtils.h" #include "hsStream.h" -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" diff --git a/Sources/Plasma/FeatureLib/pfMessage/pfMarkerMsg.h b/Sources/Plasma/FeatureLib/pfMessage/pfMarkerMsg.h index f2ec742c..94dedc81 100644 --- a/Sources/Plasma/FeatureLib/pfMessage/pfMarkerMsg.h +++ b/Sources/Plasma/FeatureLib/pfMessage/pfMarkerMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pfMarkerMsg_h_inc #define pfMarkerMsg_h_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" struct hsPoint3; class pfMarkerMsg : public plMessage diff --git a/Sources/Plasma/FeatureLib/pfMessage/pfMessageCreatable.h b/Sources/Plasma/FeatureLib/pfMessage/pfMessageCreatable.h index f808c733..4f8aeb14 100644 --- a/Sources/Plasma/FeatureLib/pfMessage/pfMessageCreatable.h +++ b/Sources/Plasma/FeatureLib/pfMessage/pfMessageCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pfMessageCreatable_inc #define pfMessageCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #if 0 #include "plTriggerMsg.h" diff --git a/Sources/Plasma/FeatureLib/pfMessage/pfMovieEventMsg.h b/Sources/Plasma/FeatureLib/pfMessage/pfMovieEventMsg.h index c008befc..4c2dd185 100644 --- a/Sources/Plasma/FeatureLib/pfMessage/pfMovieEventMsg.h +++ b/Sources/Plasma/FeatureLib/pfMessage/pfMovieEventMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pfMovieEventMsg_h_inc #define pfMovieEventMsg_h_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class pfMovieEventMsg : public plMessage { diff --git a/Sources/Plasma/FeatureLib/pfMessage/plArmatureEffectMsg.cpp b/Sources/Plasma/FeatureLib/pfMessage/plArmatureEffectMsg.cpp index 6a66c9ce..3b251b7c 100644 --- a/Sources/Plasma/FeatureLib/pfMessage/plArmatureEffectMsg.cpp +++ b/Sources/Plasma/FeatureLib/pfMessage/plArmatureEffectMsg.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsStream.h" #include "plArmatureEffectMsg.h" -#include "../plAvatar/plArmatureEffects.h" +#include "plAvatar/plArmatureEffects.h" plArmatureEffectStateMsg::plArmatureEffectStateMsg() : fSurface(plArmatureEffectsMgr::kFootNoSurface), fAddSurface(false) {} diff --git a/Sources/Plasma/FeatureLib/pfMessage/plArmatureEffectMsg.h b/Sources/Plasma/FeatureLib/pfMessage/plArmatureEffectMsg.h index a0ae4c79..259f7a19 100644 --- a/Sources/Plasma/FeatureLib/pfMessage/plArmatureEffectMsg.h +++ b/Sources/Plasma/FeatureLib/pfMessage/plArmatureEffectMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plArmatureEffectMsg_inc #define plArmatureEffectMsg_inc -#include "../pnMessage/plEventCallbackMsg.h" +#include "pnMessage/plEventCallbackMsg.h" class plArmatureEffectMsg : public plEventCallbackMsg { diff --git a/Sources/Plasma/FeatureLib/pfMessage/plClothingMsg.h b/Sources/Plasma/FeatureLib/pfMessage/plClothingMsg.h index db79cd36..315068a2 100644 --- a/Sources/Plasma/FeatureLib/pfMessage/plClothingMsg.h +++ b/Sources/Plasma/FeatureLib/pfMessage/plClothingMsg.h @@ -42,9 +42,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plClothingMsg_inc #define plClothingMsg_inc -#include "../pnMessage/plRefMsg.h" +#include "pnMessage/plRefMsg.h" #include "hsStream.h" -#include "../CoreLib/hsColorRGBA.h" +#include "hsColorRGBA.h" class hsResMgr; diff --git a/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt new file mode 100644 index 00000000..02d1b6d9 --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt @@ -0,0 +1,357 @@ +include_directories(../../CoreLib) +include_directories(../../FeatureLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) +include_directories(../../PubUtilLib) +include_directories(../../) + +include_directories(${PYTHON_INCLUDE_DIR}) +include_directories(${OPENAL_INCLUDE_DIR}) +include_directories(${OPENSSL_INCLUDE_DIR}) + +if(WIN32) + add_definitions(-DWIN32) + add_definitions(-DMS_NO_COREDLL) +endif(WIN32) + +set(pfPython_SOURCES + cyAccountManagement.cpp + cyAnimation.cpp + cyAvatar.cpp + cyCamera.cpp + cyDraw.cpp + cyInputInterface.cpp + cyMisc.cpp + cyParticleSys.cpp + cyPhysics.cpp + cyPythonInterface.cpp + plPythonFileMod.cpp + plPythonPack.cpp + plPythonSDLModifier.cpp + pyAgeInfoStruct.cpp + pyAgeLinkStruct.cpp + pyAgeVault.cpp + pyAlarm.cpp + pyAudioControl.cpp + pyCCRMgr.cpp + pyCluster.cpp + pyColor.cpp + pyCritterBrain.cpp + pyDniCoordinates.cpp + pyDniInfoSource.cpp + pyDrawControl.cpp + pyDynamicText.cpp + pyEnum.cpp + pyGameScore.cpp + pyGeometry3.cpp + pyGrassShader.cpp + pyGUIControl.cpp + pyGUIControlButton.cpp + pyGUIControlCheckBox.cpp + pyGUIControlClickMap.cpp + pyGUIControlDragBar.cpp + pyGUIControlDraggable.cpp + pyGUIControlDynamicText.cpp + pyGUIControlEditBox.cpp + pyGUIControlListBox.cpp + pyGUIControlMultiLineEdit.cpp + pyGUIControlRadioGroup.cpp + pyGUIControlTextBox.cpp + pyGUIControlValue.cpp + pyGUIDialog.cpp + pyGUIPopUpMenu.cpp + pyGUISkin.cpp + pyImage.cpp + pyJournalBook.cpp + pyKey.cpp + pyKeyMap.cpp + pyMarkerMgr.cpp + pyMatrix44.cpp + pyMoviePlayer.cpp + pyNetLinkingMgr.cpp + pyNetServerSessionInfo.cpp + pyNotify.cpp + pyPlayer.cpp + pySceneObject.cpp + pyScoreMgr.cpp + pySDL.cpp + pySpawnPointInfo.cpp + pyStatusLog.cpp + pyStream.cpp + pySwimCurrentInterface.cpp + pyVault.cpp + pyVaultAgeInfoListNode.cpp + pyVaultAgeInfoNode.cpp + pyVaultAgeLinkNode.cpp + pyVaultChronicleNode.cpp + pyVaultFolderNode.cpp + pyVaultImageNode.cpp + pyVaultMarkerGameNode.cpp + pyVaultNode.cpp + pyVaultNodeRef.cpp + pyVaultPlayerInfoListNode.cpp + pyVaultPlayerInfoNode.cpp + pyVaultPlayerNode.cpp + pyVaultSDLNode.cpp + pyVaultSystemNode.cpp + pyVaultTextNoteNode.cpp + pyWaveSet.cpp +) + +set(pfPython_HEADERS + cyAccountManagement.h + cyAnimation.h + cyAvatar.h + cyCamera.h + cyDraw.h + cyInputInterface.h + cyMisc.h + cyParticleSys.h + cyPhysics.h + cyPythonInterface.h + pfPythonCreatable.h + plPythonFileMod.h + plPythonHelpers.h + plPythonPack.h + plPythonParameter.h + plPythonSDLModifier.h + pyAgeInfoStruct.h + pyAgeLinkStruct.h + pyAgeVault.h + pyAlarm.h + pyAudioControl.h + pyCCRMgr.h + pyCluster.h + pyColor.h + pyCritterBrain.h + pyDniCoordinates.h + pyDniInfoSource.h + pyDrawControl.h + pyDynamicText.h + pyEnum.h + pyGameScore.h + pyGeometry3.h + pyGrassShader.h + pyGUIControl.h + pyGUIControlButton.h + pyGUIControlCheckBox.h + pyGUIControlClickMap.h + pyGUIControlDragBar.h + pyGUIControlDraggable.h + pyGUIControlDynamicText.h + pyGUIControlEditBox.h + pyGUIControlListBox.h + pyGUIControlMultiLineEdit.h + pyGUIControlRadioGroup.h + pyGUIControlTextBox.h + pyGUIControlValue.h + pyGUIDialog.h + pyGUIPopUpMenu.h + pyGUISkin.h + pyImage.h + pyJournalBook.h + pyKey.h + pyKeyMap.h + pyMarkerMgr.h + pyMatrix44.h + pyMoviePlayer.h + pyNetLinkingMgr.h + pyNetServerSessionInfo.h + pyNotify.h + pyPlayer.h + pySceneObject.h + pyScoreMgr.h + pySDL.h + pySpawnPointInfo.h + pyStatusLog.h + pyStream.h + pySwimCurrentInterface.h + pyVault.h + pyVaultAgeInfoListNode.h + pyVaultAgeInfoNode.h + pyVaultAgeLinkNode.h + pyVaultChronicleNode.h + pyVaultFolderNode.h + pyVaultImageNode.h + pyVaultMarkerGameNode.h + pyVaultNode.h + pyVaultNodeRef.h + pyVaultPlayerInfoListNode.h + pyVaultPlayerInfoNode.h + pyVaultPlayerNode.h + pyVaultSDLNode.h + pyVaultSystemNode.h + pyVaultTextNoteNode.h + pyWaveSet.h +) + +set(pfPython_GLUE + cyAccountManagementGlue.cpp + cyAnimationGlue.cpp + cyAvatarGlue.cpp + cyCameraGlue.cpp + cyDrawGlue.cpp + cyInputInterfaceGlue.cpp + cyMiscGlue.cpp + cyMiscGlue2.cpp + cyMiscGlue3.cpp + cyMiscglue4.cpp + cyParticleSysGlue.cpp + cyPhysicsGlue.cpp + plPythonSDLModifierGlue.cpp + pyAgeInfoStructGlue.cpp + pyAgeLinkStructGlue.cpp + pyAgeVaultGlue.cpp + pyAudioControlGlue.cpp + pyCCRMgrGlue.cpp + pyCCRMgrGlue2.cpp + pyClusterGlue.cpp + pyColorGlue.cpp + pyCritterBrainGlue.cpp + pyDniCoordinatesGlue.cpp + pyDrawControlGlue.cpp + pyDynamicTextGlue.cpp + pyGameScoreGlue.cpp + pyGeometry3Glue.cpp + pyGlueHelpers.h + pyGrassShaderGlue.cpp + pyGUIControlButtonGlue.cpp + pyGUIControlCheckBoxGlue.cpp + pyGUIControlClickMapGlue.cpp + pyGUIControlDragBarGlue.cpp + pyGUIControlDraggableGlue.cpp + pyGUIControlDynamicTextGlue.cpp + pyGUIControlEditBoxGlue.cpp + pyGUIControlGlue.cpp + pyGUIControlListBoxGlue.cpp + pyGUIControlMultiLineEditGlue.cpp + pyGUIControlRadioGroupGlue.cpp + pyGUIControlTextBoxGlue.cpp + pyGUIControlValueGlue.cpp + pyGUIDialogGlue.cpp + pyGUIPopUpMenuGlue.cpp + pyGUISkinGlue.cpp + pyImageGlue.cpp + pyJournalBookGlue.cpp + pyKeyGlue.cpp + pyKeyMapGlue.cpp + pyMarkerMgrGlue.cpp + pyMatrix44Glue.cpp + pyMoviePlayerGlue.cpp + pyNetLinkingMgrGlue.cpp + pyNetServerSessionInfoGlue.cpp + pyNotifyGlue.cpp + pyPlayerGlue.cpp + pySceneObjectGlue.cpp + pyScoreMgrGlue.cpp + pySDLGlue.cpp + pySpawnPointInfoGlue.cpp + pyStatusLogGlue.cpp + pyStreamGlue.cpp + pySwimCurrentInterfaceGlue.cpp + pyVaultAgeInfoListNodeGlue.cpp + pyVaultAgeInfoNodeGlue.cpp + pyVaultAgeLinkNodeGlue.cpp + pyVaultChronicleNodeGlue.cpp + pyVaultFolderNodeGlue.cpp + pyVaultGlue.cpp + pyVaultImageNodeGlue.cpp + pyVaultMarkerGameNodeGlue.cpp + pyVaultNodeGlue.cpp + pyVaultNodeRefGlue.cpp + pyVaultPlayerInfoListNodeGlue.cpp + pyVaultPlayerInfoNodeGlue.cpp + pyVaultPlayerNodeGlue.cpp + pyVaultSDLNodeGlue.cpp + pyVaultSystemNodeGlue.cpp + pyVaultTextNoteNodeGlue.cpp + pyWaveSetGlue.cpp +) + +set(pfPython_GAME_GLUE + Games/pyGameCli.cpp + Games/pyGameCli.h + Games/pyGameCliGlue.cpp + Games/pyGameCliMsg.cpp + Games/pyGameCliMsg.h + Games/pyGameCliMsgGlue.cpp + Games/pyGameMgrMsg.cpp + Games/pyGameMgrMsg.h + Games/pyGameMgrMsg.cpp +) + +set(pfPython_TTT + Games/TicTacToe/pyTTTGame.cpp + Games/TicTacToe/pyTTTGame.h + Games/TicTacToe/pyTTTGameGlue.cpp + Games/TicTacToe/pyTTTMsg.cpp + Games/TicTacToe/pyTTTMsg.h + Games/TicTacToe/pyTTTMsgGlue.cpp +) + +set(pfPython_HEEK + Games/Heek/pyHeekGame.cpp + Games/Heek/pyHeekGame.h + Games/Heek/pyHeekGameGlue.cpp + Games/Heek/pyHeekMsg.cpp + Games/Heek/pyHeekMsg.h + Games/Heek/pyHeekGameGlue.cpp +) + +set(pfPython_MARKER + Games/Marker/pyMarkerGame.cpp + Games/Marker/pyMarkerGame.h + Games/Marker/pyMarkerGameGlue.cpp + Games/Marker/pyMarkerMsg.cpp + Games/Marker/pyMarkerMsg.h + Games/Marker/pyMarkerMsgGlue.cpp +) + +set(pfPython_BSPIRAL + Games/BlueSpiral/pyBlueSpiralGame.cpp + Games/BlueSpiral/pyBlueSpiralGame.h + Games/BlueSpiral/pyBlueSpiralGameGlue.cpp + Games/BlueSpiral/pyBlueSpiralMsg.cpp + Games/BlueSpiral/pyBlueSpiralMsg.h + Games/BlueSpiral/pyBlueSpiralMsgGlue.cpp +) + +set(pfPython_WALL + Games/ClimbingWall/pyClimbingWallGame.cpp + Games/ClimbingWall/pyClimbingWallGame.h + Games/ClimbingWall/pyClimbingWallGameGlue.cpp + Games/ClimbingWall/pyClimbingWallMsg.cpp + Games/ClimbingWall/pyClimbingWallMsg.h + Games/ClimbingWall/pyClimbingWallMsgGlue.cpp +) + +set(pfPython_VSYNC + Games/VarSync/pyVarSyncGame.cpp + Games/VarSync/pyVarSyncGame.h + Games/VarSync/pyVarSyncGameGlue.cpp + Games/VarSync/pyVarSyncMsg.cpp + Games/VarSync/pyVarSyncMsg.h + Games/VarSync/pyVarSyncMsgGlue.cpp +) + +set(pfPython_GAMES + ${pfPython_TTT} + ${pfPython_HEEK} + ${pfPython_MARKER} + ${pfPython_BSPIRAL} + ${pfPython_WALL} + ${pfPython_VSYNC} +) + +add_library(pfPython STATIC ${pfPython_SOURCES} ${pfPython_HEADERS} ${pfPython_GLUE} ${pfPython_GAME_GLUE} ${pfPython_GAMES}) + +source_group("Source Files" FILES ${pfPython_SOURCES}) +source_group("Header Files" FILES ${pfPython_HEADERS}) +source_group("Glue Files" FILES ${pfPython_GLUE}) +source_group("Game Glue" FILES ${pfPython_GAME_GLUE}) +source_group("Game Glue\\TicTacToe" FILES ${pfPython_TTT}) +source_group("Game Glue\\Heek" FILES ${pfPython_HEEK}) +source_group("Game Glue\\Marker" FILES ${pfPython_MARKER}) +source_group("Game Glue\\BlueSpiral" FILES ${pfPython_BSPIRAL}) +source_group("Game Glue\\ClimbingWall" FILES ${pfPython_WALL}) +source_group("Game Clue\\VarSync" FILES ${pfPython_VSYNC}) diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGame.h b/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGame.h index 28c11cb5..fbcd0632 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGame.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGame.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for the BlueSpiral game client // -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #include #include "../../pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsg.h index 9f307a7d..7aea1e97 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsg.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsg.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for BlueSpiral game messages // -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #include #include "../../pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGame.h b/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGame.h index 24fe1c7f..e7095d09 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGame.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGame.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for the climbing wall game client // -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #include #include "../../pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsg.h index 8006176b..03d059ee 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsg.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsg.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for ClimbingWall game messages // -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #include #include "../../pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGame.h b/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGame.h index 4c4f7ed1..b4d21c3a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGame.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGame.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for the Heek game client // -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #include #include "../../pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsg.h index 43ecd4e6..4d33a485 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsg.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsg.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for Heek game messages // -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #include #include "../../pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGame.h b/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGame.h index c29d32d5..aa912a0b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGame.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGame.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for the Marker game client // -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #include #include "../../pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsg.h index 58a6122e..28243df7 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsg.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsg.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for Marker game messages // -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #include #include "../../pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGame.h b/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGame.h index 1a34c3e3..42b6aa28 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGame.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGame.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for the TTT game client // -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #include #include "../../pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsg.h index 08f880ce..16e246f9 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsg.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsg.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for TTT game messages // -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #include #include "../../pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGame.h b/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGame.h index a766a030..5620a7b3 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGame.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGame.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for the VarSync game client // -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #include #include "../../pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsg.h index 635ae2c8..a20fd591 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsg.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsg.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for VarSync game messages // -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #include #include "../../pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.h b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.h index 7174d9bd..46471f80 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for the game client base class // -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #include #include "../pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsg.h index f3e37339..7605625b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsg.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsg.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for game client messages // -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #include #include "../pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.h index efddd3a3..536430f2 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.h @@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // #include "hsStlUtils.h" -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #include #include "../pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.cpp b/Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.cpp index 039b34b3..fc316eb0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.cpp @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "cyAccountManagement.h" -#include "../plNetClientComm/plNetClientComm.h" +#include "plNetClientComm/plNetClientComm.h" bool cyAccountManagement::IsSubscriptionActive() { diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAccountManagementGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/cyAccountManagementGlue.cpp index f6e980cf..e9da4b25 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAccountManagementGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyAccountManagementGlue.cpp @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyGlueHelpers.h" #include "pyEnum.h" -#include "../plMessage/plAccountUpdateMsg.h" +#include "plMessage/plAccountUpdateMsg.h" PYTHON_GLOBAL_METHOD_DEFINITION_NOARGS(PtIsSubscriptionActive, "Returns true if the current player is a paying subscriber") { diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAnimation.cpp b/Sources/Plasma/FeatureLib/pfPython/cyAnimation.cpp index e76e8963..024a09bd 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAnimation.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyAnimation.cpp @@ -47,8 +47,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // #include "plgDispatch.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../pnMessage/plEventCallbackMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "pnMessage/plEventCallbackMsg.h" #include "cyAnimation.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAvatar.cpp b/Sources/Plasma/FeatureLib/pfPython/cyAvatar.cpp index cd5d123e..08821ecd 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAvatar.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyAvatar.cpp @@ -43,16 +43,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plgDispatch.h" -#include "../plAvatar/plAvatarMgr.h" - -#include "../plMessage/plAvatarMsg.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../plMessage/plOneShotCallbacks.h" -#include "../plMessage/plOneShotMsg.h" -#include "../plMessage/plMultistageMsg.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../plGImage/plMipmap.h" +#include "plAvatar/plAvatarMgr.h" + +#include "plMessage/plAvatarMsg.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "plMessage/plOneShotCallbacks.h" +#include "plMessage/plOneShotMsg.h" +#include "plMessage/plMultistageMsg.h" +#include "pnMessage/plNotifyMsg.h" +#include "pnKeyedObject/plFixedKey.h" +#include "plGImage/plMipmap.h" #include "pyKey.h" #include "pySceneObject.h" #include "pyColor.h" @@ -60,25 +60,25 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "cyPythonInterface.h" #include "cyMisc.h" -#include "../plAvatar/plOneShotMod.h" -#include "../plAvatar/plMultistageBehMod.h" -#include "../plAvatar/plAvatarClothing.h" -#include "../plAvatar/plClothingLayout.h" -#include "../plAvatar/plArmatureMod.h" -#include "../plAvatar/plAvBrainHuman.h" // needed to call the emote -#include "../plAvatar/plAGAnim.h" // to get the BodyUsage enum -#include "../plInputCore/plAvatarInputInterface.h" +#include "plAvatar/plOneShotMod.h" +#include "plAvatar/plMultistageBehMod.h" +#include "plAvatar/plAvatarClothing.h" +#include "plAvatar/plClothingLayout.h" +#include "plAvatar/plArmatureMod.h" +#include "plAvatar/plAvBrainHuman.h" // needed to call the emote +#include "plAvatar/plAGAnim.h" // to get the BodyUsage enum +#include "plInputCore/plAvatarInputInterface.h" #include "plPhysical.h" -#include "../plMessage/plSimStateMsg.h" +#include "plMessage/plSimStateMsg.h" -#include "../pnNetCommon/plNetApp.h" -#include "../plVault/plVault.h" +#include "pnNetCommon/plNetApp.h" +#include "plVault/plVault.h" -#include "../plDrawable/plSharedMesh.h" +#include "plDrawable/plSharedMesh.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../plDrawable/plMorphSequence.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "plDrawable/plMorphSequence.h" /////////////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAvatar.h b/Sources/Plasma/FeatureLib/pfPython/cyAvatar.h index e21a8929..3c1d3d7f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAvatar.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyAvatar.h @@ -51,7 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStlUtils.h" #include "hsTemplates.h" #include "hsBitVector.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include #include "pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAvatarGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/cyAvatarGlue.cpp index 8a538415..3ae9f3d8 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAvatarGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyAvatarGlue.cpp @@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyColor.h" #include "pySceneObject.h" -#include "../plAvatar/plAvBrainHuman.h" +#include "plAvatar/plAvBrainHuman.h" #include diff --git a/Sources/Plasma/FeatureLib/pfPython/cyCamera.cpp b/Sources/Plasma/FeatureLib/pfPython/cyCamera.cpp index 4539ff3c..9962e513 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyCamera.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyCamera.cpp @@ -41,17 +41,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "cyCamera.h" -#include "../pnMessage/plCameraMsg.h" -#include "../plMessage/plInputEventMsg.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnMessage/plCameraMsg.h" +#include "plMessage/plInputEventMsg.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnKeyedObject/plUoid.h" #include "hsResMgr.h" #include "pyKey.h" #include "plgDispatch.h" -#include "../pfCamera/plVirtualCamNeu.h" -#include "../pfCamera/plCameraModifier.h" -#include "../pfCamera/plCameraBrain.h" +#include "pfCamera/plVirtualCamNeu.h" +#include "pfCamera/plCameraModifier.h" +#include "pfCamera/plCameraBrain.h" cyCamera::cyCamera() { diff --git a/Sources/Plasma/FeatureLib/pfPython/cyCamera.h b/Sources/Plasma/FeatureLib/pfPython/cyCamera.h index 93b14e0c..2d3c887c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyCamera.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyCamera.h @@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // #include "hsTypes.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" class pyKey; #include diff --git a/Sources/Plasma/FeatureLib/pfPython/cyDraw.cpp b/Sources/Plasma/FeatureLib/pfPython/cyDraw.cpp index 5dc11593..ed398372 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyDraw.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyDraw.cpp @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plgDispatch.h" #include "hsBitVector.h" -#include "../pnMessage/plEnableMsg.h" +#include "pnMessage/plEnableMsg.h" cyDraw::cyDraw(plKey sender, plKey recvr) { diff --git a/Sources/Plasma/FeatureLib/pfPython/cyDraw.h b/Sources/Plasma/FeatureLib/pfPython/cyDraw.h index efc26e0f..5b5a5199 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyDraw.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyDraw.h @@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // #include "hsTemplates.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include #include "pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/cyInputInterface.cpp b/Sources/Plasma/FeatureLib/pfPython/cyInputInterface.cpp index d6b80675..7a5e91b3 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyInputInterface.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyInputInterface.cpp @@ -41,8 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "cyInputInterface.h" -#include "../plMessage/plInputIfaceMgrMsg.h" -#include "../plInputCore/plTelescopeInputInterface.h" +#include "plMessage/plInputIfaceMgrMsg.h" +#include "plInputCore/plTelescopeInputInterface.h" #include "plgDispatch.h" cyInputInterface::cyInputInterface() : diff --git a/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp b/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp index d2b350cd..31731f6d 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp @@ -43,32 +43,32 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plgDispatch.h" #include "hsResMgr.h" -#include "../plResMgr/plKeyFinder.h" - -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../plMessage/plConsoleMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plMessage/plExcludeRegionMsg.h" -#include "../plMessage/plInputEventMsg.h" -#include "../plMessage/plInputIfaceMgrMsg.h" -#include "../pnMessage/plCmdIfaceModMsg.h" -#include "../pnMessage/plAttachMsg.h" -#include "../plMessage/plTimerCallbackMsg.h" -#include "../plMessage/plNetVoiceListMsg.h" -#include "../pnMessage/plClientMsg.h" -#include "../pnMessage/plCameraMsg.h" -#include "../pnTimer/plTimerCallbackManager.h" -#include "../plVault/plVault.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plNetClient/plNetLinkingMgr.h" -#include "../plNetTransport/plNetTransport.h" -#include "../plNetTransport/plNetTransportMember.h" -#include "../plResMgr/plKeyFinder.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plAvatar/plMultistageBehMod.h" -#include "../plAvatar/plAvBrainCritter.h" +#include "plResMgr/plKeyFinder.h" + +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plFixedKey.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "plMessage/plConsoleMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plMessage/plExcludeRegionMsg.h" +#include "plMessage/plInputEventMsg.h" +#include "plMessage/plInputIfaceMgrMsg.h" +#include "pnMessage/plCmdIfaceModMsg.h" +#include "pnMessage/plAttachMsg.h" +#include "plMessage/plTimerCallbackMsg.h" +#include "plMessage/plNetVoiceListMsg.h" +#include "pnMessage/plClientMsg.h" +#include "pnMessage/plCameraMsg.h" +#include "pnTimer/plTimerCallbackManager.h" +#include "plVault/plVault.h" +#include "plNetClient/plNetClientMgr.h" +#include "plNetClient/plNetLinkingMgr.h" +#include "plNetTransport/plNetTransport.h" +#include "plNetTransport/plNetTransportMember.h" +#include "plResMgr/plKeyFinder.h" +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plMultistageBehMod.h" +#include "plAvatar/plAvBrainCritter.h" #include "pyCritterBrain.h" #include "cyPythonInterface.h" #include "pyKey.h" @@ -82,29 +82,29 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyAgeInfoStruct.h" #include "pyAgeLinkStruct.h" #include "pyAlarm.h" -#include "../pfMessage/pfKIMsg.h" -#include "../plNetMessage/plNetMessage.h" -#include "../pfCamera/plVirtualCamNeu.h" -#include "../plPipeline/plDynamicEnvMap.h" +#include "pfMessage/pfKIMsg.h" +#include "plNetMessage/plNetMessage.h" +#include "pfCamera/plVirtualCamNeu.h" +#include "plPipeline/plDynamicEnvMap.h" -#include "../pfGameGUIMgr/pfGameGUIMgr.h" -#include "../pfGameGUIMgr/pfGUIDialogMod.h" +#include "pfGameGUIMgr/pfGameGUIMgr.h" +#include "pfGameGUIMgr/pfGUIDialogMod.h" #include "pyGUIDialog.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" -#include "../plMessage/plCCRMsg.h" -#include "../plAgeLoader/plAgeLoader.h" +#include "plMessage/plCCRMsg.h" +#include "plAgeLoader/plAgeLoader.h" -#include "../plResMgr/plLocalization.h" -#include "../plGLight/plLightInfo.h" +#include "plResMgr/plLocalization.h" +#include "plGLight/plLightInfo.h" -#include "../plInputCore/plAvatarInputInterface.h" -#include "../plInputCore/plInputDevice.h" +#include "plInputCore/plAvatarInputInterface.h" +#include "plInputCore/plInputDevice.h" -#include "../plVault/plAgeInfoSource.h" +#include "plVault/plAgeInfoSource.h" -#include "../pfLocalizationMgr/pfLocalizationMgr.h" +#include "pfLocalizationMgr/pfLocalizationMgr.h" //// Static Class Stuff ////////////////////////////////////////////////////// plPipeline* cyMisc::fPipeline = nil; @@ -953,7 +953,7 @@ PyObject* cyMisc::GetLocalPlayer() #if 1 -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" // // TEMP SCREEN PRINT CODE FOR NON-DBG TEXT DISPLAY // @@ -971,7 +971,7 @@ void cyMisc::PrintToScreen(const char* msg) #endif #include "plPipeline.h" -#include "../plGImage/plMipmap.h" +#include "plGImage/plMipmap.h" ///////////////////////////////////////////////////////////////////////////// // @@ -1418,7 +1418,7 @@ void cyMisc::PageOutNode(const char* nodeName) } -#include "../plAvatar/plArmatureMod.h" +#include "plAvatar/plArmatureMod.h" ///////////////////////////////////////////////////////////////////////////// // // Function : LimitAvatarLOD @@ -1434,7 +1434,7 @@ void cyMisc::LimitAvatarLOD(int LODlimit) -#include "../plPipeline/plFogEnvironment.h" +#include "plPipeline/plFogEnvironment.h" ///////////////////////////////////////////////////////////////////////////// // @@ -1732,9 +1732,9 @@ bool cyMisc::UsingUnicode() // // // -#include "../plMessage/plParticleUpdateMsg.h" -#include "../plParticleSystem/plParticleSystem.h" -#include "../plParticleSystem/plParticleEffect.h" +#include "plMessage/plParticleUpdateMsg.h" +#include "plParticleSystem/plParticleSystem.h" +#include "plParticleSystem/plParticleEffect.h" void cyMisc::TransferParticlesToKey(pyKey& fromKey, pyKey& toKey, int numParticles) { plKey frKey = fromKey.getKey(); @@ -1924,7 +1924,7 @@ void cyMisc::SetLightColorValue(pyKey& light, std::string lightName, hsScalar r, } } -#include "../pnMessage/plEnableMsg.h" +#include "pnMessage/plEnableMsg.h" void cyMisc::SetLightAnimationOn(pyKey& light, std::string lightName, hsBool start) { // lightName is the name of the light object attached to the light that we want to talk to @@ -2017,7 +2017,7 @@ void cyMisc::RegisterForControlEventMessages(hsBool on, pyKey& k) // // PURPOSE : To request an LOS from a point on the screen // -#include "../plMessage/plLOSRequestMsg.h" +#include "plMessage/plLOSRequestMsg.h" bool cyMisc::RequestLOSScreen(pyKey &selfkey, Int32 ID, hsScalar xPos, hsScalar yPos, hsScalar distance, int what, int reportType) { plPipeline* pipe = selfkey.GetPipeline(); @@ -2074,7 +2074,7 @@ bool cyMisc::RequestLOSScreen(pyKey &selfkey, Int32 ID, hsScalar xPos, hsScalar // // PURPOSE : Check is there is something visible in the path from StartPoint to EndPoint // -#include "../plDrawable/plVisLOSMgr.h" +#include "plDrawable/plVisLOSMgr.h" PyObject* cyMisc::CheckVisLOS(pyPoint3 startPoint, pyPoint3 endPoint) { if (plVisLOSMgr::Instance()) @@ -2168,7 +2168,7 @@ bool cyMisc::IsEnterChatModeKeyBound() // // PURPOSE : Shoots from screen coordinates, a bullet and makes a mark on objects that know about bullet holes // -#include "../plMessage/plBulletMsg.h" +#include "plMessage/plBulletMsg.h" void cyMisc::ShootBulletFromScreen(pyKey &selfkey, hsScalar xPos, hsScalar yPos, hsScalar radius, hsScalar range) { plPipeline* pipe = selfkey.GetPipeline(); @@ -2404,7 +2404,7 @@ int cyMisc::GetKILevel() // // the following are for recording and rebuilding the camera stack -#include "../pfCamera/plCameraModifier.h" +#include "pfCamera/plCameraModifier.h" int cyMisc::GetNumCameras() { @@ -2493,7 +2493,7 @@ void cyMisc::RecenterCamera() pCam->Send(); } -#include "../plMessage/plTransitionMsg.h" +#include "plMessage/plTransitionMsg.h" void cyMisc::FadeIn(float lenTime, bool holdFlag, bool noSound) { @@ -2541,7 +2541,7 @@ void cyMisc::SetAlarm( float secs, PyObject * cb, UInt32 cbContext ) // // PURPOSE : captures the screen and saves it as a jpeg // -#include "../plJPEG/plJPEG.h" +#include "plJPEG/plJPEG.h" void cyMisc::SaveScreenShot(const char* fileName, int x, int y, int quality) { if ( cyMisc::GetPipeline() ) @@ -2564,7 +2564,7 @@ void cyMisc::SaveScreenShot(const char* fileName, int x, int y, int quality) // PURPOSE : This starts a screen capture in motion. It will be capture on the next // update and a plCaptureRenderMsg when its ready // -#include "../plPipeline/plCaptureRender.h" +#include "plPipeline/plCaptureRender.h" void cyMisc::StartScreenCapture(pyKey& selfkey) { cyMisc::StartScreenCaptureWH(selfkey, 800, 600); @@ -2576,7 +2576,7 @@ void cyMisc::StartScreenCaptureWH(pyKey& selfkey, UInt16 width, UInt16 height) } -#include "../plAvatar/plAvatarClothing.h" +#include "plAvatar/plAvatarClothing.h" void cyMisc::WearMaintainerSuit(pyKey& key, hsBool wear) { // run on all machines, but only affects us if we call it on our local guy (who props it to others himself) diff --git a/Sources/Plasma/FeatureLib/pfPython/cyMisc.h b/Sources/Plasma/FeatureLib/pfPython/cyMisc.h index de629c1c..2eee1260 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyMisc.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyMisc.h @@ -60,7 +60,7 @@ class pyPoint3; #include #include "hsTypes.h" #include "hsStlUtils.h" -#include "../pnUtils/pnUtils.h" +#include "pnUtils/pnUtils.h" class pyGUIDialog; class plPipeline; diff --git a/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue2.cpp b/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue2.cpp index 86ed7fb6..6173e051 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue2.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue2.cpp @@ -47,9 +47,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyEnum.h" // for enums -#include "..\plNetCommon\plNetCommon.h" -#include "..\plResMgr\plLocalization.h" -#include "..\plMessage\plLOSRequestMsg.h" +#include "plNetCommon\plNetCommon.h" +#include "plResMgr\plLocalization.h" +#include "plMessage\plLOSRequestMsg.h" #include diff --git a/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue4.cpp b/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue4.cpp index cb6081b2..770870fa 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue4.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue4.cpp @@ -45,8 +45,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pySceneObject.h" #include "pyAgeInfoStruct.h" #include "pyGeometry3.h" -#include "../NucleusLib/inc/plPipeline.h" -#include "../pnNetBase/pnNetBase.h" +#include "NucleusLib/inc/plPipeline.h" +#include "pnNetBase/pnNetBase.h" #include diff --git a/Sources/Plasma/FeatureLib/pfPython/cyParticleSys.cpp b/Sources/Plasma/FeatureLib/pfPython/cyParticleSys.cpp index 6c700ff9..0b58fd73 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyParticleSys.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyParticleSys.cpp @@ -42,10 +42,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "cyParticleSys.h" #include "hsStream.h" -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsResMgr.h" #include "plgDispatch.h" -#include "../plMessage/plParticleUpdateMsg.h" +#include "plMessage/plParticleUpdateMsg.h" cyParticleSys::cyParticleSys(plKey sender, plKey recvr) { diff --git a/Sources/Plasma/FeatureLib/pfPython/cyParticleSys.h b/Sources/Plasma/FeatureLib/pfPython/cyParticleSys.h index a45517b2..2469065d 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyParticleSys.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyParticleSys.h @@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // #include "hsTemplates.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" class pyKey; #include diff --git a/Sources/Plasma/FeatureLib/pfPython/cyPhysics.cpp b/Sources/Plasma/FeatureLib/pfPython/cyPhysics.cpp index cf4b760d..aed1982f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyPhysics.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyPhysics.cpp @@ -42,20 +42,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "cyPhysics.h" #include "plgDispatch.h" -#include "../pnMessage/plEnableMsg.h" -#include "../pnMessage/plWarpMsg.h" -#include "../plMessage/plSimInfluenceMsg.h" -#include "../plMessage/plSimStateMsg.h" -#include "../plMessage/plLinearVelocityMsg.h" -#include "../plMessage/plAngularVelocityMsg.h" +#include "pnMessage/plEnableMsg.h" +#include "pnMessage/plWarpMsg.h" +#include "plMessage/plSimInfluenceMsg.h" +#include "plMessage/plSimStateMsg.h" +#include "plMessage/plLinearVelocityMsg.h" +#include "plMessage/plAngularVelocityMsg.h" #include "pyGeometry3.h" #include "pyMatrix44.h" #include "pyKey.h" #include "hsQuat.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnKeyedObject/plKey.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnKeyedObject/plKey.h" cyPhysics::cyPhysics(plKey sender, plKey recvr) { diff --git a/Sources/Plasma/FeatureLib/pfPython/cyPhysics.h b/Sources/Plasma/FeatureLib/pfPython/cyPhysics.h index 9dfc3551..debb51e5 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyPhysics.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyPhysics.h @@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // #include "hsTemplates.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include #include "pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.cpp b/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.cpp index 4c3597b4..4dc50085 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.cpp @@ -94,8 +94,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPythonSDLModifier.h" // For printing to the log -#include "../plStatusLog/plStatusLog.h" -#include "../plNetGameLib/plNetGameLib.h" +#include "plStatusLog/plStatusLog.h" +#include "plNetGameLib/plNetGameLib.h" // vault #include "pyVaultNode.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.cpp b/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.cpp index a24ff9ed..54884ff1 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.cpp @@ -51,49 +51,49 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "plgDispatch.h" #include "hsResMgr.h" -#include "../plResMgr/plKeyFinder.h" -#include "../pnKeyedObject/plKeyImp.h" -#include "../pnKeyedObject/plUoid.h" - -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnMessage/plCmdIfaceModMsg.h" -#include "../plMessage/plInputEventMsg.h" -#include "../plModifier/plLogicModifier.h" -#include "../pfMessage/pfGUINotifyMsg.h" -#include "../plMessage/plRoomLoadNotifyMsg.h" -#include "../pfMessage/plClothingMsg.h" -#include "../pfMessage/pfKIMsg.h" -#include "../plMessage/plMemberUpdateMsg.h" -#include "../plMessage/plAgeLoadedMsg.h" -#include "../pnMessage/plRemoteAvatarInfoMsg.h" -#include "../pnMessage/plPlayerPageMsg.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plNetTransport/plNetTransportMember.h" -#include "../pnMessage/plSDLNotificationMsg.h" -#include "../plMessage/plNetOwnershipMsg.h" -#include "../plSDL/plSDL.h" -#include "../plVault/plVault.h" -#include "../plMessage/plCCRMsg.h" -#include "../plMessage/plVaultNotifyMsg.h" -#include "../plInputCore/plInputInterfaceMgr.h" -#include "../plInputCore/plInputDevice.h" -#include "../pfMessage/pfMarkerMsg.h" -#include "../pfMessage/pfBackdoorMsg.h" -#include "../plMessage/plAvatarMsg.h" -#include "../plMessage/plLOSHitMsg.h" -#include "../plMessage/plRenderMsg.h" -#include "../pfMessage/pfMovieEventMsg.h" -#include "../plMessage/plClimbEventMsg.h" -#include "../plMessage/plCaptureRenderMsg.h" -#include "../plGImage/plMipmap.h" -#include "../plMessage/plAccountUpdateMsg.h" -#include "../plAgeLoader/plAgeLoader.h" -#include "../pfGameMgr/pfGameMgr.h" -#include "../plMessage/plAIMsg.h" -#include "../plAvatar/plAvBrainCritter.h" +#include "plResMgr/plKeyFinder.h" +#include "pnKeyedObject/plKeyImp.h" +#include "pnKeyedObject/plUoid.h" + +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnKeyedObject/plKey.h" +#include "pnMessage/plTimeMsg.h" +#include "pnMessage/plCmdIfaceModMsg.h" +#include "plMessage/plInputEventMsg.h" +#include "plModifier/plLogicModifier.h" +#include "pfMessage/pfGUINotifyMsg.h" +#include "plMessage/plRoomLoadNotifyMsg.h" +#include "pfMessage/plClothingMsg.h" +#include "pfMessage/pfKIMsg.h" +#include "plMessage/plMemberUpdateMsg.h" +#include "plMessage/plAgeLoadedMsg.h" +#include "pnMessage/plRemoteAvatarInfoMsg.h" +#include "pnMessage/plPlayerPageMsg.h" +#include "plNetClient/plNetClientMgr.h" +#include "plNetTransport/plNetTransportMember.h" +#include "pnMessage/plSDLNotificationMsg.h" +#include "plMessage/plNetOwnershipMsg.h" +#include "plSDL/plSDL.h" +#include "plVault/plVault.h" +#include "plMessage/plCCRMsg.h" +#include "plMessage/plVaultNotifyMsg.h" +#include "plInputCore/plInputInterfaceMgr.h" +#include "plInputCore/plInputDevice.h" +#include "pfMessage/pfMarkerMsg.h" +#include "pfMessage/pfBackdoorMsg.h" +#include "plMessage/plAvatarMsg.h" +#include "plMessage/plLOSHitMsg.h" +#include "plMessage/plRenderMsg.h" +#include "pfMessage/pfMovieEventMsg.h" +#include "plMessage/plClimbEventMsg.h" +#include "plMessage/plCaptureRenderMsg.h" +#include "plGImage/plMipmap.h" +#include "plMessage/plAccountUpdateMsg.h" +#include "plAgeLoader/plAgeLoader.h" +#include "pfGameMgr/pfGameMgr.h" +#include "plMessage/plAIMsg.h" +#include "plAvatar/plAvBrainCritter.h" #include "plProfile.h" @@ -141,7 +141,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPythonSDLModifier.h" -#include "../plMessage/plTimerCallbackMsg.h" +#include "plMessage/plTimerCallbackMsg.h" plProfile_CreateTimer("Update", "Python", PythonUpdate); diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.h b/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.h index fc701a99..1b337b40 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.h +++ b/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.h @@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "../pnModifier/plMultiModifier.h" +#include "pnModifier/plMultiModifier.h" #include "hsGeometry3.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp b/Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp index 969a7d17..48287adc 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp @@ -43,9 +43,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStlUtils.h" #include "plPythonPack.h" #include "hsStream.h" -#include "../plFile/hsFiles.h" -#include "../plFile/plSecureStream.h" -#include "../plFile/plStreamSource.h" +#include "plFile/hsFiles.h" +#include "plFile/plSecureStream.h" +#include "plFile/plStreamSource.h" #include "hsStlSortUtils.h" #include "marshal.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonParameter.h b/Sources/Plasma/FeatureLib/pfPython/plPythonParameter.h index 577578ef..2896c307 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonParameter.h +++ b/Sources/Plasma/FeatureLib/pfPython/plPythonParameter.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPythonParameter_h_inc #define plPythonParameter_h_inc -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" // // This is the data for the parameters (or attributes) for the PythonFile components diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.cpp b/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.cpp index 6d008ce7..1f503cb0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.cpp @@ -47,13 +47,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" #include "cyMisc.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../plResMgr/plKeyFinder.h" -#include "../plAgeDescription/plAgeDescription.h" +#include "pnSceneObject/plSceneObject.h" +#include "plResMgr/plKeyFinder.h" +#include "plAgeDescription/plAgeDescription.h" -#include "../plSDL/plSDL.h" -#include "../pnNetCommon/plNetApp.h" -#include "../plNetClient/plNetClientMgr.h" +#include "plSDL/plSDL.h" +#include "pnNetCommon/plNetApp.h" +#include "plNetClient/plNetClientMgr.h" plStateDataRecord * GetAgeSDL() { diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.h b/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.h index 77ccb413..c0ff0755 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.h +++ b/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.h @@ -47,7 +47,7 @@ class plStateDataRecord; class plSimpleStateVariable; #include "hsStlUtils.h" -#include "../plModifier/plSDLModifier.h" +#include "plModifier/plSDLModifier.h" #include #include "pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.h b/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.h index 0ca95415..3ac2fb8c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsStlUtils.h" -#include "../plNetCommon/plNetServerSessionInfo.h" +#include "plNetCommon/plNetServerSessionInfo.h" #include #include "pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.h b/Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.h index cee3b1aa..38fb9ae5 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsStlUtils.h" -#include "../plNetCommon/plNetServerSessionInfo.h" +#include "plNetCommon/plNetServerSessionInfo.h" #include "pyAgeInfoStruct.h" #include diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAgeVault.cpp b/Sources/Plasma/FeatureLib/pfPython/pyAgeVault.cpp index 85e1d16e..8404a583 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAgeVault.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyAgeVault.cpp @@ -60,13 +60,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pySDL.h" -#include "../plVault/plVault.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plNetClient/plNetLinkingMgr.h" -#include "../plNetTransport/plNetTransport.h" -#include "../plNetTransport/plNetTransportMember.h" -#include "../plSDL/plSDL.h" -#include "../pnNetCommon/plNetApp.h" +#include "plVault/plVault.h" +#include "plNetClient/plNetClientMgr.h" +#include "plNetClient/plNetLinkingMgr.h" +#include "plNetTransport/plNetTransport.h" +#include "plNetTransport/plNetTransportMember.h" +#include "plSDL/plSDL.h" +#include "pnNetCommon/plNetApp.h" pyAgeVault::pyAgeVault() { } diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAudioControl.cpp b/Sources/Plasma/FeatureLib/pfPython/pyAudioControl.cpp index bddad507..aa197b57 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAudioControl.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyAudioControl.cpp @@ -47,11 +47,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyAudioControl.h" -#include "../plAudio/plAudioSystem.h" -#include "../plAudio/plVoiceChat.h" -#include "../plAudio/plWinMicLevel.h" +#include "plAudio/plAudioSystem.h" +#include "plAudio/plVoiceChat.h" +#include "plAudio/plWinMicLevel.h" -#include "../plAudio/plAudioCaps.h" +#include "plAudio/plAudioCaps.h" // Sets the master volume of a given audio channel void pyAudioControl::SetSoundFXVolume( hsScalar volume ) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyCluster.cpp b/Sources/Plasma/FeatureLib/pfPython/pyCluster.cpp index ccb9355d..02d093a5 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyCluster.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyCluster.cpp @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyCluster.h" -#include "../plDrawable/plClusterGroup.h" +#include "plDrawable/plClusterGroup.h" pyCluster::pyCluster(plKey key) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyCritterBrain.cpp b/Sources/Plasma/FeatureLib/pfPython/pyCritterBrain.cpp index 34e531a8..4334419e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyCritterBrain.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyCritterBrain.cpp @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyCritterBrain.h" #include "pyGeometry3.h" -#include "..\plAvatar\plAvBrainCritter.h" +#include "plAvatar/plAvBrainCritter.h" pyCritterBrain::pyCritterBrain(): fBrain(nil) {} diff --git a/Sources/Plasma/FeatureLib/pfPython/pyCritterBrainGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyCritterBrainGlue.cpp index 5ce5d57b..44ca9af2 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyCritterBrainGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyCritterBrainGlue.cpp @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyEnum.h" #include "pyGeometry3.h" -#include "..\plMessage\plAIMsg.h" +#include "plMessage/plAIMsg.h" #include diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinates.cpp b/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinates.cpp index 62db0d3d..eefe2a3e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinates.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinates.cpp @@ -40,9 +40,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyDniCoordinates.h" -#include "../plVault/plDniCoordinateInfo.h" +#include "plVault/plDniCoordinateInfo.h" #ifndef BUILDING_PYPLASMA -#include "../plAvatar/plAvatarMgr.h" +#include "plAvatar/plAvatarMgr.h" #include "pyVault.h" #endif diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinatesGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinatesGlue.cpp index e6c016e4..e3822a43 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinatesGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinatesGlue.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyDniCoordinates.h" #include "pyGeometry3.h" -#include "../plVault/plDniCoordinateInfo.h" +#include "plVault/plDniCoordinateInfo.h" #include diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.cpp b/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.cpp index 432afb99..d6f5848d 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.cpp @@ -39,10 +39,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "../pnUtils/pnUtils.h" -#include "../plUnifiedTime/plUnifiedTime.h" -#include "../plVault/plAgeInfoSource.h" -#include "../plVault/plVault.h" +#include "pnUtils/pnUtils.h" +#include "plUnifiedTime/plUnifiedTime.h" +#include "plVault/plAgeInfoSource.h" +#include "plVault/plVault.h" #include "pyDniInfoSource.h" #include "pyDniCoordinates.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDrawControl.cpp b/Sources/Plasma/FeatureLib/pfPython/pyDrawControl.cpp index db84a6c2..d534bc28 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDrawControl.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyDrawControl.cpp @@ -52,10 +52,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef BUILDING_PYPLASMA -#include "../plMessage/plInputEventMsg.h" -#include "../pnMessage/plClientMsg.h" -#include "../plInputCore/plInputDevice.h" -#include "../plAvatar/plArmatureMod.h" +#include "plMessage/plInputEventMsg.h" +#include "pnMessage/plClientMsg.h" +#include "plInputCore/plInputDevice.h" +#include "plAvatar/plArmatureMod.h" #endif void pyDrawControl::SetGamma2(hsScalar gamma) @@ -74,7 +74,7 @@ void pyDrawControl::SetGamma2(hsScalar gamma) } #ifndef BUILDING_PYPLASMA -#include "../plGLight/plShadowMaster.h" +#include "plGLight/plShadowMaster.h" #endif void pyDrawControl::SetShadowVisDistance(hsScalar distance) @@ -94,7 +94,7 @@ hsScalar pyDrawControl::GetShadowVisDistance() } #ifndef BUILDING_PYPLASMA -#include "../plGLight/plShadowCaster.h" +#include "plGLight/plShadowCaster.h" #endif void pyDrawControl::EnableShadows() diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDynamicText.cpp b/Sources/Plasma/FeatureLib/pfPython/pyDynamicText.cpp index fa75d9a5..4fc958cf 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDynamicText.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyDynamicText.cpp @@ -47,12 +47,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////////////// #include "plgDispatch.h" -#include "../plMessage/plDynamicTextMsg.h" +#include "plMessage/plDynamicTextMsg.h" #include "pyKey.h" #include "plPythonFileMod.h" #include "pyColor.h" #include "pyImage.h" -#include "../plGImage/plDynamicTextMap.h" +#include "plGImage/plDynamicTextMap.h" #include "pyDynamicText.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDynamicTextGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyDynamicTextGlue.cpp index 3cb19340..00b74394 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDynamicTextGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyDynamicTextGlue.cpp @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyEnum.h" #include "pyColor.h" #include "pyImage.h" -#include "../plGImage/plDynamicTextMap.h" +#include "plGImage/plDynamicTextMap.h" #include diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.cpp index 60af41a3..a692448e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.cpp @@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // /////////////////////////////////////////////// -#include "../pfGameGUIMgr/pfGUIControlMod.h" -#include "../pfGameGUIMgr/pfGUIDialogMod.h" +#include "pfGameGUIMgr/pfGUIControlMod.h" +#include "pfGameGUIMgr/pfGUIDialogMod.h" #include "pyKey.h" #include "pyGUIControl.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButton.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButton.cpp index c82c3458..6cc1239b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButton.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButton.cpp @@ -47,7 +47,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" #include "pyGUIControlButton.h" -#include "../pfGameGUIMgr/pfGUIButtonMod.h" +#include "pfGameGUIMgr/pfGUIButtonMod.h" pyGUIControlButton::pyGUIControlButton(pyKey& gckey) : pyGUIControl(gckey) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButtonGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButtonGlue.cpp index e5526c77..d9737f56 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButtonGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButtonGlue.cpp @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyGUIControlButton.h" #include "pyEnum.h" -#include "../pfGameGUIMgr/pfGUIButtonMod.h" +#include "pfGameGUIMgr/pfGUIButtonMod.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBox.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBox.cpp index 70d906e6..d093ae1e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBox.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBox.cpp @@ -46,8 +46,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" -#include "../pfGameGUIMgr/pfGUICheckBoxCtrl.h" -#include "../pfGameGUIMgr/pfGUIDialogMod.h" +#include "pfGameGUIMgr/pfGUICheckBoxCtrl.h" +#include "pfGameGUIMgr/pfGUIDialogMod.h" #include "pyGUIControlCheckBox.h" #include "pyGUIDialog.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.cpp index 1e7f568b..399176dc 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.cpp @@ -46,8 +46,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" -#include "../pfGameGUIMgr/pfGUIClickMapCtrl.h" -#include "../pfGameGUIMgr/pfGUIDialogMod.h" +#include "pfGameGUIMgr/pfGUIClickMapCtrl.h" +#include "pfGameGUIMgr/pfGUIDialogMod.h" #include "pyGUIControlClickMap.h" #include "pyGUIDialog.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBar.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBar.cpp index 61a4c1ca..321fe726 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBar.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBar.cpp @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" -#include "../pfGameGUIMgr/pfGUIDragBarCtrl.h" +#include "pfGameGUIMgr/pfGUIDragBarCtrl.h" #include "pyGUIControlDragBar.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggable.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggable.cpp index 8bd8aea4..d3c1e0e7 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggable.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggable.cpp @@ -46,8 +46,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" -#include "../pfGameGUIMgr/pfGUIDraggableMod.h" -#include "../pfGameGUIMgr/pfGUIDialogMod.h" +#include "pfGameGUIMgr/pfGUIDraggableMod.h" +#include "pfGameGUIMgr/pfGUIDialogMod.h" #include "pyGUIControlDraggable.h" #include "pyGUIDialog.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicText.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicText.cpp index 19946793..aacad44a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicText.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicText.cpp @@ -46,8 +46,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" -#include "../pfGameGUIMgr/pfGUIDynDisplayCtrl.h" -#include "../plGImage/plDynamicTextMap.h" +#include "pfGameGUIMgr/pfGUIDynDisplayCtrl.h" +#include "plGImage/plDynamicTextMap.h" #include "pyDynamicText.h" #include "pyGUIControlDynamicText.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBox.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBox.cpp index df1e5d10..d568dcb1 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBox.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBox.cpp @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" -#include "../pfGameGUIMgr/pfGUIEditBoxMod.h" +#include "pfGameGUIMgr/pfGUIEditBoxMod.h" #include "pyGUIControlEditBox.h" #include "pyColor.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.cpp index 39dc711a..55a3dba0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.cpp @@ -46,10 +46,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" -#include "../pfGameGUIMgr/pfGUIListBoxMod.h" -#include "../pfGameGUIMgr/pfGUIListElement.h" -#include "../pfGameGUIMgr/pfGUIDialogMod.h" -#include "../plGImage/plDynamicTextMap.h" +#include "pfGameGUIMgr/pfGUIListBoxMod.h" +#include "pfGameGUIMgr/pfGUIListElement.h" +#include "pfGameGUIMgr/pfGUIDialogMod.h" +#include "plGImage/plDynamicTextMap.h" #include "pyGUIControlListBox.h" #include "pyGUIDialog.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.cpp index 1a0c2fc1..a3643d20 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.cpp @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" -#include "../pfGameGUIMgr/pfGUIMultiLineEditCtrl.h" +#include "pfGameGUIMgr/pfGUIMultiLineEditCtrl.h" #include "pyGUIControlMultiLineEdit.h" #include "pyColor.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEditGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEditGlue.cpp index 50ca2abe..3a97699e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEditGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEditGlue.cpp @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyEnum.h" #include "pyColor.h" -#include "../pfGameGUIMgr/pfGUIMultiLineEditCtrl.h" +#include "pfGameGUIMgr/pfGUIMultiLineEditCtrl.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroup.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroup.cpp index de886d86..d9b08156 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroup.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroup.cpp @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" -#include "../pfGameGUIMgr/pfGUIRadioGroupCtrl.h" +#include "pfGameGUIMgr/pfGUIRadioGroupCtrl.h" #include "pyGUIControlRadioGroup.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.cpp index a96bbf16..a3eaf750 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.cpp @@ -46,8 +46,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" -#include "../pfGameGUIMgr/pfGUITextBoxMod.h" -#include "../pfGameGUIMgr/pfGUIListElement.h" +#include "pfGameGUIMgr/pfGUITextBoxMod.h" +#include "pfGameGUIMgr/pfGUIListElement.h" #include "pyGUIControlTextBox.h" #include "pyColor.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.h index f1aac266..0fd4641f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.h @@ -51,7 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" #include "pyGUIControl.h" -#include "../pfGameGUIMgr/pfGUIControlMod.h" +#include "pfGameGUIMgr/pfGUIControlMod.h" #include #include "pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlValue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlValue.cpp index 7863e8d5..a9fcb2ab 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlValue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlValue.cpp @@ -46,10 +46,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" -#include "../pfGameGUIMgr/pfGUIValueCtrl.h" -#include "../pfGameGUIMgr/pfGUIKnobCtrl.h" -#include "../pfGameGUIMgr/pfGUIUpDownPairMod.h" -#include "../pfGameGUIMgr/pfGUIProgressCtrl.h" +#include "pfGameGUIMgr/pfGUIValueCtrl.h" +#include "pfGameGUIMgr/pfGUIKnobCtrl.h" +#include "pfGameGUIMgr/pfGUIUpDownPairMod.h" +#include "pfGameGUIMgr/pfGUIProgressCtrl.h" #include "pyGUIControlValue.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIDialog.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIDialog.cpp index 52a99948..5d215a97 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIDialog.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIDialog.cpp @@ -48,8 +48,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyColor.h" #include "cyPythonInterface.h" -#include "../pfGameGUIMgr/pfGameGUIMgr.h" -#include "../pfGameGUIMgr/pfGUIDialogMod.h" +#include "pfGameGUIMgr/pfGameGUIMgr.h" +#include "pfGameGUIMgr/pfGUIDialogMod.h" #include "pyGUIDialog.h" @@ -67,10 +67,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyGUIControlClickMap.h" // specific value controls -#include "../pfGameGUIMgr/pfGUIKnobCtrl.h" -#include "../pfGameGUIMgr/pfGUIUpDownPairMod.h" +#include "pfGameGUIMgr/pfGUIKnobCtrl.h" +#include "pfGameGUIMgr/pfGUIUpDownPairMod.h" -#include "../plInputCore/plInputInterface.h" +#include "plInputCore/plInputInterface.h" pyGUIDialog::pyGUIDialog(pyKey& gckey) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.cpp index a6836c68..b7853f6a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.cpp @@ -48,8 +48,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyColor.h" #include "cyPythonInterface.h" -#include "../pfGameGUIMgr/pfGameGUIMgr.h" -#include "../pfGameGUIMgr/pfGUIPopUpMenu.h" +#include "pfGameGUIMgr/pfGameGUIMgr.h" +#include "pfGameGUIMgr/pfGUIPopUpMenu.h" #include "pyGUIPopUpMenu.h" @@ -64,7 +64,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyGUIControlDynamicText.h" #include "pyGUIControlMultiLineEdit.h" -#include "../pfGameGUIMgr/pfGUIControlHandlers.h" +#include "pfGameGUIMgr/pfGUIControlHandlers.h" #define kGetMenuPtr( ret ) if( fGCkey == nil ) return ret; \ pfGUIPopUpMenu *menu = pfGUIPopUpMenu::ConvertNoRef( fGCkey->ObjectIsLoaded() ); \ diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.h index 172c122d..38fc12fa 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "../pfGameGUIMgr/pfGUIPopUpMenu.h" +#include "pfGameGUIMgr/pfGUIPopUpMenu.h" #include "pyKey.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUISkin.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUISkin.cpp index 34e00edb..54863bef 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUISkin.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUISkin.cpp @@ -47,9 +47,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" #include "pyColor.h" #include "cyPythonInterface.h" - -#include "../pfGameGUIMgr/pfGameGUIMgr.h" -#include "../pfGameGUIMgr/pfGUIPopUpMenu.h" +#include "pfGameGUIMgr/pfGameGUIMgr.h" +#include "pfGameGUIMgr/pfGUIPopUpMenu.h" #include "pyGUISkin.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGameScore.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGameScore.cpp index 7d489377..6308c31c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGameScore.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGameScore.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyGameScore.h" -#include "../pfGameScoreMgr/pfGameScoreMgr.h" +#include "pfGameScoreMgr/pfGameScoreMgr.h" pyGameScore::pyGameScore() : fScore(nil) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGameScoreGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGameScoreGlue.cpp index c6a4146b..bdb7cda4 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGameScoreGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGameScoreGlue.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyGameScore.h" -#include "../pfGameScoreMgr/pfGameScoreMgr.h" +#include "pfGameScoreMgr/pfGameScoreMgr.h" // glue functions PYTHON_CLASS_DEFINITION(ptGameScore, pyGameScore); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGrassShader.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGrassShader.cpp index da1cb3cf..054fa10e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGrassShader.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGrassShader.cpp @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyGrassShader.h" -#include "../plSurface/plGrassShaderMod.h" +#include "plSurface/plGrassShaderMod.h" pyGrassShader::pyGrassShader() { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyImage.cpp b/Sources/Plasma/FeatureLib/pfPython/pyImage.cpp index 64183395..a9342aff 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyImage.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyImage.cpp @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "cyMisc.h" #ifndef BUILDING_PYPLASMA -#include "../plGImage/plMipmap.h" +#include "plGImage/plMipmap.h" #endif #ifndef BUILDING_PYPLASMA @@ -164,7 +164,7 @@ UInt32 pyImage::GetHeight() return 0; } -#include "../plJPEG/plJPEG.h" +#include "plJPEG/plJPEG.h" void pyImage::SaveAsJPEG(const wchar* fileName, UInt8 quality) { if (quality <= 0 || quality > 100) @@ -184,7 +184,7 @@ void pyImage::SaveAsPNG(const wchar* fileName) } #include "hsResMgr.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plUoid.h" PyObject* pyImage::LoadJPEGFromDisk(const wchar* filename, UInt16 width, UInt16 height) { plMipmap* theMipmap = plJPEG::Instance().ReadFromFile(filename); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyImage.h b/Sources/Plasma/FeatureLib/pfPython/pyImage.h index 8f284a91..6e9601d4 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyImage.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyImage.h @@ -56,7 +56,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef BUILDING_PYPLASMA #include "pyGeometry3.h" -#include "../plGImage/plMipmap.h" +#include "plGImage/plMipmap.h" #endif #include diff --git a/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.cpp b/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.cpp index 9dff2394..72fd650d 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.cpp @@ -46,13 +46,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com /////////////////////////////////////////////// #include "pyJournalBook.h" -#include "../pfJournalBook/pfJournalBook.h" +#include "pfJournalBook/pfJournalBook.h" #include "cyAnimation.h" #include "pyColor.h" #include "pyImage.h" #include "hsResMgr.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plUoid.h" UInt32 pyJournalBook::fNextKeyID = 0; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyJournalBookGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyJournalBookGlue.cpp index 5437204a..41bca814 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyJournalBookGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyJournalBookGlue.cpp @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" #include "pyImage.h" -#include "../pfJournalBook/pfJournalBook.h" +#include "pfJournalBook/pfJournalBook.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyKey.cpp b/Sources/Plasma/FeatureLib/pfPython/pyKey.cpp index 6c8b9d98..072a0fbd 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyKey.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyKey.cpp @@ -46,13 +46,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////// #include "pyKey.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include "plgDispatch.h" #include "plPythonFileMod.h" -#include "../pnMessage/plEnableMsg.h" +#include "pnMessage/plEnableMsg.h" #include "hsResMgr.h" #include "pySceneObject.h" -#include "../pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plSceneObject.h" pyKey::pyKey() { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyKey.h b/Sources/Plasma/FeatureLib/pfPython/pyKey.h index f6341cc6..d7a20684 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyKey.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyKey.h @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include #include "pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.cpp b/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.cpp index 48117f15..41335065 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.cpp @@ -48,8 +48,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKeyMap.h" -#include "../plInputCore/plInputInterfaceMgr.h" -#include "../pnInputCore/plKeyMap.h" +#include "plInputCore/plInputInterfaceMgr.h" +#include "pnInputCore/plKeyMap.h" // conversion functions const char* pyKeyMap::ConvertVKeyToChar( UInt32 vk, UInt32 flags ) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.h b/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.h index e0210b69..6d53b938 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////// #include "hsTypes.h" -#include "../pnInputCore/plKeyMap.h" +#include "pnInputCore/plKeyMap.h" #include #include "pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgr.cpp b/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgr.cpp index 46df0d76..324ce39c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgr.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgr.cpp @@ -47,7 +47,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyMarkerMgr.h" -#include "../pfCharacter/pfMarkerMgr.h" +#include "pfCharacter/pfMarkerMgr.h" void pyMarkerMgr::AddMarker(double x, double y, double z, UInt32 id, bool justCreated) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgrGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgrGlue.cpp index cc190ea3..aaa131bb 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgrGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgrGlue.cpp @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyMarkerMgr.h" -#include "../pfMessage/pfMarkerMsg.h" +#include "pfMessage/pfMarkerMsg.h" #include "pyEnum.h" #include diff --git a/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayer.cpp b/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayer.cpp index d56b6c06..dfd99cae 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayer.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayer.cpp @@ -47,8 +47,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyMoviePlayer.h" -#include "../plMessage/plMovieMsg.h" -#include "../pfMessage/pfMovieEventMsg.h" +#include "plMessage/plMovieMsg.h" +#include "pfMessage/pfMovieEventMsg.h" pyMoviePlayer::pyMoviePlayer(const char* movieName,pyKey& selfKey) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayerGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayerGlue.cpp index 9d60cf6d..fc469281 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayerGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayerGlue.cpp @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" #include "pyColor.h" -#include "../pfMessage/pfMovieEventMsg.h" +#include "pfMessage/pfMovieEventMsg.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.cpp b/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.cpp index f746b9a5..d5c530cf 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.cpp @@ -47,9 +47,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStlUtils.h" #include "pyNetLinkingMgr.h" -#include "../plNetClient/plNetLinkingMgr.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plAvatar/plArmatureMod.h" +#include "plNetClient/plNetLinkingMgr.h" +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plArmatureMod.h" #include "pyAgeInfoStruct.h" #include "pyAgeLinkStruct.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgrGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgrGlue.cpp index 208105e8..ba580d3e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgrGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgrGlue.cpp @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyEnum.h" #include "pyAgeLinkStruct.h" -#include "../plNetCommon/plNetCommon.h" +#include "plNetCommon/plNetCommon.h" #include #ifndef BUILDING_PYPLASMA diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.h b/Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.h index de79b63d..573f73e1 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define pyNetServerSessionInfo_h_inc #include "hsTypes.h" -#include "../plNetCommon/plNetServerSessionInfo.h" -#include "../plUUID/plUUID.h" +#include "plNetCommon/plNetServerSessionInfo.h" +#include "plUUID/plUUID.h" #include #include "pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp b/Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp index f4764816..0536e4f2 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////// #include "plgDispatch.h" -#include "../pnMessage/plNotifyMsg.h" +#include "pnMessage/plNotifyMsg.h" #include "pyKey.h" #include "plPythonFileMod.h" #include "pyGeometry3.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNotify.h b/Sources/Plasma/FeatureLib/pfPython/pyNotify.h index 126afa01..1e3c799c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyNotify.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyNotify.h @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "../pnMessage/plNotifyMsg.h" +#include "pnMessage/plNotifyMsg.h" #include "pyKey.h" #include "pyGeometry3.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pySDL.cpp b/Sources/Plasma/FeatureLib/pfPython/pySDL.cpp index 325347c1..70523553 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySDL.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pySDL.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pySDL.h" -#include "../plSDL/plSDL.h" +#include "plSDL/plSDL.h" /////////////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/FeatureLib/pfPython/pySDLGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pySDLGlue.cpp index f4afd5b0..192e3c3a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySDLGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pySDLGlue.cpp @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pySDL.h" -#include "..\plSDL\plSDL.h" +#include "plSDL/plSDL.h" #include "pyEnum.h" #include "pyKey.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pySceneObject.cpp b/Sources/Plasma/FeatureLib/pfPython/pySceneObject.cpp index 1aa2d8f3..749b2263 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySceneObject.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pySceneObject.cpp @@ -42,18 +42,18 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" // TEMP, for STL warnings #include "pySceneObject.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include "cyAvatar.h" -#include "../plAvatar/plAvBrainHuman.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../plResMgr/plResManager.h" -#include "../pnMessage/plCameraMsg.h" -#include "../pfCamera/plCameraModifier.h" -#include "../plAvatar/plArmatureMod.h" +#include "plAvatar/plAvBrainHuman.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "plResMgr/plResManager.h" +#include "pnMessage/plCameraMsg.h" +#include "pfCamera/plCameraModifier.h" +#include "plAvatar/plArmatureMod.h" #include "plPhysical.h" -#include "../plModifier/plResponderModifier.h" -#include "../plModifier/plLogicModifier.h" -#include "../pfPython/plPythonFileMod.h" +#include "plModifier/plResponderModifier.h" +#include "plModifier/plLogicModifier.h" +#include "pfPython/plPythonFileMod.h" #include "pyMatrix44.h" #include "pyKey.h" @@ -545,7 +545,7 @@ hsBool pySceneObject::IsAvatar() return false; } -#include "../plAvatar/plPhysicalControllerCore.h" +#include "plAvatar/plPhysicalControllerCore.h" PyObject* pySceneObject::GetAvatarVelocity() { @@ -824,8 +824,8 @@ std::vector pySceneObject::GetPythonMods() -#include "../plMessage/plAnimCmdMsg.h" -#include "../pnMessage/plNotifyMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "pnMessage/plNotifyMsg.h" void pySceneObject::Animate() { @@ -938,8 +938,8 @@ void pySceneObject::FFResponder(int state) } } -#include "../pnSceneObject/plAudioInterface.h" -#include "../NucleusLib/inc/plAudible.h" +#include "pnSceneObject/plAudioInterface.h" +#include "NucleusLib/inc/plAudible.h" void pySceneObject::SetSoundFilename(int index, const char* filename, bool isCompressed) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyScoreMgr.cpp b/Sources/Plasma/FeatureLib/pfPython/pyScoreMgr.cpp index baae452f..598a6add 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyScoreMgr.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyScoreMgr.cpp @@ -41,9 +41,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyScoreMgr.h" -#include "../pfGameScoreMgr/pfGameScoreMgr.h" -#include "../plVault/plVault.h" -#include "../plNetCommon/plNetCommon.h" +#include "pfGameScoreMgr/pfGameScoreMgr.h" +#include "plVault/plVault.h" +#include "plNetCommon/plNetCommon.h" #include "pyGameScore.h" pyScoreMgr::pyScoreMgr() diff --git a/Sources/Plasma/FeatureLib/pfPython/pyScoreMgrGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyScoreMgrGlue.cpp index 33f21be4..2e51ea0a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyScoreMgrGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyScoreMgrGlue.cpp @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyScoreMgr.h" #include "pyEnum.h" -#include "../pfGameScoreMgr/pfGameScoreMgr.h" +#include "pfGameScoreMgr/pfGameScoreMgr.h" // glue functions PYTHON_CLASS_DEFINITION(ptScoreMgr, pyScoreMgr); diff --git a/Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfo.h b/Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfo.h index 7e82e76f..a4cc54da 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfo.h +++ b/Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfo.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsStlUtils.h" -#include "../plNetCommon/plSpawnPointInfo.h" +#include "plNetCommon/plSpawnPointInfo.h" #include #include "pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyStatusLog.cpp b/Sources/Plasma/FeatureLib/pfPython/pyStatusLog.cpp index 8764344e..cc91941a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyStatusLog.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyStatusLog.cpp @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyStatusLog.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" pyStatusLog::pyStatusLog( plStatusLog* log/*=nil */) : fLog( log ) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyStatusLogGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyStatusLogGlue.cpp index df55a689..b966da88 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyStatusLogGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyStatusLogGlue.cpp @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyStatusLog.h" #include "pyEnum.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyStream.cpp b/Sources/Plasma/FeatureLib/pfPython/pyStream.cpp index 786de7f0..634d82f8 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyStream.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyStream.cpp @@ -47,7 +47,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyStream.h" -#include "../plFile/plEncryptedStream.h" +#include "plFile/plEncryptedStream.h" pyStream::pyStream() : fStream( nil ) diff --git a/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterface.cpp b/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterface.cpp index a500bdda..75110ab1 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterface.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterface.cpp @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pySwimCurrentInterface.h" -#include "../plAvatar/plSwimRegion.h" +#include "plAvatar/plSwimRegion.h" pySwimCurrentInterface::pySwimCurrentInterface(plKey key) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVault.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVault.cpp index 46707a9e..af597e04 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVault.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVault.cpp @@ -64,17 +64,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyAgeLinkStruct.h" #include "pySDL.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include "cyPythonInterface.h" -#include "../plVault/plVault.h" -#include "../pnNetCommon/plNetApp.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plNetClient/plNetLinkingMgr.h" -#include "../plNetClientComm/plNetClientComm.h" -#include "../plMessage/plVaultNotifyMsg.h" +#include "plVault/plVault.h" +#include "pnNetCommon/plNetApp.h" +#include "plNetClient/plNetClientMgr.h" +#include "plNetClient/plNetLinkingMgr.h" +#include "plNetClientComm/plNetClientComm.h" +#include "plMessage/plVaultNotifyMsg.h" -#include "../plSDL/plSDL.h" +#include "plSDL/plSDL.h" //============================================================================ diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNode.cpp index a3288905..856bc7d9 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNode.cpp @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyVaultAgeInfoListNode.h" #include "pyVaultFolderNode.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" // should only be created from C++ side pyVaultAgeInfoListNode::pyVaultAgeInfoListNode(RelVaultNode* nfsNode) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNodeGlue.cpp index ad2396a6..970ce593 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNodeGlue.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyVaultAgeInfoListNode.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNode.cpp index a161d23e..092c9a25 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNode.cpp @@ -56,7 +56,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyNetLinkingMgr.h" #include "pyAgeInfoStruct.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" // should only be created from C++ side pyVaultAgeInfoNode::pyVaultAgeInfoNode(RelVaultNode* nfsNode) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNodeGlue.cpp index b320bea5..684a0902 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNodeGlue.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyVaultAgeInfoNode.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.cpp index efdafac7..6426e3b8 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.cpp @@ -51,9 +51,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyAgeLinkStruct.h" #include "pySpawnPointInfo.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" -#include "../plNetCommon/plSpawnPointInfo.h" +#include "plNetCommon/plSpawnPointInfo.h" // should only be created from C++ side pyVaultAgeLinkNode::pyVaultAgeLinkNode(RelVaultNode* nfsNode) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.h index f033cc30..1c38c678 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.h @@ -55,7 +55,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyGlueHelpers.h" #include "pyVaultNode.h" -#include "../plNetCommon/plNetServerSessionInfo.h" // for plAgeLinkStruct +#include "plNetCommon/plNetServerSessionInfo.h" // for plAgeLinkStruct class pyVaultAgeInfoNode; struct RelVaultNode; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNodeGlue.cpp index 9d5b49d1..251fb5b8 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNodeGlue.cpp @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyVaultAgeLinkNode.h" #include "pySpawnPointInfo.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNode.cpp index 2dbdff86..819cda02 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNode.cpp @@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyVault.h" #endif -#include "../plVault/plVault.h" +#include "plVault/plVault.h" // should only be created from C++ side pyVaultChronicleNode::pyVaultChronicleNode(RelVaultNode* nfsNode) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNodeGlue.cpp index 8fc48b1f..1c105b98 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNodeGlue.cpp @@ -40,8 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyVaultChronicleNode.h" - -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNode.cpp index a3a03a49..be81066a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNode.cpp @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyVaultFolderNode.h" #include "hsUtils.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" // should only be created from C++ side pyVaultFolderNode::pyVaultFolderNode( RelVaultNode* nfsNode ) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNodeGlue.cpp index c494196e..5b1d604f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNodeGlue.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyVaultFolderNode.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultGlue.cpp index f6108c1f..8e0bd00c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultGlue.cpp @@ -47,8 +47,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pySDL.h" #include "pyAgeLinkStruct.h" -#include "../plVault/plVault.h" -#include "../plMessage/plVaultNotifyMsg.h" +#include "plVault/plVault.h" +#include "plMessage/plVaultNotifyMsg.h" #include #ifndef BUILDING_PYPLASMA diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.cpp index 3c1e0f38..b90097ac 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.cpp @@ -54,10 +54,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "cyMisc.h" #include "hsResMgr.h" -#include "../plGImage/plMipmap.h" -#include "../plVault/plVault.h" -#include "../pnMessage/plRefMsg.h" -#include "../plNetClient/plNetClientMgr.h" +#include "plGImage/plMipmap.h" +#include "plVault/plVault.h" +#include "pnMessage/plRefMsg.h" +#include "plNetClient/plNetClientMgr.h" static unsigned s_keyseq; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.h index 87d9f4a2..8d7baf1f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.h @@ -55,7 +55,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyGlueHelpers.h" #include "pyVaultNode.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" struct RelVaultNode; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNodeGlue.cpp index ba78190f..b96e6915 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNodeGlue.cpp @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyVaultImageNode.h" #include "pyImage.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.cpp index 759a0f8c..8b04c778 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.cpp @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyVaultMarkerGameNode.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" // should only be created from C++ side pyVaultMarkerGameNode::pyVaultMarkerGameNode(RelVaultNode* nfsNode) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.h index 93ab3272..a74ce258 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.h @@ -54,7 +54,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyGlueHelpers.h" #include "pyVaultNode.h" -#include "../pnNetBase/pnNetBase.h" +#include "pnNetBase/pnNetBase.h" struct RelVaultNode; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNodeGlue.cpp index 4dc21426..6a134166 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNodeGlue.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyVaultMarkerGameNode.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.cpp index 6dfa886c..b08a4e04 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.cpp @@ -68,13 +68,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyVaultSystemNode.h" #endif -#include "../plGImage/plMipmap.h" +#include "plGImage/plMipmap.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #ifndef BUILDING_PYPLASMA -#include "../pnNetCommon/plNetApp.h" -#include "../plNetClientComm/plNetClientComm.h" +#include "pnNetCommon/plNetApp.h" +#include "plNetClientComm/plNetClientComm.h" #endif #include diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeGlue.cpp index 359346ff..9df2087f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeGlue.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyVaultNode.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRef.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRef.cpp index c47aed2c..e6a67295 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRef.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRef.cpp @@ -52,7 +52,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyVaultNode.h" #include "pyVaultPlayerInfoNode.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" ////////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRefGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRefGlue.cpp index 53e71475..604a97d0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRefGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRefGlue.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyVaultNodeRef.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNode.cpp index 914c62a0..051ed754 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNode.cpp @@ -53,7 +53,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyVaultPlayerInfoNode.h" #include "pyVaultNodeRef.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNodeGlue.cpp index 27fc381f..a9437989 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNodeGlue.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyVaultPlayerInfoListNode.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNode.cpp index 236b147a..9500469b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNode.cpp @@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyVault.h" #endif -#include "../plVault/plVault.h" +#include "plVault/plVault.h" // should only be created from C++ side pyVaultPlayerInfoNode::pyVaultPlayerInfoNode(RelVaultNode* nfsNode) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNodeGlue.cpp index d1d00925..9cf213e8 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNodeGlue.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyVaultPlayerInfoNode.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.cpp index b7873ee6..a32500f7 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.cpp @@ -50,16 +50,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyVault.h" #endif -#include "../pfPython/pyAgeInfoStruct.h" -#include "../pfPython/pyVaultAgeLinkNode.h" -#include "../pfPython/pyVaultPlayerInfoNode.h" -#include "../pfPython/pyVaultPlayerInfoListNode.h" -#include "../pfPython/pyVaultFolderNode.h" -#include "../pfPython/pyVaultChronicleNode.h" -#include "../pfPython/pyVaultSDLNode.h" -#include "../pfPython/pyAgeLinkStruct.h" - -#include "../plVault/plVault.h" +#include "pfPython/pyAgeInfoStruct.h" +#include "pfPython/pyVaultAgeLinkNode.h" +#include "pfPython/pyVaultPlayerInfoNode.h" +#include "pfPython/pyVaultPlayerInfoListNode.h" +#include "pfPython/pyVaultFolderNode.h" +#include "pfPython/pyVaultChronicleNode.h" +#include "pfPython/pyVaultSDLNode.h" +#include "pfPython/pyAgeLinkStruct.h" + +#include "plVault/plVault.h" //============================================================================ static PyObject * GetPlayerVaultFolder (unsigned folderType) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.h index ef18110d..90eb5a95 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.h @@ -54,8 +54,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include "pyGlueHelpers.h" -#include "../pfPython/pyVaultNode.h" -#include "../pfPython/pyVaultPlayerInfoNode.h" +#include "pfPython/pyVaultNode.h" +#include "pfPython/pyVaultPlayerInfoNode.h" class pyAgeInfoStruct; struct RelVaultNode; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNodeGlue.cpp index 85cbc79b..f1b5d3f5 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNodeGlue.cpp @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyVaultPlayerNode.h" #include "pyAgeInfoStruct.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNode.cpp index 3bfee6d3..359333fa 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNode.cpp @@ -48,9 +48,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyVaultSDLNode.h" #include "pySDL.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" -#include "../plSDL/plSDL.h" +#include "plSDL/plSDL.h" // should only be created from C++ side pyVaultSDLNode::pyVaultSDLNode(RelVaultNode* nfsNode) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNodeGlue.cpp index db7fd213..565359f0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNodeGlue.cpp @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyVaultSDLNode.h" #include "pySDL.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNode.cpp index 60abd737..dc191f16 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNode.cpp @@ -52,7 +52,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyVaultAgeLinkNode.h" #include "pyVaultFolderNode.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" // should only be created from C++ side pyVaultSystemNode::pyVaultSystemNode(RelVaultNode* nfsNode) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNodeGlue.cpp index 36022d62..30040f78 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNodeGlue.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyVaultSystemNode.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNode.cpp index f669ea23..e752f506 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNode.cpp @@ -52,7 +52,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyVaultAgeLinkNode.h" #include "pyVaultFolderNode.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" // should only be created from C++ side pyVaultTextNoteNode::pyVaultTextNoteNode(RelVaultNode* nfsNode) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNodeGlue.cpp index 449a424c..8c447122 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNodeGlue.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyVaultTextNoteNode.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyWaveSet.cpp b/Sources/Plasma/FeatureLib/pfPython/pyWaveSet.cpp index edf12b14..cdcdd2a4 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyWaveSet.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyWaveSet.cpp @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyWaveSet.h" -#include "../plDrawable/plWaveSet7.h" +#include "plDrawable/plWaveSet7.h" pyWaveSet::pyWaveSet(plKey key) { diff --git a/Sources/Plasma/FeatureLib/pfSecurePreloader/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfSecurePreloader/CMakeLists.txt new file mode 100644 index 00000000..6d7125be --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfSecurePreloader/CMakeLists.txt @@ -0,0 +1,22 @@ +include_directories(../../CoreLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) +include_directories(../../PubUtilLib) + +if(WIN32) + add_definitions(-DWIN32) +endif(WIN32) + +set(pfSecurePreloader_SOURCES + pfSecurePreloader.cpp +) + +set(pfSecurePreloader_HEADERS + pfSecurePreloader.h + pfSecurePreloaderCreatable.h +) + +add_library(pfSecurePreloader STATIC ${pfSecurePreloader_SOURCES} ${pfSecurePreloader_HEADERS}) + +source_group("Source Files" FILES ${pfSecurePreloader_SOURCES}) +source_group("Header Files" FILES ${pfSecurePreloader_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfSecurePreloader/pfSecurePreloader.cpp b/Sources/Plasma/FeatureLib/pfSecurePreloader/pfSecurePreloader.cpp index 42613be1..1aa78318 100644 --- a/Sources/Plasma/FeatureLib/pfSecurePreloader/pfSecurePreloader.cpp +++ b/Sources/Plasma/FeatureLib/pfSecurePreloader/pfSecurePreloader.cpp @@ -42,20 +42,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsSTLStream.h" #include "hsResMgr.h" #include "plgDispatch.h" -#include "../pnUtils/pnUtils.h" -#include "../pnNetBase/pnNetBase.h" -#include "../pnAsyncCore/pnAsyncCore.h" -#include "../pnNetCli/pnNetCli.h" -#include "../plNetGameLib/plNetGameLib.h" -#include "../plFile/plFileUtils.h" -#include "../plFile/plStreamSource.h" -#include "../plNetCommon/plNetCommon.h" -#include "../plProgressMgr/plProgressMgr.h" -#include "../plMessage/plPreloaderMsg.h" -#include "../plMessage/plNetCommMsgs.h" +#include "pnUtils/pnUtils.h" +#include "pnNetBase/pnNetBase.h" +#include "pnAsyncCore/pnAsyncCore.h" +#include "pnNetCli/pnNetCli.h" +#include "plNetGameLib/plNetGameLib.h" +#include "plFile/plFileUtils.h" +#include "plFile/plStreamSource.h" +#include "plNetCommon/plNetCommon.h" +#include "plProgressMgr/plProgressMgr.h" +#include "plMessage/plPreloaderMsg.h" +#include "plMessage/plNetCommMsgs.h" #include "pfSecurePreloader.h" -#include "../plNetClientComm/plNetClientComm.h" +#include "plNetClientComm/plNetClientComm.h" extern hsBool gDataServerLocal; diff --git a/Sources/Plasma/FeatureLib/pfSecurePreloader/pfSecurePreloader.h b/Sources/Plasma/FeatureLib/pfSecurePreloader/pfSecurePreloader.h index 8cb6adb9..5760b633 100644 --- a/Sources/Plasma/FeatureLib/pfSecurePreloader/pfSecurePreloader.h +++ b/Sources/Plasma/FeatureLib/pfSecurePreloader/pfSecurePreloader.h @@ -46,8 +46,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStlUtils.h" #include "hsCritSect.h" #include "hsStream.h" -#include "../plFile/plSecureStream.h" -#include "../pnKeyedObject/hsKeyedObject.h" +#include "plFile/plSecureStream.h" +#include "pnKeyedObject/hsKeyedObject.h" class plOperationProgress; diff --git a/Sources/Plasma/FeatureLib/pfSecurePreloader/pfSecurePreloaderCreatable.h b/Sources/Plasma/FeatureLib/pfSecurePreloader/pfSecurePreloaderCreatable.h index 595e5aa0..7f6c3437 100644 --- a/Sources/Plasma/FeatureLib/pfSecurePreloader/pfSecurePreloaderCreatable.h +++ b/Sources/Plasma/FeatureLib/pfSecurePreloader/pfSecurePreloaderCreatable.h @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PLASMA20_SOURCES_PLASMA_FEATURELIB_PFSECUREPRELOADER_PFSECUREPRELOADERCREATABLE_H #define PLASMA20_SOURCES_PLASMA_FEATURELIB_PFSECUREPRELOADER_PFSECUREPRELOADERCREATABLE_H -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "pfSecurePreloader.h" REGISTER_NONCREATABLE(pfSecurePreloader); diff --git a/Sources/Plasma/FeatureLib/pfStackTrace/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfStackTrace/CMakeLists.txt new file mode 100644 index 00000000..449736b5 --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfStackTrace/CMakeLists.txt @@ -0,0 +1,27 @@ +include_directories(../../CoreLib) + +if(WIN32) + add_definitions(-DWIN32) +endif(WIN32) + +set(pfStackTrace_SOURCES + pfMapFile.cpp + pfMapFileEntry.cpp + pfPrintStackTrace.cpp + pfStackTrace.cpp + pfTextFile.cpp +) + +set(pfStackTrace_HEADERS + pfArray.h + pfMapFile.h + pfMapFileEntry.h + pfPrintStackTrace.h + pfStackTrace.h + pfTextFile.h +) + +add_library(pfStackTrace STATIC ${pfStackTrace_SOURCES} ${pfStackTrace_HEADERS}) + +source_group("Source Files" FILES ${pfStackTrace_SOURCES}) +source_group("Header Files" FILES ${pfStackTrace_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfSurface/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfSurface/CMakeLists.txt new file mode 100644 index 00000000..bc87de4c --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfSurface/CMakeLists.txt @@ -0,0 +1,34 @@ +include_directories(../../CoreLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) +include_directories(../../PubUtilLib) + +if(WIN32) + add_definitions(-DWIN32) +endif(WIN32) + +set(pfSurface_SOURCES + plDistOpacityMod.cpp + plFadeOpacityLay.cpp + plFadeOpacityMod.cpp + plGrabCubeMap.cpp + plLayerAVI.cpp + plLayerBink.cpp + plLayerMovie.cpp +) + +set(pfSurface_HEADERS + pfSurfaceCreatable.h + plDistOpacityMod.h + plFadeOpacityLay.h + plFadeOpacityMod.h + plGrabCubeMap.h + plLayerAVI.h + plLayerBink.h + plLayerMovie.h +) + +add_library(pfSurface STATIC ${pfSurface_SOURCES} ${pfSources_HEADERS}) + +source_group("Source Files" FILES ${pfSurface_SOURCES}) +source_group("Header Files" FILES ${pfSurface_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfSurface/pfSurfaceCreatable.h b/Sources/Plasma/FeatureLib/pfSurface/pfSurfaceCreatable.h index dc33e1c3..c416d2aa 100644 --- a/Sources/Plasma/FeatureLib/pfSurface/pfSurfaceCreatable.h +++ b/Sources/Plasma/FeatureLib/pfSurface/pfSurfaceCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pfSurfaceCreatable_inc #define pfSurfaceCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plLayerMovie.h" diff --git a/Sources/Plasma/FeatureLib/pfSurface/plDistOpacityMod.cpp b/Sources/Plasma/FeatureLib/pfSurface/plDistOpacityMod.cpp index beb8133c..45f4e48c 100644 --- a/Sources/Plasma/FeatureLib/pfSurface/plDistOpacityMod.cpp +++ b/Sources/Plasma/FeatureLib/pfSurface/plDistOpacityMod.cpp @@ -46,20 +46,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plDistOpacityMod.h" #include "plFadeOpacityLay.h" -#include "../plSurface/hsGMaterial.h" +#include "plSurface/hsGMaterial.h" -#include "../plDrawable/plAccessGeometry.h" -#include "../plDrawable/plAccessSpan.h" +#include "plDrawable/plAccessGeometry.h" +#include "plDrawable/plAccessSpan.h" -#include "../plMessage/plMatRefMsg.h" +#include "plMessage/plMatRefMsg.h" // If we're tracking the camera -#include "../plMessage/plRenderMsg.h" +#include "plMessage/plRenderMsg.h" #include "plPipeline.h" // If we're tracking the avater -#include "../plMessage/plAvatarMsg.h" -#include "../plAvatar/plArmatureMod.h" +#include "plMessage/plAvatarMsg.h" +#include "plAvatar/plArmatureMod.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfSurface/plDistOpacityMod.h b/Sources/Plasma/FeatureLib/pfSurface/plDistOpacityMod.h index ecd7d097..40885dff 100644 --- a/Sources/Plasma/FeatureLib/pfSurface/plDistOpacityMod.h +++ b/Sources/Plasma/FeatureLib/pfSurface/plDistOpacityMod.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plDistOpacityMod_inc #include "hsGeometry3.h" -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" #include "hsTemplates.h" class plPipeline; diff --git a/Sources/Plasma/FeatureLib/pfSurface/plFadeOpacityLay.h b/Sources/Plasma/FeatureLib/pfSurface/plFadeOpacityLay.h index f6182a39..5b023ec4 100644 --- a/Sources/Plasma/FeatureLib/pfSurface/plFadeOpacityLay.h +++ b/Sources/Plasma/FeatureLib/pfSurface/plFadeOpacityLay.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plFadeOpacityLay_inc #define plFadeOpacityLay_inc -#include "../plSurface/plLayerInterface.h" +#include "plSurface/plLayerInterface.h" class plFadeOpacityLay : public plLayerInterface diff --git a/Sources/Plasma/FeatureLib/pfSurface/plFadeOpacityMod.cpp b/Sources/Plasma/FeatureLib/pfSurface/plFadeOpacityMod.cpp index 2e7d12dd..16bbdd67 100644 --- a/Sources/Plasma/FeatureLib/pfSurface/plFadeOpacityMod.cpp +++ b/Sources/Plasma/FeatureLib/pfSurface/plFadeOpacityMod.cpp @@ -45,20 +45,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plFadeOpacityLay.h" -#include "../plMessage/plRenderMsg.h" -#include "../plMessage/plMatRefMsg.h" +#include "plMessage/plRenderMsg.h" +#include "plMessage/plMatRefMsg.h" -#include "../plSurface/hsGMaterial.h" +#include "plSurface/hsGMaterial.h" -#include "../plDrawable/plVisLOSMgr.h" -#include "../plDrawable/plAccessGeometry.h" -#include "../plDrawable/plAccessSpan.h" -#include "../plDrawable/plDrawableSpans.h" +#include "plDrawable/plVisLOSMgr.h" +#include "plDrawable/plAccessGeometry.h" +#include "plDrawable/plAccessSpan.h" +#include "plDrawable/plDrawableSpans.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plDrawInterface.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plDrawInterface.h" -#include "../plScene/plVisMgr.h" +#include "plScene/plVisMgr.h" #include "plgDispatch.h" #include "plPipeline.h" diff --git a/Sources/Plasma/FeatureLib/pfSurface/plFadeOpacityMod.h b/Sources/Plasma/FeatureLib/pfSurface/plFadeOpacityMod.h index fe83f56f..65d60437 100644 --- a/Sources/Plasma/FeatureLib/pfSurface/plFadeOpacityMod.h +++ b/Sources/Plasma/FeatureLib/pfSurface/plFadeOpacityMod.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plFadeOpacityMod_inc #include "hsGeometry3.h" -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" #include "hsTemplates.h" class plPipeline; diff --git a/Sources/Plasma/FeatureLib/pfSurface/plGrabCubeMap.cpp b/Sources/Plasma/FeatureLib/pfSurface/plGrabCubeMap.cpp index d9d0636f..82c3efe9 100644 --- a/Sources/Plasma/FeatureLib/pfSurface/plGrabCubeMap.cpp +++ b/Sources/Plasma/FeatureLib/pfSurface/plGrabCubeMap.cpp @@ -52,14 +52,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsColorRGBA.h" #include "hsBounds.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plDrawInterface.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plDrawInterface.h" -#include "../plGImage/plMipmap.h" +#include "plGImage/plMipmap.h" -#include "../plJPEG/plJPEG.h" +#include "plJPEG/plJPEG.h" -#include "../plMessage/plRenderRequestMsg.h" +#include "plMessage/plRenderRequestMsg.h" plGrabCubeRenderRequest::plGrabCubeRenderRequest() : fQuality(75) diff --git a/Sources/Plasma/FeatureLib/pfSurface/plGrabCubeMap.h b/Sources/Plasma/FeatureLib/pfSurface/plGrabCubeMap.h index 3d5fd01c..f00d142e 100644 --- a/Sources/Plasma/FeatureLib/pfSurface/plGrabCubeMap.h +++ b/Sources/Plasma/FeatureLib/pfSurface/plGrabCubeMap.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plGrabCubeMap_inc #define plGrabCubeMap_inc -#include "../plScene/plRenderRequest.h" +#include "plScene/plRenderRequest.h" class plSceneObject; class plPipeline; diff --git a/Sources/Plasma/FeatureLib/pfSurface/plLayerAVI.cpp b/Sources/Plasma/FeatureLib/pfSurface/plLayerAVI.cpp index 4c100bdb..0d38a6d8 100644 --- a/Sources/Plasma/FeatureLib/pfSurface/plLayerAVI.cpp +++ b/Sources/Plasma/FeatureLib/pfSurface/plLayerAVI.cpp @@ -54,7 +54,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plLayerAVI.h" -#include "../plGImage/plMipmap.h" +#include "plGImage/plMipmap.h" #if HS_BUILD_FOR_WIN32 class plAVIFileInfo diff --git a/Sources/Plasma/FeatureLib/pfSurface/plLayerMovie.cpp b/Sources/Plasma/FeatureLib/pfSurface/plLayerMovie.cpp index 218fa015..7156a18d 100644 --- a/Sources/Plasma/FeatureLib/pfSurface/plLayerMovie.cpp +++ b/Sources/Plasma/FeatureLib/pfSurface/plLayerMovie.cpp @@ -46,9 +46,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "hsUtils.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plGImage/plMipmap.h" -#include "../plPipeline/hsGDeviceRef.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plGImage/plMipmap.h" +#include "plPipeline/hsGDeviceRef.h" plLayerMovie::plLayerMovie() : fMovieName(nil), diff --git a/Sources/Plasma/FeatureLib/pfSurface/plLayerMovie.h b/Sources/Plasma/FeatureLib/pfSurface/plLayerMovie.h index 1c007003..f39df2e0 100644 --- a/Sources/Plasma/FeatureLib/pfSurface/plLayerMovie.h +++ b/Sources/Plasma/FeatureLib/pfSurface/plLayerMovie.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLayerMovie_inc #define plLayerMovie_inc -#include "../plSurface/plLayerAnimation.h" -#include "../plInterp/plAnimTimeConvert.h" +#include "plSurface/plLayerAnimation.h" +#include "plInterp/plAnimTimeConvert.h" class plMessage; class hsStream; From afdcfc9fd32715d66da3221d6ea5945c84a034bb Mon Sep 17 00:00:00 2001 From: Zrax Date: Fri, 8 Apr 2011 18:09:44 -0700 Subject: [PATCH 10/18] Finished PubUtilLib cmakification --HG-- rename : MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plOGGCodec.cpp => MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plOGGCodec.cpp rename : MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plOGGCodec.h => MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plOGGCodec.h rename : MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWavFile.cpp => MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.cpp rename : MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWavFile.h => MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.h (cherry picked from commit 0477edc597375923fc2b6580172e9ce841564d03) --- CMakeLists.txt | 16 +- .../Plasma/FeatureLib/pfPython/CMakeLists.txt | 714 +++++++++--------- Sources/Plasma/PubUtilLib/CMakeLists.txt | 16 +- .../Plasma/PubUtilLib/plAudio/CMakeLists.txt | 50 ++ .../Plasma/PubUtilLib/plAudio/plAudioCaps.cpp | 6 +- .../PubUtilLib/plAudio/plAudioCreatable.h | 2 +- .../PubUtilLib/plAudio/plAudioSystem.cpp | 22 +- .../Plasma/PubUtilLib/plAudio/plAudioSystem.h | 2 +- .../PubUtilLib/plAudio/plDSoundBuffer.cpp | 8 +- .../PubUtilLib/plAudio/plEAXEffects.cpp | 4 +- .../PubUtilLib/plAudio/plEAXListenerMod.cpp | 4 +- .../PubUtilLib/plAudio/plEAXListenerMod.h | 2 +- Sources/Plasma/PubUtilLib/plAudio/plSound.cpp | 32 +- Sources/Plasma/PubUtilLib/plAudio/plSound.h | 8 +- .../PubUtilLib/plAudio/plSoundEvent.cpp | 4 +- .../Plasma/PubUtilLib/plAudio/plVoiceChat.cpp | 26 +- .../PubUtilLib/plAudio/plWAVClipBuffer.cpp | 2 +- .../plAudio/plWin32GroupedSound.cpp | 8 +- .../PubUtilLib/plAudio/plWin32Sound.cpp | 18 +- .../PubUtilLib/plAudio/plWin32StaticSound.cpp | 18 +- .../plAudio/plWin32StreamingSound.cpp | 12 +- .../plAudio/plWin32StreamingSound.h | 2 +- .../PubUtilLib/plAudioCore/CMakeLists.txt | 34 + .../plAudioCore/plAudioFileReader.cpp | 10 +- .../plAudioCore/plBufferedFileReader.h | 2 +- .../{plAudio => plAudioCore}/plOGGCodec.cpp | 2 +- .../{plAudio => plAudioCore}/plOGGCodec.h | 2 +- .../PubUtilLib/plAudioCore/plSoundBuffer.cpp | 12 +- .../PubUtilLib/plAudioCore/plSoundBuffer.h | 4 +- .../{plAudio => plAudioCore}/plWavFile.cpp | 0 .../{plAudio => plAudioCore}/plWavFile.h | 2 +- .../PubUtilLib/plInputCore/CMakeLists.txt | 37 + .../plInputCore/plAvatarInputInterface.cpp | 26 +- .../plInputCore/plAvatarInputInterface.h | 2 +- .../PubUtilLib/plInputCore/plDInputDevice.cpp | 2 +- .../plInputCore/plDebugInputInterface.cpp | 8 +- .../plInputCore/plDebugInputInterface.h | 2 +- .../PubUtilLib/plInputCore/plInputDevice.cpp | 12 +- .../PubUtilLib/plInputCore/plInputDevice.h | 4 +- .../plInputCore/plInputInterface.cpp | 4 +- .../PubUtilLib/plInputCore/plInputInterface.h | 4 +- .../plInputCore/plInputInterfaceMgr.cpp | 24 +- .../plInputCore/plInputInterfaceMgr.h | 4 +- .../PubUtilLib/plInputCore/plInputManager.cpp | 12 +- .../PubUtilLib/plInputCore/plInputManager.h | 4 +- .../plInputCore/plSceneInputInterface.cpp | 68 +- .../plInputCore/plSceneInputInterface.h | 4 +- .../plInputCore/plTelescopeInputInterface.cpp | 2 +- .../plInputCore/plTelescopeInputInterface.h | 2 +- .../PubUtilLib/plModifier/CMakeLists.txt | 59 ++ .../plModifier/plAnimEventModifier.cpp | 8 +- .../plModifier/plAnimEventModifier.h | 2 +- .../plAnimTimeConvertSDLModifier.cpp | 4 +- .../plModifier/plAnimTimeConvertSDLModifier.h | 2 +- .../plModifier/plAxisAnimModifier.cpp | 26 +- .../plModifier/plAxisAnimModifier.h | 2 +- .../plModifier/plCloneSpawnModifier.cpp | 14 +- .../plModifier/plCloneSpawnModifier.h | 2 +- .../plModifier/plDecalEnableMod.cpp | 8 +- .../PubUtilLib/plModifier/plDecalEnableMod.h | 4 +- .../PubUtilLib/plModifier/plDetectorLog.cpp | 2 +- .../plModifier/plExcludeRegionModifier.cpp | 26 +- .../plModifier/plExcludeRegionModifier.h | 4 +- .../plModifier/plGameMarkerModifier.cpp | 6 +- .../plModifier/plGameMarkerModifier.h | 2 +- .../PubUtilLib/plModifier/plImageLibMod.cpp | 4 +- .../PubUtilLib/plModifier/plImageLibMod.h | 4 +- .../plModifier/plInterfaceInfoModifier.cpp | 2 +- .../plModifier/plInterfaceInfoModifier.h | 4 +- .../plModifier/plLayerSDLModifier.cpp | 4 +- .../plModifier/plLayerSDLModifier.h | 2 +- .../PubUtilLib/plModifier/plLogicModifier.cpp | 34 +- .../PubUtilLib/plModifier/plLogicModifier.h | 2 +- .../plMaintainersMarkerModifier.cpp | 4 +- .../plModifier/plMaintainersMarkerModifier.h | 4 +- .../plModifier/plModifierCreatable.h | 2 +- .../plModifier/plResponderModifier.cpp | 50 +- .../plModifier/plResponderModifier.h | 4 +- .../plModifier/plResponderSDLModifier.cpp | 2 +- .../plModifier/plResponderSDLModifier.h | 2 +- .../PubUtilLib/plModifier/plSDLModifier.cpp | 18 +- .../plModifier/plSimpleModifier.cpp | 10 +- .../PubUtilLib/plModifier/plSimpleModifier.h | 2 +- .../plModifier/plSoundSDLModifier.cpp | 8 +- .../plModifier/plSoundSDLModifier.h | 2 +- .../PubUtilLib/plModifier/plSpawnModifier.cpp | 16 +- .../PubUtilLib/plModifier/plSpawnModifier.h | 4 +- .../PubUtilLib/plNetClient/CMakeLists.txt | 47 ++ .../plNetClient/plLinkEffectsMgr.cpp | 42 +- .../PubUtilLib/plNetClient/plLinkEffectsMgr.h | 2 +- .../plNetClient/plNetCliAgeJoiner.cpp | 34 +- .../plNetClient/plNetCliAgeJoiner.h | 4 +- .../plNetClient/plNetCliAgeLeaver.cpp | 24 +- .../plNetClient/plNetCliAgeLeaver.h | 4 +- .../plNetClient/plNetClientCommInterface.cpp | 4 +- .../plNetClient/plNetClientCreatable.h | 4 +- .../plNetClient/plNetClientGroup.cpp | 4 +- .../PubUtilLib/plNetClient/plNetClientGroup.h | 2 +- .../PubUtilLib/plNetClient/plNetClientMgr.cpp | 106 +-- .../PubUtilLib/plNetClient/plNetClientMgr.h | 12 +- .../plNetClient/plNetClientMgrLoad.cpp | 69 +- .../plNetClient/plNetClientMgrRecord.cpp | 6 +- .../plNetClient/plNetClientMgrSend.cpp | 46 +- .../plNetClient/plNetClientMgrShow.cpp | 12 +- .../plNetClient/plNetClientMgrVoice.cpp | 22 +- .../plNetClient/plNetClientMsgHandler.cpp | 62 +- .../plNetClient/plNetClientMsgHandler.h | 2 +- .../plNetClient/plNetClientMsgScreener.cpp | 10 +- .../plNetClient/plNetClientMsgScreener.h | 2 +- .../plNetClient/plNetLinkingMgr.cpp | 34 +- .../PubUtilLib/plNetClient/plNetLinkingMgr.h | 6 +- .../plNetClient/plNetObjectDebugger.cpp | 12 +- .../plNetClient/plNetObjectDebugger.h | 4 +- .../PubUtilLib/plNetClient/plNetVoiceList.cpp | 8 +- .../PubUtilLib/plNetCommon/CMakeLists.txt | 33 + .../PubUtilLib/plNetCommon/plClientGuid.cpp | 4 +- .../PubUtilLib/plNetCommon/plClientGuid.h | 4 +- .../PubUtilLib/plNetCommon/plNetCommon.cpp | 2 +- .../plNetCommon/plNetCommonCreatable.h | 2 +- .../plNetCommon/plNetCommonHelpers.cpp | 4 +- .../plNetCommon/plNetMsgScreener.cpp | 36 +- .../PubUtilLib/plNetCommon/plNetMsgScreener.h | 4 +- .../plNetCommon/plNetServerSessionInfo.cpp | 4 +- .../plNetCommon/plSpawnPointInfo.cpp | 2 +- .../Plasma/PubUtilLib/plPhysX/CMakeLists.txt | 30 + .../PubUtilLib/plPhysX/plLOSDispatch.cpp | 16 +- .../Plasma/PubUtilLib/plPhysX/plLOSDispatch.h | 2 +- .../Plasma/PubUtilLib/plPhysX/plPXConvert.h | 6 +- .../PubUtilLib/plPhysX/plPXPhysical.cpp | 36 +- .../Plasma/PubUtilLib/plPhysX/plPXPhysical.h | 2 +- .../Plasma/PubUtilLib/plPhysX/plPXStream.h | 4 +- .../PubUtilLib/plPhysX/plPhysXCreatable.h | 2 +- .../PubUtilLib/plPhysX/plSimulationMgr.cpp | 16 +- .../PubUtilLib/plPhysX/plSimulationMgr.h | 2 +- .../PubUtilLib/plPipeline/CMakeLists.txt | 87 +++ .../plPipeline/hsG3DDeviceSelector.cpp | 6 +- .../PubUtilLib/plPipeline/plCaptureRender.cpp | 12 +- .../PubUtilLib/plPipeline/plCaptureRender.h | 2 +- .../plCubicRenderTargetModifier.cpp | 12 +- .../plPipeline/plCubicRenderTargetModifier.h | 4 +- .../PubUtilLib/plPipeline/plCullTree.cpp | 2 +- .../Plasma/PubUtilLib/plPipeline/plCullTree.h | 2 +- .../PubUtilLib/plPipeline/plDTProgressMgr.h | 2 +- .../PubUtilLib/plPipeline/plDXDeviceRefs.cpp | 8 +- .../PubUtilLib/plPipeline/plDXPipeline.cpp | 72 +- .../PubUtilLib/plPipeline/plDXPipeline.h | 2 +- .../PubUtilLib/plPipeline/plDXPixelShader.cpp | 2 +- .../PubUtilLib/plPipeline/plDXShader.cpp | 2 +- .../plPipeline/plDXVertexShader.cpp | 2 +- .../PubUtilLib/plPipeline/plDynamicEnvMap.cpp | 28 +- .../PubUtilLib/plPipeline/plDynamicEnvMap.h | 2 +- .../PubUtilLib/plPipeline/plFogEnvironment.h | 2 +- .../PubUtilLib/plPipeline/plGBufferGroup.cpp | 4 +- .../plPipeline/plPipelineCreatable.h | 2 +- .../Plasma/PubUtilLib/plPipeline/plPlates.cpp | 14 +- .../PubUtilLib/plPipeline/plRenderTarget.cpp | 2 +- .../PubUtilLib/plPipeline/plRenderTarget.h | 2 +- .../plPipeline/plStatusLogDrawer.cpp | 2 +- .../PubUtilLib/plPipeline/plStatusLogDrawer.h | 2 +- .../PubUtilLib/plPipeline/plTextGenerator.cpp | 8 +- .../PubUtilLib/plPipeline/plTransitionMgr.cpp | 28 +- .../PubUtilLib/plPipeline/plTransitionMgr.h | 2 +- cmake/FindOgg.cmake | 30 + cmake/FindPhysX.cmake | 61 ++ cmake/FindSpeex.cmake | 30 + cmake/FindVorbis.cmake | 37 + 166 files changed, 1717 insertions(+), 1171 deletions(-) create mode 100644 Sources/Plasma/PubUtilLib/plAudio/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plAudioCore/CMakeLists.txt rename Sources/Plasma/PubUtilLib/{plAudio => plAudioCore}/plOGGCodec.cpp (99%) rename Sources/Plasma/PubUtilLib/{plAudio => plAudioCore}/plOGGCodec.h (98%) rename Sources/Plasma/PubUtilLib/{plAudio => plAudioCore}/plWavFile.cpp (100%) rename Sources/Plasma/PubUtilLib/{plAudio => plAudioCore}/plWavFile.h (98%) create mode 100644 Sources/Plasma/PubUtilLib/plInputCore/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plModifier/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plNetClient/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plNetCommon/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plPhysX/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt create mode 100644 cmake/FindOgg.cmake create mode 100644 cmake/FindPhysX.cmake create mode 100644 cmake/FindSpeex.cmake create mode 100644 cmake/FindVorbis.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 1adcbda7..cdd8d488 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,18 +1,24 @@ project(CyanWorldsEngine) cmake_minimum_required(VERSION 2.8) +set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") + # Find all 3rd-party libraries that are required find_package(OpenSSL REQUIRED) find_package(OpenAL REQUIRED) -find_package(PythonLibs REQUIRED) -find_package(ZLIB REQUIRED) -find_package(EXPAT REQUIRED) +find_package(PythonLibs REQUIRED) +find_package(EXPAT REQUIRED) find_package(ZLIB REQUIRED) +find_package(PHYSX REQUIRED) #TODO: Not required if we aren't building the client +find_package(Ogg REQUIRED) #TODO: Not required if we aren't building the client +find_package(Vorbis REQUIRED) #TODO: Not required if we aren't building the client +find_package(Speex REQUIRED) #TODO: Not required if we aren't building the client +#find_package(BINK REQUIRED) #TODO: Find Bink, but don't require it if plPipeline isn't built... +# Or better yet, just eliminate bink altogether option(EXTERNAL_RELEASE "Is this release intended for the general public?" OFF) -# TODO: are there any other build types which are useful for us? ->>>>>>> Finish the port of FeatureLib to CMake +#TODO: Don't hard code this add_definitions(-DBUILD_TYPE=BUILD_TYPE_LIVE) if(EXTERNAL_RELEASE) diff --git a/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt index 02d1b6d9..d5e41676 100644 --- a/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt +++ b/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt @@ -1,357 +1,357 @@ -include_directories(../../CoreLib) -include_directories(../../FeatureLib) -include_directories(../../NucleusLib) -include_directories(../../NucleusLib/inc) -include_directories(../../PubUtilLib) -include_directories(../../) - -include_directories(${PYTHON_INCLUDE_DIR}) -include_directories(${OPENAL_INCLUDE_DIR}) -include_directories(${OPENSSL_INCLUDE_DIR}) - -if(WIN32) - add_definitions(-DWIN32) - add_definitions(-DMS_NO_COREDLL) -endif(WIN32) - -set(pfPython_SOURCES - cyAccountManagement.cpp - cyAnimation.cpp - cyAvatar.cpp - cyCamera.cpp - cyDraw.cpp - cyInputInterface.cpp - cyMisc.cpp - cyParticleSys.cpp - cyPhysics.cpp - cyPythonInterface.cpp - plPythonFileMod.cpp - plPythonPack.cpp - plPythonSDLModifier.cpp - pyAgeInfoStruct.cpp - pyAgeLinkStruct.cpp - pyAgeVault.cpp - pyAlarm.cpp - pyAudioControl.cpp - pyCCRMgr.cpp - pyCluster.cpp - pyColor.cpp - pyCritterBrain.cpp - pyDniCoordinates.cpp - pyDniInfoSource.cpp - pyDrawControl.cpp - pyDynamicText.cpp - pyEnum.cpp - pyGameScore.cpp - pyGeometry3.cpp - pyGrassShader.cpp - pyGUIControl.cpp - pyGUIControlButton.cpp - pyGUIControlCheckBox.cpp - pyGUIControlClickMap.cpp - pyGUIControlDragBar.cpp - pyGUIControlDraggable.cpp - pyGUIControlDynamicText.cpp - pyGUIControlEditBox.cpp - pyGUIControlListBox.cpp - pyGUIControlMultiLineEdit.cpp - pyGUIControlRadioGroup.cpp - pyGUIControlTextBox.cpp - pyGUIControlValue.cpp - pyGUIDialog.cpp - pyGUIPopUpMenu.cpp - pyGUISkin.cpp - pyImage.cpp - pyJournalBook.cpp - pyKey.cpp - pyKeyMap.cpp - pyMarkerMgr.cpp - pyMatrix44.cpp - pyMoviePlayer.cpp - pyNetLinkingMgr.cpp - pyNetServerSessionInfo.cpp - pyNotify.cpp - pyPlayer.cpp - pySceneObject.cpp - pyScoreMgr.cpp - pySDL.cpp - pySpawnPointInfo.cpp - pyStatusLog.cpp - pyStream.cpp - pySwimCurrentInterface.cpp - pyVault.cpp - pyVaultAgeInfoListNode.cpp - pyVaultAgeInfoNode.cpp - pyVaultAgeLinkNode.cpp - pyVaultChronicleNode.cpp - pyVaultFolderNode.cpp - pyVaultImageNode.cpp - pyVaultMarkerGameNode.cpp - pyVaultNode.cpp - pyVaultNodeRef.cpp - pyVaultPlayerInfoListNode.cpp - pyVaultPlayerInfoNode.cpp - pyVaultPlayerNode.cpp - pyVaultSDLNode.cpp - pyVaultSystemNode.cpp - pyVaultTextNoteNode.cpp - pyWaveSet.cpp -) - -set(pfPython_HEADERS - cyAccountManagement.h - cyAnimation.h - cyAvatar.h - cyCamera.h - cyDraw.h - cyInputInterface.h - cyMisc.h - cyParticleSys.h - cyPhysics.h - cyPythonInterface.h - pfPythonCreatable.h - plPythonFileMod.h - plPythonHelpers.h - plPythonPack.h - plPythonParameter.h - plPythonSDLModifier.h - pyAgeInfoStruct.h - pyAgeLinkStruct.h - pyAgeVault.h - pyAlarm.h - pyAudioControl.h - pyCCRMgr.h - pyCluster.h - pyColor.h - pyCritterBrain.h - pyDniCoordinates.h - pyDniInfoSource.h - pyDrawControl.h - pyDynamicText.h - pyEnum.h - pyGameScore.h - pyGeometry3.h - pyGrassShader.h - pyGUIControl.h - pyGUIControlButton.h - pyGUIControlCheckBox.h - pyGUIControlClickMap.h - pyGUIControlDragBar.h - pyGUIControlDraggable.h - pyGUIControlDynamicText.h - pyGUIControlEditBox.h - pyGUIControlListBox.h - pyGUIControlMultiLineEdit.h - pyGUIControlRadioGroup.h - pyGUIControlTextBox.h - pyGUIControlValue.h - pyGUIDialog.h - pyGUIPopUpMenu.h - pyGUISkin.h - pyImage.h - pyJournalBook.h - pyKey.h - pyKeyMap.h - pyMarkerMgr.h - pyMatrix44.h - pyMoviePlayer.h - pyNetLinkingMgr.h - pyNetServerSessionInfo.h - pyNotify.h - pyPlayer.h - pySceneObject.h - pyScoreMgr.h - pySDL.h - pySpawnPointInfo.h - pyStatusLog.h - pyStream.h - pySwimCurrentInterface.h - pyVault.h - pyVaultAgeInfoListNode.h - pyVaultAgeInfoNode.h - pyVaultAgeLinkNode.h - pyVaultChronicleNode.h - pyVaultFolderNode.h - pyVaultImageNode.h - pyVaultMarkerGameNode.h - pyVaultNode.h - pyVaultNodeRef.h - pyVaultPlayerInfoListNode.h - pyVaultPlayerInfoNode.h - pyVaultPlayerNode.h - pyVaultSDLNode.h - pyVaultSystemNode.h - pyVaultTextNoteNode.h - pyWaveSet.h -) - -set(pfPython_GLUE - cyAccountManagementGlue.cpp - cyAnimationGlue.cpp - cyAvatarGlue.cpp - cyCameraGlue.cpp - cyDrawGlue.cpp - cyInputInterfaceGlue.cpp - cyMiscGlue.cpp - cyMiscGlue2.cpp - cyMiscGlue3.cpp - cyMiscglue4.cpp - cyParticleSysGlue.cpp - cyPhysicsGlue.cpp - plPythonSDLModifierGlue.cpp - pyAgeInfoStructGlue.cpp - pyAgeLinkStructGlue.cpp - pyAgeVaultGlue.cpp - pyAudioControlGlue.cpp - pyCCRMgrGlue.cpp - pyCCRMgrGlue2.cpp - pyClusterGlue.cpp - pyColorGlue.cpp - pyCritterBrainGlue.cpp - pyDniCoordinatesGlue.cpp - pyDrawControlGlue.cpp - pyDynamicTextGlue.cpp - pyGameScoreGlue.cpp - pyGeometry3Glue.cpp - pyGlueHelpers.h - pyGrassShaderGlue.cpp - pyGUIControlButtonGlue.cpp - pyGUIControlCheckBoxGlue.cpp - pyGUIControlClickMapGlue.cpp - pyGUIControlDragBarGlue.cpp - pyGUIControlDraggableGlue.cpp - pyGUIControlDynamicTextGlue.cpp - pyGUIControlEditBoxGlue.cpp - pyGUIControlGlue.cpp - pyGUIControlListBoxGlue.cpp - pyGUIControlMultiLineEditGlue.cpp - pyGUIControlRadioGroupGlue.cpp - pyGUIControlTextBoxGlue.cpp - pyGUIControlValueGlue.cpp - pyGUIDialogGlue.cpp - pyGUIPopUpMenuGlue.cpp - pyGUISkinGlue.cpp - pyImageGlue.cpp - pyJournalBookGlue.cpp - pyKeyGlue.cpp - pyKeyMapGlue.cpp - pyMarkerMgrGlue.cpp - pyMatrix44Glue.cpp - pyMoviePlayerGlue.cpp - pyNetLinkingMgrGlue.cpp - pyNetServerSessionInfoGlue.cpp - pyNotifyGlue.cpp - pyPlayerGlue.cpp - pySceneObjectGlue.cpp - pyScoreMgrGlue.cpp - pySDLGlue.cpp - pySpawnPointInfoGlue.cpp - pyStatusLogGlue.cpp - pyStreamGlue.cpp - pySwimCurrentInterfaceGlue.cpp - pyVaultAgeInfoListNodeGlue.cpp - pyVaultAgeInfoNodeGlue.cpp - pyVaultAgeLinkNodeGlue.cpp - pyVaultChronicleNodeGlue.cpp - pyVaultFolderNodeGlue.cpp - pyVaultGlue.cpp - pyVaultImageNodeGlue.cpp - pyVaultMarkerGameNodeGlue.cpp - pyVaultNodeGlue.cpp - pyVaultNodeRefGlue.cpp - pyVaultPlayerInfoListNodeGlue.cpp - pyVaultPlayerInfoNodeGlue.cpp - pyVaultPlayerNodeGlue.cpp - pyVaultSDLNodeGlue.cpp - pyVaultSystemNodeGlue.cpp - pyVaultTextNoteNodeGlue.cpp - pyWaveSetGlue.cpp -) - -set(pfPython_GAME_GLUE - Games/pyGameCli.cpp - Games/pyGameCli.h - Games/pyGameCliGlue.cpp - Games/pyGameCliMsg.cpp - Games/pyGameCliMsg.h - Games/pyGameCliMsgGlue.cpp - Games/pyGameMgrMsg.cpp - Games/pyGameMgrMsg.h - Games/pyGameMgrMsg.cpp -) - -set(pfPython_TTT - Games/TicTacToe/pyTTTGame.cpp - Games/TicTacToe/pyTTTGame.h - Games/TicTacToe/pyTTTGameGlue.cpp - Games/TicTacToe/pyTTTMsg.cpp - Games/TicTacToe/pyTTTMsg.h - Games/TicTacToe/pyTTTMsgGlue.cpp -) - -set(pfPython_HEEK - Games/Heek/pyHeekGame.cpp - Games/Heek/pyHeekGame.h - Games/Heek/pyHeekGameGlue.cpp - Games/Heek/pyHeekMsg.cpp - Games/Heek/pyHeekMsg.h - Games/Heek/pyHeekGameGlue.cpp -) - -set(pfPython_MARKER - Games/Marker/pyMarkerGame.cpp - Games/Marker/pyMarkerGame.h - Games/Marker/pyMarkerGameGlue.cpp - Games/Marker/pyMarkerMsg.cpp - Games/Marker/pyMarkerMsg.h - Games/Marker/pyMarkerMsgGlue.cpp -) - -set(pfPython_BSPIRAL - Games/BlueSpiral/pyBlueSpiralGame.cpp - Games/BlueSpiral/pyBlueSpiralGame.h - Games/BlueSpiral/pyBlueSpiralGameGlue.cpp - Games/BlueSpiral/pyBlueSpiralMsg.cpp - Games/BlueSpiral/pyBlueSpiralMsg.h - Games/BlueSpiral/pyBlueSpiralMsgGlue.cpp -) - -set(pfPython_WALL - Games/ClimbingWall/pyClimbingWallGame.cpp - Games/ClimbingWall/pyClimbingWallGame.h - Games/ClimbingWall/pyClimbingWallGameGlue.cpp - Games/ClimbingWall/pyClimbingWallMsg.cpp - Games/ClimbingWall/pyClimbingWallMsg.h - Games/ClimbingWall/pyClimbingWallMsgGlue.cpp -) - -set(pfPython_VSYNC - Games/VarSync/pyVarSyncGame.cpp - Games/VarSync/pyVarSyncGame.h - Games/VarSync/pyVarSyncGameGlue.cpp - Games/VarSync/pyVarSyncMsg.cpp - Games/VarSync/pyVarSyncMsg.h - Games/VarSync/pyVarSyncMsgGlue.cpp -) - -set(pfPython_GAMES - ${pfPython_TTT} - ${pfPython_HEEK} - ${pfPython_MARKER} - ${pfPython_BSPIRAL} - ${pfPython_WALL} - ${pfPython_VSYNC} -) - -add_library(pfPython STATIC ${pfPython_SOURCES} ${pfPython_HEADERS} ${pfPython_GLUE} ${pfPython_GAME_GLUE} ${pfPython_GAMES}) - -source_group("Source Files" FILES ${pfPython_SOURCES}) -source_group("Header Files" FILES ${pfPython_HEADERS}) -source_group("Glue Files" FILES ${pfPython_GLUE}) -source_group("Game Glue" FILES ${pfPython_GAME_GLUE}) -source_group("Game Glue\\TicTacToe" FILES ${pfPython_TTT}) -source_group("Game Glue\\Heek" FILES ${pfPython_HEEK}) -source_group("Game Glue\\Marker" FILES ${pfPython_MARKER}) -source_group("Game Glue\\BlueSpiral" FILES ${pfPython_BSPIRAL}) -source_group("Game Glue\\ClimbingWall" FILES ${pfPython_WALL}) -source_group("Game Clue\\VarSync" FILES ${pfPython_VSYNC}) +include_directories(../../CoreLib) +include_directories(../../FeatureLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) +include_directories(../../PubUtilLib) +include_directories(../../) + +include_directories(${PYTHON_INCLUDE_DIR}) +include_directories(${OPENAL_INCLUDE_DIR}) +include_directories(${OPENSSL_INCLUDE_DIR}) + +if(WIN32) + add_definitions(-DWIN32) + add_definitions(-DMS_NO_COREDLL) +endif(WIN32) + +set(pfPython_SOURCES + cyAccountManagement.cpp + cyAnimation.cpp + cyAvatar.cpp + cyCamera.cpp + cyDraw.cpp + cyInputInterface.cpp + cyMisc.cpp + cyParticleSys.cpp + cyPhysics.cpp + cyPythonInterface.cpp + plPythonFileMod.cpp + plPythonPack.cpp + plPythonSDLModifier.cpp + pyAgeInfoStruct.cpp + pyAgeLinkStruct.cpp + pyAgeVault.cpp + pyAlarm.cpp + pyAudioControl.cpp + pyCCRMgr.cpp + pyCluster.cpp + pyColor.cpp + pyCritterBrain.cpp + pyDniCoordinates.cpp + pyDniInfoSource.cpp + pyDrawControl.cpp + pyDynamicText.cpp + pyEnum.cpp + pyGameScore.cpp + pyGeometry3.cpp + pyGrassShader.cpp + pyGUIControl.cpp + pyGUIControlButton.cpp + pyGUIControlCheckBox.cpp + pyGUIControlClickMap.cpp + pyGUIControlDragBar.cpp + pyGUIControlDraggable.cpp + pyGUIControlDynamicText.cpp + pyGUIControlEditBox.cpp + pyGUIControlListBox.cpp + pyGUIControlMultiLineEdit.cpp + pyGUIControlRadioGroup.cpp + pyGUIControlTextBox.cpp + pyGUIControlValue.cpp + pyGUIDialog.cpp + pyGUIPopUpMenu.cpp + pyGUISkin.cpp + pyImage.cpp + pyJournalBook.cpp + pyKey.cpp + pyKeyMap.cpp + pyMarkerMgr.cpp + pyMatrix44.cpp + pyMoviePlayer.cpp + pyNetLinkingMgr.cpp + pyNetServerSessionInfo.cpp + pyNotify.cpp + pyPlayer.cpp + pySceneObject.cpp + pyScoreMgr.cpp + pySDL.cpp + pySpawnPointInfo.cpp + pyStatusLog.cpp + pyStream.cpp + pySwimCurrentInterface.cpp + pyVault.cpp + pyVaultAgeInfoListNode.cpp + pyVaultAgeInfoNode.cpp + pyVaultAgeLinkNode.cpp + pyVaultChronicleNode.cpp + pyVaultFolderNode.cpp + pyVaultImageNode.cpp + pyVaultMarkerGameNode.cpp + pyVaultNode.cpp + pyVaultNodeRef.cpp + pyVaultPlayerInfoListNode.cpp + pyVaultPlayerInfoNode.cpp + pyVaultPlayerNode.cpp + pyVaultSDLNode.cpp + pyVaultSystemNode.cpp + pyVaultTextNoteNode.cpp + pyWaveSet.cpp +) + +set(pfPython_HEADERS + cyAccountManagement.h + cyAnimation.h + cyAvatar.h + cyCamera.h + cyDraw.h + cyInputInterface.h + cyMisc.h + cyParticleSys.h + cyPhysics.h + cyPythonInterface.h + pfPythonCreatable.h + plPythonFileMod.h + plPythonHelpers.h + plPythonPack.h + plPythonParameter.h + plPythonSDLModifier.h + pyAgeInfoStruct.h + pyAgeLinkStruct.h + pyAgeVault.h + pyAlarm.h + pyAudioControl.h + pyCCRMgr.h + pyCluster.h + pyColor.h + pyCritterBrain.h + pyDniCoordinates.h + pyDniInfoSource.h + pyDrawControl.h + pyDynamicText.h + pyEnum.h + pyGameScore.h + pyGeometry3.h + pyGrassShader.h + pyGUIControl.h + pyGUIControlButton.h + pyGUIControlCheckBox.h + pyGUIControlClickMap.h + pyGUIControlDragBar.h + pyGUIControlDraggable.h + pyGUIControlDynamicText.h + pyGUIControlEditBox.h + pyGUIControlListBox.h + pyGUIControlMultiLineEdit.h + pyGUIControlRadioGroup.h + pyGUIControlTextBox.h + pyGUIControlValue.h + pyGUIDialog.h + pyGUIPopUpMenu.h + pyGUISkin.h + pyImage.h + pyJournalBook.h + pyKey.h + pyKeyMap.h + pyMarkerMgr.h + pyMatrix44.h + pyMoviePlayer.h + pyNetLinkingMgr.h + pyNetServerSessionInfo.h + pyNotify.h + pyPlayer.h + pySceneObject.h + pyScoreMgr.h + pySDL.h + pySpawnPointInfo.h + pyStatusLog.h + pyStream.h + pySwimCurrentInterface.h + pyVault.h + pyVaultAgeInfoListNode.h + pyVaultAgeInfoNode.h + pyVaultAgeLinkNode.h + pyVaultChronicleNode.h + pyVaultFolderNode.h + pyVaultImageNode.h + pyVaultMarkerGameNode.h + pyVaultNode.h + pyVaultNodeRef.h + pyVaultPlayerInfoListNode.h + pyVaultPlayerInfoNode.h + pyVaultPlayerNode.h + pyVaultSDLNode.h + pyVaultSystemNode.h + pyVaultTextNoteNode.h + pyWaveSet.h +) + +set(pfPython_GLUE + cyAccountManagementGlue.cpp + cyAnimationGlue.cpp + cyAvatarGlue.cpp + cyCameraGlue.cpp + cyDrawGlue.cpp + cyInputInterfaceGlue.cpp + cyMiscGlue.cpp + cyMiscGlue2.cpp + cyMiscGlue3.cpp + cyMiscglue4.cpp + cyParticleSysGlue.cpp + cyPhysicsGlue.cpp + plPythonSDLModifierGlue.cpp + pyAgeInfoStructGlue.cpp + pyAgeLinkStructGlue.cpp + pyAgeVaultGlue.cpp + pyAudioControlGlue.cpp + pyCCRMgrGlue.cpp + pyCCRMgrGlue2.cpp + pyClusterGlue.cpp + pyColorGlue.cpp + pyCritterBrainGlue.cpp + pyDniCoordinatesGlue.cpp + pyDrawControlGlue.cpp + pyDynamicTextGlue.cpp + pyGameScoreGlue.cpp + pyGeometry3Glue.cpp + pyGlueHelpers.h + pyGrassShaderGlue.cpp + pyGUIControlButtonGlue.cpp + pyGUIControlCheckBoxGlue.cpp + pyGUIControlClickMapGlue.cpp + pyGUIControlDragBarGlue.cpp + pyGUIControlDraggableGlue.cpp + pyGUIControlDynamicTextGlue.cpp + pyGUIControlEditBoxGlue.cpp + pyGUIControlGlue.cpp + pyGUIControlListBoxGlue.cpp + pyGUIControlMultiLineEditGlue.cpp + pyGUIControlRadioGroupGlue.cpp + pyGUIControlTextBoxGlue.cpp + pyGUIControlValueGlue.cpp + pyGUIDialogGlue.cpp + pyGUIPopUpMenuGlue.cpp + pyGUISkinGlue.cpp + pyImageGlue.cpp + pyJournalBookGlue.cpp + pyKeyGlue.cpp + pyKeyMapGlue.cpp + pyMarkerMgrGlue.cpp + pyMatrix44Glue.cpp + pyMoviePlayerGlue.cpp + pyNetLinkingMgrGlue.cpp + pyNetServerSessionInfoGlue.cpp + pyNotifyGlue.cpp + pyPlayerGlue.cpp + pySceneObjectGlue.cpp + pyScoreMgrGlue.cpp + pySDLGlue.cpp + pySpawnPointInfoGlue.cpp + pyStatusLogGlue.cpp + pyStreamGlue.cpp + pySwimCurrentInterfaceGlue.cpp + pyVaultAgeInfoListNodeGlue.cpp + pyVaultAgeInfoNodeGlue.cpp + pyVaultAgeLinkNodeGlue.cpp + pyVaultChronicleNodeGlue.cpp + pyVaultFolderNodeGlue.cpp + pyVaultGlue.cpp + pyVaultImageNodeGlue.cpp + pyVaultMarkerGameNodeGlue.cpp + pyVaultNodeGlue.cpp + pyVaultNodeRefGlue.cpp + pyVaultPlayerInfoListNodeGlue.cpp + pyVaultPlayerInfoNodeGlue.cpp + pyVaultPlayerNodeGlue.cpp + pyVaultSDLNodeGlue.cpp + pyVaultSystemNodeGlue.cpp + pyVaultTextNoteNodeGlue.cpp + pyWaveSetGlue.cpp +) + +set(pfPython_GAME_GLUE + Games/pyGameCli.cpp + Games/pyGameCli.h + Games/pyGameCliGlue.cpp + Games/pyGameCliMsg.cpp + Games/pyGameCliMsg.h + Games/pyGameCliMsgGlue.cpp + Games/pyGameMgrMsg.cpp + Games/pyGameMgrMsg.h + Games/pyGameMgrMsg.cpp +) + +set(pfPython_TTT + Games/TicTacToe/pyTTTGame.cpp + Games/TicTacToe/pyTTTGame.h + Games/TicTacToe/pyTTTGameGlue.cpp + Games/TicTacToe/pyTTTMsg.cpp + Games/TicTacToe/pyTTTMsg.h + Games/TicTacToe/pyTTTMsgGlue.cpp +) + +set(pfPython_HEEK + Games/Heek/pyHeekGame.cpp + Games/Heek/pyHeekGame.h + Games/Heek/pyHeekGameGlue.cpp + Games/Heek/pyHeekMsg.cpp + Games/Heek/pyHeekMsg.h + Games/Heek/pyHeekGameGlue.cpp +) + +set(pfPython_MARKER + Games/Marker/pyMarkerGame.cpp + Games/Marker/pyMarkerGame.h + Games/Marker/pyMarkerGameGlue.cpp + Games/Marker/pyMarkerMsg.cpp + Games/Marker/pyMarkerMsg.h + Games/Marker/pyMarkerMsgGlue.cpp +) + +set(pfPython_BSPIRAL + Games/BlueSpiral/pyBlueSpiralGame.cpp + Games/BlueSpiral/pyBlueSpiralGame.h + Games/BlueSpiral/pyBlueSpiralGameGlue.cpp + Games/BlueSpiral/pyBlueSpiralMsg.cpp + Games/BlueSpiral/pyBlueSpiralMsg.h + Games/BlueSpiral/pyBlueSpiralMsgGlue.cpp +) + +set(pfPython_WALL + Games/ClimbingWall/pyClimbingWallGame.cpp + Games/ClimbingWall/pyClimbingWallGame.h + Games/ClimbingWall/pyClimbingWallGameGlue.cpp + Games/ClimbingWall/pyClimbingWallMsg.cpp + Games/ClimbingWall/pyClimbingWallMsg.h + Games/ClimbingWall/pyClimbingWallMsgGlue.cpp +) + +set(pfPython_VSYNC + Games/VarSync/pyVarSyncGame.cpp + Games/VarSync/pyVarSyncGame.h + Games/VarSync/pyVarSyncGameGlue.cpp + Games/VarSync/pyVarSyncMsg.cpp + Games/VarSync/pyVarSyncMsg.h + Games/VarSync/pyVarSyncMsgGlue.cpp +) + +set(pfPython_GAMES + ${pfPython_TTT} + ${pfPython_HEEK} + ${pfPython_MARKER} + ${pfPython_BSPIRAL} + ${pfPython_WALL} + ${pfPython_VSYNC} +) + +add_library(pfPython STATIC ${pfPython_SOURCES} ${pfPython_HEADERS} ${pfPython_GLUE} ${pfPython_GAME_GLUE} ${pfPython_GAMES}) + +source_group("Source Files" FILES ${pfPython_SOURCES}) +source_group("Header Files" FILES ${pfPython_HEADERS}) +source_group("Glue Files" FILES ${pfPython_GLUE}) +source_group("Game Glue" FILES ${pfPython_GAME_GLUE}) +source_group("Game Glue\\TicTacToe" FILES ${pfPython_TTT}) +source_group("Game Glue\\Heek" FILES ${pfPython_HEEK}) +source_group("Game Glue\\Marker" FILES ${pfPython_MARKER}) +source_group("Game Glue\\BlueSpiral" FILES ${pfPython_BSPIRAL}) +source_group("Game Glue\\ClimbingWall" FILES ${pfPython_WALL}) +source_group("Game Glue\\VarSync" FILES ${pfPython_VSYNC}) diff --git a/Sources/Plasma/PubUtilLib/CMakeLists.txt b/Sources/Plasma/PubUtilLib/CMakeLists.txt index e8da53cc..5fd9b82d 100644 --- a/Sources/Plasma/PubUtilLib/CMakeLists.txt +++ b/Sources/Plasma/PubUtilLib/CMakeLists.txt @@ -3,8 +3,8 @@ add_definitions(-D_LIB) add_subdirectory(plAgeDescription) add_subdirectory(plAgeLoader) add_subdirectory(plAudible) -#add_subdirectory(plAudio) # TODO: DirectX -#add_subdirectory(plAudioCore) # TODO: DirectX +add_subdirectory(plAudio) +add_subdirectory(plAudioCore) add_subdirectory(plAvatar) add_subdirectory(plCompression) add_subdirectory(plContainer) @@ -17,24 +17,24 @@ add_subdirectory(plFile) #add_subdirectory(plGImage) add_subdirectory(plGLight) #add_subdirectory(plGRenderProcs) # Not being used by any current slns -#add_subdirectory(plInputCore) # TODO: DirectX +add_subdirectory(plInputCore) add_subdirectory(plInterp) add_subdirectory(plIntersect) add_subdirectory(plJPEG) add_subdirectory(plMath) add_subdirectory(plMessage) -#add_subdirectory(plModifier) # TODO: PhysX -#add_subdirectory(plNetClient) # TODO: STLport +add_subdirectory(plModifier) +add_subdirectory(plNetClient) add_subdirectory(plNetClientComm) add_subdirectory(plNetClientRecorder) -#add_subdirectory(plNetCommon) # TODO: STLport +add_subdirectory(plNetCommon) add_subdirectory(plNetGameLib) add_subdirectory(plNetMessage) add_subdirectory(plNetTransport) add_subdirectory(plParticleSystem) add_subdirectory(plPhysical) -#add_subdirectory(plPhysX) # TODO: PhysX -#add_subdirectory(plPipeline) # TODO: Bink, DirectX +add_subdirectory(plPhysX) +add_subdirectory(plPipeline) add_subdirectory(plProgressMgr) add_subdirectory(plResMgr) add_subdirectory(plScene) diff --git a/Sources/Plasma/PubUtilLib/plAudio/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plAudio/CMakeLists.txt new file mode 100644 index 00000000..8619a451 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plAudio/CMakeLists.txt @@ -0,0 +1,50 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +#TODO: This should probably be an external dependancy +include_directories("../../../../SDKs/Win32/HawkVoice/src") + +include_directories(${OPENAL_INCLUDE_DIR}) +include_directories(${Speex_INCLUDE_DIR}) + +set(plAudio_SOURCES + plAudioCaps.cpp + plAudioSystem.cpp + plDSoundBuffer.cpp + plEAXEffects.cpp + plEAXListenerMod.cpp + plSound.cpp + plSoundEvent.cpp + plVoiceChat.cpp + plWAVClipBuffer.cpp + plWin32GroupedSound.cpp + plWin32Sound.cpp + plWin32StaticSound.cpp + plWin32StreamingSound.cpp + plWinMicLevel.cpp +) + +set(plAudio_HEADERS + plAudioCaps.h + plAudioCreatable.h + plAudioSystem.h + plDSoundBuffer.h + plEAXEffects.h + plEAXListenerMod.h + plSound.h + plSoundEvent.h + plVoiceChat.h + plWAVClipBuffer.h + plWin32GroupedSound.h + plWin32Sound.h + plWin32StaticSound.h + plWin32StreamingSound.h + plWinMicLevel.h +) + +add_library(plAudio STATIC ${plAudio_SOURCES} ${plAudio_HEADERS}) + +source_group("Source Files" FILES ${plAudio_SOURCES}) +source_group("Header Files" FILES ${plAudio_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plAudio/plAudioCaps.cpp b/Sources/Plasma/PubUtilLib/plAudio/plAudioCaps.cpp index dda658ec..d268d201 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plAudioCaps.cpp +++ b/Sources/Plasma/PubUtilLib/plAudio/plAudioCaps.cpp @@ -46,8 +46,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////////////// #include "HeadSpin.h" -#include "al.h" -#include "alc.h" +#include +#include #include "plEAXEffects.h" #include "plAudioCaps.h" @@ -57,7 +57,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #endif #include -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" #define MAX_NUM_SOURCES 128 #define kLogMe if( fLog != nil ) fLog->AddLineF( diff --git a/Sources/Plasma/PubUtilLib/plAudio/plAudioCreatable.h b/Sources/Plasma/PubUtilLib/plAudio/plAudioCreatable.h index 34a1d1b6..ad98d050 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plAudioCreatable.h +++ b/Sources/Plasma/PubUtilLib/plAudio/plAudioCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAudioCreatable_inc #define plAudioCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plAudioSystem.h" diff --git a/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.cpp b/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.cpp index c2da6da0..f561e4c4 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.cpp +++ b/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.cpp @@ -40,9 +40,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" -#include "al.h" -#include "alc.h" -#include "efx.h" +#include +#include +#include #include #ifdef EAX_SDK_AVAILABLE #include @@ -52,7 +52,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsGeometry3.h" #include "plgDispatch.h" #include "plProfile.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" #include "plSound.h" #include "plAudioCaps.h" @@ -62,14 +62,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plEAXListenerMod.h" #include "plVoiceChat.h" -#include "../pnMessage/plAudioSysMsg.h" -#include "../plMessage/plRenderMsg.h" -#include "../pnMessage/plRefMsg.h" -#include "../plMessage/plAgeLoadedMsg.h" -#include "../pnMessage/plTimeMsg.h" +#include "pnMessage/plAudioSysMsg.h" +#include "plMessage/plRenderMsg.h" +#include "pnMessage/plRefMsg.h" +#include "plMessage/plAgeLoadedMsg.h" +#include "pnMessage/plTimeMsg.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnKeyedObject/plKey.h" #define SAFE_RELEASE(p) if(p){ p->Release(); p = nil; } diff --git a/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.h b/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.h index a376e9c7..171c7589 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.h +++ b/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.h @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsWindowHndl.h" #include "hsTemplates.h" #include "hsGeometry3.h" -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #define DEFAULT_AUDIO_DEVICE_NAME "Generic Software" diff --git a/Sources/Plasma/PubUtilLib/plAudio/plDSoundBuffer.cpp b/Sources/Plasma/PubUtilLib/plAudio/plDSoundBuffer.cpp index 82f6d53d..48941037 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plDSoundBuffer.cpp +++ b/Sources/Plasma/PubUtilLib/plAudio/plDSoundBuffer.cpp @@ -50,17 +50,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsThread.h" #include "plDSoundBuffer.h" -#include "al.h" +#include #include "plgDispatch.h" #include "plAudioSystem.h" -#include "../plAudioCore/plAudioCore.h" -#include "../plAudioCore/plAudioFileReader.h" +#include "plAudioCore/plAudioCore.h" +#include "plAudioCore/plAudioFileReader.h" #include "plEAXEffects.h" #include "plProfile.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" #include diff --git a/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp b/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp index b5225e02..9deca6c3 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp +++ b/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp @@ -64,7 +64,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #endif #include "plEAXEffects.h" -#include "../plAudioCore/plAudioCore.h" +#include "plAudioCore/plAudioCore.h" #include "plDSoundBuffer.h" #include "hsTemplates.h" #include "plEAXListenerMod.h" @@ -78,7 +78,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include #endif -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" #define kDebugLog if( myLog != nil ) myLog->AddLineF( diff --git a/Sources/Plasma/PubUtilLib/plAudio/plEAXListenerMod.cpp b/Sources/Plasma/PubUtilLib/plAudio/plEAXListenerMod.cpp index dc081214..546a839f 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plEAXListenerMod.cpp +++ b/Sources/Plasma/PubUtilLib/plAudio/plEAXListenerMod.cpp @@ -50,11 +50,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #endif #include "hsTypes.h" #include "plEAXListenerMod.h" -#include "../plIntersect/plSoftVolume.h" +#include "plIntersect/plSoftVolume.h" #include "hsResMgr.h" #include "plgDispatch.h" #include "plAudioSystem.h" -#include "../pnMessage/plAudioSysMsg.h" +#include "pnMessage/plAudioSysMsg.h" #ifdef EAX_SDK_AVAILABLE #include diff --git a/Sources/Plasma/PubUtilLib/plAudio/plEAXListenerMod.h b/Sources/Plasma/PubUtilLib/plAudio/plEAXListenerMod.h index c08c93f4..1d33e171 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plEAXListenerMod.h +++ b/Sources/Plasma/PubUtilLib/plAudio/plEAXListenerMod.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define _plEAXListenerMod_h -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" class plMessage; class plSoftVolume; diff --git a/Sources/Plasma/PubUtilLib/plAudio/plSound.cpp b/Sources/Plasma/PubUtilLib/plAudio/plSound.cpp index c6fe0631..0447b0d8 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plSound.cpp +++ b/Sources/Plasma/PubUtilLib/plAudio/plSound.cpp @@ -52,22 +52,22 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plSound.h" #include "plWin32Sound.h" -#include "../plAudioCore/plSoundBuffer.h" -#include "../plDrawable/plDrawableGenerator.h" -#include "../pnMessage/plRefMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnMessage/plAudioSysMsg.h" -#include "../pnMessage/plSoundMsg.h" -#include "../plMessage/plListenerMsg.h" -#include "../plIntersect/plSoftVolume.h" -#include "../plStatusLog/plStatusLog.h" -#include "../plPipeline/plPlates.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnNetCommon/plSDLTypes.h" -#include "../plAvatar/plScalarChannel.h" -#include "../plAvatar/plAGModifier.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plAudioInterface.h" +#include "plAudioCore/plSoundBuffer.h" +#include "plDrawable/plDrawableGenerator.h" +#include "pnMessage/plRefMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "pnMessage/plAudioSysMsg.h" +#include "pnMessage/plSoundMsg.h" +#include "plMessage/plListenerMsg.h" +#include "plIntersect/plSoftVolume.h" +#include "plStatusLog/plStatusLog.h" +#include "plPipeline/plPlates.h" +#include "pnKeyedObject/plKey.h" +#include "pnNetCommon/plSDLTypes.h" +#include "plAvatar/plScalarChannel.h" +#include "plAvatar/plAGModifier.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plAudioInterface.h" plProfile_CreateCounterNoReset( "Loaded", "Sound", SoundNumLoaded ); plProfile_CreateCounterNoReset( "Waiting to Die", "Sound", WaitingToDie ); diff --git a/Sources/Plasma/PubUtilLib/plAudio/plSound.h b/Sources/Plasma/PubUtilLib/plAudio/plSound.h index 7a50d9d8..9a7618b6 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plSound.h +++ b/Sources/Plasma/PubUtilLib/plAudio/plSound.h @@ -57,10 +57,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTemplates.h" #include "hsGeometry3.h" #include "plEAXEffects.h" -#include "../pnNetCommon/plSynchedObject.h" -#include "../plAvatar/plAGChannel.h" -#include "../plAvatar/plAGApplicator.h" -#include "../plAudioCore/plSoundBuffer.h" +#include "pnNetCommon/plSynchedObject.h" +#include "plAvatar/plAGChannel.h" +#include "plAvatar/plAGApplicator.h" +#include "plAudioCore/plSoundBuffer.h" class hsResMgr; class hsStream; diff --git a/Sources/Plasma/PubUtilLib/plAudio/plSoundEvent.cpp b/Sources/Plasma/PubUtilLib/plAudio/plSoundEvent.cpp index 4adc285b..0ff8706c 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plSoundEvent.cpp +++ b/Sources/Plasma/PubUtilLib/plAudio/plSoundEvent.cpp @@ -53,8 +53,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plSoundEvent.h" #include "plgDispatch.h" -#include "../pnMessage/plEventCallbackMsg.h" -#include "../pnMessage/plSoundMsg.h" +#include "pnMessage/plEventCallbackMsg.h" +#include "pnMessage/plSoundMsg.h" #include "plSound.h" plSoundEvent::plSoundEvent( Types type, plSound *owner ) diff --git a/Sources/Plasma/PubUtilLib/plAudio/plVoiceChat.cpp b/Sources/Plasma/PubUtilLib/plAudio/plVoiceChat.cpp index 3edfdae9..0213b6be 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plVoiceChat.cpp +++ b/Sources/Plasma/PubUtilLib/plAudio/plVoiceChat.cpp @@ -43,28 +43,28 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsWindows.h" #include "hsTimer.h" #include "hsResMgr.h" -#include "al.h" -#include "alc.h" +#include +#include #include "plDSoundBuffer.h" -#include "speex.h" -#include "speex_bits.h" +#include +#include #include "hsGeometry3.h" #include "plVoiceChat.h" #include "plAudioSystem.h" #include "plgDispatch.h" -#include "../plAudible/plWinAudible.h" -#include "../plNetMessage/plNetMessage.h" -#include "../plPipeline/plPlates.h" +#include "plAudible/plWinAudible.h" +#include "plNetMessage/plNetMessage.h" +#include "plPipeline/plPlates.h" #include "hsConfig.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plAvatar/plArmatureMod.h" +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plArmatureMod.h" #include "hsQuat.h" -#include "../plAudioCore/plAudioCore.h" +#include "plAudioCore/plAudioCore.h" // DEBUG for printing to the console -#include "../plMessage/plConsoleMsg.h" -#include "../plPipeline/plDebugText.h" -#include "../plStatusLog/plStatusLog.h" +#include "plMessage/plConsoleMsg.h" +#include "plPipeline/plDebugText.h" +#include "plStatusLog/plStatusLog.h" #define MICROPHONE "ui_microphone.png" #define TALKING "ui_speaker.png" diff --git a/Sources/Plasma/PubUtilLib/plAudio/plWAVClipBuffer.cpp b/Sources/Plasma/PubUtilLib/plAudio/plWAVClipBuffer.cpp index d42cf945..dbd1b372 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plWAVClipBuffer.cpp +++ b/Sources/Plasma/PubUtilLib/plAudio/plWAVClipBuffer.cpp @@ -63,7 +63,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "hsUtils.h" -#include "plWavFile.h" +#include "plAudioCore/plWavFile.h" //// Constructor/Destructor ////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plAudio/plWin32GroupedSound.cpp b/Sources/Plasma/PubUtilLib/plAudio/plWin32GroupedSound.cpp index ce76b3de..f9c68d81 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plWin32GroupedSound.cpp +++ b/Sources/Plasma/PubUtilLib/plAudio/plWin32GroupedSound.cpp @@ -54,12 +54,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plDSoundBuffer.h" #include "plAudioSystem.h" -#include "../plAudioCore/plSoundBuffer.h" -#include "../plAudioCore/plSoundDeswizzler.h" +#include "plAudioCore/plSoundBuffer.h" +#include "plAudioCore/plSoundDeswizzler.h" #include "plgDispatch.h" -#include "../pnMessage/plSoundMsg.h" +#include "pnMessage/plSoundMsg.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" #include "plProfile.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/PubUtilLib/plAudio/plWin32Sound.cpp b/Sources/Plasma/PubUtilLib/plAudio/plWin32Sound.cpp index a81a31b4..066b6753 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plWin32Sound.cpp +++ b/Sources/Plasma/PubUtilLib/plAudio/plWin32Sound.cpp @@ -50,15 +50,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plWin32Sound.h" #include "plAudioSystem.h" #include "plDSoundBuffer.h" -#include "plWavFile.h" - -#include "../plAudible/plWinAudible.h" -#include "../plNetMessage/plNetMessage.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnMessage/plSoundMsg.h" -#include "../pnMessage/plEventCallbackMsg.h" -#include "../plPipeline/plPlates.h" -#include "../plStatusLog/plStatusLog.h" +#include "plAudioCore/plWavFile.h" + +#include "plAudible/plWinAudible.h" +#include "plNetMessage/plNetMessage.h" +#include "pnNetCommon/plNetApp.h" +#include "pnMessage/plSoundMsg.h" +#include "pnMessage/plEventCallbackMsg.h" +#include "plPipeline/plPlates.h" +#include "plStatusLog/plStatusLog.h" plProfile_CreateMemCounter("Sounds", "Memory", MemSounds); plProfile_Extern(SoundPlaying); diff --git a/Sources/Plasma/PubUtilLib/plAudio/plWin32StaticSound.cpp b/Sources/Plasma/PubUtilLib/plAudio/plWin32StaticSound.cpp index d2ea7832..4b522266 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plWin32StaticSound.cpp +++ b/Sources/Plasma/PubUtilLib/plAudio/plWin32StaticSound.cpp @@ -48,15 +48,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plWin32Sound.h" #include "plDSoundBuffer.h" #include "plAudioSystem.h" -#include "../plAudioCore/plSoundBuffer.h" -#include "../plAudioCore/plSoundDeswizzler.h" -#include "../pnMessage/plEventCallbackMsg.h" -#include "../pnMessage/plAudioSysMsg.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../plMessage/plAvatarMsg.h" - -#include "../plPipeline/plPlates.h" -#include "../plStatusLog/plStatusLog.h" +#include "plAudioCore/plSoundBuffer.h" +#include "plAudioCore/plSoundDeswizzler.h" +#include "pnMessage/plEventCallbackMsg.h" +#include "pnMessage/plAudioSysMsg.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "plMessage/plAvatarMsg.h" + +#include "plPipeline/plPlates.h" +#include "plStatusLog/plStatusLog.h" plProfile_Extern(MemSounds); plProfile_CreateAsynchTimer( "Static Shove Time", "Sound", StaticSndShoveTime ); diff --git a/Sources/Plasma/PubUtilLib/plAudio/plWin32StreamingSound.cpp b/Sources/Plasma/PubUtilLib/plAudio/plWin32StreamingSound.cpp index e402e771..22f78481 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plWin32StreamingSound.cpp +++ b/Sources/Plasma/PubUtilLib/plAudio/plWin32StreamingSound.cpp @@ -51,12 +51,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plDSoundBuffer.h" #include "plAudioSystem.h" -#include "../plAudioCore/plAudioFileReader.h" -#include "../plAudioCore/plSoundBuffer.h" -#include "../plAudioCore/plSoundDeswizzler.h" -#include "../pnMessage/plSoundMsg.h" -#include "../pnMessage/plEventCallbackMsg.h" -#include "../plStatusLog/plStatusLog.h" +#include "plAudioCore/plAudioFileReader.h" +#include "plAudioCore/plSoundBuffer.h" +#include "plAudioCore/plSoundDeswizzler.h" +#include "pnMessage/plSoundMsg.h" +#include "pnMessage/plEventCallbackMsg.h" +#include "plStatusLog/plStatusLog.h" #define STREAMING_UPDATE_MS 200 diff --git a/Sources/Plasma/PubUtilLib/plAudio/plWin32StreamingSound.h b/Sources/Plasma/PubUtilLib/plAudio/plWin32StreamingSound.h index b4de1572..15dd010e 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plWin32StreamingSound.h +++ b/Sources/Plasma/PubUtilLib/plAudio/plWin32StreamingSound.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plWin32StreamingSound_h #include "plWin32Sound.h" -#include "../pnUtils/pnUtils.h" +#include "pnUtils/pnUtils.h" class plDSoundBuffer; class DSoundCallbackHandle; diff --git a/Sources/Plasma/PubUtilLib/plAudioCore/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plAudioCore/CMakeLists.txt new file mode 100644 index 00000000..34d86088 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plAudioCore/CMakeLists.txt @@ -0,0 +1,34 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +include_directories(${Ogg_INCLUDE_DIR}) +include_directories(${Vorbis_INCLUDE_DIR}) + +set(plAudioCore_SOURCES + plAudioFileReader.cpp + plBufferedFileReader.cpp + plFastWavReader.cpp + plOGGCodec.cpp + plSoundBuffer.cpp + plSoundDeswizzler.cpp + plWavFile.cpp +) + +set(plAudioCore_HEADERS + plAudioCore.h + plAudioCoreCreatable.h + plAudioFileReader.h + plBufferedFileReader.h + plFastWavReader.h + plOGGCodec.h + plSoundBuffer.h + plSoundDeswizzler.h + plWavFile.h +) + +add_library(plAudioCore STATIC ${plAudioCore_SOURCES} ${plAudioCore_HEADERS}) + +source_group("Source Files" FILES ${plAudioCore_SOURCES}) +source_group("Header Files" FILES ${plAudioCore_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plAudioCore/plAudioFileReader.cpp b/Sources/Plasma/PubUtilLib/plAudioCore/plAudioFileReader.cpp index 37cc2969..67a347ea 100644 --- a/Sources/Plasma/PubUtilLib/plAudioCore/plAudioFileReader.cpp +++ b/Sources/Plasma/PubUtilLib/plAudioCore/plAudioFileReader.cpp @@ -55,13 +55,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAudioCore.h" //#include "hsTimer.h" #include "hsUtils.h" -#include "../plFile/hsFiles.h" -#include "../plFile/plFileUtils.h" -#include "../plUnifiedTime/plUnifiedTime.h" +#include "plFile/hsFiles.h" +#include "plFile/plFileUtils.h" +#include "plUnifiedTime/plUnifiedTime.h" #include "plBufferedFileReader.h" #include "plFastWavReader.h" -#include "../plAudio/plOGGCodec.h" -#include "../plAudio/plWavFile.h" +#include "plOGGCodec.h" +#include "plWavFile.h" #define kCacheDirName "streamingCache" diff --git a/Sources/Plasma/PubUtilLib/plAudioCore/plBufferedFileReader.h b/Sources/Plasma/PubUtilLib/plAudioCore/plBufferedFileReader.h index 7c764e88..af86c2e6 100644 --- a/Sources/Plasma/PubUtilLib/plAudioCore/plBufferedFileReader.h +++ b/Sources/Plasma/PubUtilLib/plAudioCore/plBufferedFileReader.h @@ -51,7 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plBufferedFileReader_h #define _plBufferedFileReader_h -#include "../plAudioCore/plAudioFileReader.h" +#include "plAudioCore/plAudioFileReader.h" //// Class Definition //////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plAudio/plOGGCodec.cpp b/Sources/Plasma/PubUtilLib/plAudioCore/plOGGCodec.cpp similarity index 99% rename from Sources/Plasma/PubUtilLib/plAudio/plOGGCodec.cpp rename to Sources/Plasma/PubUtilLib/plAudioCore/plOGGCodec.cpp index 1ac72f81..e132432d 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plOGGCodec.cpp +++ b/Sources/Plasma/PubUtilLib/plAudioCore/plOGGCodec.cpp @@ -61,7 +61,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plOGGCodec.h" #include "hsTimer.h" -#include "../pnNetCommon/plNetApp.h" +#include "pnNetCommon/plNetApp.h" plOGGCodec::DecodeFormat plOGGCodec::fDecodeFormat = plOGGCodec::k16bitSigned; UInt8 plOGGCodec::fDecodeFlags = 0; diff --git a/Sources/Plasma/PubUtilLib/plAudio/plOGGCodec.h b/Sources/Plasma/PubUtilLib/plAudioCore/plOGGCodec.h similarity index 98% rename from Sources/Plasma/PubUtilLib/plAudio/plOGGCodec.h rename to Sources/Plasma/PubUtilLib/plAudioCore/plOGGCodec.h index 5a593d29..781421ac 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plOGGCodec.h +++ b/Sources/Plasma/PubUtilLib/plAudioCore/plOGGCodec.h @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plOGGCodec_h #define _plOGGCodec_h -#include "../plAudioCore/plAudioFileReader.h" +#include "plAudioFileReader.h" //// Class Definition //////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plAudioCore/plSoundBuffer.cpp b/Sources/Plasma/PubUtilLib/plAudioCore/plSoundBuffer.cpp index f7068053..0e3dc4fb 100644 --- a/Sources/Plasma/PubUtilLib/plAudioCore/plSoundBuffer.cpp +++ b/Sources/Plasma/PubUtilLib/plAudioCore/plSoundBuffer.cpp @@ -48,12 +48,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plgDispatch.h" #include "hsResMgr.h" -#include "../pnMessage/plRefMsg.h" -#include "../plFile/plFileUtils.h" -#include "../plFile/hsFiles.h" -#include "../plUnifiedTime/plUnifiedTime.h" -#include "../pnUtils/pnUtils.h" -#include "../plStatusLog/plStatusLog.h" +#include "pnMessage/plRefMsg.h" +#include "plFile/plFileUtils.h" +#include "plFile/hsFiles.h" +#include "plUnifiedTime/plUnifiedTime.h" +#include "pnUtils/pnUtils.h" +#include "plStatusLog/plStatusLog.h" #include "hsTimer.h" static bool s_running; diff --git a/Sources/Plasma/PubUtilLib/plAudioCore/plSoundBuffer.h b/Sources/Plasma/PubUtilLib/plAudioCore/plSoundBuffer.h index 6bb72244..39a288e6 100644 --- a/Sources/Plasma/PubUtilLib/plAudioCore/plSoundBuffer.h +++ b/Sources/Plasma/PubUtilLib/plAudioCore/plSoundBuffer.h @@ -52,10 +52,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plSoundBuffer_h #define _plSoundBuffer_h -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include "plAudioCore.h" #include "plAudioFileReader.h" -#include "../pnUtils/pnUtils.h" +#include "pnUtils/pnUtils.h" //// Class Definition //////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plAudio/plWavFile.cpp b/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.cpp similarity index 100% rename from Sources/Plasma/PubUtilLib/plAudio/plWavFile.cpp rename to Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.cpp diff --git a/Sources/Plasma/PubUtilLib/plAudio/plWavFile.h b/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.h similarity index 98% rename from Sources/Plasma/PubUtilLib/plAudio/plWavFile.h rename to Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.h index e12f982b..684341cb 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plWavFile.h +++ b/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsWindows.h" #include "hsStlUtils.h" #include -#include "../plAudioCore/plAudioFileReader.h" +#include "plAudioFileReader.h" struct plSoundMarker diff --git a/Sources/Plasma/PubUtilLib/plInputCore/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plInputCore/CMakeLists.txt new file mode 100644 index 00000000..73e1522e --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plInputCore/CMakeLists.txt @@ -0,0 +1,37 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +include_directories(${OPENSSL_INCLUDE_DIR}) +include_directories(${OPENAL_INCLUDE_DIR}) + +set(plInputCore_SOURCES + plAvatarInputInterface.cpp + plDebugInputInterface.cpp + plDInputDevice.cpp + plInputDevice.cpp + plInputInterface.cpp + plInputInterfaceMgr.cpp + plInputManager.cpp + plSceneInputInterface.cpp + plTelescopeInputInterface.cpp +) + +set(plInputCore_HEADERS + plAvatarInputInterface.h + plDebugInputInterface.h + plDInputDevice.h + plInputCoreCreatable.h + plInputDevice.h + plInputInterface.h + plInputInterfaceMgr.h + plInputManager.h + plSceneInputInterface.h + plTelescopeInputInterface.h +) + +add_library(plInputCore STATIC ${plInputCore_SOURCES} ${plInputCore_HEADERS}) + +source_group("Source Files" FILES ${plInputCore_SOURCES}) +source_group("Header Files" FILES ${plInputCore_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.cpp b/Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.cpp index b5b61608..5fc4bd39 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.cpp +++ b/Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.cpp @@ -54,27 +54,27 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plAvatarInputInterface.h" -#include "../pnInputCore/plKeyMap.h" -#include "../plMessage/plInputEventMsg.h" +#include "pnInputCore/plKeyMap.h" +#include "plMessage/plInputEventMsg.h" #include "plInputInterfaceMgr.h" #include "plInputManager.h" #include "plInputDevice.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnMessage/plProxyDrawMsg.h" -#include "../pnMessage/plCmdIfaceModMsg.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnMessage/plProxyDrawMsg.h" +#include "pnMessage/plCmdIfaceModMsg.h" // DEHACK // used to run debug drawing stuff only; should never be checked in with this enabled #if 0 -#include "../FeatureLib/pfCamera/plVirtualCam.h" -#include "../plDrawable/plDrawableSpans.h" +#include "FeatureLib/pfCamera/plVirtualCam.h" +#include "plDrawable/plDrawableSpans.h" #endif -#include "../plAudio/plVoiceChat.h" +#include "plAudio/plVoiceChat.h" #include "plInputDevice.h" #include "plInputManager.h" #include "hsResMgr.h" @@ -82,10 +82,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsConfig.h" #include "hsMatrix44.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" -#include "../pnNetCommon/plNetApp.h" +#include "pnNetCommon/plNetApp.h" //// Constructor/Destructor ////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.h b/Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.h index cb8c8207..1ea7a877 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.h +++ b/Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plAvatarInputInterface_inc #include "plInputInterface.h" -#include "../pnInputCore/plInputMap.h" +#include "pnInputCore/plInputMap.h" #include "hsTemplates.h" diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plDInputDevice.cpp b/Sources/Plasma/PubUtilLib/plInputCore/plDInputDevice.cpp index 8ead27eb..503d64b4 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plDInputDevice.cpp +++ b/Sources/Plasma/PubUtilLib/plInputCore/plDInputDevice.cpp @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plDInputDevice.h" #include "plgDispatch.h" -#include "../plMessage/plInputEventMsg.h" +#include "plMessage/plInputEventMsg.h" #define DIRECTINPUT_VERSION 0x0800 #include // diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.cpp b/Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.cpp index 2d9e964a..8b5b4881 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.cpp +++ b/Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.cpp @@ -54,10 +54,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plInputManager.h" #include "plInputDevice.h" -#include "../plMessage/plInputIfaceMgrMsg.h" -#include "../plMessage/plInputEventMsg.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnInputCore/plKeyMap.h" +#include "plMessage/plInputIfaceMgrMsg.h" +#include "plMessage/plInputEventMsg.h" +#include "pnKeyedObject/plKey.h" +#include "pnInputCore/plKeyMap.h" #include "plgDispatch.h" #include "plPipeline.h" diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.h b/Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.h index e043cb8a..595e0350 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.h +++ b/Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define _plDebugInputInterface_h #include "plInputInterface.h" -#include "../pnInputCore/plInputMap.h" +#include "pnInputCore/plInputMap.h" //// Class Definition //////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp b/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp index b49a7ac4..32c266f2 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp +++ b/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp @@ -48,17 +48,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plInputDevice.h" #include "plInputManager.h" #include "plAvatarInputInterface.h" -#include "../plMessage/plInputEventMsg.h" -#include "../pnMessage/plTimeMsg.h" +#include "plMessage/plInputEventMsg.h" +#include "pnMessage/plTimeMsg.h" #include "hsUtils.h" #include "plgDispatch.h" -#include "../plPipeline/plPlates.h" -#include "../plPipeline/plDebugText.h" -#include "../plGImage/plMipmap.h" +#include "plPipeline/plPlates.h" +#include "plPipeline/plDebugText.h" +#include "plGImage/plMipmap.h" #include "hsWindows.h" -#include "../NucleusLib/inc/plPipeline.h" +#include "plPipeline.h" // The resolution that uses the base size of the cursor. // All other resolutions will scale the cursor size to keep the same physical size. diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h b/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h index bcb7297b..a89cbea2 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h +++ b/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h @@ -46,8 +46,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" #include "hsWindows.h" -//#include "../pnInputCore/plControlDefinition.h" -#include "../pnInputCore/plOSMsg.h" +//#include "pnInputCore/plControlDefinition.h" +#include "pnInputCore/plOSMsg.h" #include "hsBitVector.h" #include "hsTemplates.h" class plMessage; diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.cpp b/Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.cpp index 811ed35a..2b884296 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.cpp +++ b/Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.cpp @@ -55,8 +55,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plInputInterface.h" #include "plInputInterfaceMgr.h" -#include "../pnInputCore/plKeyMap.h" -#include "../plMessage/plInputEventMsg.h" +#include "pnInputCore/plKeyMap.h" +#include "plMessage/plInputEventMsg.h" #include "hsResMgr.h" #include "plgDispatch.h" diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.h b/Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.h index b63fd5de..b23a183c 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.h +++ b/Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.h @@ -67,8 +67,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsBitVector.h" // Needed for UNIX Build // only windows will let you predeclare an enum -#include "../../NucleusLib/pnInputCore/plKeyDef.h" -#include "../../NucleusLib/pnInputCore/plControlEventCodes.h" +#include "pnInputCore/plKeyDef.h" +#include "pnInputCore/plControlEventCodes.h" //// Class Definition //////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.cpp b/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.cpp index c1077d98..a68d66c3 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.cpp @@ -56,24 +56,24 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plInputInterface.h" #include "plInputDevice.h" // For mouse device stuff -#include "../pnInputCore/plKeyMap.h" -#include "../plMessage/plInputEventMsg.h" -#include "../plMessage/plInputIfaceMgrMsg.h" -#include "../pnMessage/plClientMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnMessage/plCmdIfaceModMsg.h" -#include "../pnMessage/plPlayerPageMsg.h" +#include "pnInputCore/plKeyMap.h" +#include "plMessage/plInputEventMsg.h" +#include "plMessage/plInputIfaceMgrMsg.h" +#include "pnMessage/plClientMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "pnMessage/plCmdIfaceModMsg.h" +#include "pnMessage/plPlayerPageMsg.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plFixedKey.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plFixedKey.h" -#include "../pnNetCommon/plNetApp.h" -#include "../plNetClient/plNetClientMgr.h" +#include "pnNetCommon/plNetApp.h" +#include "plNetClient/plNetClientMgr.h" #include "hsResMgr.h" #include "plgDispatch.h" #include "plProfile.h" -#include "../plResMgr/plLocalization.h" +#include "plResMgr/plLocalization.h" plProfile_CreateTimer("Input", "Update", Input); diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.h b/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.h index 9341ae88..8b763a92 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.h +++ b/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.h @@ -52,10 +52,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plInputInterfaceMgr_h #define _plInputInterfaceMgr_h -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" #include "hsTemplates.h" #include "hsGeometry3.h" -#include "../pnInputCore/plKeyMap.h" +#include "pnInputCore/plKeyMap.h" //// Class Definition //////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp b/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp index 009b2eb7..314a638d 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp +++ b/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp @@ -51,17 +51,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPipeline.h" #include "plInputDevice.h" #include "plDInputDevice.h" -#include "../plMessage/plInputEventMsg.h" +#include "plMessage/plInputEventMsg.h" #include "plInputInterfaceMgr.h" #include "hsStream.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plFixedKey.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plFixedKey.h" #include "hsResMgr.h" #include "hsTimer.h" #include "plgDispatch.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnMessage/plCmdIfaceModMsg.h" -#include "../pnMessage/plPlayerPageMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "pnMessage/plCmdIfaceModMsg.h" +#include "pnMessage/plPlayerPageMsg.h" hsBool plInputManager::fUseDInput = false; UInt8 plInputManager::bRecenterMouse = 0; diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.h b/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.h index 66f97bbb..cce79f12 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.h +++ b/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.h @@ -47,8 +47,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include "hsTypes.h" #include "hsTemplates.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnInputCore/plInputMap.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnInputCore/plInputMap.h" class plDInputMgr; class plInputDevice; diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plSceneInputInterface.cpp b/Sources/Plasma/PubUtilLib/plInputCore/plSceneInputInterface.cpp index 99f95b9e..aecce2be 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plSceneInputInterface.cpp +++ b/Sources/Plasma/PubUtilLib/plInputCore/plSceneInputInterface.cpp @@ -55,44 +55,44 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plInputManager.h" #include "plInputDevice.h" -#include "../plPhysical/plPickingDetector.h" -#include "../plMessage/plInputEventMsg.h" -#include "../plMessage/plLOSRequestMsg.h" -#include "../plMessage/plLOSHitMsg.h" -#include "../plMessage/plPickedMsg.h" -#include "../plMessage/plRenderMsg.h" -#include "../plMessage/plInputIfaceMgrMsg.h" -#include "../plMessage/plVaultNotifyMsg.h" -#include "../pnMessage/plFakeOutMsg.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../pnMessage/plRemoteAvatarInfoMsg.h" -#include "../pnMessage/plCursorChangeMsg.h" -#include "../pnMessage/plCameraMsg.h" -#include "../pnMessage/plPlayerPageMsg.h" -#include "../pnMessage/plCmdIfaceModMsg.h" -#include "../plAvatar/plArmatureMod.h" -#include "../plAvatar/plAvBrain.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plAvatar/plPhysicalControllerCore.h" -#include "../plModifier/plInterfaceInfoModifier.h" -#include "../pnModifier/plLogicModBase.h" -#include "../plVault/plVault.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plNetClient/plNetLinkingMgr.h" -#include "../plNetCommon/plNetServerSessionInfo.h" -#include "../plNetTransport/plNetTransport.h" -#include "../plNetTransport/plNetTransportMember.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnInputCore/plKeyMap.h" +#include "plPhysical/plPickingDetector.h" +#include "plMessage/plInputEventMsg.h" +#include "plMessage/plLOSRequestMsg.h" +#include "plMessage/plLOSHitMsg.h" +#include "plMessage/plPickedMsg.h" +#include "plMessage/plRenderMsg.h" +#include "plMessage/plInputIfaceMgrMsg.h" +#include "plMessage/plVaultNotifyMsg.h" +#include "pnMessage/plFakeOutMsg.h" +#include "pnMessage/plNotifyMsg.h" +#include "pnMessage/plRemoteAvatarInfoMsg.h" +#include "pnMessage/plCursorChangeMsg.h" +#include "pnMessage/plCameraMsg.h" +#include "pnMessage/plPlayerPageMsg.h" +#include "pnMessage/plCmdIfaceModMsg.h" +#include "plAvatar/plArmatureMod.h" +#include "plAvatar/plAvBrain.h" +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plPhysicalControllerCore.h" +#include "plModifier/plInterfaceInfoModifier.h" +#include "pnModifier/plLogicModBase.h" +#include "plVault/plVault.h" +#include "plNetClient/plNetClientMgr.h" +#include "plNetClient/plNetLinkingMgr.h" +#include "plNetCommon/plNetServerSessionInfo.h" +#include "plNetTransport/plNetTransport.h" +#include "plNetTransport/plNetTransportMember.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnInputCore/plKeyMap.h" #include "plPhysical.h" #include "plgDispatch.h" #include "plPipeline.h" -#include "../plModifier/plDetectorLog.h" +#include "plModifier/plDetectorLog.h" #define ID_FIND_CLICKABLE 2 @@ -1239,4 +1239,4 @@ UInt32 plSceneInputInterface::SetCurrentCursorID(UInt32 id) void plSceneInputInterface::RequestAvatarTurnToPointLOS() { IRequestLOSCheck( plMouseDevice::Instance()->GetCursorX(), plMouseDevice::Instance()->GetCursorY(), ID_FIND_WALKABLE_GROUND ); -} \ No newline at end of file +} diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plSceneInputInterface.h b/Sources/Plasma/PubUtilLib/plInputCore/plSceneInputInterface.h index a8397720..21b9f224 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plSceneInputInterface.h +++ b/Sources/Plasma/PubUtilLib/plInputCore/plSceneInputInterface.h @@ -50,8 +50,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plInputInterface.h" #include "hsGeometry3.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnUtils/pnUtils.h" +#include "pnKeyedObject/plKey.h" +#include "pnUtils/pnUtils.h" //// Class Definition //////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plTelescopeInputInterface.cpp b/Sources/Plasma/PubUtilLib/plInputCore/plTelescopeInputInterface.cpp index 797a4954..d9f06760 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plTelescopeInputInterface.cpp +++ b/Sources/Plasma/PubUtilLib/plInputCore/plTelescopeInputInterface.cpp @@ -54,7 +54,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plInputInterfaceMgr.h" #include "plInputManager.h" #include "plInputDevice.h" -#include "../pnInputCore/plKeyMap.h" +#include "pnInputCore/plKeyMap.h" #include "plgDispatch.h" diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plTelescopeInputInterface.h b/Sources/Plasma/PubUtilLib/plInputCore/plTelescopeInputInterface.h index 55d0d722..95614cd4 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plTelescopeInputInterface.h +++ b/Sources/Plasma/PubUtilLib/plInputCore/plTelescopeInputInterface.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define _plTelescopeInputInterface_h #include "plInputInterface.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" //// Class Definition //////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plModifier/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plModifier/CMakeLists.txt new file mode 100644 index 00000000..2830b277 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plModifier/CMakeLists.txt @@ -0,0 +1,59 @@ +include_directories("../../CoreLib") +include_directories("../../FeatureLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +include_directories(${PHYSX_INCLUDE_DIRS}) +include_directories(${OPENAL_INCLUDE_DIR}) +include_directories(${OPENSSL_INCLUDE_DIR}) + +set(plModifier_SOURCES + plAnimEventModifier.cpp + plAnimTimeConvertSDLModifier.cpp + plAxisAnimModifier.cpp + plCloneSpawnModifier.cpp + plDecalEnableMod.cpp + plDetectorLog.cpp + plExcludeRegionModifier.cpp + plGameMarkerModifier.cpp + plImageLibMod.cpp + plInterfaceInfoModifier.cpp + plLayerSDLModifier.cpp + plLogicModifier.cpp + plMaintainersMarkerModifier.cpp + plResponderModifier.cpp + plResponderSDLModifier.cpp + plSDLModifier.cpp + plSimpleModifier.cpp + plSoundSDLModifier.cpp + plSpawnModifier.cpp +) + +set(plModifier_HEADERS + plAnimEventModifier.h + plAnimTimeConvertSDLModifier.h + plAxisAnimModifier.h + plCloneSpawnModifier.h + plDecalEnableMod.h + plDetectorLog.h + plExcludeRegionModifier.h + plGameMarkerModifier.h + plImageLibMod.h + plInterfaceInfoModifier.h + plLayerSDLModifier.h + plLogicModifier.h + plMaintainersMarkerModifier.h + plModifierCreatable.h + plResponderModifier.h + plResponderSDLModifier.h + plSDLModifier.h + plSimpleModifier.h + plSoundSDLModifier.h + plSpawnModifier.h +) + +add_library(plModifier STATIC ${plModifier_SOURCES} ${plModifier_HEADERS}) + +source_group("Source Files" FILES ${plModifier_SOURCES}) +source_group("Header Files" FILES ${plModifier_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plModifier/plAnimEventModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plAnimEventModifier.cpp index 8b6a9c9f..bf2ab8d3 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plAnimEventModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plAnimEventModifier.cpp @@ -42,11 +42,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAnimEventModifier.h" #include "hsResMgr.h" -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" -#include "../pnMessage/plRefMsg.h" -#include "../pnMessage/plEnableMsg.h" -#include "../pnMessage/plEventCallbackMsg.h" +#include "pnMessage/plRefMsg.h" +#include "pnMessage/plEnableMsg.h" +#include "pnMessage/plEventCallbackMsg.h" plAnimEventModifier::plAnimEventModifier() : fCallback(nil), fDisabled(false) { diff --git a/Sources/Plasma/PubUtilLib/plModifier/plAnimEventModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plAnimEventModifier.h index 08d31ce2..84367365 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plAnimEventModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plAnimEventModifier.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAnimEventModifier_h_inc #define plAnimEventModifier_h_inc -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" #include "hsTemplates.h" // diff --git a/Sources/Plasma/PubUtilLib/plModifier/plAnimTimeConvertSDLModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plAnimTimeConvertSDLModifier.cpp index 4221e479..64c5be25 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plAnimTimeConvertSDLModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plAnimTimeConvertSDLModifier.cpp @@ -41,8 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTimer.h" #include "plAnimTimeConvertSDLModifier.h" -#include "../plSDL/plSDL.h" -#include "../plInterp/plAnimTimeConvert.h" +#include "plSDL/plSDL.h" +#include "plInterp/plAnimTimeConvert.h" // static vars char plAnimTimeConvertSDLModifier::AnimTimeConvertVarNames::kStrFlags[]="flags"; diff --git a/Sources/Plasma/PubUtilLib/plModifier/plAnimTimeConvertSDLModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plAnimTimeConvertSDLModifier.h index 6ae781e4..148e32aa 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plAnimTimeConvertSDLModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plAnimTimeConvertSDLModifier.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAnimTimeConvertSDLModifier_inc #define plAnimTimeConvertSDLModifier_inc -#include "../plModifier/plSDLModifier.h" +#include "plModifier/plSDLModifier.h" // // This modifier (abstract baseclass) handles sending and recving diff --git a/Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.cpp index 7c9777f0..161ef8ca 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.cpp @@ -44,19 +44,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsUtils.h" #include "plAxisAnimModifier.h" #include "hsResMgr.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnKeyedObject/plKey.h" -#include "../plNetMessage/plNetMsgHelpers.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnMessage/plCmdIfaceModMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plMessage/plInputEventMsg.h" -#include "../plMessage/plInputIfaceMgrMsg.h" -#include "../plInputCore/plInputDevice.h" -#include "../plInputCore/plInputManager.h" -#include "../plInputCore/plInputInterface.h" -#include "../pnNetCommon/plNetApp.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnKeyedObject/plKey.h" +#include "plNetMessage/plNetMsgHelpers.h" +#include "pnMessage/plNotifyMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "pnMessage/plCmdIfaceModMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plMessage/plInputEventMsg.h" +#include "plMessage/plInputIfaceMgrMsg.h" +#include "plInputCore/plInputDevice.h" +#include "plInputCore/plInputManager.h" +#include "plInputCore/plInputInterface.h" +#include "pnNetCommon/plNetApp.h" #include "plgDispatch.h" //// plAxisInputInterface //////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.h index 592b9561..42c39ee7 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plAxisAnimMod_inc #include "hsStlUtils.h" -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" class plKey; diff --git a/Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.cpp index 193b17c4..082fc336 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.cpp @@ -42,15 +42,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plCloneSpawnModifier.h" #include "hsResMgr.h" -#include "../plResMgr/plResManager.h" -#include "../plResMgr/plKeyFinder.h" -#include "../pnSceneObject/plSceneObject.h" +#include "plResMgr/plResManager.h" +#include "plResMgr/plKeyFinder.h" +#include "pnSceneObject/plSceneObject.h" -#include "../plScene/plSceneNode.h" -#include "../pnMessage/plClientMsg.h" +#include "plScene/plSceneNode.h" +#include "pnMessage/plClientMsg.h" #include "plgDispatch.h" -#include "../pnMessage/plWarpMsg.h" -#include "../pnMessage/plNodeRefMsg.h" +#include "pnMessage/plWarpMsg.h" +#include "pnMessage/plNodeRefMsg.h" plCloneSpawnModifier::plCloneSpawnModifier() : fTemplateName(nil), fExportTime(false) { diff --git a/Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.h index a1ca6f68..8c140bd1 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plCloneSpawnModifier_inc #define plCloneSpawnModifier_inc -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" class plCloneSpawnModifier : public plSingleModifier { diff --git a/Sources/Plasma/PubUtilLib/plModifier/plDecalEnableMod.cpp b/Sources/Plasma/PubUtilLib/plModifier/plDecalEnableMod.cpp index bfea2a93..fdc57dd0 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plDecalEnableMod.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plDecalEnableMod.cpp @@ -43,11 +43,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plDecalEnableMod.h" -#include "../plMessage/plDynaDecalEnableMsg.h" -#include "../plMessage/plCollideMsg.h" +#include "plMessage/plDynaDecalEnableMsg.h" +#include "plMessage/plCollideMsg.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../plAvatar/plArmatureMod.h" +#include "pnSceneObject/plSceneObject.h" +#include "plAvatar/plArmatureMod.h" #include "hsTimer.h" #include "hsStream.h" diff --git a/Sources/Plasma/PubUtilLib/plModifier/plDecalEnableMod.h b/Sources/Plasma/PubUtilLib/plModifier/plDecalEnableMod.h index d25a9dc1..b61463dc 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plDecalEnableMod.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plDecalEnableMod.h @@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plDecalEnableMod_inc #include "hsTemplates.h" -#include "../pnModifier/plSingleModifier.h" -#include "../pnKeyedObject/plKey.h" +#include "pnModifier/plSingleModifier.h" +#include "pnKeyedObject/plKey.h" class plDecalEnableMod : public plSingleModifier { diff --git a/Sources/Plasma/PubUtilLib/plModifier/plDetectorLog.cpp b/Sources/Plasma/PubUtilLib/plModifier/plDetectorLog.cpp index 0001f649..c47d9b12 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plDetectorLog.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plDetectorLog.cpp @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plDetectorLog.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" // Don't bother logging detectors in the external release, since it isn't written to disk #ifdef PLASMA_EXTERNAL_RELEASE diff --git a/Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.cpp index baa08ed7..4c537813 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.cpp @@ -40,29 +40,29 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plExcludeRegionModifier.h" -#include "../plMessage/plExcludeRegionMsg.h" +#include "plMessage/plExcludeRegionMsg.h" #include "hsTemplates.h" #include "hsResMgr.h" -#include "../pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plCoordinateInterface.h" #include "plDetectorLog.h" // For MsgReceive -#include "../plMessage/plCollideMsg.h" -#include "../pnSceneObject/plSceneObject.h" +#include "plMessage/plCollideMsg.h" +#include "pnSceneObject/plSceneObject.h" // For IClear and IRelease -#include "../pnMessage/plWarpMsg.h" -#include "../plMessage/plAvatarMsg.h" +#include "pnMessage/plWarpMsg.h" +#include "plMessage/plAvatarMsg.h" #include "plPhysical.h" -#include "../plPhysical/plSimDefs.h" +#include "plPhysical/plSimDefs.h" -#include "../plAvatar/plAvBrainGeneric.h" +#include "plAvatar/plAvBrainGeneric.h" -#include "../plSDL/plSDL.h" -#include "../pnMessage/plSDLModifierMsg.h" +#include "plSDL/plSDL.h" +#include "pnMessage/plSDLModifierMsg.h" //for hack -#include "../plPhysX/plPXPhysical.h" -#include "../plPhysX/plPXPhysicalControllerCore.h" -#include "NxCapsule.h" +#include "plPhysX/plPXPhysical.h" +#include "plPhysX/plPXPhysicalControllerCore.h" +#include static plPhysical* GetPhysical(plSceneObject* obj) { if (obj) diff --git a/Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.h index 0cc074e1..d0578d3f 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.h @@ -42,10 +42,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plExcludeRegionModifier_inc #define plExcludeRegionModifier_inc -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" #include "hsMatrix44.h" #include "hsTemplates.h" -#include "../plModifier/plSDLModifier.h" +#include "plModifier/plSDLModifier.h" // // Moves all of the avatars out of the area it's SceneObject occupies and makes it diff --git a/Sources/Plasma/PubUtilLib/plModifier/plGameMarkerModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plGameMarkerModifier.cpp index 892a5cf7..bfb684d3 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plGameMarkerModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plGameMarkerModifier.cpp @@ -40,10 +40,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plGameMarkerModifier.h" -#include "../plMessage/plCollideMsg.h" +#include "plMessage/plCollideMsg.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../pnSceneObject/plSceneObject.h" +#include "pnMessage/plNotifyMsg.h" +#include "pnSceneObject/plSceneObject.h" hsBool plGameMarkerModifier::MsgReceive(plMessage* msg) { diff --git a/Sources/Plasma/PubUtilLib/plModifier/plGameMarkerModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plGameMarkerModifier.h index 6e68d413..30f440e4 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plGameMarkerModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plGameMarkerModifier.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plGameMarkerModifier_h_inc #define plGameMarkerModifier_h_inc -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" class plGameMarkerModifier : public plSingleModifier { diff --git a/Sources/Plasma/PubUtilLib/plModifier/plImageLibMod.cpp b/Sources/Plasma/PubUtilLib/plModifier/plImageLibMod.cpp index d442c08b..b085a049 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plImageLibMod.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plImageLibMod.cpp @@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plImageLibMod.h" -#include "../plGImage/plBitmap.h" -#include "../pnMessage/plRefMsg.h" +#include "plGImage/plBitmap.h" +#include "pnMessage/plRefMsg.h" #include "hsTimer.h" #include "hsStream.h" diff --git a/Sources/Plasma/PubUtilLib/plModifier/plImageLibMod.h b/Sources/Plasma/PubUtilLib/plModifier/plImageLibMod.h index 9c85bd51..285957dc 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plImageLibMod.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plImageLibMod.h @@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plImageLibMod_inc #include "hsTemplates.h" -#include "../pnModifier/plSingleModifier.h" -#include "../pnKeyedObject/plKey.h" +#include "pnModifier/plSingleModifier.h" +#include "pnKeyedObject/plKey.h" class plBitmap; class plImageLibMod : public plSingleModifier diff --git a/Sources/Plasma/PubUtilLib/plModifier/plInterfaceInfoModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plInterfaceInfoModifier.cpp index 60d7239a..8e461110 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plInterfaceInfoModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plInterfaceInfoModifier.cpp @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plInterfaceInfoModifier.h" #include "hsResMgr.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" plInterfaceInfoModifier::plInterfaceInfoModifier() diff --git a/Sources/Plasma/PubUtilLib/plModifier/plInterfaceInfoModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plInterfaceInfoModifier.h index bde3c6cb..8760fbb9 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plInterfaceInfoModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plInterfaceInfoModifier.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plInterfaceInfoMod_inc #define plInterfaceInfoMod_inc -#include "../pnModifier/plSingleModifier.h" -#include "../pnKeyedObject/plKey.h" +#include "pnModifier/plSingleModifier.h" +#include "pnKeyedObject/plKey.h" #include "hsTemplates.h" class plInterfaceInfoModifier : public plSingleModifier diff --git a/Sources/Plasma/PubUtilLib/plModifier/plLayerSDLModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plLayerSDLModifier.cpp index b32993c1..261b747b 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plLayerSDLModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plLayerSDLModifier.cpp @@ -41,8 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsMatrix44.h" #include "plLayerSDLModifier.h" -#include "../plSDL/plSDL.h" -#include "../plSurface/plLayerAnimation.h" +#include "plSDL/plSDL.h" +#include "plSurface/plLayerAnimation.h" // static vars char plLayerSDLModifier::kStrAtc[]="atc"; diff --git a/Sources/Plasma/PubUtilLib/plModifier/plLayerSDLModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plLayerSDLModifier.h index 6326677c..b5824706 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plLayerSDLModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plLayerSDLModifier.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLayerSDLModifier_inc #define plLayerSDLModifier_inc -#include "../plModifier/plAnimTimeConvertSDLModifier.h" +#include "plModifier/plAnimTimeConvertSDLModifier.h" // // This modifier is responsible for sending and recving diff --git a/Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.cpp index ab6f15c0..6754b2bc 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.cpp @@ -42,23 +42,23 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plLogicModifier.h" #include "plgDispatch.h" -#include "../pnTimer/plTimerCallbackManager.h" -#include "../pnModifier/plConditionalObject.h" -#include "../plPhysical/plDetectorModifier.h" -#include "../plMessage/plCondRefMsg.h" -#include "../plMessage/plTimerCallbackMsg.h" -#include "../plMessage/plActivatorMsg.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnMessage/plFakeOutMsg.h" -#include "../pnMessage/plCursorChangeMsg.h" -#include "../pnMessage/plNotifyMsg.h" - -#include "../plModifier/plDetectorLog.h" -#include "../plInputCore/plSceneInputInterface.h" -#include "../../FeatureLib/pfConditional/plFacingConditionalObject.h" -#include "../../FeatureLib/pfConditional/plObjectInBoxConditionalObject.h" +#include "pnTimer/plTimerCallbackManager.h" +#include "pnModifier/plConditionalObject.h" +#include "plPhysical/plDetectorModifier.h" +#include "plMessage/plCondRefMsg.h" +#include "plMessage/plTimerCallbackMsg.h" +#include "plMessage/plActivatorMsg.h" +#include "pnNetCommon/plNetApp.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnKeyedObject/plKey.h" +#include "pnMessage/plFakeOutMsg.h" +#include "pnMessage/plCursorChangeMsg.h" +#include "pnMessage/plNotifyMsg.h" + +#include "plModifier/plDetectorLog.h" +#include "plInputCore/plSceneInputInterface.h" +#include "pfConditional/plFacingConditionalObject.h" +#include "pfConditional/plObjectInBoxConditionalObject.h" plLogicModifier::plLogicModifier() diff --git a/Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.h index 77f2b922..83f6fac6 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLogicModifier_inc #define plLogicModifier_inc -#include "../pnModifier/plLogicModBase.h" +#include "pnModifier/plLogicModBase.h" class plLogicModifier : public plLogicModBase { diff --git a/Sources/Plasma/PubUtilLib/plModifier/plMaintainersMarkerModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plMaintainersMarkerModifier.cpp index 11f28206..d1aa4e82 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plMaintainersMarkerModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plMaintainersMarkerModifier.cpp @@ -40,8 +40,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plMaintainersMarkerModifier.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../plAvatar/plAvatarMgr.h" +#include "pnSceneObject/plSceneObject.h" +#include "plAvatar/plAvatarMgr.h" void plMaintainersMarkerModifier::AddTarget(plSceneObject* so) { diff --git a/Sources/Plasma/PubUtilLib/plModifier/plMaintainersMarkerModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plMaintainersMarkerModifier.h index 519a2e40..1a2898ca 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plMaintainersMarkerModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plMaintainersMarkerModifier.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plMaintainersMarkerModifier_inc #define plMaintainersMarkerModifier_inc -#include "../pnModifier/plMultiModifier.h" -#include "../pnMessage/plMessage.h" +#include "pnModifier/plMultiModifier.h" +#include "pnMessage/plMessage.h" class plMaintainersMarkerModifier : public plMultiModifier diff --git a/Sources/Plasma/PubUtilLib/plModifier/plModifierCreatable.h b/Sources/Plasma/PubUtilLib/plModifier/plModifierCreatable.h index 648eb154..d8ade0ed 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plModifierCreatable.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plModifierCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plModifierCreatable_inc #define plModifierCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plSpawnModifier.h" diff --git a/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.cpp index f6ec11d5..914676bd 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.cpp @@ -47,33 +47,33 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plgDispatch.h" #include "hsResMgr.h" #include "plPhysical.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../pnNetCommon/plNetApp.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnMessage/plNotifyMsg.h" +#include "pnNetCommon/plNetApp.h" // for localOnly cmd check -#include "../plMessage/plLinkToAgeMsg.h" -#include "../pnMessage/plCameraMsg.h" -#include "../pnMessage/plSoundMsg.h" - -#include "../plMessage/plResponderMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../pnMessage/plSDLModifierMsg.h" -#include "../../FeatureLib/pfMessage/plArmatureEffectMsg.h" - -#include "../plStatusLog/plStatusLog.h" - -#include "../plMessage/plTimerCallbackMsg.h" -#include "../pnTimer/plTimerCallbackManager.h" - -#include "../plMessage/plSimStateMsg.h" -//#include "../plHavok1\plHKPhysical.h" -//#include "../plHavok1\plHKSubWorld.h" -#include "../plAvatar/plArmatureMod.h" -#include "../plAvatar/plAvatarMgr.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "pnMessage/plCameraMsg.h" +#include "pnMessage/plSoundMsg.h" + +#include "plMessage/plResponderMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "pnMessage/plSDLModifierMsg.h" +#include "pfMessage/plArmatureEffectMsg.h" + +#include "plStatusLog/plStatusLog.h" + +#include "plMessage/plTimerCallbackMsg.h" +#include "pnTimer/plTimerCallbackManager.h" + +#include "plMessage/plSimStateMsg.h" +//#include "plHavok1\plHKPhysical.h" +//#include "plHavok1\plHKSubWorld.h" +#include "plAvatar/plArmatureMod.h" +#include "plAvatar/plAvatarMgr.h" //#ifdef HS_DEBUGGING diff --git a/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.h index aa409207..db1f08a7 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plResponderModifier_inc #include "hsStlUtils.h" -#include "../pnModifier/plSingleModifier.h" -#include "../pnMessage/plMessage.h" +#include "pnModifier/plSingleModifier.h" +#include "pnMessage/plMessage.h" class plNotifyMsg; diff --git a/Sources/Plasma/PubUtilLib/plModifier/plResponderSDLModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plResponderSDLModifier.cpp index dc35545c..90095954 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plResponderSDLModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plResponderSDLModifier.cpp @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plResponderSDLModifier.h" -#include "../plSDL/plSDL.h" +#include "plSDL/plSDL.h" #include "plResponderModifier.h" // static vars diff --git a/Sources/Plasma/PubUtilLib/plModifier/plResponderSDLModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plResponderSDLModifier.h index 7685bae9..918ea12d 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plResponderSDLModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plResponderSDLModifier.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plResponderSDLModifier_inc #define plResponderSDLModifier_inc -#include "../plModifier/plSDLModifier.h" +#include "plModifier/plSDLModifier.h" // // This modifier is responsible for sending and recving responder state diff --git a/Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.cpp index 2ab14a10..124600a8 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.cpp @@ -41,15 +41,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plSDLModifier.h" -#include "../pnNetCommon/plSynchedObject.h" -#include "../pnDispatch/plDispatch.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnMessage/plSDLModifierMsg.h" - -#include "../plNetMessage/plNetMessage.h" -#include "../plSDL/plSDL.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plNetClient/plNetObjectDebugger.h" +#include "pnNetCommon/plSynchedObject.h" +#include "pnDispatch/plDispatch.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnMessage/plSDLModifierMsg.h" + +#include "plNetMessage/plNetMessage.h" +#include "plSDL/plSDL.h" +#include "plNetClient/plNetClientMgr.h" +#include "plNetClient/plNetObjectDebugger.h" plSDLModifier::plSDLModifier() : fStateCache(nil), fSentOrRecvdState(false) { diff --git a/Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.cpp index 8c316001..e59f4eb2 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.cpp @@ -45,12 +45,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plgDispatch.h" #include "hsStream.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnMessage/plRefMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnMessage/plTimeMsg.h" +#include "pnMessage/plRefMsg.h" #include "hsTimer.h" -// #include "../pfConditional/plAnimationEventConditionalObject.h" -#include "../plMessage/plAnimCmdMsg.h" +// #include "pfConditional/plAnimationEventConditionalObject.h" +#include "plMessage/plAnimCmdMsg.h" plSimpleModifier::plSimpleModifier() : diff --git a/Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.h index 5dca3d42..30fb6c5a 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.h @@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pnModifier/plModifier.h" #include "pnNetCommon/plSynchedValue.h" -#include "../plInterp/plAnimTimeConvert.h" +#include "plInterp/plAnimTimeConvert.h" class plSceneObject; class plRefMsg; diff --git a/Sources/Plasma/PubUtilLib/plModifier/plSoundSDLModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plSoundSDLModifier.cpp index 67e51973..b1db11bb 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plSoundSDLModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plSoundSDLModifier.cpp @@ -40,10 +40,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plSoundSDLModifier.h" -#include "../plSDL/plSDL.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plAudioInterface.h" -#include "../plAudio/plSound.h" +#include "plSDL/plSDL.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plAudioInterface.h" +#include "plAudio/plSound.h" // static vars char plSoundSDLModifier::kStrVolume[]="desiredVolume"; diff --git a/Sources/Plasma/PubUtilLib/plModifier/plSoundSDLModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plSoundSDLModifier.h index abdfd0c5..ad2b4dd8 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plSoundSDLModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plSoundSDLModifier.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plSoundSDLModifier_inc #define plSoundSDLModifier_inc -#include "../plModifier/plSDLModifier.h" +#include "plModifier/plSDLModifier.h" // // This modifier is responsible for sending and recving diff --git a/Sources/Plasma/PubUtilLib/plModifier/plSpawnModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plSpawnModifier.cpp index 1016b0a0..b21f44a3 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plSpawnModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plSpawnModifier.cpp @@ -43,17 +43,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com //#include "hsTypes.h" //#include "hsGeometry3.h" //#include "plgDispatch.h" -//#include "../pnSceneObject/plDrawInterface.h" -//#include "../pnSceneObject/plCoordinateInterface.h" +//#include "pnSceneObject/plDrawInterface.h" +//#include "pnSceneObject/plCoordinateInterface.h" //#include "hsBounds.h" #include "plSpawnModifier.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../plAvatar/plAvatarMgr.h" -//#include "../pnMessage/plTimeMsg.h" -//#include "../pnKeyedObject/plKey.h" +#include "pnSceneObject/plSceneObject.h" +#include "plAvatar/plAvatarMgr.h" +//#include "pnMessage/plTimeMsg.h" +//#include "pnKeyedObject/plKey.h" -//#include "../plMessage/plSpawnRequestMsg.h" -//#include "../plMessage/plSpawnModMsg.h" +//#include "plMessage/plSpawnRequestMsg.h" +//#include "plMessage/plSpawnModMsg.h" //hsBool plSpawnModifier::MsgReceive(plMessage* msg) //{ diff --git a/Sources/Plasma/PubUtilLib/plModifier/plSpawnModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plSpawnModifier.h index 56c11997..fdb88867 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plSpawnModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plSpawnModifier.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plSpawnModifier_inc #define plSpawnModifier_inc -#include "../pnModifier/plMultiModifier.h" -#include "../pnMessage/plMessage.h" +#include "pnModifier/plMultiModifier.h" +#include "pnMessage/plMessage.h" class plSpawnModifier : public plMultiModifier { diff --git a/Sources/Plasma/PubUtilLib/plNetClient/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plNetClient/CMakeLists.txt new file mode 100644 index 00000000..459e72bb --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plNetClient/CMakeLists.txt @@ -0,0 +1,47 @@ +include_directories("../../CoreLib") +include_directories("../../FeatureLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +include_directories(${OPENSSL_INCLUDE_DIR}) + +set(plNetClient_SOURCES + plLinkEffectsMgr.cpp + plNetCliAgeJoiner.cpp + plNetCliAgeLeaver.cpp + plNetClientCommInterface.cpp + plNetClientGroup.cpp + plNetClientMgr.cpp + plNetClientMgrLoad.cpp + plNetClientMgrRecord.cpp + plNetClientMgrSend.cpp + plNetClientMgrShow.cpp + plNetClientMgrVoice.cpp + plNetClientMsgHandler.cpp + plNetClientMsgScreener.cpp + plNetClientStats.cpp + plNetLinkingMgr.cpp + plNetObjectDebugger.cpp + plNetVoiceList.cpp +) + +set(plNetClient_HEADERS + plLinkEffectsMgr.h + plNetCliAgeJoiner.h + plNetCliAgeLeaver.h + plNetClientCreatable.h + plNetClientGroup.h + plNetClientMgr.h + plNetClientMsgHandler.h + plNetClientMsgScreener.h + plNetClientStats.h + plNetLinkingMgr.h + plNetObjectDebugger.h + plNetVoiceList.h +) + +add_library(plNetClient STATIC ${plNetClient_SOURCES} ${plNetClient_HEADERS}) + +source_group("Source Files" FILES ${plNetClient_SOURCES}) +source_group("Header Files" FILES ${plNetClient_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.cpp index 4bd84d45..31d908e7 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.cpp @@ -40,37 +40,37 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include "hsTemplates.h" #include "hsStream.h" #include "plLinkEffectsMgr.h" -#include "../pnMessage/plEventCallbackMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnMessage/plPlayerPageMsg.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../plMessage/plTransitionMsg.h" +#include "pnMessage/plEventCallbackMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "pnMessage/plPlayerPageMsg.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "plMessage/plTransitionMsg.h" #include "plgDispatch.h" #include "hsResMgr.h" #include "hsTimer.h" -#include "../pnNetCommon/plNetApp.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../plNetTransport/plNetTransportMember.h" -#include "../plVault/plVault.h" -#include "../plNetClient/plNetLinkingMgr.h" -#include "../plAgeLoader/plAgeLoader.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnMessage/plWarpMsg.h" -#include "../pnKeyedObject/plFixedKey.h" +#include "pnNetCommon/plNetApp.h" +#include "plNetClient/plNetClientMgr.h" +#include "pnSceneObject/plSceneObject.h" +#include "plNetTransport/plNetTransportMember.h" +#include "plVault/plVault.h" +#include "plNetClient/plNetLinkingMgr.h" +#include "plAgeLoader/plAgeLoader.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnMessage/plWarpMsg.h" +#include "pnKeyedObject/plFixedKey.h" // chronicle var #define kCleftSolved L"CleftSolved" -#include "../plAvatar/plArmatureMod.h" -#include "../plAvatar/plAvatarTasks.h" -#include "../plAvatar/plAGAnim.h" -#include "../plMessage/plAvatarMsg.h" -#include "../plMessage/plLoadAgeMsg.h" +#include "plAvatar/plArmatureMod.h" +#include "plAvatar/plAvatarTasks.h" +#include "plAvatar/plAGAnim.h" +#include "plMessage/plAvatarMsg.h" +#include "plMessage/plLoadAgeMsg.h" plLinkEffectsMgr::plLinkEffectsMgr() { diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.h b/Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.h index 1381759b..c73687b8 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.h +++ b/Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLinkEffectsMgr_inc #define plLinkEffectsMgr_inc -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" class plLinkEffectsTriggerMsg; class plPseudoLinkEffectMsg; diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.cpp index d934ed81..f7ecea28 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.cpp @@ -51,28 +51,28 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNetClientMgr.h" #include "plNetLinkingMgr.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" -#include "../pnMessage/plPlayerPageMsg.h" -#include "../pnMessage/plTimeMsg.h" +#include "pnMessage/plPlayerPageMsg.h" +#include "pnMessage/plTimeMsg.h" -#include "../plNetClientComm/plNetClientComm.h" -#include "../plAgeLoader/plAgeLoader.h" -#include "../plAgeLoader/plBackgroundDownloader.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plVault/plVault.h" +#include "plNetClientComm/plNetClientComm.h" +#include "plAgeLoader/plAgeLoader.h" +#include "plAgeLoader/plBackgroundDownloader.h" +#include "plAvatar/plAvatarMgr.h" +#include "plVault/plVault.h" -#include "../plNetMessage/plNetMessage.h" +#include "plNetMessage/plNetMessage.h" -#include "../plMessage/plNetCommMsgs.h" -#include "../plMessage/plAgeLoadedMsg.h" -#include "../plMessage/plInputIfaceMgrMsg.h" -#include "../plMessage/plNetClientMgrMsg.h" +#include "plMessage/plNetCommMsgs.h" +#include "plMessage/plAgeLoadedMsg.h" +#include "plMessage/plInputIfaceMgrMsg.h" +#include "plMessage/plNetClientMgrMsg.h" -#include "../plProgressMgr/plProgressMgr.h" -#include "../pnDispatch/plDispatch.h" -#include "../plResMgr/plResManager.h" +#include "plProgressMgr/plProgressMgr.h" +#include "pnDispatch/plDispatch.h" +#include "plResMgr/plResManager.h" /***************************************************************************** diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.h b/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.h index 16fa91c0..51e4ce74 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.h +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.h @@ -50,8 +50,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" -#include "../pnUtils/pnUtils.h" -#include "../plNetClientComm/plNetClientComm.h" +#include "pnUtils/pnUtils.h" +#include "plNetClientComm/plNetClientComm.h" /***************************************************************************** diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.cpp index 4d39e138..8b355871 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.cpp @@ -49,18 +49,18 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNetClientMgr.h" #include "plNetLinkingMgr.h" -#include "../pnMessage/plTimeMsg.h" - -#include "../plNetClientComm/plNetClientComm.h" -#include "../plNetGameLib/plNetGameLib.h" -#include "../plAgeLoader/plAgeLoader.h" -#include "../plAgeLoader/plBackgroundDownloader.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plVault/plVault.h" - -#include "../plMessage/plLoadAgeMsg.h" -#include "../plMessage/plAgeLoadedMsg.h" -#include "../plMessage/plInputIfaceMgrMsg.h" +#include "pnMessage/plTimeMsg.h" + +#include "plNetClientComm/plNetClientComm.h" +#include "plNetGameLib/plNetGameLib.h" +#include "plAgeLoader/plAgeLoader.h" +#include "plAgeLoader/plBackgroundDownloader.h" +#include "plAvatar/plAvatarMgr.h" +#include "plVault/plVault.h" + +#include "plMessage/plLoadAgeMsg.h" +#include "plMessage/plAgeLoadedMsg.h" +#include "plMessage/plInputIfaceMgrMsg.h" diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.h b/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.h index 7ef34811..5bac12ab 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.h +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.h @@ -50,8 +50,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" -#include "../pnUtils/pnUtils.h" -#include "../pnNetBase/pnNetBase.h" +#include "pnUtils/pnUtils.h" +#include "pnNetBase/pnNetBase.h" /***************************************************************************** diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientCommInterface.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientCommInterface.cpp index 42b4fc13..7cf83218 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientCommInterface.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientCommInterface.cpp @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNetClientMgr.h" #include "plNetLinkingMgr.h" -#include "../plNetClientRecorder/plNetClientRecorder.h" -#include "../plNetMessage/plNetMessage.h" +#include "plNetClientRecorder/plNetClientRecorder.h" +#include "plNetMessage/plNetMessage.h" #include "plgDispatch.h" diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientCreatable.h b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientCreatable.h index 0e871ca8..182b20fd 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientCreatable.h +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientCreatable.h @@ -42,12 +42,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plNetClientCreatable_inc #define plNetClientCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plNetClientMgr.h" REGISTER_CREATABLE( plNetClientMgr ); -#include "../plNetTransport/plNetTransportMember.h" +#include "plNetTransport/plNetTransportMember.h" REGISTER_CREATABLE( plNetTransportMember ); #include "plLinkEffectsMgr.h" diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.cpp index 3a0d0e17..d6fc5c63 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.cpp @@ -41,8 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsResMgr.h" #include "plNetClientGroup.h" -#include "../plResMgr/plKeyFinder.h" -#include "../plResMgr/plPageInfo.h" +#include "plResMgr/plKeyFinder.h" +#include "plResMgr/plPageInfo.h" // // cache room desc string, from fID diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h index b2459ddf..38c9a951 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plNetClientGroup_h #include "hsStlUtils.h" -#include "../../NucleusLib/pnNetCommon/plNetGroup.h" +#include "pnNetCommon/plNetGroup.h" // // represents a collection of net groups. diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp index b03b5d31..f9803fa5 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp @@ -49,62 +49,62 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNetLinkingMgr.h" #include "plNetObjectDebugger.h" -#include "../pnUtils/pnUtils.h" -#include "../pnProduct/pnProduct.h" -#include "../pnNetCommon/plSynchedObject.h" -#include "../pnNetCommon/plNetServers.h" -#include "../pnNetCommon/plSDLTypes.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plObjInterface.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnMessage/plClientMsg.h" -#include "../pnMessage/plSDLModifierMsg.h" -#include "../pnMessage/plPlayerPageMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnModifier/plModifier.h" -#include "../pnAsyncCore/pnAsyncCore.h" - -#include "../plAgeLoader/plAgeLoader.h" -#include "../plAgeLoader/plResPatcher.h" -#include "../plNetClientRecorder/plNetClientRecorder.h" -#include "../plScene/plSceneNode.h" -#include "../plNetCommon/plNetCommonConstants.h" -#include "../plNetMessage/plNetMessage.h" -#include "../plMessage/plLoadAvatarMsg.h" -#include "../plMessage/plLoadCloneMsg.h" -#include "../plMessage/plSynchEnableMsg.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../plMessage/plLoadAgeMsg.h" -#include "../plMessage/plAgeLoadedMsg.h" -#include "../plMessage/plCCRMsg.h" -#include "../plMessage/plAvatarMsg.h" -#include "../plMessage/plNetVoiceListMsg.h" -#include "../plMessage/plNetCommMsgs.h" -#include "../plMessage/plNetClientMgrMsg.h" -#include "../plResMgr/plKeyFinder.h" -#include "../plResMgr/plPageInfo.h" -#include "../plNetTransport/plNetTransportMember.h" -#include "../plAgeDescription/plAgeDescription.h" -#include "../plAvatar/plAvatarClothing.h" -#include "../plAvatar/plArmatureMod.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plSurface/plLayerInterface.h" -#include "../plStatusLog/plStatusLog.h" -#include "../plSDL/plSDL.h" -#include "../plUnifiedTime/plUnifiedTime.h" -#include "../plFile/plEncryptedStream.h" -#include "../plProgressMgr/plProgressMgr.h" -#include "../plVault/plVault.h" - -#include "../../FeatureLib/pfMessage/pfKIMsg.h" // Move this to PubUtil level +#include "pnUtils/pnUtils.h" +#include "pnProduct/pnProduct.h" +#include "pnNetCommon/plSynchedObject.h" +#include "pnNetCommon/plNetServers.h" +#include "pnNetCommon/plSDLTypes.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plObjInterface.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnMessage/plClientMsg.h" +#include "pnMessage/plSDLModifierMsg.h" +#include "pnMessage/plPlayerPageMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "pnModifier/plModifier.h" +#include "pnAsyncCore/pnAsyncCore.h" + +#include "plAgeLoader/plAgeLoader.h" +#include "plAgeLoader/plResPatcher.h" +#include "plNetClientRecorder/plNetClientRecorder.h" +#include "plScene/plSceneNode.h" +#include "plNetCommon/plNetCommonConstants.h" +#include "plNetMessage/plNetMessage.h" +#include "plMessage/plLoadAvatarMsg.h" +#include "plMessage/plLoadCloneMsg.h" +#include "plMessage/plSynchEnableMsg.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "plMessage/plLoadAgeMsg.h" +#include "plMessage/plAgeLoadedMsg.h" +#include "plMessage/plCCRMsg.h" +#include "plMessage/plAvatarMsg.h" +#include "plMessage/plNetVoiceListMsg.h" +#include "plMessage/plNetCommMsgs.h" +#include "plMessage/plNetClientMgrMsg.h" +#include "plResMgr/plKeyFinder.h" +#include "plResMgr/plPageInfo.h" +#include "plNetTransport/plNetTransportMember.h" +#include "plAgeDescription/plAgeDescription.h" +#include "plAvatar/plAvatarClothing.h" +#include "plAvatar/plArmatureMod.h" +#include "plAvatar/plAvatarMgr.h" +#include "plSurface/plLayerInterface.h" +#include "plStatusLog/plStatusLog.h" +#include "plSDL/plSDL.h" +#include "plUnifiedTime/plUnifiedTime.h" +#include "plFile/plEncryptedStream.h" +#include "plProgressMgr/plProgressMgr.h" +#include "plVault/plVault.h" + +#include "pfMessage/pfKIMsg.h" // Move this to PubUtil level #if 1 // for debugging #include "plCreatableIndex.h" -#include "../plModifier/plResponderModifier.h" -#include "../plSurface/plLayerAnimation.h" +#include "plModifier/plResponderModifier.h" +#include "plSurface/plLayerAnimation.h" #endif #include diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h index 8fe246b5..90332a8e 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h @@ -51,13 +51,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNetClientMsgHandler.h" #include "plNetClientStats.h" // STATS Counters -#include "../pnNetCommon/plNetApp.h" +#include "pnNetCommon/plNetApp.h" -#include "../plNetTransport/plNetTransport.h" -#include "../plEncryption/plChecksum.h" -#include "../plNetCommon/plNetServerSessionInfo.h" -#include "../plNetClientComm/plNetClientComm.h" -#include "../plUnifiedTime/plUnifiedTime.h" +#include "plNetTransport/plNetTransport.h" +#include "plEncryption/plChecksum.h" +#include "plNetCommon/plNetServerSessionInfo.h" +#include "plNetClientComm/plNetClientComm.h" +#include "plUnifiedTime/plUnifiedTime.h" #pragma warning(disable: 4284) //////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrLoad.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrLoad.cpp index a7b855f7..6357fff1 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrLoad.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrLoad.cpp @@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #if 1 // for debugging #include "plCreatableIndex.h" -#include "../plModifier/plResponderModifier.h" -#include "../plSurface/plLayerAnimation.h" +#include "plModifier/plResponderModifier.h" +#include "plSurface/plLayerAnimation.h" #endif #include "hsStream.h" @@ -52,38 +52,43 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "hsTimer.h" -#include "../plNetMessage/plNetMessage.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnModifier/plModifier.h" -#include "../pnMessage/plNodeRefMsg.h" -#include "../pnMessage/plClientMsg.h" -#include "../pnMessage/plNodeChangeMsg.h" -#include "../pnMessage/plPlayerPageMsg.h" - -#include "../plScene/plSceneNode.h" -#include "../plScene/plRelevanceMgr.h" -#include "../plNetTransport/plNetTransportMember.h" -#include "../plResMgr/plKeyFinder.h" -#include "../plAgeDescription/plAgeDescription.h" -#include "../plAvatar/plArmatureMod.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plSDL/plSDL.h" +#include "plNetMessage/plNetMessage.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnModifier/plModifier.h" +#include "pnMessage/plNodeRefMsg.h" +#include "pnMessage/plClientMsg.h" +#include "pnMessage/plNodeChangeMsg.h" +#include "pnMessage/plPlayerPageMsg.h" + +#include "plScene/plSceneNode.h" +#include "plScene/plRelevanceMgr.h" +#include "plNetTransport/plNetTransportMember.h" +#include "plResMgr/plKeyFinder.h" +#include "plAgeDescription/plAgeDescription.h" +#include "plAvatar/plArmatureMod.h" +#include "plAvatar/plAvatarMgr.h" +#include "plSDL/plSDL.h" /// TEMP HACK TO LOAD CONSOLE INIT FILES ON AGE LOAD -#include "../plMessage/plConsoleMsg.h" -#include "../plMessage/plLoadAvatarMsg.h" -#include "../plMessage/plAgeLoadedMsg.h" - -#include "../plAgeLoader/plResPatcher.h" -#include "../plProgressMgr/plProgressMgr.h" -#include "../plResMgr/plRegistryHelpers.h" -#include "../plResMgr/plRegistryNode.h" -#include "../plResMgr/plResManager.h" - -#include "process.h" // for getpid() +#include "plMessage/plConsoleMsg.h" +#include "plMessage/plLoadAvatarMsg.h" +#include "plMessage/plAgeLoadedMsg.h" + +#include "plAgeLoader/plResPatcher.h" +#include "plProgressMgr/plProgressMgr.h" +#include "plResMgr/plRegistryHelpers.h" +#include "plResMgr/plRegistryNode.h" +#include "plResMgr/plResManager.h" + +#ifdef _MSC_VER +#include // for getpid() +#else +#include +#include +#endif extern hsBool gDataServerLocal; diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrRecord.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrRecord.cpp index 28cd5428..3322bfaf 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrRecord.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrRecord.cpp @@ -42,10 +42,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plgDispatch.h" #include "plNetClientMgr.h" -#include "../pnNetCommon/pnNetCommon.h" -#include "../pnMessage/plTimeMsg.h" +#include "pnNetCommon/pnNetCommon.h" +#include "pnMessage/plTimeMsg.h" -#include "../plNetClientRecorder/plNetClientRecorder.h" +#include "plNetClientRecorder/plNetClientRecorder.h" // // make a recording of current play diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrSend.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrSend.cpp index ddd651fc..f3fe7f3a 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrSend.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrSend.cpp @@ -46,29 +46,29 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNetObjectDebugger.h" #include "plNetClientMsgScreener.h" -#include "../pnNetCommon/plSynchedObject.h" -#include "../pnNetCommon/plSDLTypes.h" -#include "../pnMessage/plCameraMsg.h" - -#include "../plNetClientRecorder/plNetClientRecorder.h" -#include "../plMessage/plLoadCloneMsg.h" -#include "../plMessage/plLoadAvatarMsg.h" -#include "../plAvatar/plAvatarClothing.h" -#include "../plAvatar/plArmatureMod.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plNetMessage/plNetMessage.h" -#include "../plMessage/plCCRMsg.h" -#include "../plVault/plVault.h" -#include "../plContainer/plConfigInfo.h" -#include "../plDrawable/plMorphSequence.h" -#include "../plParticleSystem/plParticleSystem.h" -#include "../plParticleSystem/plParticleSDLMod.h" -#include "../plResMgr/plLocalization.h" - -#include "../../FeatureLib/pfMessage/pfKIMsg.h" // TMP - -#include "../plNetGameLib/plNetGameLib.h" -#include "../plSDL/plSDL.h" +#include "pnNetCommon/plSynchedObject.h" +#include "pnNetCommon/plSDLTypes.h" +#include "pnMessage/plCameraMsg.h" + +#include "plNetClientRecorder/plNetClientRecorder.h" +#include "plMessage/plLoadCloneMsg.h" +#include "plMessage/plLoadAvatarMsg.h" +#include "plAvatar/plAvatarClothing.h" +#include "plAvatar/plArmatureMod.h" +#include "plAvatar/plAvatarMgr.h" +#include "plNetMessage/plNetMessage.h" +#include "plMessage/plCCRMsg.h" +#include "plVault/plVault.h" +#include "plContainer/plConfigInfo.h" +#include "plDrawable/plMorphSequence.h" +#include "plParticleSystem/plParticleSystem.h" +#include "plParticleSystem/plParticleSDLMod.h" +#include "plResMgr/plLocalization.h" + +#include "pfMessage/pfKIMsg.h" // TMP + +#include "plNetGameLib/plNetGameLib.h" +#include "plSDL/plSDL.h" // // request members list from server diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrShow.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrShow.cpp index 15ecc454..13be9d59 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrShow.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrShow.cpp @@ -42,13 +42,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNetClientMgr.h" #include "plNetLinkingMgr.h" -#include "../pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plSceneObject.h" -#include "../plPipeline/plPlates.h" -#include "../plPipeline/plDebugText.h" -#include "../plNetTransport/plNetTransportMember.h" -#include "../plAvatar/plArmatureMod.h" -#include "../plScene/plRelevanceMgr.h" +#include "plPipeline/plPlates.h" +#include "plPipeline/plDebugText.h" +#include "plNetTransport/plNetTransportMember.h" +#include "plAvatar/plArmatureMod.h" +#include "plScene/plRelevanceMgr.h" // // Code which displays stuff on the screen diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrVoice.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrVoice.cpp index ef3429f0..b4b1c610 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrVoice.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrVoice.cpp @@ -45,17 +45,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsGeometry3.h" #include "plNetClientMgr.h" -#include "../plNetMessage/plNetMessage.h" -#include "../pnNetCommon/plNetServers.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnKeyedObject/plKey.h" - -#include "../plNetTransport/plNetTransportMember.h" -#include "../plMessage/plMemberUpdateMsg.h" -#include "../plMessage/plNetVoiceListMsg.h" -#include "../plStatusLog/plStatusLog.h" -#include "../plVault/plVault.h" +#include "plNetMessage/plNetMessage.h" +#include "pnNetCommon/plNetServers.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnKeyedObject/plKey.h" + +#include "plNetTransport/plNetTransportMember.h" +#include "plMessage/plMemberUpdateMsg.h" +#include "plMessage/plNetVoiceListMsg.h" +#include "plStatusLog/plStatusLog.h" +#include "plVault/plVault.h" #define SAME_TALK_AND_LISTEN diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.cpp index 02f9ee90..4939842c 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.cpp @@ -48,36 +48,36 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNetLinkingMgr.h" #include "plCCRMgrBase.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plObjInterface.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../pnMessage/plNodeRefMsg.h" -#include "../pnMessage/plClientMsg.h" -//#include "../pnMessage/plWarpMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnMessage/plCameraMsg.h" -#include "../pnMessage/plPlayerPageMsg.h" -#include "../pnFactory/plCreator.h" -#include "../pnSceneObject/plAudioInterface.h" -#include "../pnNetCommon/plSDLTypes.h" - -#include "../plAudible/plWinAudible.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plNetTransport/plNetTransportMember.h" -#include "../plMessage/plMemberUpdateMsg.h" -#include "../plMessage/plNetOwnershipMsg.h" -#include "../plMessage/plCCRMsg.h" -#include "../plVault/plVault.h" -#include "../plSDL/plSDL.h" -#include "../plNetCommon/plNetCommonConstants.h" -#include "../plNetMessage/plNetMessage.h" -#include "../plNetMessage/plNetCommonMessage.h" - -#include "../../FeatureLib/pfMessage/pfKIMsg.h" // Should be moved to PubUtil level +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plObjInterface.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnMessage/plObjRefMsg.h" +#include "pnMessage/plNodeRefMsg.h" +#include "pnMessage/plClientMsg.h" +//#include "pnMessage/plWarpMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "pnMessage/plCameraMsg.h" +#include "pnMessage/plPlayerPageMsg.h" +#include "pnFactory/plCreator.h" +#include "pnSceneObject/plAudioInterface.h" +#include "pnNetCommon/plSDLTypes.h" + +#include "plAudible/plWinAudible.h" +#include "plAvatar/plAvatarMgr.h" +#include "plNetTransport/plNetTransportMember.h" +#include "plMessage/plMemberUpdateMsg.h" +#include "plMessage/plNetOwnershipMsg.h" +#include "plMessage/plCCRMsg.h" +#include "plVault/plVault.h" +#include "plSDL/plSDL.h" +#include "plNetCommon/plNetCommonConstants.h" +#include "plNetMessage/plNetMessage.h" +#include "plNetMessage/plNetCommonMessage.h" + +#include "pfMessage/pfKIMsg.h" // Should be moved to PubUtil level //////////////////////////////////////////////////////////////////////// @@ -241,7 +241,7 @@ MSG_HANDLER_DEFN(plNetClientMsgHandler,plNetMsgSDLState) plStateDataRecord::ReadStreamHeader(&stream, &descName, &ver); plStateDescriptor* des = plSDLMgr::GetInstance()->FindDescriptor(descName, ver); - if (strcmpi(descName, kSDLAvatarPhysical) == 0) + if (stricmp(descName, kSDLAvatarPhysical) == 0) rwFlags |= plSDL::kKeepDirty; // diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.h b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.h index 02492bf8..a561c75f 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.h +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plNetClientMsgHandler_inc #define plNetClientMsgHandler_inc -#include "../plNetCommon/plNetMsgHandler.h" +#include "plNetCommon/plNetMsgHandler.h" #include "hsStlUtils.h" /////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgScreener.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgScreener.cpp index d949a56a..0939b59a 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgScreener.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgScreener.cpp @@ -42,12 +42,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNetClientMsgScreener.h" #include "plNetLinkingMgr.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnMessage/plMessage.h" +#include "pnNetCommon/plNetApp.h" +#include "pnMessage/plMessage.h" -#include "../plStatusLog/plStatusLog.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plAvatar/plArmatureMod.h" +#include "plStatusLog/plStatusLog.h" +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plArmatureMod.h" /////////////////////////////////////////////////////////////// // CLIENT Version diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgScreener.h b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgScreener.h index cf197e6c..cbbeb320 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgScreener.h +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgScreener.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plNetClientMsgScreener_h #define plNetClientMsgScreener_h -#include "../plNetCommon/plNetMsgScreener.h" +#include "plNetCommon/plNetMsgScreener.h" // // Client-side version diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.cpp index 9ee48c4b..268d3dfc 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.cpp @@ -44,25 +44,25 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNetCliAgeJoiner.h" #include "plNetCliAgeLeaver.h" -#include "../plNetTransport/plNetTransportMember.h" // OfferLinkToPlayer() +#include "plNetTransport/plNetTransportMember.h" // OfferLinkToPlayer() #include "plgDispatch.h" -#include "../pnMessage/plTimeMsg.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plUoid.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../plNetCommon/plNetCommon.h" -#include "../plVault/plVault.h" -#include "../pnNetCommon/pnNetCommon.h" -#include "../plMessage/plVaultNotifyMsg.h" -#include "../plNetMessage/plNetMessage.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plAvatar/plArmatureMod.h" -#include "../plFile/hsFiles.h" -#include "../plMessage/plNCAgeJoinerMsg.h" -#include "../plVault/plVault.h" +#include "pnMessage/plTimeMsg.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plUoid.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnSceneObject/plSceneObject.h" +#include "plNetCommon/plNetCommon.h" +#include "plVault/plVault.h" +#include "pnNetCommon/pnNetCommon.h" +#include "plMessage/plVaultNotifyMsg.h" +#include "plNetMessage/plNetMessage.h" +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plArmatureMod.h" +#include "plFile/hsFiles.h" +#include "plMessage/plNCAgeJoinerMsg.h" +#include "plVault/plVault.h" /***************************************************************************** diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.h b/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.h index 1f905c09..f5ac3890 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.h +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.h @@ -45,9 +45,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsStlUtils.h" #include "hsBitVector.h" -#include "../plNetCommon/plNetServerSessionInfo.h" -#include "../plNetCommon/plNetCommon.h" -#include "../plMessage/plLinkToAgeMsg.h" +#include "plNetCommon/plNetServerSessionInfo.h" +#include "plNetCommon/plNetCommon.h" +#include "plMessage/plLinkToAgeMsg.h" class plMessage; struct plNCAgeJoiner; diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.cpp index 89f0b97a..4d092358 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.cpp @@ -43,13 +43,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "hsTemplates.h" -#include "../pnUtils/pnUtils.h" -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnUtils/pnUtils.h" +#include "pnKeyedObject/hsKeyedObject.h" -#include "../plStatusLog/plStatusLog.h" -#include "../plResMgr/plKeyFinder.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plAgeLoader/plAgeLoader.h" +#include "plStatusLog/plStatusLog.h" +#include "plResMgr/plKeyFinder.h" +#include "plNetClient/plNetClientMgr.h" +#include "plAgeLoader/plAgeLoader.h" plNetObjectDebugger::DebugObject::DebugObject(const char* objName, plLocation& loc, UInt32 flags) : fLoc(loc), diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.h b/Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.h index 68c7f627..9c421422 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.h +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.h @@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsStlUtils.h" -#include "../pnKeyedObject/plUoid.h" -#include "../pnNetCommon/plNetApp.h" +#include "pnKeyedObject/plUoid.h" +#include "pnNetCommon/plNetApp.h" class hsKeyedObject; class plStatusLog; diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetVoiceList.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetVoiceList.cpp index 04199116..88cd409a 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetVoiceList.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetVoiceList.cpp @@ -43,10 +43,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plgDispatch.h" #include "plNetClientMgr.h" #include "plNetVoiceList.h" -#include "../plNetTransport/plNetTransportMember.h" -#include "../pnMessage/plSoundMsg.h" -#include "../pnKeyedObject/plKey.h" -#include "../plStatusLog/plStatusLog.h" +#include "plNetTransport/plNetTransportMember.h" +#include "pnMessage/plSoundMsg.h" +#include "pnKeyedObject/plKey.h" +#include "plStatusLog/plStatusLog.h" // statics float plNetListenList::kUpdateInterval=0.5f; diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plNetCommon/CMakeLists.txt new file mode 100644 index 00000000..27c58694 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plNetCommon/CMakeLists.txt @@ -0,0 +1,33 @@ +include_directories("../../CoreLib") +include_directories("../../FeatureLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plNetCommon_SOURCES + plClientGuid.cpp + plNetCommon.cpp + plNetCommonHelpers.cpp + plNetMember.cpp + plNetMsgScreener.cpp + plNetServerSessionInfo.cpp + plSpawnPointInfo.cpp +) + +set(plNetCommon_HEADERS + plClientGuid.h + plNetCommon.h + plNetCommonConstants.h + plNetCommonCreatable.h + plNetCommonHelpers.h + plNetMember.h + plNetMsgHandler.h + plNetMsgScreener.h + plNetServerSessionInfo.h + plSpawnPointInfo.h +) + +add_library(plNetCommon STATIC ${plNetCommon_SOURCES} ${plNetCommon_HEADERS}) + +source_group("Source Files" FILES ${plNetCommon_SOURCES}) +source_group("Header Files" FILES ${plNetCommon_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.cpp b/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.cpp index 43f26462..13c80154 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.cpp +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.cpp @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include #include "plNetCommon.h" -#include "../pnMessage/plMessage.h" -#include "../plSockets/plNet.h" +#include "pnMessage/plMessage.h" +#include "plSockets/plNet.h" plClientGuid::plClientGuid() :fPlayerID(0) diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.h b/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.h index 9eedfee7..82be1990 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.h +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.h @@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsConfig.h" #include "hsStlUtils.h" -#include "../pnFactory/plCreatable.h" -#include "../plUUID/plUUID.h" +#include "pnFactory/plCreatable.h" +#include "plUUID/plUUID.h" class plClientGuid : public plCreatable { diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.cpp b/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.cpp index 99dc5435..d72fb8f5 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.cpp +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plNetCommon.h" #include "hsStlUtils.h" -#include "../plUUID/plUUID.h" +#include "plUUID/plUUID.h" #include namespace plNetCommon diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonCreatable.h b/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonCreatable.h index dfcc5260..da423728 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonCreatable.h +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonCreatable.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plNetCommonCreatable_inc #define plNetCommonCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #ifndef SERVER #include "plNetMember.h" diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.cpp b/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.cpp index 24ed7a2a..ccc80f55 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.cpp +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.cpp @@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "hsStlUtils.h" #include "plNetCommonHelpers.h" -#include "../pnNetCommon/plGenericVar.h" -#include "../plCompression/plZlibCompress.h" +#include "pnNetCommon/plGenericVar.h" +#include "plCompression/plZlibCompress.h" #include #include diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetMsgScreener.cpp b/Sources/Plasma/PubUtilLib/plNetCommon/plNetMsgScreener.cpp index 53b97ff5..c91c0160 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetMsgScreener.cpp +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plNetMsgScreener.cpp @@ -43,24 +43,24 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNetMsgScreener.h" #include "plCreatableIndex.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../pnMessage/plEnableMsg.h" -#include "../pnMessage/plSetNetGroupIDMsg.h" -#include "../pnInputCore/plControlEventCodes.h" - -#include "../plMessage/plCCRMsg.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../plMessage/plAvatarMsg.h" -#include "../plMessage/plInputIfaceMgrMsg.h" -#include "../plMessage/plInputEventMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plMessage/plBulletMsg.h" -#include "../plMessage/plAvCoopMsg.h" -#include "../plMessage/plParticleUpdateMsg.h" - -#include "../../FeatureLib/pfMessage/pfKIMsg.h" -#include "../../FeatureLib/pfMessage/plClothingMsg.h" +#include "pnNetCommon/plNetApp.h" +#include "pnMessage/plNotifyMsg.h" +#include "pnMessage/plEnableMsg.h" +#include "pnMessage/plSetNetGroupIDMsg.h" +#include "pnInputCore/plControlEventCodes.h" + +#include "plMessage/plCCRMsg.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "plMessage/plAvatarMsg.h" +#include "plMessage/plInputIfaceMgrMsg.h" +#include "plMessage/plInputEventMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plMessage/plBulletMsg.h" +#include "plMessage/plAvCoopMsg.h" +#include "plMessage/plParticleUpdateMsg.h" + +#include "pfMessage/pfKIMsg.h" +#include "pfMessage/plClothingMsg.h" // // say why the msg got rejected diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetMsgScreener.h b/Sources/Plasma/PubUtilLib/plNetCommon/plNetMsgScreener.h index 2ab523af..41f19f97 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetMsgScreener.h +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plNetMsgScreener.h @@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plNetMsgScreener_h #define plNetMsgScreener_h -#include "../pnKeyedObject/plKey.h" -#include "../plStatusLog/plLoggable.h" +#include "pnKeyedObject/plKey.h" +#include "plStatusLog/plLoggable.h" // // Class which decides what game messages are allowed to be sent to the server. diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.cpp b/Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.cpp index f0188727..50852417 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.cpp +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.cpp @@ -41,11 +41,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "hsStream.h" -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "plNetServerSessionInfo.h" #include "hsStlUtils.h" #include "plNetCommon.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plSpawnPointInfo.cpp b/Sources/Plasma/PubUtilLib/plNetCommon/plSpawnPointInfo.cpp index 8fec6de2..7b67de80 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plSpawnPointInfo.cpp +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plSpawnPointInfo.cpp @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plSpawnPointInfo.h" -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsStream.h" #include "hsBitVector.h" diff --git a/Sources/Plasma/PubUtilLib/plPhysX/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plPhysX/CMakeLists.txt new file mode 100644 index 00000000..0482c9ae --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plPhysX/CMakeLists.txt @@ -0,0 +1,30 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +include_directories(${PHYSX_INCLUDE_DIRS}) +include_directories(${OPENSSL_INCLUDE_DIR}) + +set(plPhysX_SOURCES + plLOSDispatch.cpp + plPXConvert.cpp + plPXPhysical.cpp + plPXPhysicalControllerCore.cpp + plSimulationMgr.cpp +) + +set(plPhysX_HEADERS + plLOSDispatch.h + plPhysXCreatable.h + plPXConvert.h + plPXPhysical.h + plPXPhysicalControllerCore.h + plPXStream.h + plSimulationMgr.h +) + +add_library(plPhysX STATIC ${plPhysX_SOURCES} ${plPhysX_HEADERS}) + +source_group("Source Files" FILES ${plPhysX_SOURCES}) +source_group("Header Files" FILES ${plPhysX_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plPhysX/plLOSDispatch.cpp b/Sources/Plasma/PubUtilLib/plPhysX/plLOSDispatch.cpp index 16bb5128..8bccac1b 100644 --- a/Sources/Plasma/PubUtilLib/plPhysX/plLOSDispatch.cpp +++ b/Sources/Plasma/PubUtilLib/plPhysX/plLOSDispatch.cpp @@ -42,19 +42,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plLOSDispatch.h" #include "plSimulationMgr.h" #include "plgDispatch.h" -#include "../plMessage/plLOSRequestMsg.h" -#include "../plMessage/plLOSHitMsg.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../plModifier/plLogicModifier.h" +#include "plMessage/plLOSRequestMsg.h" +#include "plMessage/plLOSHitMsg.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnSceneObject/plSceneObject.h" +#include "plModifier/plLogicModifier.h" #include "plPXPhysical.h" #include "plPXPhysicalControllerCore.h" #include "plPXConvert.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plAvatar/plArmatureMod.h" +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plArmatureMod.h" -#include "NxPhysics.h" +#include #include "plProfile.h" plProfile_Extern(LineOfSight); diff --git a/Sources/Plasma/PubUtilLib/plPhysX/plLOSDispatch.h b/Sources/Plasma/PubUtilLib/plPhysX/plLOSDispatch.h index b7ec9525..cce93709 100644 --- a/Sources/Plasma/PubUtilLib/plPhysX/plLOSDispatch.h +++ b/Sources/Plasma/PubUtilLib/plPhysX/plLOSDispatch.h @@ -39,7 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" class plLOSRequestMsg; struct hsMatrix44; diff --git a/Sources/Plasma/PubUtilLib/plPhysX/plPXConvert.h b/Sources/Plasma/PubUtilLib/plPhysX/plPXConvert.h index 17817dbb..28e727f9 100644 --- a/Sources/Plasma/PubUtilLib/plPhysX/plPXConvert.h +++ b/Sources/Plasma/PubUtilLib/plPhysX/plPXConvert.h @@ -46,9 +46,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsQuat.h" #include "hsMatrix44.h" -#include "NxVec3.h" -#include "NxQuat.h" -#include "NxMat34.h" +#include +#include +#include // Converts to and from the PhysX types namespace plPXConvert diff --git a/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp b/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp index 3745f067..af914716 100644 --- a/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp +++ b/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp @@ -52,24 +52,24 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsSTLStream.h" #include "plSimulationMgr.h" -#include "../plPhysical/plPhysicalSDLModifier.h" -#include "../plPhysical/plPhysicalSndGroup.h" -#include "../plPhysical/plPhysicalProxy.h" -#include "../pnSceneObject/plSimulationInterface.h" -#include "../pnSceneObject/plCoordinateInterface.h" - -#include "../pnKeyedObject/plKey.h" -#include "../pnMessage/plCorrectionMsg.h" -#include "../pnMessage/plNodeRefMsg.h" -#include "../pnMessage/plSDLModifierMsg.h" -#include "../plMessage/plSimStateMsg.h" -#include "../plMessage/plSimInfluenceMsg.h" -#include "../plMessage/plLinearVelocityMsg.h" -#include "../plMessage/plAngularVelocityMsg.h" -#include "../plDrawable/plDrawableGenerator.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plNetTransport/plNetTransportMember.h" -#include "../plStatusLog/plStatusLog.h" +#include "plPhysical/plPhysicalSDLModifier.h" +#include "plPhysical/plPhysicalSndGroup.h" +#include "plPhysical/plPhysicalProxy.h" +#include "pnSceneObject/plSimulationInterface.h" +#include "pnSceneObject/plCoordinateInterface.h" + +#include "pnKeyedObject/plKey.h" +#include "pnMessage/plCorrectionMsg.h" +#include "pnMessage/plNodeRefMsg.h" +#include "pnMessage/plSDLModifierMsg.h" +#include "plMessage/plSimStateMsg.h" +#include "plMessage/plSimInfluenceMsg.h" +#include "plMessage/plLinearVelocityMsg.h" +#include "plMessage/plAngularVelocityMsg.h" +#include "plDrawable/plDrawableGenerator.h" +#include "plNetClient/plNetClientMgr.h" +#include "plNetTransport/plNetTransportMember.h" +#include "plStatusLog/plStatusLog.h" #include "plPXConvert.h" #include "plPXPhysicalControllerCore.h" diff --git a/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.h b/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.h index 5c4ca8ae..896f7404 100644 --- a/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.h +++ b/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPhysical.h" #include "hsMatrix44.h" -#include "../plPhysical/plSimDefs.h" +#include "plPhysical/plSimDefs.h" #include "hsBitVector.h" #include "hsUtils.h" diff --git a/Sources/Plasma/PubUtilLib/plPhysX/plPXStream.h b/Sources/Plasma/PubUtilLib/plPhysX/plPXStream.h index e4c32719..5133a3e8 100644 --- a/Sources/Plasma/PubUtilLib/plPhysX/plPXStream.h +++ b/Sources/Plasma/PubUtilLib/plPhysX/plPXStream.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plPXStream_h_inc #include "hsStream.h" -#include "NxPhysics.h" -#include "NxStream.h" +#include +#include // A super simple wrapper to convert a Plasma stream into a PhysX one class plPXStream : public NxStream diff --git a/Sources/Plasma/PubUtilLib/plPhysX/plPhysXCreatable.h b/Sources/Plasma/PubUtilLib/plPhysX/plPhysXCreatable.h index cf986171..16c8c1be 100644 --- a/Sources/Plasma/PubUtilLib/plPhysX/plPhysXCreatable.h +++ b/Sources/Plasma/PubUtilLib/plPhysX/plPhysXCreatable.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPhysXCreatable_inc #define plPhysXCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plPXPhysical.h" diff --git a/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.cpp b/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.cpp index 5603c566..332a96c2 100644 --- a/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.cpp @@ -50,14 +50,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPXPhysicalControllerCore.h" #include "plPXConvert.h" #include "plLOSDispatch.h" -#include "../plPhysical/plPhysicsSoundMgr.h" -#include "../plStatusLog/plStatusLog.h" -#include "../pnSceneObject/plSimulationInterface.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnNetCommon/plSDLTypes.h" -#include "../plMessage/plCollideMsg.h" - -#include "../plModifier/plDetectorLog.h" +#include "plPhysical/plPhysicsSoundMgr.h" +#include "plStatusLog/plStatusLog.h" +#include "pnSceneObject/plSimulationInterface.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnNetCommon/plSDLTypes.h" +#include "plMessage/plCollideMsg.h" + +#include "plModifier/plDetectorLog.h" #ifndef PLASMA_EXTERNAL_RELEASE bool plSimulationMgr::fDisplayAwakeActors=false; diff --git a/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.h b/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.h index 7f85cd1c..a8251bc4 100644 --- a/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.h +++ b/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plSimulationMgr_H #include "hsStlUtils.h" -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include "hsTemplates.h" class plPXPhysical; diff --git a/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt new file mode 100644 index 00000000..142c378a --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt @@ -0,0 +1,87 @@ +include_directories("../../CoreLib") +include_directories("../../FeatureLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plPipeline_SOURCES + hsG3DDeviceSelector.cpp + hsGColorizer.cpp + hsGDDrawDllLoad.cpp + plBinkPlayer.cpp + plCaptureRender.cpp + plCubicRenderTargetModifier.cpp + plCullTree.cpp + plDebugText.cpp + plDTProgressMgr.cpp + plDXEnumerate.cpp + plDXPipeline.cpp + plDXPixelShader.cpp + plDXShader.cpp + plDXTextFont.cpp + plDXVertexShader.cpp + plDynamicEnvMap.cpp + plFogEnvironment.cpp + plGBufferGroup.cpp + plPlates.cpp + plRenderTarget.cpp + plStatusLogDrawer.cpp + plTextFont.cpp + plTextGenerator.cpp + plTransitionMgr.cpp + plVertCoder.cpp +) + +set(plPipeline_HEADERS + hsFogControl.h + hsG3DDeviceSelector.h + hsGColorizer.h + hsGDDrawDllLoad.h + hsWinRef.h + plBinkPlayer.h + plCaptureRender.h + plCubicRenderTarget.h + plCubicRenderTargetModifier.h + plCuller.h + plCullTree.h + plDebugText.h + plDrawPrim.h + plDTProgressMgr.h + plDXEnumerate.h + plDXPipeline.h + plDXPixelShader.h + plDXSettings.h + plDXShader.h + plDXTextFont.h + plDXVertexShader.h + plDynamicEnvMap.h + plFogEnvironment.h + plGBufferGroup.h + plPipeDebugFlags.h + plPipelineCreatable.h + plPipelineCreate.h + plPlates.h + plRenderTarget.h + plStatusLogDrawer.h + plStencil.h + plTextFont.h + plTextGenerator.h + plTransitionMgr.h + plVertCoder.h +) + +set(plPipeline_DEVICEREFS + hsGDeviceRef.h + plDXBufferRefs.h + plDXDeviceRef.h + plDXDeviceRefs.cpp + plDXLightRef.h + plDXRenderTargetRef.h + plDXTextureRef.h +) + +add_library(plPipeline STATIC ${plPipeline_SOURCES} ${plPipeline_HEADERS} ${plPipeline_DEVICEREFS}) + +source_group("Source Files" FILES ${plPipeline_SOURCES}) +source_group("Header Files" FILES ${plPipeline_HEADERS}) +source_group("DeviceRefs" FILES ${plPipeline_DEVICEREFS}) diff --git a/Sources/Plasma/PubUtilLib/plPipeline/hsG3DDeviceSelector.cpp b/Sources/Plasma/PubUtilLib/plPipeline/hsG3DDeviceSelector.cpp index 8f3053b9..bc5ebd1c 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/hsG3DDeviceSelector.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/hsG3DDeviceSelector.cpp @@ -55,9 +55,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifdef HS_OPEN_GL #if HS_BUILD_FOR_WIN32 -#include "gls.h" -#include "glswgl.h" -#include "glext.h" +#include +#include +#include #endif #endif diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plCaptureRender.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plCaptureRender.cpp index 498f9e44..39ddb1d6 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plCaptureRender.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plCaptureRender.cpp @@ -45,16 +45,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef MF_FRONTBUFF_CAPTURE -#include "../plGImage/plMipmap.h" -#include "../plMessage/plCaptureRenderMsg.h" +#include "plGImage/plMipmap.h" +#include "plMessage/plCaptureRenderMsg.h" #include "plPipeline.h" #include "plRenderTarget.h" -#include "../plScene/plPageTreeMgr.h" -#include "../plScene/plPostEffectMod.h" +#include "plScene/plPageTreeMgr.h" +#include "plScene/plPostEffectMod.h" #include "hsResMgr.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plUoid.h" -#include "../pfGameGUIMgr/pfGameGUIMgr.h" +#include "pfGameGUIMgr/pfGameGUIMgr.h" // CaptureRenderRequest // diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plCaptureRender.h b/Sources/Plasma/PubUtilLib/plPipeline/plCaptureRender.h index 6550b727..66d6fa43 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plCaptureRender.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/plCaptureRender.h @@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef MF_FRONTBUFF_CAPTURE -#include "../plScene/plRenderRequest.h" +#include "plScene/plRenderRequest.h" class plRenderTarget; class plCaptureRenderMsg; diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plCubicRenderTargetModifier.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plCubicRenderTargetModifier.cpp index b71c35cc..7657fb0f 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plCubicRenderTargetModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plCubicRenderTargetModifier.cpp @@ -58,12 +58,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plDrawable.h" #include "hsBounds.h" -#include "../plScene/plRenderRequest.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnSceneObject/plDrawInterface.h" -#include "../pnMessage/plTimeMsg.h" -#include "../plMessage/plRenderRequestMsg.h" +#include "plScene/plRenderRequest.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plDrawInterface.h" +#include "pnMessage/plTimeMsg.h" +#include "plMessage/plRenderRequestMsg.h" #include "hsResMgr.h" #include "hsTimer.h" diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plCubicRenderTargetModifier.h b/Sources/Plasma/PubUtilLib/plPipeline/plCubicRenderTargetModifier.h index 54aebbfc..d967a3de 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plCubicRenderTargetModifier.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/plCubicRenderTargetModifier.h @@ -57,8 +57,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plCubicRenderTargetModifier_h #define _plCubicRenderTargetModifier_h -#include "../../NucleusLib/pnModifier/plModifier.h" -#include "../pnNetCommon/plSynchedValue.h" +#include "pnModifier/plModifier.h" +#include "pnNetCommon/plSynchedValue.h" class plCubicRenderTarget; diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plCullTree.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plCullTree.cpp index daab443e..efede854 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plCullTree.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plCullTree.cpp @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plCullTree.h" -#include "../plDrawable/plSpaceTree.h" +#include "plDrawable/plSpaceTree.h" #include "hsFastMath.h" #include "hsColorRGBA.h" #include "plProfile.h" diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plCullTree.h b/Sources/Plasma/PubUtilLib/plPipeline/plCullTree.h index 88b0b3cf..061454c3 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plCullTree.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/plCullTree.h @@ -47,7 +47,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsGeometry3.h" #include "hsBitVector.h" #include "plCuller.h" -#include "../plScene/plCullPoly.h" +#include "plScene/plCullPoly.h" #ifdef HS_DEBUGGING #define DEBUG_POINTERS diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDTProgressMgr.h b/Sources/Plasma/PubUtilLib/plPipeline/plDTProgressMgr.h index a1074602..932296a3 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plDTProgressMgr.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/plDTProgressMgr.h @@ -52,7 +52,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plDTProgressMgr_h #define _plDTProgressMgr_h -#include "../plProgressMgr/plProgressMgr.h" +#include "plProgressMgr/plProgressMgr.h" class plPipeline; diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXDeviceRefs.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plDXDeviceRefs.cpp index 6c5f3f2e..be7e422c 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plDXDeviceRefs.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plDXDeviceRefs.cpp @@ -64,15 +64,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plDXTextureRef.h" #include "plDXRenderTargetRef.h" #include "plGBufferGroup.h" -#include "../plDrawable/plGeometrySpan.h" -#include "../plDrawable/plDrawableSpans.h" -#include "../plGLight/plLightInfo.h" +#include "plDrawable/plGeometrySpan.h" +#include "plDrawable/plDrawableSpans.h" +#include "plGLight/plLightInfo.h" #include "plRenderTarget.h" #include "plCubicRenderTarget.h" #include "plDynamicEnvMap.h" #include "plProfile.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" plProfile_CreateMemCounter("Vertices", "Memory", MemVertex); plProfile_CreateMemCounter("Indices", "Memory", MemIndex); diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp index 81d50943..70357d33 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp @@ -77,40 +77,40 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTemplates.h" //#include "hsGEnviron.h" #include "plProfile.h" -#include "../plMessage/plDeviceRecreateMsg.h" -#include "../pnMessage/plSelfDestructMsg.h" -#include "../pnMessage/plClientMsg.h" -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plLayerInterface.h" -#include "../plSurface/plLayerShadowBase.h" -#include "../plGImage/plMipmap.h" -#include "../plGImage/plCubicEnvironmap.h" -#include "../plDrawable/plDrawableSpans.h" -#include "../plDrawable/plGeometrySpan.h" -#include "../plDrawable/plSpaceTree.h" -#include "../plDrawable/plDrawableGenerator.h" -#include "../plDrawable/plSpanTypes.h" -#include "../plDrawable/plAccessSpan.h" -#include "../plDrawable/plAuxSpan.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plDrawInterface.h" +#include "plMessage/plDeviceRecreateMsg.h" +#include "pnMessage/plSelfDestructMsg.h" +#include "pnMessage/plClientMsg.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plLayerInterface.h" +#include "plSurface/plLayerShadowBase.h" +#include "plGImage/plMipmap.h" +#include "plGImage/plCubicEnvironmap.h" +#include "plDrawable/plDrawableSpans.h" +#include "plDrawable/plGeometrySpan.h" +#include "plDrawable/plSpaceTree.h" +#include "plDrawable/plDrawableGenerator.h" +#include "plDrawable/plSpanTypes.h" +#include "plDrawable/plAccessSpan.h" +#include "plDrawable/plAuxSpan.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plDrawInterface.h" #include "hsFastMath.h" -#include "../plGLight/plLightInfo.h" -#include "../plParticleSystem/plParticleEmitter.h" -#include "../plParticleSystem/plParticle.h" -#include "../plAvatar/plAvatarClothing.h" +#include "plGLight/plLightInfo.h" +#include "plParticleSystem/plParticleEmitter.h" +#include "plParticleSystem/plParticle.h" +#include "plAvatar/plAvatarClothing.h" #include "plDebugText.h" #include "plFogEnvironment.h" #include "plDXTextFont.h" #include "plGBufferGroup.h" #include "hsTimer.h" #include "plgDispatch.h" -#include "../plScene/plRenderRequest.h" -#include "../plScene/plVisMgr.h" +#include "plScene/plRenderRequest.h" +#include "plScene/plVisMgr.h" #include "plRenderTarget.h" #include "plCubicRenderTarget.h" #include "plDynamicEnvMap.h" -#include "../../FeatureLib/pfCamera/plVirtualCamNeu.h" +#include "pfCamera/plVirtualCamNeu.h" #include "plDXBufferRefs.h" #include "plDXTextureRef.h" @@ -119,32 +119,32 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plDXVertexShader.h" #include "plDXPixelShader.h" -#include "../plGLight/plShadowSlave.h" -#include "../plGLight/plShadowCaster.h" +#include "plGLight/plShadowSlave.h" +#include "plGLight/plShadowCaster.h" #include "hsGMatState.inl" -#include "../plSurface/plShader.h" +#include "plSurface/plShader.h" #include "plDXVertexShader.h" #include "plDXPixelShader.h" -#include "../pnMessage/plPipeResMakeMsg.h" +#include "pnMessage/plPipeResMakeMsg.h" #include "plPipeResReq.h" -#include "../pnNetCommon/plNetApp.h" // for dbg logging -#include "../../FeatureLib/pfCamera/plVirtualCamNeu.h" -#include "../../FeatureLib/pfCamera/plCameraModifier.h" -#include "../plResMgr/plLocalization.h" +#include "pnNetCommon/plNetApp.h" // for dbg logging +#include "pfCamera/plVirtualCamNeu.h" +#include "pfCamera/plCameraModifier.h" +#include "plResMgr/plLocalization.h" // mf horse - test hack, nuke this later -#include "../plSurface/plLayerDepth.h" +#include "plSurface/plLayerDepth.h" -#include "../plGImage/hsCodecManager.h" -//#include "../plGImage/hsDXTDirectXCodec.h" +#include "plGImage/hsCodecManager.h" +//#include "plGImage/hsDXTDirectXCodec.h" #ifdef HS_DEBUGGING // This is so VC++ will let us view the contents of plIcicle::fOwnerKey -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #endif #include "plCullTree.h" diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.h b/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.h index 71d75637..ecda292a 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.h @@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPipeline.h" #include "plDXSettings.h" -#include "../plSurface/plLayerInterface.h" +#include "plSurface/plLayerInterface.h" #include "hsMatrix44.h" #include "plFogEnvironment.h" #include "hsG3DDeviceSelector.h" diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXPixelShader.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plDXPixelShader.cpp index 95fd106c..e61d5f41 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plDXPixelShader.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plDXPixelShader.cpp @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plDXPixelShader.h" -#include "../plSurface/plShader.h" +#include "plSurface/plShader.h" #include "plDXPipeline.h" diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXShader.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plDXShader.cpp index 6854b9e4..8864fd1d 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plDXShader.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plDXShader.cpp @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plDXShader.h" -#include "../plSurface/plShader.h" +#include "plSurface/plShader.h" #include "plDXPipeline.h" diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXVertexShader.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plDXVertexShader.cpp index 69c6f868..210d93ce 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plDXVertexShader.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plDXVertexShader.cpp @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plDXVertexShader.h" -#include "../plSurface/plShader.h" +#include "plSurface/plShader.h" #include "plGBufferGroup.h" #include "plDXPipeline.h" diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDynamicEnvMap.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plDynamicEnvMap.cpp index b8ab4006..5da10629 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plDynamicEnvMap.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plDynamicEnvMap.cpp @@ -52,20 +52,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTimer.h" #include "hsStream.h" -#include "../plMessage/plRenderRequestMsg.h" -#include "../plMessage/plDynamicEnvMapMsg.h" -#include "../pfCamera/plCameraModifier.h" -#include "../pfCamera/plVirtualCamNeu.h" -#include "../plMessage/plRenderMsg.h" -#include "../plMessage/plAgeLoadedMsg.h" -#include "../plMessage/plLayRefMsg.h" -#include "../pnMessage/plPipeResMakeMsg.h" -#include "../pnMessage/plRefMsg.h" - -#include "../plScene/plVisRegion.h" -#include "../plScene/plVisMgr.h" -#include "../plResMgr/plKeyFinder.h" -#include "../plSurface/plLayer.h" +#include "plMessage/plRenderRequestMsg.h" +#include "plMessage/plDynamicEnvMapMsg.h" +#include "pfCamera/plCameraModifier.h" +#include "pfCamera/plVirtualCamNeu.h" +#include "plMessage/plRenderMsg.h" +#include "plMessage/plAgeLoadedMsg.h" +#include "plMessage/plLayRefMsg.h" +#include "pnMessage/plPipeResMakeMsg.h" +#include "pnMessage/plRefMsg.h" + +#include "plScene/plVisRegion.h" +#include "plScene/plVisMgr.h" +#include "plResMgr/plKeyFinder.h" +#include "plSurface/plLayer.h" plDynamicEnvMap::plDynamicEnvMap() : fPos(0,0,0), diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDynamicEnvMap.h b/Sources/Plasma/PubUtilLib/plPipeline/plDynamicEnvMap.h index ada9fa65..070690d8 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plDynamicEnvMap.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/plDynamicEnvMap.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plDynamicEnvMap_inc #include "plCubicRenderTarget.h" -#include "../plScene/plRenderRequest.h" +#include "plScene/plRenderRequest.h" #include "hsBitVector.h" class plRenderRequestMsg; diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plFogEnvironment.h b/Sources/Plasma/PubUtilLib/plPipeline/plFogEnvironment.h index 07d4900b..2f86c886 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plFogEnvironment.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/plFogEnvironment.h @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plFogEnvironment_h #define _plFogEnvironment_h -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include "hsTypes.h" #include "hsColorRGBA.h" #include "hsTemplates.h" diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plGBufferGroup.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plGBufferGroup.cpp index ee45c3da..284effeb 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plGBufferGroup.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plGBufferGroup.cpp @@ -55,8 +55,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plGBufferGroup.h" #include "hsStream.h" -#include "../plSurface/hsGMaterial.h" -#include "../plDrawable/plGeometrySpan.h" +#include "plSurface/hsGMaterial.h" +#include "plDrawable/plGeometrySpan.h" #include "plPipeline.h" #include "hsGDeviceRef.h" #include "plProfile.h" diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plPipelineCreatable.h b/Sources/Plasma/PubUtilLib/plPipeline/plPipelineCreatable.h index 6137e990..ea92b5a7 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plPipelineCreatable.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/plPipelineCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPipelineCreatable_inc #define plPipelineCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plPlates.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plPlates.cpp index cc32b44f..9c56446a 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plPlates.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plPlates.cpp @@ -50,13 +50,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPipeline.h" #include "plPlates.h" -#include "../plJPEG/plJPEG.h" -#include "../plGImage/plPNG.h" -#include "../plGImage/plMipmap.h" -#include "../plSurface/plLayer.h" -#include "../plSurface/hsGMaterial.h" -#include "../plMessage/plLayRefMsg.h" -#include "../pnMessage/plRefMsg.h" +#include "plJPEG/plJPEG.h" +#include "plGImage/plPNG.h" +#include "plGImage/plMipmap.h" +#include "plSurface/plLayer.h" +#include "plSurface/hsGMaterial.h" +#include "plMessage/plLayRefMsg.h" +#include "pnMessage/plRefMsg.h" #include "hsGDeviceRef.h" #include "hsResMgr.h" #include "plPipeDebugFlags.h" diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plRenderTarget.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plRenderTarget.cpp index 7267db59..3dc7dc67 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plRenderTarget.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plRenderTarget.cpp @@ -58,7 +58,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPipeline.h" #include "plgDispatch.h" -#include "../pnMessage/plPipeResMakeMsg.h" +#include "pnMessage/plPipeResMakeMsg.h" /////////////////////////////////////////////////////////////////////////////// //// plRenderTarget Functions ///////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plRenderTarget.h b/Sources/Plasma/PubUtilLib/plPipeline/plRenderTarget.h index d2a23cd9..3f14a5c3 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plRenderTarget.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/plRenderTarget.h @@ -55,7 +55,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPipeResReq.h" -#include "../plGImage/plBitmap.h" +#include "plGImage/plBitmap.h" #define ASSERT_ABSOLUTE hsAssert( !fProportionalViewport, "Cannot perform this on a proportional RenderTarget" ); #define ASSERT_PROPORTIONAL hsAssert( fProportionalViewport, "Cannot perform this on an absolute RenderTarget" ); diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plStatusLogDrawer.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plStatusLogDrawer.cpp index ce0f2513..9f1b7825 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plStatusLogDrawer.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plStatusLogDrawer.cpp @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plStatusLogDrawer.h" #include "plPipeline.h" #include "plDebugText.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" //// Draw //////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plStatusLogDrawer.h b/Sources/Plasma/PubUtilLib/plPipeline/plStatusLogDrawer.h index 9d916a90..7c3b7efb 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plStatusLogDrawer.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/plStatusLogDrawer.h @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plStatusLogDrawer_h #define _plStatusLogDrawer_h -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" //// plStatusLogDrawer Class Definition //////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plTextGenerator.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plTextGenerator.cpp index d8c682c7..f3f49bf2 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plTextGenerator.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plTextGenerator.cpp @@ -53,11 +53,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsWindows.h" #include "hsTypes.h" #include "hsMatrix44.h" -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include "plTextGenerator.h" -#include "../plGImage/plMipmap.h" -#include "../plPipeline/hsGDeviceRef.h" -#include "../pnMessage/plRefMsg.h" +#include "plGImage/plMipmap.h" +#include "plPipeline/hsGDeviceRef.h" +#include "pnMessage/plRefMsg.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plTransitionMgr.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plTransitionMgr.cpp index 1ce66a56..ea4ab5ae 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plTransitionMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plTransitionMgr.cpp @@ -57,26 +57,26 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plTransitionMgr.h" #include "plPlates.h" -#include "../plGImage/plMipmap.h" -#include "../plSurface/plLayer.h" -#include "../plSurface/hsGMaterial.h" -#include "../plMessage/plLayRefMsg.h" -#include "../pnMessage/plRefMsg.h" -#include "../plMessage/plTransitionMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnMessage/plEventCallbackMsg.h" -#include "../plMessage/plLinkToAgeMsg.h" +#include "plGImage/plMipmap.h" +#include "plSurface/plLayer.h" +#include "plSurface/hsGMaterial.h" +#include "plMessage/plLayRefMsg.h" +#include "pnMessage/plRefMsg.h" +#include "plMessage/plTransitionMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "pnMessage/plEventCallbackMsg.h" +#include "plMessage/plLinkToAgeMsg.h" #include "plgDispatch.h" #include "hsGDeviceRef.h" #include "hsResMgr.h" #include "hsTimer.h" -#include "../plAudio/plAudioSystem.h" -#include "../pnNetCommon/plNetApp.h" -#include "../plNetClient/plLinkEffectsMgr.h" -#include "../pnNetCommon/plNetApp.h" +#include "plAudio/plAudioSystem.h" +#include "pnNetCommon/plNetApp.h" +#include "plNetClient/plLinkEffectsMgr.h" +#include "pnNetCommon/plNetApp.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" //// Constructor/Destructor ////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plTransitionMgr.h b/Sources/Plasma/PubUtilLib/plPipeline/plTransitionMgr.h index 111edfec..8994f1fb 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plTransitionMgr.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/plTransitionMgr.h @@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsTemplates.h" -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include "hsUtils.h" diff --git a/cmake/FindOgg.cmake b/cmake/FindOgg.cmake new file mode 100644 index 00000000..e62e601c --- /dev/null +++ b/cmake/FindOgg.cmake @@ -0,0 +1,30 @@ +if(Ogg_INCLUDE_DIR AND Ogg_LIBRARY) + set(Ogg_FIND_QUIETLY TRUE) +endif() + + +find_path(Ogg_INCLUDE_DIR ogg/ogg.h + /usr/local/include + /usr/include +) + +find_library(Ogg_LIBRARY NAMES ogg + PATHS /usr/local/lib /usr/lib +) + +set(Ogg_LIBRARIES ${Ogg_LIBRARY}) + + +if(Ogg_INCLUDE_DIR AND Ogg_LIBRARY) + set(Ogg_FOUND TRUE) +endif() + +if (Ogg_FOUND) + if(NOT Ogg_FIND_QUIETLY) + message(STATUS "Found libogg: ${Ogg_INCLUDE_DIR}") + endif() +else() + if(Ogg_FIND_REQUIRED) + message(FATAL_ERROR "Could not find libogg") + endif() +endif() diff --git a/cmake/FindPhysX.cmake b/cmake/FindPhysX.cmake new file mode 100644 index 00000000..8a99e234 --- /dev/null +++ b/cmake/FindPhysX.cmake @@ -0,0 +1,61 @@ +if(NOT PHYSX_SDK_PATH) + find_path(PHYSX_SDK_PATH Foundation/include/Nx.h) +elseif(PHYSX_SDK_PATH AND PHYSX_LOADER_LIBRARY) + set(PHYSX_FIND_QUIETLY TRUE) +endif() + +if(PHYSX_SDK_PATH) + set(PHYSX_FOUNDATION_INCLUDE_DIR "${PHYSX_SDK_PATH}/Foundation/include") + set(PHYSX_COOKING_INCLUDE_DIR "${PHYSX_SDK_PATH}/Cooking/include") + set(PHYSX_FRAMEWORK_INCLUDE_DIR "${PHYSX_SDK_PATH}/Framework/include") + set(PHYSX_CHARACTER_INCLUDE_DIR "${PHYSX_SDK_PATH}/NxCharacter/include") + set(PHYSX_EXTENSIONS_INCLUDE_DIR "${PHYSX_SDK_PATH}/NxExtensions/include") + set(PHYSX_PHYSICS_INCLUDE_DIR "${PHYSX_SDK_PATH}/Physics/include") + set(PHYSX_LOADER_INCLUDE_DIR "${PHYSX_SDK_PATH}/PhysXLoader/include") + + set(PHYSX_INCLUDE_DIRS + ${PHYSX_COOKING_INCLUDE_DIR} + ${PHYSX_FOUNDATION_INCLUDE_DIR} + ${PHYSX_FRAMEWORK_INCLUDE_DIR} + ${PHYSX_CHARACTER_INCLUDE_DIR} + ${PHYSX_EXTENSIONS_INCLUDE_DIR} + ${PHYSX_PHYSICS_INCLUDE_DIR} + ${PHYSX_LOADER_INCLUDE_DIR} + ) +endif() + +#TODO: Make find paths work for Linux builds too +find_library(PHYSX_COOKING_LIBRARY NAMES NxCooking + PATHS "${PHYSX_SDK_PATH}/lib/win32") +find_library(PHYSX_CHARACTER_LIBRARY NAMES NxCharacter + PATHS "${PHYSX_SDK_PATH}/lib/win32") +find_library(PHYSX_EXTENSIONS_LIBRARY NAMES NxExtensions + PATHS "${PHYSX_SDK_PATH}/lib/win32") +find_library(PHYSX_LOADER_LIBRARY NAMES PhysXLoader + PATHS "${PHYSX_SDK_PATH}/lib/win32") + +set(PHYSX_LIBRARIES + ${PHYSX_COOKING_LIBRARY} + ${PHYSX_CHARACTER_LIBRARY} + ${PHYSX_EXTENSIONS_LIBRARY} + ${PHYSX_LOADER_LIBRARY} +) + +mark_as_advanced(PHYSX_COOKING_LIBRARY + PHYSX_CHARACTER_LIBRARY + PHYSX_EXTENSIONS_LIBRARY + PHYSX_LOADER_LIBRARY) + +if(PHYSX_SDK_PATH AND PHYSX_LOADER_LIBRARY) + set(PHYSX_FOUND TRUE) +endif() + +if (PHYSX_FOUND) + if(NOT PHYSX_FIND_QUIETLY) + message(STATUS "Found PhysX: ${PHYSX_SDK_PATH}") + endif() +else() + if(PHYSX_FIND_REQUIRED) + message(FATAL_ERROR "Could not find PhysX. Please set your PHYSX_SDK_PATH appropriately and try again") + endif() +endif() diff --git a/cmake/FindSpeex.cmake b/cmake/FindSpeex.cmake new file mode 100644 index 00000000..306d177c --- /dev/null +++ b/cmake/FindSpeex.cmake @@ -0,0 +1,30 @@ +if(Speex_INCLUDE_DIR AND Speex_LIBRARY) + set(Speex_FIND_QUIETLY TRUE) +endif() + + +find_path(Speex_INCLUDE_DIR speex.h + /usr/local/include + /usr/include +) + +find_library(Speex_LIBRARY NAMES speex + PATHS /usr/local/lib /usr/lib +) + +set(Speex_LIBRARIES ${Speex_LIBRARY}) + + +if(Speex_INCLUDE_DIR AND Speex_LIBRARY) + set(Speex_FOUND TRUE) +endif() + +if (Speex_FOUND) + if(NOT Speex_FIND_QUIETLY) + message(STATUS "Found speex: ${Speex_INCLUDE_DIR}") + endif() +else() + if(Speex_FIND_REQUIRED) + message(FATAL_ERROR "Could not find speex") + endif() +endif() diff --git a/cmake/FindVorbis.cmake b/cmake/FindVorbis.cmake new file mode 100644 index 00000000..36f3872d --- /dev/null +++ b/cmake/FindVorbis.cmake @@ -0,0 +1,37 @@ +if(Vorbis_INCLUDE_DIR AND Vorbis_LIBRARY) + set(Vorbis_FIND_QUIETLY TRUE) +endif() + + +find_path(Vorbis_INCLUDE_DIR vorbis/codec.h + /usr/local/include + /usr/include +) + +find_library(Vorbis_LIBRARY NAMES vorbis + PATHS /usr/local/lib /usr/lib +) + +find_library(VorbisFile_LIBRARY NAMES vorbisfile + PATHS /usr/local/lib /usr/lib +) + +set(Vorbis_LIBRARIES + ${Vorbis_LIBRARY} + ${VorbisFile_LIBRARY} +) + + +if(Vorbis_INCLUDE_DIR AND Vorbis_LIBRARY AND VorbisFile_LIBRARY) + set(Vorbis_FOUND TRUE) +endif() + +if (Vorbis_FOUND) + if(NOT Vorbis_FIND_QUIETLY) + message(STATUS "Found libvorbis: ${Vorbis_INCLUDE_DIR}") + endif() +else() + if(Vorbis_FIND_REQUIRED) + message(FATAL_ERROR "Could not find libvorbis") + endif() +endif() From fe01769980a8d3055ca7990aa8cb89c0ff4e0ef7 Mon Sep 17 00:00:00 2001 From: Zrax Date: Fri, 8 Apr 2011 18:15:25 -0700 Subject: [PATCH 11/18] Rename the project to "Plasma" (cherry picked from commit 7a4cbbe021b2e0c722eab2cc0935169940b11690) --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cdd8d488..395933df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -project(CyanWorldsEngine) +project(Plasma) cmake_minimum_required(VERSION 2.8) set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") From 7ced2a3c8c0025ac670976bb38c98cb6b6bc4bb5 Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Sat, 9 Apr 2011 02:05:11 -0700 Subject: [PATCH 12/18] Almost done with NucleusLib cmake conversion --HG-- rename : MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetResManager.cpp => MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.cpp rename : MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetResManager.h => MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.h (cherry picked from commit ae434d4eda4735d7c47ee14d1bda5149d9046644) --- .../Plasma/FeatureLib/pfCCR/CMakeLists.txt | 37 +++---- Sources/Plasma/NucleusLib/CMakeLists.txt | 29 +++++- Sources/Plasma/NucleusLib/inc/CMakeLists.txt | 34 +++++++ Sources/Plasma/NucleusLib/inc/hsResMgr.h | 2 +- Sources/Plasma/NucleusLib/inc/plAudible.h | 2 +- Sources/Plasma/NucleusLib/inc/plDrawable.h | 2 +- Sources/Plasma/NucleusLib/inc/plPhysical.h | 2 +- Sources/Plasma/NucleusLib/inc/plPipeline.h | 2 +- Sources/Plasma/NucleusLib/inc/plgDispatch.h | 2 +- .../NucleusLib/inc/pnNucleusCreatables.h | 2 +- .../NucleusLib/pnGameMgr/CMakeLists.txt | 53 ++++++++++ Sources/Plasma/NucleusLib/pnGameMgr/Pch.h | 6 +- .../Plasma/NucleusLib/pnGameMgr/pnGameMgr.h | 12 +-- .../Plasma/NucleusLib/pnIni/CMakeLists.txt | 21 ++++ .../Plasma/NucleusLib/pnIniExe/CMakeLists.txt | 20 ++++ .../NucleusLib/pnInputCore/CMakeLists.txt | 21 ++++ .../NucleusLib/pnInputCore/plInputMap.cpp | 4 +- .../Plasma/NucleusLib/pnInputCore/plKeyDef.h | 2 +- .../NucleusLib/pnKeyedObject/CMakeLists.txt | 28 ++++++ .../pnKeyedObject/hsKeyedObject.cpp | 4 +- .../NucleusLib/pnKeyedObject/plKeyImp.cpp | 4 +- .../pnKeyedObject/plMsgForwarder.cpp | 12 +-- .../NucleusLib/pnKeyedObject/plReceiver.h | 2 +- .../Plasma/NucleusLib/pnMail/CMakeLists.txt | 16 ++++ .../NucleusLib/pnMessage/CMakeLists.txt | 64 +++++++++++++ .../NucleusLib/pnMessage/plCameraMsg.cpp | 2 +- .../Plasma/NucleusLib/pnMessage/plCameraMsg.h | 2 +- .../Plasma/NucleusLib/pnMessage/plClientMsg.h | 6 +- .../NucleusLib/pnMessage/plCursorChangeMsg.h | 2 +- .../NucleusLib/pnMessage/plFakeOutMsg.h | 2 +- .../Plasma/NucleusLib/pnMessage/plMessage.cpp | 2 +- .../Plasma/NucleusLib/pnMessage/plMessage.h | 4 +- .../pnMessage/plMessageWithCallbacks.cpp | 2 +- .../Plasma/NucleusLib/pnMessage/plNotifyMsg.h | 2 +- .../NucleusLib/pnMessage/plPipeResMakeMsg.h | 2 +- .../NucleusLib/pnMessage/plPlayerPageMsg.h | 2 +- .../Plasma/NucleusLib/pnMessage/plRefMsg.cpp | 4 +- .../pnMessage/plRemoteAvatarInfoMsg.h | 2 +- .../NucleusLib/pnMessage/plSDLModifierMsg.cpp | 2 +- .../NucleusLib/pnMessage/plSDLModifierMsg.h | 2 +- .../pnMessage/plSDLNotificationMsg.h | 2 +- .../NucleusLib/pnMessage/plSatisfiedMsg.h | 2 +- .../NucleusLib/pnMessage/plSetNetGroupIDMsg.h | 2 +- .../NucleusLib/pnMessage/plSharedStateMsg.h | 2 +- .../NucleusLib/pnMessage/plSimulationMsg.h | 2 +- .../NucleusLib/pnMessage/pnMessageCreatable.h | 2 +- .../NucleusLib/pnModifier/CMakeLists.txt | 26 +++++ .../pnModifier/plConditionalObject.h | 4 +- .../NucleusLib/pnModifier/plLogicModBase.cpp | 16 ++-- .../NucleusLib/pnModifier/plLogicModBase.h | 2 +- .../NucleusLib/pnModifier/plModifier.cpp | 12 +-- .../Plasma/NucleusLib/pnModifier/plModifier.h | 2 +- .../NucleusLib/pnModifier/plMultiModifier.h | 2 +- .../NucleusLib/pnModifier/plSingleModifier.h | 2 +- .../pnModifier/pnModifierCreatable.h | 2 +- .../NucleusLib/pnNetBase/CMakeLists.txt | 29 ++++++ Sources/Plasma/NucleusLib/pnNetBase/Pch.h | 4 +- .../pnNetBase/Private/pnNbAllIncludes.h | 2 +- .../Plasma/NucleusLib/pnNetCli/CMakeLists.txt | 20 ++++ .../NucleusLib/pnNetCommon/CMakeLists.txt | 35 +++++++ .../pnNetCommon}/plNetResManager.cpp | 0 .../pnNetCommon}/plNetResManager.h | 4 +- .../NucleusLib/pnNetDiag/CMakeLists.txt | 21 ++++ .../NucleusLib/pnNetProtocol/CMakeLists.txt | 96 +++++++++++++++++++ Sources/Plasma/NucleusLib/pnNetProtocol/Pch.h | 2 +- .../pnNetProtocol/Private/pnNpAllIncludes.h | 4 +- .../NucleusLib/pnProduct/CMakeLists.txt | 26 +++++ .../pnProduct/Private/pnPrAllIncludes.h | 2 +- .../NucleusLib/pnSceneObject/CMakeLists.txt | 27 ++++++ .../pnSceneObject/plAudioInterface.cpp | 16 ++-- .../pnSceneObject/plCoordinateInterface.cpp | 12 +-- .../pnSceneObject/plCoordinateInterface.h | 2 +- .../pnSceneObject/plDrawInterface.cpp | 6 +- .../pnSceneObject/plObjInterface.cpp | 6 +- .../NucleusLib/pnSceneObject/plObjInterface.h | 8 +- .../pnSceneObject/plSceneObject.cpp | 36 +++---- .../NucleusLib/pnSceneObject/plSceneObject.h | 10 +- .../pnSceneObject/plSimulationInterface.cpp | 14 +-- .../pnSceneObject/pnSceneObjectCreatable.h | 2 +- .../NucleusLib/pnSimpleNet/CMakeLists.txt | 16 ++++ 80 files changed, 739 insertions(+), 162 deletions(-) create mode 100644 Sources/Plasma/NucleusLib/inc/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnGameMgr/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnIni/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnIniExe/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnInputCore/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnKeyedObject/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnMail/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnMessage/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnModifier/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnNetBase/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnNetCli/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnNetCommon/CMakeLists.txt rename Sources/Plasma/{PubUtilLib/plNetCommon => NucleusLib/pnNetCommon}/plNetResManager.cpp (100%) rename Sources/Plasma/{PubUtilLib/plNetCommon => NucleusLib/pnNetCommon}/plNetResManager.h (96%) create mode 100644 Sources/Plasma/NucleusLib/pnNetDiag/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnNetProtocol/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnProduct/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnSceneObject/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnSimpleNet/CMakeLists.txt diff --git a/Sources/Plasma/FeatureLib/pfCCR/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfCCR/CMakeLists.txt index 6fc5e1c9..abbf1985 100644 --- a/Sources/Plasma/FeatureLib/pfCCR/CMakeLists.txt +++ b/Sources/Plasma/FeatureLib/pfCCR/CMakeLists.txt @@ -1,18 +1,19 @@ -include_directories(../../CoreLib) -include_directories(../../NucleusLib/inc) - -set(pfCCR_SOURCES - plCCRMgr.cpp - plCCRVault.cpp -) - -set(pfCCR_HEADERS - plCCRCreatable.h - plCCRMgr.h - plCCRVault.h -) - -add_library(pfCCR STATIC ${pfCCR_SOURCES} ${pfCCR_HEADERS}) - -source_group("Source Files" FILES ${pfCCR_SOURCES}) -source_group("Header Files" FILES ${pfCCR_HEADERS}) +include_directories(../../CoreLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) + +set(pfCCR_SOURCES + plCCRMgr.cpp + plCCRVault.cpp +) + +set(pfCCR_HEADERS + plCCRCreatable.h + plCCRMgr.h + plCCRVault.h +) + +add_library(pfCCR STATIC ${pfCCR_SOURCES} ${pfCCR_HEADERS}) + +source_group("Source Files" FILES ${pfCCR_SOURCES}) +source_group("Header Files" FILES ${pfCCR_HEADERS}) diff --git a/Sources/Plasma/NucleusLib/CMakeLists.txt b/Sources/Plasma/NucleusLib/CMakeLists.txt index d17fd048..e5916895 100644 --- a/Sources/Plasma/NucleusLib/CMakeLists.txt +++ b/Sources/Plasma/NucleusLib/CMakeLists.txt @@ -1,11 +1,34 @@ add_definitions(-D_LIB) +add_subdirectory(inc) add_subdirectory(pnAddrInfo) add_subdirectory(pnAsyncCore) add_subdirectory(pnAsyncCoreExe) -add_subdirectory(pnCrash) -add_subdirectory(pnCrashExe) -add_subdirectory(pnCsrCli) +#add_subdirectory(pnCrash) # Not being used in any current sln +#add_subdirectory(pnCrashExe) # Not being used in any current sln +#add_subdirectory(pnCsrCli) # Not being used in any current sln add_subdirectory(pnCsrNet) add_subdirectory(pnDispatch) add_subdirectory(pnFactory) +add_subdirectory(pnGameMgr) +add_subdirectory(pnIni) +add_subdirectory(pnIniExe) +add_subdirectory(pnInputCore) +add_subdirectory(pnKeyedObject) +add_subdirectory(pnMail) +add_subdirectory(pnMessage) +add_subdirectory(pnModifier) +add_subdirectory(pnNetBase) +add_subdirectory(pnNetCli) +add_subdirectory(pnNetCommon) +add_subdirectory(pnNetDiag) +#add_subdirectory(pnNetLog) # Not being used in any current sln +add_subdirectory(pnNetProtocol) +#add_subdirectory(pnOraLib) # Not being used in any current sln +add_subdirectory(pnProduct) +add_subdirectory(pnSceneObject) +add_subdirectory(pnSimpleNet) +#add_subdirectory(pnSqlLib) # Not being used in any current sln +#add_subdirectory(pnTimer) +#add_subdirectory(pnUtils) +#add_subdirectory(pnUtilsExe) diff --git a/Sources/Plasma/NucleusLib/inc/CMakeLists.txt b/Sources/Plasma/NucleusLib/inc/CMakeLists.txt new file mode 100644 index 00000000..bf169094 --- /dev/null +++ b/Sources/Plasma/NucleusLib/inc/CMakeLists.txt @@ -0,0 +1,34 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") + +set(pnNucleusInc_HEADERS + hsGMatState.h + hsGMatState.inl + hsResMgr.h + hsTimer.h + plAudible.h + plCCRMgrBase.h + plClassIndexMacros.h + plCreatableIndex.h + plCreatableStrings.h + plDrawable.h + plgDispatch.h + plPhysical.h + plPipeline.h + plPipeResReq.h + plProfile.h + plProfileManager.h + plRefFlags.h + pnAllCreatables.h + pnNucleusCreatables.h +) + +set(pnNucleusInc_SOURCES + plProfileManager.cpp + pnSingletons.cpp +) + +add_library(pnNucleusInc STATIC ${pnNucleusInc_HEADERS} ${pnNucleusInc_SOURCES}) + +source_group("Header Files" FILES ${pnNucleusInc_HEADERS}) +source_group("Source Files" FILES ${pnNucleusInc_SOURCES}) diff --git a/Sources/Plasma/NucleusLib/inc/hsResMgr.h b/Sources/Plasma/NucleusLib/inc/hsResMgr.h index bdc6285d..26751c08 100644 --- a/Sources/Plasma/NucleusLib/inc/hsResMgr.h +++ b/Sources/Plasma/NucleusLib/inc/hsResMgr.h @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsRefCnt.h" #include "plLoadMask.h" #include "plRefFlags.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" class hsStream; class plKeyImp; diff --git a/Sources/Plasma/NucleusLib/inc/plAudible.h b/Sources/Plasma/NucleusLib/inc/plAudible.h index 08f6e84f..6c9607a7 100644 --- a/Sources/Plasma/NucleusLib/inc/plAudible.h +++ b/Sources/Plasma/NucleusLib/inc/plAudible.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plAudible_inc #include "hsTemplates.h" -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" class plSound; class hsStream; diff --git a/Sources/Plasma/NucleusLib/inc/plDrawable.h b/Sources/Plasma/NucleusLib/inc/plDrawable.h index b65388a7..d6dfc19c 100644 --- a/Sources/Plasma/NucleusLib/inc/plDrawable.h +++ b/Sources/Plasma/NucleusLib/inc/plDrawable.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plDrawable_inc #define plDrawable_inc -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include "plLoadMask.h" #include "hsTemplates.h" #include "plRenderLevel.h" diff --git a/Sources/Plasma/NucleusLib/inc/plPhysical.h b/Sources/Plasma/NucleusLib/inc/plPhysical.h index cada1df8..ec57030b 100644 --- a/Sources/Plasma/NucleusLib/inc/plPhysical.h +++ b/Sources/Plasma/NucleusLib/inc/plPhysical.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPhysical_inc #define plPhysical_inc -#include "../pnNetCommon/plSynchedObject.h" +#include "pnNetCommon/plSynchedObject.h" #include "hsTemplates.h" struct hsMatrix44; diff --git a/Sources/Plasma/NucleusLib/inc/plPipeline.h b/Sources/Plasma/NucleusLib/inc/plPipeline.h index 88b31f1b..ae707d6b 100644 --- a/Sources/Plasma/NucleusLib/inc/plPipeline.h +++ b/Sources/Plasma/NucleusLib/inc/plPipeline.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPipeline_inc #define plPipeline_inc -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" #include "hsGMatState.h" #include "hsTemplates.h" #include "hsStlUtils.h" diff --git a/Sources/Plasma/NucleusLib/inc/plgDispatch.h b/Sources/Plasma/NucleusLib/inc/plgDispatch.h index 77c68085..a9ea1580 100644 --- a/Sources/Plasma/NucleusLib/inc/plgDispatch.h +++ b/Sources/Plasma/NucleusLib/inc/plgDispatch.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plDispatchBase_inc #define plDispatchBase_inc -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" class plMessage; class plKey; diff --git a/Sources/Plasma/NucleusLib/inc/pnNucleusCreatables.h b/Sources/Plasma/NucleusLib/inc/pnNucleusCreatables.h index 721665bc..bd409c31 100644 --- a/Sources/Plasma/NucleusLib/inc/pnNucleusCreatables.h +++ b/Sources/Plasma/NucleusLib/inc/pnNucleusCreatables.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pnNucleusCreatables_inc #define pnNucleusCreatables_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plPipeline.h" diff --git a/Sources/Plasma/NucleusLib/pnGameMgr/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnGameMgr/CMakeLists.txt new file mode 100644 index 00000000..12dbedb9 --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnGameMgr/CMakeLists.txt @@ -0,0 +1,53 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") +include_directories("../../NucleusLib/inc") + +set(pnGameMgr_BLUESPIRAL + BlueSpiral/pnGmBlueSpiral.h + BlueSpiral/pnGmBlueSpiral.cpp +) + +set(pnGameMgr_CLIMBINGWALL + ClimbingWall/pnGmClimbingWall.h + ClimbingWall/pnGmClimbingWall.cpp +) + +set(pnGameMgr_HEEK + Heek/pnGmHeek.h + Heek/pnGmHeek.cpp +) + +set(pnGameMgr_MARKER + Marker/pnGmMarker.h + Marker/pnGmMarker.cpp +) + +set(pnGameMgr_TICTACTOE + TicTacToe/pnGmTicTacToe.h + TicTacToe/pnGmTicTacToe.cpp +) + +set(pnGameMgr_VARSYNC + VarSync/pnGmVarSync.h + VarSync/pnGmVarSync.cpp +) + +set(pnGameMgr_SOURCES + Intern.h + Pch.h + pnGameMgr.h + pnGameMgr.cpp +) + +add_library(pnGameMgr STATIC ${pnGameMgr_SOURCES} ${pnGameMgr_BLUESPIRAL} + ${pnGameMgr_CLIMBINGWALL} ${pnGameMgr_HEEK} + ${pnGameMgr_MARKER} ${pnGameMgr_TICTACTOE} + ${pnGameMgr_VARSYNC}) + +source_group("BlueSpiral" FILES ${pnGameMgr_BLUESPIRAL}) +source_group("ClimbingWall" FILES ${pnGameMgr_CLIMBINGWALL}) +source_group("Heek" FILES ${pnGameMgr_HEEK}) +source_group("Marker" FILES ${pnGameMgr_MARKER}) +source_group("TicTacToe" FILES ${pnGameMgr_TICTACTOE}) +source_group("VarSync" FILES ${pnGameMgr_VARSYNC}) +source_group("" FILES ${pnGameMgr_SOURCES}) diff --git a/Sources/Plasma/NucleusLib/pnGameMgr/Pch.h b/Sources/Plasma/NucleusLib/pnGameMgr/Pch.h index 4272485c..18e9f044 100644 --- a/Sources/Plasma/NucleusLib/pnGameMgr/Pch.h +++ b/Sources/Plasma/NucleusLib/pnGameMgr/Pch.h @@ -51,9 +51,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNGAMESCOMMON_PCH_H -#include "../pnUtils/pnUtils.h" -#include "../pnNetBase/pnNetBase.h" -#include "../pnProduct/pnProduct.h" +#include "pnUtils/pnUtils.h" +#include "pnNetBase/pnNetBase.h" +#include "pnProduct/pnProduct.h" #include "pnGameMgr.h" #include "Intern.h" diff --git a/Sources/Plasma/NucleusLib/pnGameMgr/pnGameMgr.h b/Sources/Plasma/NucleusLib/pnGameMgr/pnGameMgr.h index 62b29b9d..807c59af 100644 --- a/Sources/Plasma/NucleusLib/pnGameMgr/pnGameMgr.h +++ b/Sources/Plasma/NucleusLib/pnGameMgr/pnGameMgr.h @@ -49,12 +49,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNGAMEMGR_PNGAMEMGR_H -#include "../pnUtils/pnUtils.h" -#include "../pnNetBase/pnNetBase.h" -#include "../pnAsyncCore/pnAsyncCore.h" -#include "../pnNetCli/pnNetCli.h" -#include "../pnProduct/pnProduct.h" -#include "../pnKeyedObject/plKey.h" +#include "pnUtils/pnUtils.h" +#include "pnNetBase/pnNetBase.h" +#include "pnAsyncCore/pnAsyncCore.h" +#include "pnNetCli/pnNetCli.h" +#include "pnProduct/pnProduct.h" +#include "pnKeyedObject/plKey.h" #include "hsGeometry3.h" diff --git a/Sources/Plasma/NucleusLib/pnIni/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnIni/CMakeLists.txt new file mode 100644 index 00000000..f111055f --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnIni/CMakeLists.txt @@ -0,0 +1,21 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") + +set(pnIni_HEADERS + Intern.h + Pch.h + pnIni.h +) + +set(pnIni_PRIVATE + Private/pnIniAllIncludes.h + Private/pnIniChange.h + Private/pnIniCore.h + Private/pnIniCore.cpp + Private/pnIniSrv.h +) + +add_library(pnIni STATIC ${pnIni_HEADERS} ${pnIni_PRIVATE}) + +source_group("Header Files" FILES ${pnIni_HEADERS}) +source_group("Private" FILES ${pnIni_PRIVATE}) diff --git a/Sources/Plasma/NucleusLib/pnIniExe/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnIniExe/CMakeLists.txt new file mode 100644 index 00000000..e7660ab5 --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnIniExe/CMakeLists.txt @@ -0,0 +1,20 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") + +set(pnIniExe_HEADERS + Pch.h +) + +set(pnIniExe_PRIVATE + Private/pnIniSrv.cpp +) + +set(pnIniExe_PRIVATE_WIN32 + Private/Win32/pnW32IniChange.cpp +) + +add_library(pnIniExe STATIC ${pnIniExe_HEADERS} ${pnIniExe_PRIVATE} ${pnIniExe_PRIVATE_WIN32}) + +source_group("Header Files" FILES ${pnIniExe_HEADERS}) +source_group("Private" FILES ${pnIniExe_PRIVATE}) +source_group("Private\\Win32" FILES ${pnIniExe_PRIVATE_WIN32}) diff --git a/Sources/Plasma/NucleusLib/pnInputCore/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnInputCore/CMakeLists.txt new file mode 100644 index 00000000..6515e5b0 --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnInputCore/CMakeLists.txt @@ -0,0 +1,21 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(pnInputCore_HEADERS + plControlDefinition.h + plControlEventCodes.h + plInputMap.h + plKeyDef.h + plKeyMap.h + plOSMsg.h +) + +set(pnInputCore_SOURCES + plInputMap.cpp +) + +add_library(pnInputCore STATIC ${pnInputCore_HEADERS} ${pnInputCore_SOURCES}) + +source_group("Header Files" FILES ${pnInputCore_HEADERS}) +source_group("Source Files" FILES ${pnInputCore_SOURCES}) diff --git a/Sources/Plasma/NucleusLib/pnInputCore/plInputMap.cpp b/Sources/Plasma/NucleusLib/pnInputCore/plInputMap.cpp index a08811dd..7300de96 100644 --- a/Sources/Plasma/NucleusLib/pnInputCore/plInputMap.cpp +++ b/Sources/Plasma/NucleusLib/pnInputCore/plInputMap.cpp @@ -40,12 +40,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ // plInputDevice.cpp -#include "STRING" +#include #include "plInputMap.h" #include "plKeyMap.h" #include "hsUtils.h" -#include "../plResMgr/plLocalization.h" +#include "plResMgr/plLocalization.h" ControlEventCode plInputMap::ConvertCharToControlCode(const char* c) { diff --git a/Sources/Plasma/NucleusLib/pnInputCore/plKeyDef.h b/Sources/Plasma/NucleusLib/pnInputCore/plKeyDef.h index 04182cdf..84152980 100644 --- a/Sources/Plasma/NucleusLib/pnInputCore/plKeyDef.h +++ b/Sources/Plasma/NucleusLib/pnInputCore/plKeyDef.h @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #if HS_BUILD_FOR_WIN32 -#include "windows.h" +#include #define VK_BACK_QUOTE 0xc0 // diff --git a/Sources/Plasma/NucleusLib/pnKeyedObject/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnKeyedObject/CMakeLists.txt new file mode 100644 index 00000000..614a6ef1 --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnKeyedObject/CMakeLists.txt @@ -0,0 +1,28 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") +include_directories("../../NucleusLib/inc") + +set(pnKeyedObject_HEADERS + hsKeyedObject.h + plFixedKey.h + plKey.h + plKeyImp.h + plMsgForwarder.h + plReceiver.h + plUoid.h + pnKeyedObjectCreatable.h +) + +set(pnKeyedObject_SOURCES + hsKeyedObject.cpp + plFixedKey.cpp + plKey.cpp + plKeyImp.cpp + plMsgForwarder.cpp + plUoid.cpp +) + +add_library(pnKeyedObject STATIC ${pnKeyedObject_HEADERS} ${pnKeyedObject_SOURCES}) + +source_group("Header Files" FILES ${pnKeyedObject_HEADERS}) +source_group("Source Files" FILES ${pnKeyedObject_SOURCES}) diff --git a/Sources/Plasma/NucleusLib/pnKeyedObject/hsKeyedObject.cpp b/Sources/Plasma/NucleusLib/pnKeyedObject/hsKeyedObject.cpp index c2943d9f..74561946 100644 --- a/Sources/Plasma/NucleusLib/pnKeyedObject/hsKeyedObject.cpp +++ b/Sources/Plasma/NucleusLib/pnKeyedObject/hsKeyedObject.cpp @@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsKeyedObject.h" #include "plKeyImp.h" #include "hsResMgr.h" -#include "../pnDispatch/plDispatch.h" -#include "../pnMessage/plSelfDestructMsg.h" +#include "pnDispatch/plDispatch.h" +#include "pnMessage/plSelfDestructMsg.h" void hsKeyedObject::SetKey(plKey k) { diff --git a/Sources/Plasma/NucleusLib/pnKeyedObject/plKeyImp.cpp b/Sources/Plasma/NucleusLib/pnKeyedObject/plKeyImp.cpp index 6cb0c778..17e691a8 100644 --- a/Sources/Plasma/NucleusLib/pnKeyedObject/plKeyImp.cpp +++ b/Sources/Plasma/NucleusLib/pnKeyedObject/plKeyImp.cpp @@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsKeyedObject.h" #include "hsResMgr.h" #include "hsTypes.h" -#include "../pnMessage/plRefMsg.h" -#include "../pnMessage/plSelfDestructMsg.h" +#include "pnMessage/plRefMsg.h" +#include "pnMessage/plSelfDestructMsg.h" #include "hsTimer.h" #include "plProfile.h" #include "plgDispatch.h" diff --git a/Sources/Plasma/NucleusLib/pnKeyedObject/plMsgForwarder.cpp b/Sources/Plasma/NucleusLib/pnKeyedObject/plMsgForwarder.cpp index 593883e1..b5f22e23 100644 --- a/Sources/Plasma/NucleusLib/pnKeyedObject/plMsgForwarder.cpp +++ b/Sources/Plasma/NucleusLib/pnKeyedObject/plMsgForwarder.cpp @@ -42,13 +42,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plMsgForwarder.h" #include "hsResMgr.h" #include "hsTypes.h" -#include "../pnMessage/plMessage.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnNetCommon/plSynchedObject.h" +#include "pnMessage/plMessage.h" +#include "pnKeyedObject/plKey.h" +#include "pnNetCommon/plNetApp.h" +#include "pnNetCommon/plSynchedObject.h" -#include "../pnMessage/plSelfDestructMsg.h" -#include "../pnMessage/plMessageWithCallbacks.h" +#include "pnMessage/plSelfDestructMsg.h" +#include "pnMessage/plMessageWithCallbacks.h" class plForwardCallback diff --git a/Sources/Plasma/NucleusLib/pnKeyedObject/plReceiver.h b/Sources/Plasma/NucleusLib/pnKeyedObject/plReceiver.h index 8a92a86c..035ee8bf 100644 --- a/Sources/Plasma/NucleusLib/pnKeyedObject/plReceiver.h +++ b/Sources/Plasma/NucleusLib/pnKeyedObject/plReceiver.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plReceiver_inc #define plReceiver_inc -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" class plMessage; diff --git a/Sources/Plasma/NucleusLib/pnMail/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnMail/CMakeLists.txt new file mode 100644 index 00000000..58017a39 --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnMail/CMakeLists.txt @@ -0,0 +1,16 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") + +set(pnMail_HEADERS + Pch.h + pnMail.h +) + +set(pnMail_SOURCES + pnMail.cpp +) + +add_library(pnMail STATIC ${pnMail_HEADERS} ${pnMail_SOURCES}) + +source_group("Header Files" FILES ${pnMail_HEADERS}) +source_group("Source Files" FILES ${pnMail_SOURCES}) diff --git a/Sources/Plasma/NucleusLib/pnMessage/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnMessage/CMakeLists.txt new file mode 100644 index 00000000..681037fa --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnMessage/CMakeLists.txt @@ -0,0 +1,64 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(pnMessage_HEADERS + plAttachMsg.h + plAudioSysMsg.h + plCameraMsg.h + plClientMsg.h + plCorrectionMsg.h + plCursorChangeMsg.h + plEnableMsg.h + plEventCallbackMsg.h + plFakeOutMsg.h + plIntRefMsg.h + plMessage.h + plMessageWithCallbacks.h + plMultiModMsg.h + plNodeChangeMsg.h + plNodeRefMsg.h + plNotifyMsg.h + plObjRefMsg.h + plPipeResMakeMsg.h + plPlayerPageMsg.h + plProxyDrawMsg.h + plRefMsg.h + plRemoteAvatarInfoMsg.h + plSatisfiedMsg.h + plSDLModifierMsg.h + plSDLNotificationMsg.h + plSelfDestructMsg.h + plServerReplyMsg.h + plSetNetGroupIDMsg.h + plSharedStateMsg.h + plSimulationMsg.h + plSimulationSynchMsg.h + plSingleModMsg.h + plSoundMsg.h + plTimeMsg.h + plWarpMsg.h + pnMessageCreatable.h +) + +set(pnMessage_SOURCES + plCameraMsg.cpp + plClientMsg.cpp + plMessage.cpp + plMessageWithCallbacks.cpp + plNodeChangeMsg.cpp + plNotifyMsg.cpp + plProxyDrawMsg.cpp + plRefMsg.cpp + plSDLModifierMsg.cpp + plServerReplyMsg.cpp + plSimulationMsg.cpp + plSoundMsg.cpp + plTimeMsg.cpp +) + +add_library(pnMessage STATIC ${pnMessage_HEADERS} ${pnMessage_SOURCES}) + +source_group("Header Files" FILES ${pnMessage_HEADERS}) +source_group("Source Files" FILES ${pnMessage_SOURCES}) diff --git a/Sources/Plasma/NucleusLib/pnMessage/plCameraMsg.cpp b/Sources/Plasma/NucleusLib/pnMessage/plCameraMsg.cpp index 59da08e2..877bacf4 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plCameraMsg.cpp +++ b/Sources/Plasma/NucleusLib/pnMessage/plCameraMsg.cpp @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plCameraMsg.h" #include "hsStream.h" #include "hsResMgr.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" // diff --git a/Sources/Plasma/NucleusLib/pnMessage/plCameraMsg.h b/Sources/Plasma/NucleusLib/pnMessage/plCameraMsg.h index 0ff88d95..5f2e5c46 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plCameraMsg.h +++ b/Sources/Plasma/NucleusLib/pnMessage/plCameraMsg.h @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // camera message class // -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsBitVector.h" #include "hsGeometry3.h" diff --git a/Sources/Plasma/NucleusLib/pnMessage/plClientMsg.h b/Sources/Plasma/NucleusLib/pnMessage/plClientMsg.h index f4f6ce6c..b1849308 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plClientMsg.h +++ b/Sources/Plasma/NucleusLib/pnMessage/plClientMsg.h @@ -42,13 +42,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plClientMsg_inc #define plClientMsg_inc -#include "../pnMessage/plMessage.h" -#include "../pnMessage/plRefMsg.h" +#include "pnMessage/plMessage.h" +#include "pnMessage/plRefMsg.h" #include "hsStream.h" #include "hsResMgr.h" #include "hsUtils.h" #include "hsStlUtils.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plUoid.h" // // Handles various types of client (app) msgs, relating diff --git a/Sources/Plasma/NucleusLib/pnMessage/plCursorChangeMsg.h b/Sources/Plasma/NucleusLib/pnMessage/plCursorChangeMsg.h index b1bb1c47..861a43c4 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plCursorChangeMsg.h +++ b/Sources/Plasma/NucleusLib/pnMessage/plCursorChangeMsg.h @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // this message is to fake out a gadget to see if it would potentially trigger... // -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsBitVector.h" class hsStream; diff --git a/Sources/Plasma/NucleusLib/pnMessage/plFakeOutMsg.h b/Sources/Plasma/NucleusLib/pnMessage/plFakeOutMsg.h index d410a59e..a6d27800 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plFakeOutMsg.h +++ b/Sources/Plasma/NucleusLib/pnMessage/plFakeOutMsg.h @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // this message is to fake out a gadget to see if it would potentially trigger... // -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsBitVector.h" class hsStream; diff --git a/Sources/Plasma/NucleusLib/pnMessage/plMessage.cpp b/Sources/Plasma/NucleusLib/pnMessage/plMessage.cpp index cd167845..9fc0b01d 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plMessage.cpp +++ b/Sources/Plasma/NucleusLib/pnMessage/plMessage.cpp @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define PLMESSAGE_PRIVATE #include "plMessage.h" #include "hsStream.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include "hsResMgr.h" #include "hsTimer.h" #include "hsTemplates.h" diff --git a/Sources/Plasma/NucleusLib/pnMessage/plMessage.h b/Sources/Plasma/NucleusLib/pnMessage/plMessage.h index 888ffc60..d79b7d4b 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plMessage.h +++ b/Sources/Plasma/NucleusLib/pnMessage/plMessage.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plMessage_inc #define plMessage_inc -#include "../pnFactory/plCreatable.h" -#include "../pnKeyedObject/plKey.h" +#include "pnFactory/plCreatable.h" +#include "pnKeyedObject/plKey.h" #include "hsTemplates.h" #include "hsStlUtils.h" diff --git a/Sources/Plasma/NucleusLib/pnMessage/plMessageWithCallbacks.cpp b/Sources/Plasma/NucleusLib/pnMessage/plMessageWithCallbacks.cpp index ecdca959..f20cf361 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plMessageWithCallbacks.cpp +++ b/Sources/Plasma/NucleusLib/pnMessage/plMessageWithCallbacks.cpp @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "plMessageWithCallbacks.h" #include "plEventCallbackMsg.h" -#include "../pnNetCommon/plSynchedObject.h" +#include "pnNetCommon/plSynchedObject.h" #include "plgDispatch.h" #include "hsBitVector.h" diff --git a/Sources/Plasma/NucleusLib/pnMessage/plNotifyMsg.h b/Sources/Plasma/NucleusLib/pnMessage/plNotifyMsg.h index dc24dfce..6b33ebcd 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plNotifyMsg.h +++ b/Sources/Plasma/NucleusLib/pnMessage/plNotifyMsg.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plMessage.h" #include "hsResMgr.h" -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" #include "hsUtils.h" #include "hsGeometry3.h" diff --git a/Sources/Plasma/NucleusLib/pnMessage/plPipeResMakeMsg.h b/Sources/Plasma/NucleusLib/pnMessage/plPipeResMakeMsg.h index ab1f1e8e..d8b32e26 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plPipeResMakeMsg.h +++ b/Sources/Plasma/NucleusLib/pnMessage/plPipeResMakeMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPipeResMakeMsg_inc #define plPipeResMakeMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plPipeline; diff --git a/Sources/Plasma/NucleusLib/pnMessage/plPlayerPageMsg.h b/Sources/Plasma/NucleusLib/pnMessage/plPlayerPageMsg.h index 2b899a42..c3c6acac 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plPlayerPageMsg.h +++ b/Sources/Plasma/NucleusLib/pnMessage/plPlayerPageMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPlayerPageMsg_inc #define plPlayerPageMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsResMgr.h" #include "hsStream.h" diff --git a/Sources/Plasma/NucleusLib/pnMessage/plRefMsg.cpp b/Sources/Plasma/NucleusLib/pnMessage/plRefMsg.cpp index af83e64b..28446680 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plRefMsg.cpp +++ b/Sources/Plasma/NucleusLib/pnMessage/plRefMsg.cpp @@ -45,8 +45,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "hsResMgr.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/hsKeyedObject.h" plRefMsg::plRefMsg() : fRef(nil), fOldRef(nil), fContext(0) diff --git a/Sources/Plasma/NucleusLib/pnMessage/plRemoteAvatarInfoMsg.h b/Sources/Plasma/NucleusLib/pnMessage/plRemoteAvatarInfoMsg.h index c986116e..b933e749 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plRemoteAvatarInfoMsg.h +++ b/Sources/Plasma/NucleusLib/pnMessage/plRemoteAvatarInfoMsg.h @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // this message is to fake out a gadget to see if it would potentially trigger... // -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class hsStream; class hsResMgr; diff --git a/Sources/Plasma/NucleusLib/pnMessage/plSDLModifierMsg.cpp b/Sources/Plasma/NucleusLib/pnMessage/plSDLModifierMsg.cpp index dd3b515f..f921650b 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plSDLModifierMsg.cpp +++ b/Sources/Plasma/NucleusLib/pnMessage/plSDLModifierMsg.cpp @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plSDLModifierMsg.h" -#include "../PubUtilLib/plSDL/plSDL.h" // ugh. +#include "plSDL/plSDL.h" // ugh. plSDLModifierMsg::plSDLModifierMsg(const char* sdlName, Action a) : fSDLName(nil), diff --git a/Sources/Plasma/NucleusLib/pnMessage/plSDLModifierMsg.h b/Sources/Plasma/NucleusLib/pnMessage/plSDLModifierMsg.h index 180c10ba..0ebf8a74 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plSDLModifierMsg.h +++ b/Sources/Plasma/NucleusLib/pnMessage/plSDLModifierMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plSDLModifierMsg_INC #define plSDLModifierMsg_INC -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsUtils.h" // diff --git a/Sources/Plasma/NucleusLib/pnMessage/plSDLNotificationMsg.h b/Sources/Plasma/NucleusLib/pnMessage/plSDLNotificationMsg.h index c28d3002..76ae31d4 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plSDLNotificationMsg.h +++ b/Sources/Plasma/NucleusLib/pnMessage/plSDLNotificationMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plSDLNotificationMsg_inc #define plSDLNotificationMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plSimpleStateVariable; class plSDLNotificationMsg : public plMessage diff --git a/Sources/Plasma/NucleusLib/pnMessage/plSatisfiedMsg.h b/Sources/Plasma/NucleusLib/pnMessage/plSatisfiedMsg.h index fd1c0bfb..761db82e 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plSatisfiedMsg.h +++ b/Sources/Plasma/NucleusLib/pnMessage/plSatisfiedMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plSatisfiedMsg_inc #define plSatisfiedMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plSatisfiedMsg : public plMessage { diff --git a/Sources/Plasma/NucleusLib/pnMessage/plSetNetGroupIDMsg.h b/Sources/Plasma/NucleusLib/pnMessage/plSetNetGroupIDMsg.h index 7a84b4e6..0ebd053c 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plSetNetGroupIDMsg.h +++ b/Sources/Plasma/NucleusLib/pnMessage/plSetNetGroupIDMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plSetNetGroupIDMsg_h_inc #include "plMessage.h" -#include "../pnNetCommon/plNetGroup.h" +#include "pnNetCommon/plNetGroup.h" // Send this to a SynchedObject to change its NetGroupID class plSetNetGroupIDMsg : public plMessage diff --git a/Sources/Plasma/NucleusLib/pnMessage/plSharedStateMsg.h b/Sources/Plasma/NucleusLib/pnMessage/plSharedStateMsg.h index cfba87af..b57c2cf4 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plSharedStateMsg.h +++ b/Sources/Plasma/NucleusLib/pnMessage/plSharedStateMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plSharedStateMsg_inc #include "plMessage.h" -#include "../pnNetCommon/plNetSharedState.h" +#include "pnNetCommon/plNetSharedState.h" class hsStream; class hsResMgr; diff --git a/Sources/Plasma/NucleusLib/pnMessage/plSimulationMsg.h b/Sources/Plasma/NucleusLib/pnMessage/plSimulationMsg.h index b434e0e7..cb15a335 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plSimulationMsg.h +++ b/Sources/Plasma/NucleusLib/pnMessage/plSimulationMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PLSIMULATIONMSG_H #define PLSIMULATIONMSG_H -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" // PLSIMULATIONMSG // Virtual base class for all messages which are specific to the simulation interface diff --git a/Sources/Plasma/NucleusLib/pnMessage/pnMessageCreatable.h b/Sources/Plasma/NucleusLib/pnMessage/pnMessageCreatable.h index 1f2aa8f0..0a031895 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/pnMessageCreatable.h +++ b/Sources/Plasma/NucleusLib/pnMessage/pnMessageCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pnMessageCreatable_inc #define pnMessageCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plMessage.h" diff --git a/Sources/Plasma/NucleusLib/pnModifier/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnModifier/CMakeLists.txt new file mode 100644 index 00000000..2c3d0e9c --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnModifier/CMakeLists.txt @@ -0,0 +1,26 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(pnModifier_HEADERS + plConditionalObject.h + plLogicModBase.h + plModifier.h + plMultiModifier.h + plSingleModifier.h + pnModifierCreatable.h +) + +set(pnModifier_SOURCES + plConditionalObject.cpp + plLogicModBase.cpp + plModifier.cpp + plMultiModifier.cpp + plSingleModifier.cpp +) + +add_library(pnModifier STATIC ${pnModifier_HEADERS} ${pnModifier_SOURCES}) + +source_group("Header Files" FILES ${pnModifier_HEADERS}) +source_group("Source Files" FILES ${pnModifier_SOURCES}) diff --git a/Sources/Plasma/NucleusLib/pnModifier/plConditionalObject.h b/Sources/Plasma/NucleusLib/pnModifier/plConditionalObject.h index 57183805..15093f8c 100644 --- a/Sources/Plasma/NucleusLib/pnModifier/plConditionalObject.h +++ b/Sources/Plasma/NucleusLib/pnModifier/plConditionalObject.h @@ -43,9 +43,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plConditionalObject_inc #define plConditionalObject_inc -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include "hsBitVector.h" -#include "../pnNetCommon/plSynchedValue.h" +#include "pnNetCommon/plSynchedValue.h" class plLogicModBase; diff --git a/Sources/Plasma/NucleusLib/pnModifier/plLogicModBase.cpp b/Sources/Plasma/NucleusLib/pnModifier/plLogicModBase.cpp index ab48b16c..657d6897 100644 --- a/Sources/Plasma/NucleusLib/pnModifier/plLogicModBase.cpp +++ b/Sources/Plasma/NucleusLib/pnModifier/plLogicModBase.cpp @@ -44,14 +44,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plgDispatch.h" #include "hsResMgr.h" #include "hsTimer.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnNetCommon/plGenericVar.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnNetCommon/plNetSharedState.h" -#include "../../PubUtilLib/plNetMessage/plNetMessage.h" // breaks project dependancy levels -#include "../pnMessage/plNotifyMsg.h" -#include "../pnMessage/plEnableMsg.h" -#include "../pnMessage/plServerReplyMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnNetCommon/plGenericVar.h" +#include "pnNetCommon/plNetApp.h" +#include "pnNetCommon/plNetSharedState.h" +#include "plNetMessage/plNetMessage.h" // breaks project dependancy levels +#include "pnMessage/plNotifyMsg.h" +#include "pnMessage/plEnableMsg.h" +#include "pnMessage/plServerReplyMsg.h" void plLogicModBase::ConsoleTrigger(plKey playerKey) { diff --git a/Sources/Plasma/NucleusLib/pnModifier/plLogicModBase.h b/Sources/Plasma/NucleusLib/pnModifier/plLogicModBase.h index 6a9050ff..1c8707a7 100644 --- a/Sources/Plasma/NucleusLib/pnModifier/plLogicModBase.h +++ b/Sources/Plasma/NucleusLib/pnModifier/plLogicModBase.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plLogicModBase_inc #include "plSingleModifier.h" -#include "../pnNetCommon/plSynchedValue.h" +#include "pnNetCommon/plSynchedValue.h" #include "hsTemplates.h" class plConditionalObject; diff --git a/Sources/Plasma/NucleusLib/pnModifier/plModifier.cpp b/Sources/Plasma/NucleusLib/pnModifier/plModifier.cpp index b56f61e5..a23f3498 100644 --- a/Sources/Plasma/NucleusLib/pnModifier/plModifier.cpp +++ b/Sources/Plasma/NucleusLib/pnModifier/plModifier.cpp @@ -42,12 +42,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plModifier.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plDrawInterface.h" -#include "../pnSceneObject/plSimulationInterface.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnSceneObject/plAudioInterface.h" -#include "../pnMessage/plTimeMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plDrawInterface.h" +#include "pnSceneObject/plSimulationInterface.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plAudioInterface.h" +#include "pnMessage/plTimeMsg.h" plModifier::plModifier() { diff --git a/Sources/Plasma/NucleusLib/pnModifier/plModifier.h b/Sources/Plasma/NucleusLib/pnModifier/plModifier.h index 4f1444cc..9bfb48b9 100644 --- a/Sources/Plasma/NucleusLib/pnModifier/plModifier.h +++ b/Sources/Plasma/NucleusLib/pnModifier/plModifier.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plModifier_inc #define plModifier_inc -#include "../pnNetCommon/plSynchedObject.h" +#include "pnNetCommon/plSynchedObject.h" class hsStream; class hsResMgr; diff --git a/Sources/Plasma/NucleusLib/pnModifier/plMultiModifier.h b/Sources/Plasma/NucleusLib/pnModifier/plMultiModifier.h index 91447911..ba6e3d89 100644 --- a/Sources/Plasma/NucleusLib/pnModifier/plMultiModifier.h +++ b/Sources/Plasma/NucleusLib/pnModifier/plMultiModifier.h @@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plModifier.h" #include "hsBitVector.h" -#include "../pnNetCommon/plSynchedValue.h" +#include "pnNetCommon/plSynchedValue.h" #include "hsTemplates.h" class plSceneObject; diff --git a/Sources/Plasma/NucleusLib/pnModifier/plSingleModifier.h b/Sources/Plasma/NucleusLib/pnModifier/plSingleModifier.h index 23ab4de9..70ae78bf 100644 --- a/Sources/Plasma/NucleusLib/pnModifier/plSingleModifier.h +++ b/Sources/Plasma/NucleusLib/pnModifier/plSingleModifier.h @@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plModifier.h" #include "hsBitVector.h" -#include "../pnNetCommon/plSynchedValue.h" +#include "pnNetCommon/plSynchedValue.h" class plSceneObject; class plSingleModMsg; diff --git a/Sources/Plasma/NucleusLib/pnModifier/pnModifierCreatable.h b/Sources/Plasma/NucleusLib/pnModifier/pnModifierCreatable.h index dbb12e87..e4869bd3 100644 --- a/Sources/Plasma/NucleusLib/pnModifier/pnModifierCreatable.h +++ b/Sources/Plasma/NucleusLib/pnModifier/pnModifierCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pnModifierCreatable_inc #define pnModifierCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plModifier.h" diff --git a/Sources/Plasma/NucleusLib/pnNetBase/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnNetBase/CMakeLists.txt new file mode 100644 index 00000000..1cd1250b --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnNetBase/CMakeLists.txt @@ -0,0 +1,29 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") + +set(pnNetBase_HEADERS + Intern.h + Pch.h + pnNbAuthKey.hpp + pnNbCsrKey.hpp + pnNbConst.h + pnNbGameKey.hpp + pnNbGateKeeperKey.hpp + pnNetBase.h +) + +set(pnNetBase_PRIVATE + Private/pnNbAllIncludes.h + Private/pnNbEchoMsgs.h + Private/pnNbError.h + Private/pnNbError.cpp + Private/pnNbProtocol.h + Private/pnNbProtocol.cpp + Private/pnNbSrvs.h + Private/pnNbSrvs.cpp +) + +add_library(pnNetBase STATIC ${pnNetBase_HEADERS} ${pnNetBase_PRIVATE}) + +source_group("Header Files" FILES ${pnNetBase_HEADERS}) +source_group("Private" FILES ${pnNetBase_PRIVATE}) diff --git a/Sources/Plasma/NucleusLib/pnNetBase/Pch.h b/Sources/Plasma/NucleusLib/pnNetBase/Pch.h index 0be6bdae..4f7abdca 100644 --- a/Sources/Plasma/NucleusLib/pnNetBase/Pch.h +++ b/Sources/Plasma/NucleusLib/pnNetBase/Pch.h @@ -51,7 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNNETBASE_PCH_H -#include "../pnUtils/pnUtils.h" -#include "../pnProduct/pnProduct.h" +#include "pnUtils/pnUtils.h" +#include "pnProduct/pnProduct.h" #include "Private/pnNbAllIncludes.h" diff --git a/Sources/Plasma/NucleusLib/pnNetBase/Private/pnNbAllIncludes.h b/Sources/Plasma/NucleusLib/pnNetBase/Private/pnNbAllIncludes.h index 27795bb9..47979e98 100644 --- a/Sources/Plasma/NucleusLib/pnNetBase/Private/pnNbAllIncludes.h +++ b/Sources/Plasma/NucleusLib/pnNetBase/Private/pnNbAllIncludes.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNNETBASE_PRIVATE_PNNBALLINCLUDES_H -#include "../pnProduct/pnProduct.h" +#include "pnProduct/pnProduct.h" #include "pnNbConst.h" #include "pnNbError.h" diff --git a/Sources/Plasma/NucleusLib/pnNetCli/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnNetCli/CMakeLists.txt new file mode 100644 index 00000000..a5e11546 --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnNetCli/CMakeLists.txt @@ -0,0 +1,20 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") + +set(pnNetCli_HEADERS + Intern.h + Pch.h + pnNetCli.h +) + +set(pnNetCli_SOURCES + pnNcChannel.cpp + pnNcCli.cpp + pnNcEncrypt.cpp + pnNcUtils.cpp +) + +add_library(pnNetCli STATIC ${pnNetCli_HEADERS} ${pnNetCli_SOURCES}) + +source_group("Header Files" FILES ${pnNetCli_HEADERS}) +source_group("Source Files" FILES ${pnNetCli_SOURCES}) diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnNetCommon/CMakeLists.txt new file mode 100644 index 00000000..30c6d535 --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnNetCommon/CMakeLists.txt @@ -0,0 +1,35 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") +include_directories("../../NucleusLib/inc") +include_directories("../../PubUtilLib") + +set(pnNetCommon_HEADERS + plGenericVar.h + plNetAddress.h + plNetApp.h + plNetGroup.h + plNetResManager.h + plNetServers.h + plNetSharedState.h + plSDLTypes.h + plSynchedObject.h + plSynchedValue.h +) + +set(pnNetCommon_SOURCES + plGenericVar.cpp + plNetAddress.cpp + plNetApp.cpp + plNetGroup.cpp + plNetResManager.cpp + plNetServers.cpp + plNetSharedState.cpp + plSDLTypes.cpp + plSynchedObject.cpp + plSynchedValue.cpp +) + +add_library(pnNetCommon STATIC ${pnNetCommon_HEADERS} ${pnNetCommon_SOURCES}) + +source_group("Header Files" FILES ${pnNetCommon_HEADERS}) +source_group("Source Files" FILES ${pnNetCommon_SOURCES}) diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetResManager.cpp b/Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.cpp similarity index 100% rename from Sources/Plasma/PubUtilLib/plNetCommon/plNetResManager.cpp rename to Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.cpp diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetResManager.h b/Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.h similarity index 96% rename from Sources/Plasma/PubUtilLib/plNetCommon/plNetResManager.h rename to Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.h index 97c450fe..1e973472 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetResManager.h +++ b/Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.h @@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plNetResMgr_h #define plNetResMgr_h -#include "../plResMgr/plResManager.h" -#include "../pnKeyedObject/plKey.h" +#include "plResMgr/plResManager.h" +#include "pnKeyedObject/plKey.h" // // plNetResMgr - Keys? Disk? What? Nah, we'll just create new ones and give them to ya diff --git a/Sources/Plasma/NucleusLib/pnNetDiag/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnNetDiag/CMakeLists.txt new file mode 100644 index 00000000..c299a95a --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnNetDiag/CMakeLists.txt @@ -0,0 +1,21 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") + +set(pnNetDiag_HEADERS + Intern.h + Pch.h + pnNetDiag.h +) + +set(pnNetDiag_SOURCES + pnNdDns.cpp + pnNdIcmp.cpp + pnNdTcp.cpp + pnNetDiag.cpp + pnNetSys.cpp +) + +add_library(pnNetDiag STATIC ${pnNetDiag_HEADERS} ${pnNetDiag_SOURCES}) + +source_group("Header Files" FILES ${pnNetDiag_HEADERS}) +source_group("Source Files" FILES ${pnNetDiag_SOURCES}) diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnNetProtocol/CMakeLists.txt new file mode 100644 index 00000000..d01cbd3e --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnNetProtocol/CMakeLists.txt @@ -0,0 +1,96 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") + +if(PLASMA_TARGETS STREQUAL "Server") + include_directories("../../ServerLib") +endif(PLASMA_TARGETS STREQUAL "Server") + +set(pnNetProtocol_HEADERS + Intern.h + Pch.h + pnNetProtocol.h +) + +set(pnNetProtocol_PRIVATE + Private/pnNpAllIncludes.h + Private/pnNpCommon.h + Private/pnNpCommon.cpp +) + +set(pnNetProtocol_PROTO_CLI2AUTH + Private/Protocols/CLi2Auth/pnNpCli2Auth.h + Private/Protocols/CLi2Auth/pnNpCli2Auth.cpp +) + +set(pnNetProtocol_PROTO_CLI2CSR + Private/Protocols/CLi2Csr/pnNpCli2Csr.h + Private/Protocols/CLi2Csr/pnNpCli2Csr.cpp +) + +set(pnNetProtocol_PROTO_CLI2FILE + Private/Protocols/CLi2File/pnNpCli2File.h + Private/Protocols/CLi2File/pnNpCli2File.cpp +) + +set(pnNetProtocol_PROTO_CLI2GAME + Private/Protocols/CLi2Game/pnNpCli2Game.h + Private/Protocols/CLi2Game/pnNpCli2Game.cpp +) + +set(pnNetProtocol_PROTO_CLI2GK + Private/Protocols/CLi2GateKeeper/pnNpCli2GateKeeper.h + Private/Protocols/CLi2GateKeeper/pnNpCli2GateKeeper.cpp +) + +set(pnNetProtocol_PROTO_SRV2DB + Private/Protocols/Srv2Db/pnNpSrv2Db.h + Private/Protocols/Srv2Db/pnNpSrv2Db.cpp +) + +set(pnNetProtocol_PROTO_SRV2LOG + Private/Protocols/Srv2Log/pnNpSrv2Log.h + Private/Protocols/Srv2Log/pnNpSrv2Log.cpp +) + +set(pnNetProtocol_PROTO_SRV2MCP + Private/Protocols/Srv2Mcp/pnNpSrv2Mcp.h + Private/Protocols/Srv2Mcp/pnNpSrv2Mcp.cpp +) + +set(pnNetProtocol_PROTO_SRV2SCORE + Private/Protocols/Srv2Score/pnNpSrv2Score.h + Private/Protocols/Srv2Score/pnNpSrv2Score.cpp +) + +set(pnNetProtocol_PROTO_SRV2STATE + Private/Protocols/Srv2State/pnNpSrv2State.h + Private/Protocols/Srv2State/pnNpSrv2State.cpp +) + +set(pnNetProtocol_PROTO_SRV2VAULT + Private/Protocols/Srv2Vault/pnNpSrv2Vault.h + Private/Protocols/Srv2Vault/pnNpSrv2Vault.cpp +) + +add_library(pnNetProtocol STATIC ${pnNetProtocol_HEADERS} ${pnNetProtocol_PRIVATE} + ${pnNetProtocol_PROTO_CLI2AUTH} ${pnNetProtocol_PROTO_CLI2CSR} + ${pnNetProtocol_PROTO_CLI2FILE} ${pnNetProtocol_PROTO_CLI2GAME} + ${pnNetProtocol_PROTO_CLI2GK} ${pnNetProtocol_PROTO_SRV2DB} + ${pnNetProtocol_PROTO_SRV2LOG} ${pnNetProtocol_PROTO_SRV2MCP} + ${pnNetProtocol_PROTO_SRV2SCORE} ${pnNetProtocol_PROTO_SRV2STATE} + ${pnNetProtocol_PROTO_SRV2VAULT} +) + +source_group("Header Files" FILES ${pnNetProtocol_HEADERS}) +source_group("Private" FILES ${pnNetProtocol_PRIVATE}) +source_group("Private\\Cli2Auth" FILES ${pnNetProtocol_PROTO_CLI2AUTH}) +source_group("Private\\Cli2Csr" FILES ${pnNetProtocol_PROTO_CLI2CSR}) +source_group("Private\\Cli2File" FILES ${pnNetProtocol_PROTO_CLI2FILE}) +source_group("Private\\Cli2Game" FILES ${pnNetProtocol_PROTO_CLI2GAME}) +source_group("Private\\Cli2GateKeeper" FILES ${pnNetProtocol_PROTO_CLI2GK}) +source_group("Private\\Srv2Db" FILES ${pnNetProtocol_PROTO_SRV2DB}) +source_group("Private\\Srv2Log" FILES ${pnNetProtocol_PROTO_SRV2LOG}) +source_group("Private\\Srv2Mcp" FILES ${pnNetProtocol_PROTO_SRV2MCP}) +source_group("Private\\Srv2Score" FILES ${pnNetProtocol_PROTO_SRV2SCORE}) +source_group("Private\\Srv2State" FILES ${pnNetProtocol_PROTO_SRV2STATE}) +source_group("Private\\Srv2Vault" FILES ${pnNetProtocol_PROTO_SRV2VAULT}) diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/Pch.h b/Sources/Plasma/NucleusLib/pnNetProtocol/Pch.h index e7f69987..bdd216ca 100644 --- a/Sources/Plasma/NucleusLib/pnNetProtocol/Pch.h +++ b/Sources/Plasma/NucleusLib/pnNetProtocol/Pch.h @@ -58,7 +58,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifdef SERVER #include "pnIni/pnIni.h" -#include "../ServerLib/psUtils/psUtils.h" // for SrvMsgHeader, ugh +#include "psUtils/psUtils.h" // for SrvMsgHeader, ugh #endif #include "Private/pnNpAllIncludes.h" diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpAllIncludes.h b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpAllIncludes.h index 1529011d..45f08014 100644 --- a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpAllIncludes.h +++ b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpAllIncludes.h @@ -89,8 +89,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifdef SERVER # ifdef USES_NETSRV // for SrvMsgHeader definition -# include "../../NucleusLib/pnIni/pnIni.h" // psSrvConn needs ini types -# include "../../ServerLib/psUtils/psUtils.h" +# include "pnIni/pnIni.h" // psSrvConn needs ini types +# include "psUtils/psUtils.h" # ifdef USES_PROTOCOL_SRV2VAULT # include "Protocols/Srv2Vault/pnNpSrv2Vault.h" diff --git a/Sources/Plasma/NucleusLib/pnProduct/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnProduct/CMakeLists.txt new file mode 100644 index 00000000..c48bec6e --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnProduct/CMakeLists.txt @@ -0,0 +1,26 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") + +set(pnProduct_HEADERS + Pch.h + pnProduct.h +) + +set(pnProduct_PRIVATE + Private/pnPrAllIncludes.h + Private/pnPrBranchId.h + Private/pnPrBranchId.cpp + Private/pnPrBuildId.h + Private/pnPrBuildId.cpp + Private/pnPrBuildString.h + Private/pnPrBuildString.cpp + Private/pnPrBuildType.h + Private/pnPrBuildType.cpp + Private/pnPrProductId.h + Private/pnPrProductId.cpp +) + +add_library(pnProduct STATIC ${pnProduct_HEADERS} ${pnProduct_PRIVATE}) + +source_group("Header Files" FILES ${pnProduct_HEADERS}) +source_group("Private" FILES ${pnProduct_PRIVATE}) diff --git a/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrAllIncludes.h b/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrAllIncludes.h index 9945af79..ec61463e 100644 --- a/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrAllIncludes.h +++ b/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrAllIncludes.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNPRODUCT_PRIVATE_PNPRALLINCLUDES_H -#include "../pnUtils/pnUtils.h" +#include "pnUtils/pnUtils.h" #include "pnPrBuildId.h" #include "pnPrBuildType.h" diff --git a/Sources/Plasma/NucleusLib/pnSceneObject/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnSceneObject/CMakeLists.txt new file mode 100644 index 00000000..11ad2c4a --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnSceneObject/CMakeLists.txt @@ -0,0 +1,27 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") +include_directories("../../NucleusLib/inc") + +set(pnSceneObject_HEADERS + plAudioInterface.h + plCoordinateInterface.h + plDrawInterface.h + plObjInterface.h + plSceneObject.h + plSimulationInterface.h + pnSceneObjectCreatable.h +) + +set(pnSceneObject_SOURCES + plAudioInterface.cpp + plCoordinateInterface.cpp + plDrawInterface.cpp + plObjInterface.cpp + plSceneObject.cpp + plSimulationInterface.cpp +) + +add_library(pnSceneObject STATIC ${pnSceneObject_HEADERS} ${pnSceneObject_SOURCES}) + +source_group("Header Files" FILES ${pnSceneObject_HEADERS}) +source_group("Source Files" FILES ${pnSceneObject_SOURCES}) diff --git a/Sources/Plasma/NucleusLib/pnSceneObject/plAudioInterface.cpp b/Sources/Plasma/NucleusLib/pnSceneObject/plAudioInterface.cpp index a5140295..4a527f3b 100644 --- a/Sources/Plasma/NucleusLib/pnSceneObject/plAudioInterface.cpp +++ b/Sources/Plasma/NucleusLib/pnSceneObject/plAudioInterface.cpp @@ -43,20 +43,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plAudioInterface.h" #include "plAudible.h" -#include "../pnMessage/plAudioSysMsg.h" -#include "../pnMessage/plSoundMsg.h" +#include "pnMessage/plAudioSysMsg.h" +#include "pnMessage/plSoundMsg.h" #include "hsBounds.h" #include "hsStream.h" #include "hsResMgr.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include "plSceneObject.h" #include "plgDispatch.h" -#include "../pnMessage/plEnableMsg.h" -#include "../pnMessage/plIntRefMsg.h" +#include "pnMessage/plEnableMsg.h" +#include "pnMessage/plIntRefMsg.h" #include "plCoordinateInterface.h" -#include "../pnMessage/plNodeRefMsg.h" -#include "../pnMessage/plProxyDrawMsg.h" -#include "../pnNetCommon/plNetApp.h" +#include "pnMessage/plNodeRefMsg.h" +#include "pnMessage/plProxyDrawMsg.h" +#include "pnNetCommon/plNetApp.h" #include "hsTimer.h" diff --git a/Sources/Plasma/NucleusLib/pnSceneObject/plCoordinateInterface.cpp b/Sources/Plasma/NucleusLib/pnSceneObject/plCoordinateInterface.cpp index b86edd9a..04b8b509 100644 --- a/Sources/Plasma/NucleusLib/pnSceneObject/plCoordinateInterface.cpp +++ b/Sources/Plasma/NucleusLib/pnSceneObject/plCoordinateInterface.cpp @@ -45,15 +45,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plDrawInterface.h" #include "plSimulationInterface.h" #include "plAudioInterface.h" -#include "../pnMessage/plWarpMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnMessage/plCorrectionMsg.h" -#include "../pnMessage/plIntRefMsg.h" -#include "../pnNetCommon/plSDLTypes.h" +#include "pnMessage/plWarpMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "pnMessage/plCorrectionMsg.h" +#include "pnMessage/plIntRefMsg.h" +#include "pnNetCommon/plSDLTypes.h" #include "plSceneObject.h" #include "hsResMgr.h" #include "plgDispatch.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include "hsStream.h" #include "plProfile.h" diff --git a/Sources/Plasma/NucleusLib/pnSceneObject/plCoordinateInterface.h b/Sources/Plasma/NucleusLib/pnSceneObject/plCoordinateInterface.h index bb9195f5..1ca1d8fb 100644 --- a/Sources/Plasma/NucleusLib/pnSceneObject/plCoordinateInterface.h +++ b/Sources/Plasma/NucleusLib/pnSceneObject/plCoordinateInterface.h @@ -47,7 +47,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plObjInterface.h" #include "hsTemplates.h" #include "hsMatrix44.h" -#include "../pnNetCommon/plSynchedValue.h" +#include "pnNetCommon/plSynchedValue.h" class hsStream; class hsResMgr; diff --git a/Sources/Plasma/NucleusLib/pnSceneObject/plDrawInterface.cpp b/Sources/Plasma/NucleusLib/pnSceneObject/plDrawInterface.cpp index 6ea14c00..1c58ca9a 100644 --- a/Sources/Plasma/NucleusLib/pnSceneObject/plDrawInterface.cpp +++ b/Sources/Plasma/NucleusLib/pnSceneObject/plDrawInterface.cpp @@ -48,9 +48,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "plgDispatch.h" #include "plSceneObject.h" -#include "../pnMessage/plEnableMsg.h" -#include "../pnMessage/plIntRefMsg.h" -#include "../pnMessage/plDISpansMsg.h" +#include "pnMessage/plEnableMsg.h" +#include "pnMessage/plIntRefMsg.h" +#include "pnMessage/plDISpansMsg.h" plDrawInterface::plDrawInterface() { diff --git a/Sources/Plasma/NucleusLib/pnSceneObject/plObjInterface.cpp b/Sources/Plasma/NucleusLib/pnSceneObject/plObjInterface.cpp index 6ef5a826..6095a638 100644 --- a/Sources/Plasma/NucleusLib/pnSceneObject/plObjInterface.cpp +++ b/Sources/Plasma/NucleusLib/pnSceneObject/plObjInterface.cpp @@ -43,10 +43,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plObjInterface.h" #include "hsResMgr.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include "plSceneObject.h" -#include "../pnMessage/plIntRefMsg.h" -#include "../pnMessage/plEnableMsg.h" +#include "pnMessage/plIntRefMsg.h" +#include "pnMessage/plEnableMsg.h" plObjInterface::plObjInterface() diff --git a/Sources/Plasma/NucleusLib/pnSceneObject/plObjInterface.h b/Sources/Plasma/NucleusLib/pnSceneObject/plObjInterface.h index 12274958..6371978e 100644 --- a/Sources/Plasma/NucleusLib/pnSceneObject/plObjInterface.h +++ b/Sources/Plasma/NucleusLib/pnSceneObject/plObjInterface.h @@ -43,12 +43,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plInterface_inc #define plInterface_inc -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnMessage/plRefMsg.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnMessage/plRefMsg.h" #include "plSceneObject.h" #include "hsStream.h" -#include "../pnNetCommon/plSynchedObject.h" -#include "../pnNetCommon/plSynchedValue.h" +#include "pnNetCommon/plSynchedObject.h" +#include "pnNetCommon/plSynchedValue.h" #include "hsBitVector.h" class hsResMgr; diff --git a/Sources/Plasma/NucleusLib/pnSceneObject/plSceneObject.cpp b/Sources/Plasma/NucleusLib/pnSceneObject/plSceneObject.cpp index dffe53cc..92503265 100644 --- a/Sources/Plasma/NucleusLib/pnSceneObject/plSceneObject.cpp +++ b/Sources/Plasma/NucleusLib/pnSceneObject/plSceneObject.cpp @@ -46,27 +46,27 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plSimulationInterface.h" #include "plCoordinateInterface.h" #include "plAudioInterface.h" -#include "../pnDispatch/plDispatch.h" -#include "../pnModifier/plModifier.h" -#include "../pnMessage/plMessage.h" -#include "../pnMessage/plRefMsg.h" +#include "pnDispatch/plDispatch.h" +#include "pnModifier/plModifier.h" +#include "pnMessage/plMessage.h" +#include "pnMessage/plRefMsg.h" #include "plDrawable.h" #include "plPhysical.h" #include "plAudible.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnMessage/plCorrectionMsg.h" -#include "../pnMessage/plWarpMsg.h" -#include "../pnMessage/plSoundMsg.h" -#include "../pnMessage/plEnableMsg.h" -#include "../pnMessage/plAttachMsg.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../pnMessage/plNodeRefMsg.h" -#include "../pnMessage/plIntRefMsg.h" -#include "../pnMessage/plSimulationSynchMsg.h" -#include "../pnMessage/plSimulationMsg.h" -#include "../pnMessage/plNodeChangeMsg.h" -#include "../pnMessage/plSelfDestructMsg.h" -#include "../pnKeyedObject/plKey.h" +#include "pnMessage/plTimeMsg.h" +#include "pnMessage/plCorrectionMsg.h" +#include "pnMessage/plWarpMsg.h" +#include "pnMessage/plSoundMsg.h" +#include "pnMessage/plEnableMsg.h" +#include "pnMessage/plAttachMsg.h" +#include "pnMessage/plObjRefMsg.h" +#include "pnMessage/plNodeRefMsg.h" +#include "pnMessage/plIntRefMsg.h" +#include "pnMessage/plSimulationSynchMsg.h" +#include "pnMessage/plSimulationMsg.h" +#include "pnMessage/plNodeChangeMsg.h" +#include "pnMessage/plSelfDestructMsg.h" +#include "pnKeyedObject/plKey.h" #include "hsStream.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/NucleusLib/pnSceneObject/plSceneObject.h b/Sources/Plasma/NucleusLib/pnSceneObject/plSceneObject.h index 124d7a1d..37d64ce3 100644 --- a/Sources/Plasma/NucleusLib/pnSceneObject/plSceneObject.h +++ b/Sources/Plasma/NucleusLib/pnSceneObject/plSceneObject.h @@ -44,11 +44,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plSceneObject_inc #include "hsBitVector.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnMessage/plRefMsg.h" -#include "../pnNetCommon/plSynchedObject.h" -#include "../pnNetCommon/plSynchedValue.h" -#include "../pnModifier/plModifier.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnMessage/plRefMsg.h" +#include "pnNetCommon/plSynchedObject.h" +#include "pnNetCommon/plSynchedValue.h" +#include "pnModifier/plModifier.h" #include "hsStream.h" class plObjInterface; diff --git a/Sources/Plasma/NucleusLib/pnSceneObject/plSimulationInterface.cpp b/Sources/Plasma/NucleusLib/pnSceneObject/plSimulationInterface.cpp index f3632f9b..db20faef 100644 --- a/Sources/Plasma/NucleusLib/pnSceneObject/plSimulationInterface.cpp +++ b/Sources/Plasma/NucleusLib/pnSceneObject/plSimulationInterface.cpp @@ -47,13 +47,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "hsResMgr.h" #include "plSceneObject.h" -#include "../pnMessage/plEnableMsg.h" -#include "../pnMessage/plIntRefMsg.h" -#include "../pnMessage/plWarpMsg.h" -#include "../pnMessage/plSimulationSynchMsg.h" -#include "../pnMessage/plSimulationMsg.h" -#include "../pnMessage/plNodeRefMsg.h" -#include "../pnKeyedObject/plKey.h" +#include "pnMessage/plEnableMsg.h" +#include "pnMessage/plIntRefMsg.h" +#include "pnMessage/plWarpMsg.h" +#include "pnMessage/plSimulationSynchMsg.h" +#include "pnMessage/plSimulationMsg.h" +#include "pnMessage/plNodeRefMsg.h" +#include "pnKeyedObject/plKey.h" plSimulationInterface::plSimulationInterface() : fPhysical(nil) { diff --git a/Sources/Plasma/NucleusLib/pnSceneObject/pnSceneObjectCreatable.h b/Sources/Plasma/NucleusLib/pnSceneObject/pnSceneObjectCreatable.h index 2cd54339..0f5a9964 100644 --- a/Sources/Plasma/NucleusLib/pnSceneObject/pnSceneObjectCreatable.h +++ b/Sources/Plasma/NucleusLib/pnSceneObject/pnSceneObjectCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plSceneObjectCreatable_inc #define plSceneObjectCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plObjInterface.h" diff --git a/Sources/Plasma/NucleusLib/pnSimpleNet/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnSimpleNet/CMakeLists.txt new file mode 100644 index 00000000..3429634e --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnSimpleNet/CMakeLists.txt @@ -0,0 +1,16 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") + +set(pnSimpleNet_HEADERS + Pch.h + pnSimpleNet.h +) + +set(pnSimpleNet_SOURCES + pnSimpleNet.cpp +) + +add_library(pnSimpleNet STATIC ${pnSimpleNet_HEADERS} ${pnSimpleNet_SOURCES}) + +source_group("Header Files" FILES ${pnSimpleNet_HEADERS}) +source_group("Source Files" FILES ${pnSimpleNet_SOURCES}) From 36f2b2646611d37d082a65148586d10e3b9d2c59 Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Sat, 9 Apr 2011 11:53:24 -0700 Subject: [PATCH 13/18] The rest of NucleusLib (cherry picked from commit 7069e00e6f97c6665bf8a0d917780bdd7bfdfab0) --- Sources/Plasma/NucleusLib/CMakeLists.txt | 6 +- .../Plasma/NucleusLib/pnTimer/CMakeLists.txt | 23 +++++ .../pnTimer/plTimerCallbackManager.cpp | 4 +- .../pnTimer/plTimerCallbackManager.h | 2 +- .../NucleusLib/pnTimer/pnBuildDates.cpp | 2 +- .../NucleusLib/pnTimer/pnTimerCreatable.h | 2 +- .../Plasma/NucleusLib/pnUtils/CMakeLists.txt | 93 +++++++++++++++++++ .../NucleusLib/pnUtils/Private/pnUtCrypt.cpp | 6 +- .../NucleusLib/pnUtilsExe/CMakeLists.txt | 33 +++++++ Sources/Plasma/NucleusLib/pnUtilsExe/Pch.h | 2 +- 10 files changed, 161 insertions(+), 12 deletions(-) create mode 100644 Sources/Plasma/NucleusLib/pnTimer/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnUtils/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnUtilsExe/CMakeLists.txt diff --git a/Sources/Plasma/NucleusLib/CMakeLists.txt b/Sources/Plasma/NucleusLib/CMakeLists.txt index e5916895..38036bf0 100644 --- a/Sources/Plasma/NucleusLib/CMakeLists.txt +++ b/Sources/Plasma/NucleusLib/CMakeLists.txt @@ -29,6 +29,6 @@ add_subdirectory(pnProduct) add_subdirectory(pnSceneObject) add_subdirectory(pnSimpleNet) #add_subdirectory(pnSqlLib) # Not being used in any current sln -#add_subdirectory(pnTimer) -#add_subdirectory(pnUtils) -#add_subdirectory(pnUtilsExe) +add_subdirectory(pnTimer) +add_subdirectory(pnUtils) +add_subdirectory(pnUtilsExe) diff --git a/Sources/Plasma/NucleusLib/pnTimer/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnTimer/CMakeLists.txt new file mode 100644 index 00000000..afe747ce --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnTimer/CMakeLists.txt @@ -0,0 +1,23 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") +include_directories("../../NucleusLib/inc") + +set(pnTimer_HEADERS + plTimedValue.h + plTimerCallbackManager.h + pnBuildDates.h + pnTimerCreatable.h +) + +set(pnTimer_SOURCES + hsTimer.cpp + plTimedValue.cpp + plTimerCallbackManager.cpp + pnBranchDate.cpp + pnBuildDates.cpp +) + +add_library(pnTimer STATIC ${pnTimer_HEADERS} ${pnTimer_SOURCES}) + +source_group("Header Files" FILES ${pnTimer_HEADERS}) +source_group("Source Files" FILES ${pnTimer_SOURCES}) diff --git a/Sources/Plasma/NucleusLib/pnTimer/plTimerCallbackManager.cpp b/Sources/Plasma/NucleusLib/pnTimer/plTimerCallbackManager.cpp index 696cc786..2d5474c3 100644 --- a/Sources/Plasma/NucleusLib/pnTimer/plTimerCallbackManager.cpp +++ b/Sources/Plasma/NucleusLib/pnTimer/plTimerCallbackManager.cpp @@ -42,9 +42,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plTimerCallbackManager.h" -#include "../pnMessage/plTimeMsg.h" +#include "pnMessage/plTimeMsg.h" #include "plgDispatch.h" -#include "../pnKeyedObject/plFixedKey.h" +#include "pnKeyedObject/plFixedKey.h" #include "hsTimer.h" plTimerCallbackManager::plTimerCallbackManager() diff --git a/Sources/Plasma/NucleusLib/pnTimer/plTimerCallbackManager.h b/Sources/Plasma/NucleusLib/pnTimer/plTimerCallbackManager.h index f9e4eb0c..27fac315 100644 --- a/Sources/Plasma/NucleusLib/pnTimer/plTimerCallbackManager.h +++ b/Sources/Plasma/NucleusLib/pnTimer/plTimerCallbackManager.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plTimerCallbackManager_Defined #include "hsScalar.h" -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include "hsTemplates.h" class plMessage; diff --git a/Sources/Plasma/NucleusLib/pnTimer/pnBuildDates.cpp b/Sources/Plasma/NucleusLib/pnTimer/pnBuildDates.cpp index c88b6c09..7fc1ce41 100644 --- a/Sources/Plasma/NucleusLib/pnTimer/pnBuildDates.cpp +++ b/Sources/Plasma/NucleusLib/pnTimer/pnBuildDates.cpp @@ -52,7 +52,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////////////// #include "hsWindows.h" -#include "../pnTimer/pnBuildDates.h" +#include "pnTimer/pnBuildDates.h" char pnBuildDates::fBuildDate[ 128 ] = __DATE__; char pnBuildDates::fBuildTime[ 128 ] = __TIME__; diff --git a/Sources/Plasma/NucleusLib/pnTimer/pnTimerCreatable.h b/Sources/Plasma/NucleusLib/pnTimer/pnTimerCreatable.h index d445f702..e53c2a64 100644 --- a/Sources/Plasma/NucleusLib/pnTimer/pnTimerCreatable.h +++ b/Sources/Plasma/NucleusLib/pnTimer/pnTimerCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pnTimerCreatable_inc #define pnTimerCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plTimerCallbackManager.h" diff --git a/Sources/Plasma/NucleusLib/pnUtils/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnUtils/CMakeLists.txt new file mode 100644 index 00000000..5361b584 --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnUtils/CMakeLists.txt @@ -0,0 +1,93 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") + +include_directories(${OPENSSL_INCLUDE_DIR}) + +set(pnUtils_HEADERS + Intern.h + Pch.h + pnUtils.h +) + +set(pnUtils_PRIVATE + Private/pnUtAddr.h + Private/pnUtAddr.cpp + Private/pnUtAllIncludes.h + Private/pnUtArray.h + Private/pnUtArray.cpp + Private/pnUtBase64.h + Private/pnUtBase64.cpp + Private/pnUtBigNum.h + Private/pnUtBigNum.cpp + Private/pnUtCmd.h + Private/pnUtCmd.cpp + Private/pnUtCoreLib.h + Private/pnUtCrypt.h + Private/pnUtCrypt.cpp + Private/pnUtEndian.h + Private/pnUtEndian.cpp + Private/pnUtHash.h + Private/pnUtHash.cpp + Private/pnUtList.h + Private/pnUtList.cpp + Private/pnUtMath.h + Private/pnUtMath.cpp + Private/pnUtMisc.h + Private/pnUtMisc.cpp + Private/pnUtPath.h + Private/pnUtPath.cpp + Private/pnUtPragma.h + Private/pnUtPriQ.h + Private/pnUtRand.h + Private/pnUtRand.cpp + Private/pnUtRef.h + Private/pnUtSkipList.h + Private/pnUtSort.h + Private/pnUtSpareList.h + Private/pnUtSpareList.cpp + Private/pnUtStr.h + Private/pnUtStr.cpp + Private/pnUtSubst.h + Private/pnUtSubst.cpp + Private/pnUtSync.h + Private/pnUtTime.h + Private/pnUtTime.cpp + Private/pnUtTls.h + Private/pnUtTls.cpp + Private/pnUtUuid.h + Private/pnUtUuid.cpp +) + +set(pnUtils_SOURCES + pnUtils.cpp +) + +if(WIN32) + set(pnUtils_WIN32 + Private/Win32/pnUtW32Addr.cpp + Private/Win32/pnUtW32Misc.cpp + Private/Win32/pnUtW32Path.cpp + Private/Win32/pnUtW32Str.cpp + Private/Win32/pnUtW32Sync.cpp + Private/Win32/pnUtW32Time.cpp + Private/Win32/pnUtW32Uuid.cpp + ) +else() + set(pnUtils_UNIX + Private/Unix/pnUteUxStr.cpp + Private/Unix/pnUteUxSync.cpp + Private/Unix/pnUteUxUuid.cpp + ) +endif() + +add_library(pnUtils STATIC ${pnUtils_HEADERS} ${pnUtils_PRIVATE} ${pnUtils_SOURCES} + ${pnUtils_UNIX} ${pnUtils_WIN32}) + +source_group("Header Files" FILES ${pnUtils_HEADERS}) +source_group("Source Files" FILES ${pnUtils_SOURCES}) +source_group("Private" FILES ${pnUtils_PRIVATE}) +if(WIN32) + source_group("Private\\Win32" FILES ${pnUtils_WIN32}) +else() + source_group("Private\\Unix" FILES ${pnUtils_UNIX}) +endif() diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCrypt.cpp b/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCrypt.cpp index 7f22e8de..e955dc9e 100644 --- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCrypt.cpp +++ b/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCrypt.cpp @@ -48,13 +48,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "../Pch.h" #pragma hdrstop -#include "openssl/md5.h" -#include "openssl/sha.h" +#include +#include // OpenSSL's RC4 algorithm has bugs and randomly corrupts data //#define OPENSSL_RC4 #ifdef OPENSSL_RC4 -#include "openssl/rc4.h" +#include #endif /***************************************************************************** diff --git a/Sources/Plasma/NucleusLib/pnUtilsExe/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnUtilsExe/CMakeLists.txt new file mode 100644 index 00000000..2187ea6f --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnUtilsExe/CMakeLists.txt @@ -0,0 +1,33 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") + +set(pnUtilsExe_HEADERS + Intern.h + Pch.h +) + +set(pnUtilsExe_PRIVATE + Private/pnUteTime.cpp + Private/pnUteTls.cpp +) + +if(WIN32) + set(pnUtilsExe_WIN32 + Private/Win32/pnUteW32Time.cpp + ) +else() + set(pnUtilsExe_UNIX + Private/Unix/pnUteUxTime.cpp + ) +endif() + +add_library(pnUtilsExe STATIC ${pnUtilsExe_HEADERS} ${pnUtilsExe_PRIVATE} + ${pnUtilsExe_UNIX} ${pnUtilsExe_WIN32}) + +source_group("Header Files" FILES ${pnUtilsExe_HEADERS}) +source_group("Private" FILES ${pnUtilsExe_PRIVATE}) +if(WIN32) + source_group("Private\\Win32" FILES ${pnUtilsExe_WIN32}) +else() + source_group("Private\\Unix" FILES ${pnUtilsExe_UNIX}) +endif() diff --git a/Sources/Plasma/NucleusLib/pnUtilsExe/Pch.h b/Sources/Plasma/NucleusLib/pnUtilsExe/Pch.h index 58bcd410..f32572ba 100644 --- a/Sources/Plasma/NucleusLib/pnUtilsExe/Pch.h +++ b/Sources/Plasma/NucleusLib/pnUtilsExe/Pch.h @@ -51,7 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILSEXE_PCH_H -#include "../pnUtils/Pch.h" +#include "pnUtils/Pch.h" #include "Intern.h" #include From 81430040526d205651547e82b62d94be845d1b56 Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Sat, 9 Apr 2011 17:32:18 -0700 Subject: [PATCH 14/18] Progress towards making plClient compile (cherry picked from commit f7a9adab7204cefdab95b168814c9209875a5b2d) --- Sources/Plasma/Apps/CMakeLists.txt | 4 + Sources/Plasma/Apps/plClient/CMakeLists.txt | 160 ++++++++++++++ Sources/Plasma/Apps/plClient/plClient.cpp | 204 +++++++++--------- .../Plasma/Apps/plClient/plClientCreatable.h | 2 +- Sources/Plasma/Apps/plClient/winmain.cpp | 30 +-- .../Plasma/Apps/plClientPatcher/UruPlayer.cpp | 2 +- Sources/Plasma/CMakeLists.txt | 1 + .../Plasma/FeatureLib/inc/pfAllCreatables.h | 28 +-- .../FeatureLib/pfGameGUIMgr/CMakeLists.txt | 1 + .../Plasma/FeatureLib/pfPython/CMakeLists.txt | 4 +- .../NucleusLib/pnNetCommon/CMakeLists.txt | 1 + Sources/Plasma/PubUtilLib/CMakeLists.txt | 2 +- .../Plasma/PubUtilLib/plGImage/CMakeLists.txt | 47 ++++ .../PubUtilLib/plGImage/hsDXTDirectXCodec.cpp | 2 +- .../PubUtilLib/plGImage/plAVIWriter.cpp | 6 +- .../Plasma/PubUtilLib/plGImage/plAVIWriter.h | 4 +- .../Plasma/PubUtilLib/plGImage/plBitmap.cpp | 12 +- .../plGImage/plDynSurfaceWriter.cpp | 8 +- .../PubUtilLib/plGImage/plDynamicTextMap.cpp | 10 +- Sources/Plasma/PubUtilLib/plGImage/plFont.h | 2 +- .../PubUtilLib/plGImage/plFontCache.cpp | 8 +- .../Plasma/PubUtilLib/plGImage/plFontCache.h | 2 +- .../PubUtilLib/plGImage/plGImageCreatable.h | 2 +- .../PubUtilLib/plGImage/plLODMipmap.cpp | 8 +- .../Plasma/PubUtilLib/plGImage/plMipmap.cpp | 8 +- .../PubUtilLib/plGImage/plWinFontCache.cpp | 6 +- .../plUnifiedTime/plUnifiedTime.cpp | 63 +++--- 27 files changed, 424 insertions(+), 203 deletions(-) create mode 100644 Sources/Plasma/Apps/CMakeLists.txt create mode 100644 Sources/Plasma/Apps/plClient/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plGImage/CMakeLists.txt diff --git a/Sources/Plasma/Apps/CMakeLists.txt b/Sources/Plasma/Apps/CMakeLists.txt new file mode 100644 index 00000000..23df716f --- /dev/null +++ b/Sources/Plasma/Apps/CMakeLists.txt @@ -0,0 +1,4 @@ +add_definitions(-D_LIB) # We shouldn't actually need this here, but + # Cyan uses it, so meh + +add_subdirectory(plClient) diff --git a/Sources/Plasma/Apps/plClient/CMakeLists.txt b/Sources/Plasma/Apps/plClient/CMakeLists.txt new file mode 100644 index 00000000..02f7b41d --- /dev/null +++ b/Sources/Plasma/Apps/plClient/CMakeLists.txt @@ -0,0 +1,160 @@ +include_directories("../../Apps") +include_directories("../../CoreLib") +include_directories("../../FeatureLib/inc") +include_directories("../../FeatureLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib/inc") +include_directories("../../PubUtilLib") + +include_directories(${OPENAL_INCLUDE_DIR}) +include_directories(${OPENSSL_INCLUDE_DIR}) +include_directories(${PYTHON_INCLUDE_DIR}) + +set(plClient_HEADERS + plClient.h + plClientCreatable.h + #plClientKey.h + plClientUpdateFormat.h + #plPluginClient.h +) + +set(plClient_SOURCES + pfAllCreatables.cpp + plAllCreatables.cpp + plClient.cpp + #plClientKey.cpp + #plPluginClient.cpp + pnAllCreatables.cpp + winmain.cpp +) + +set(plClient_TEXT + ../../../../Docs/ReleaseNotes/ReleaseNotes.txt +) + +set(plClient_RESOURCES + res/plClient.rc + res/resource.h +) + +add_executable(plClient WIN32 ${plClient_SOURCES} ${plClient_HEADERS} + ${plClient_TEXT} ${plClient_RESOURCES}) +target_link_libraries(plClient CoreLib) +target_link_libraries(plClient CoreLibExe) +target_link_libraries(plClient pfAnimation) +target_link_libraries(plClient pfAudio) +target_link_libraries(plClient pfCamera) +target_link_libraries(plClient pfCCR) +target_link_libraries(plClient pfCharacter) +target_link_libraries(plClient pfConditional) +target_link_libraries(plClient pfConsole) +target_link_libraries(plClient pfCsrSrv) +target_link_libraries(plClient pfGameGUIMgr) +target_link_libraries(plClient pfGameMgr) +target_link_libraries(plClient pfGameScoreMgr) +target_link_libraries(plClient pfJournalBook) +target_link_libraries(plClient pfLocalizationMgr) +target_link_libraries(plClient pfMessage) +target_link_libraries(plClient pfPython) +target_link_libraries(plClient pfSecurePreloader) +target_link_libraries(plClient pfStackTrace) +target_link_libraries(plClient pfSurface) +target_link_libraries(plClient plAgeDescription) +target_link_libraries(plClient plAgeLoader) +target_link_libraries(plClient plAudible) +target_link_libraries(plClient plAudio) +target_link_libraries(plClient plAudioCore) +target_link_libraries(plClient plAvatar) +#target_link_libraries(plClient plClientKey) +target_link_libraries(plClient plCompression) +target_link_libraries(plClient plContainer) +target_link_libraries(plClient plDrawable) +target_link_libraries(plClient plEncryption) +target_link_libraries(plClient plFile) +target_link_libraries(plClient plGImage) +target_link_libraries(plClient plGLight) +target_link_libraries(plClient plInputCore) +target_link_libraries(plClient plInterp) +target_link_libraries(plClient plIntersect) +target_link_libraries(plClient plJPEG) +target_link_libraries(plClient plMath) +target_link_libraries(plClient plMessage) +target_link_libraries(plClient plModifier) +target_link_libraries(plClient plNetClient) +target_link_libraries(plClient plNetClientComm) +target_link_libraries(plClient plNetClientRecorder) +target_link_libraries(plClient plNetCommon) +target_link_libraries(plClient plNetGameLib) +target_link_libraries(plClient plNetMessage) +target_link_libraries(plClient plNetTransport) +target_link_libraries(plClient plParticleSystem) +target_link_libraries(plClient plPhysical) +target_link_libraries(plClient plPhysX) +target_link_libraries(plClient plPipeline) +target_link_libraries(plClient plProgressMgr) +target_link_libraries(plClient plResMgr) +target_link_libraries(plClient plScene) +target_link_libraries(plClient plSDL) +target_link_libraries(plClient plSockets) +target_link_libraries(plClient plStatGather) +target_link_libraries(plClient plStatusLog) +target_link_libraries(plClient plStreamLogger) +target_link_libraries(plClient plSurface) +target_link_libraries(plClient plTransform) +target_link_libraries(plClient plUnifiedTime) +target_link_libraries(plClient plUUID) +target_link_libraries(plClient plVault) +target_link_libraries(plClient pnAddrInfo) +target_link_libraries(plClient pnAsyncCore) +target_link_libraries(plClient pnAsyncCoreExe) +target_link_libraries(plClient pnCsrNet) +target_link_libraries(plClient pnDispatch) +target_link_libraries(plClient pnFactory) +target_link_libraries(plClient pnGameMgr) +target_link_libraries(plClient pnIni) +target_link_libraries(plClient pnIniExe) +target_link_libraries(plClient pnInputCore) +target_link_libraries(plClient pnKeyedObject) +target_link_libraries(plClient pnMessage) +target_link_libraries(plClient pnModifier) +target_link_libraries(plClient pnNetBase) +target_link_libraries(plClient pnNetCli) +target_link_libraries(plClient pnNetCommon) +target_link_libraries(plClient pnNetProtocol) +target_link_libraries(plClient pnNucleusInc) +target_link_libraries(plClient pnProduct) +target_link_libraries(plClient pnSceneObject) +target_link_libraries(plClient pnSimpleNet) +target_link_libraries(plClient pnTimer) +target_link_libraries(plClient pnUtils) +target_link_libraries(plClient pnUtilsExe) + +target_link_libraries(plClient ${PYTHON_LIBRARY}) +target_link_libraries(plClient ${PYTHON_DEBUG_LIBRARY}) +target_link_libraries(plClient ${OPENAL_LIBRARY}) +target_link_libraries(plClient ${OPENSSL_LIBRARIES}) +target_link_libraries(plClient ${EXPAT_LIBRARY}) +target_link_libraries(plClient ${JPEG_LIBRARY}) +target_link_libraries(plClient ${Speex_LIBRARY}) +target_link_libraries(plClient ${PHYSX_LIBRARIES}) +target_link_libraries(plClient ${Ogg_LIBRARIES}) +target_link_libraries(plClient ${Vorbis_LIBRARIES}) +target_link_libraries(plClient ws2_32) +target_link_libraries(plClient winhttp) +target_link_libraries(plClient version) +target_link_libraries(plClient rpcrt4) +target_link_libraries(plClient vfw32) +target_link_libraries(plClient d3d9) +target_link_libraries(plClient d3dx9) +target_link_libraries(plClient ddraw) +target_link_libraries(plClient dinput8) +target_link_libraries(plClient dsound) +target_link_libraries(plClient dxerr9) +target_link_libraries(plClient dxguid) +target_link_libraries(plClient strmiids) + +source_group("Source Files" FILES ${plClient_SOURCES}) +source_group("Header Files" FILES ${plClient_HEADERS}) +source_group("Text" FILES ${plClient_TEXT}) +source_group("Resource Files" FILES ${plClient_RESOURCES}) diff --git a/Sources/Plasma/Apps/plClient/plClient.cpp b/Sources/Plasma/Apps/plClient/plClient.cpp index 0a45a9c1..c13b7d41 100644 --- a/Sources/Plasma/Apps/plClient/plClient.cpp +++ b/Sources/Plasma/Apps/plClient/plClient.cpp @@ -45,120 +45,120 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsWindowHndl.h" #include "plClient.h" #include "hsStream.h" -#include "../plResMgr/plResManager.h" -#include "../plResMgr/plKeyFinder.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnMessage/plRefMsg.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../plScene/plSceneNode.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnMessage/plClientMsg.h" -#include "../pfCamera/plVirtualCamNeu.h" +#include "plResMgr/plResManager.h" +#include "plResMgr/plKeyFinder.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnMessage/plRefMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "plScene/plSceneNode.h" +#include "pnMessage/plTimeMsg.h" +#include "pnMessage/plClientMsg.h" +#include "pfCamera/plVirtualCamNeu.h" #include "hsTimer.h" -#include "../plPipeline/hsG3DDeviceSelector.h" -#include "../plFile/plEncryptedStream.h" -#include "../plFile/plFileUtils.h" -#include "../plInputCore/plInputManager.h" -#include "../plInputCore/plInputInterfaceMgr.h" -#include "../plInputCore/plInputDevice.h" -#include "../plPhysX/plSimulationMgr.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plScene/plRelevanceMgr.h" -#include "../pnTimer/plTimerCallbackManager.h" -#include "../pfAudio/plListener.h" -#include "../pnMessage/plCmdIfaceModMsg.h" -#include "../plMessage/plRoomLoadNotifyMsg.h" -#include "../pnMessage/plPlayerPageMsg.h" -#include "../pnMessage/plCameraMsg.h" -#include "../plMessage/plTransitionMsg.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../plMessage/plPreloaderMsg.h" -#include "../plMessage/plNetCommMsgs.h" -#include "../plMessage/plAgeLoadedMsg.h" - -#include "../pfConsole/pfConsoleEngine.h" -#include "../pfConsole/pfConsole.h" -#include "../pfConsole/pfConsoleDirSrc.h" -#include "../plScene/plPageTreeMgr.h" -#include "../plScene/plVisMgr.h" -#include "../plFile/hsFiles.h" - -#include "../pfKI/pfKI.h" - -#include "../plAudio/plAudioSystem.h" -#include "../plAudio/plAudioCaps.h" - -#include "../plStatGather/plProfileManagerFull.h" +#include "plPipeline/hsG3DDeviceSelector.h" +#include "plFile/plEncryptedStream.h" +#include "plFile/plFileUtils.h" +#include "plInputCore/plInputManager.h" +#include "plInputCore/plInputInterfaceMgr.h" +#include "plInputCore/plInputDevice.h" +#include "plPhysX/plSimulationMgr.h" +#include "plNetClient/plNetClientMgr.h" +#include "plAvatar/plAvatarMgr.h" +#include "plScene/plRelevanceMgr.h" +#include "pnTimer/plTimerCallbackManager.h" +#include "pfAudio/plListener.h" +#include "pnMessage/plCmdIfaceModMsg.h" +#include "plMessage/plRoomLoadNotifyMsg.h" +#include "pnMessage/plPlayerPageMsg.h" +#include "pnMessage/plCameraMsg.h" +#include "plMessage/plTransitionMsg.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "plMessage/plPreloaderMsg.h" +#include "plMessage/plNetCommMsgs.h" +#include "plMessage/plAgeLoadedMsg.h" + +#include "pfConsole/pfConsoleEngine.h" +#include "pfConsole/pfConsole.h" +#include "pfConsole/pfConsoleDirSrc.h" +#include "plScene/plPageTreeMgr.h" +#include "plScene/plVisMgr.h" +#include "plFile/hsFiles.h" + +#include "pfKI/pfKI.h" + +#include "plAudio/plAudioSystem.h" +#include "plAudio/plAudioCaps.h" + +#include "plStatGather/plProfileManagerFull.h" #include "plPipeline.h" -#include "../plPipeline/plPipelineCreate.h" -#include "../plPipeline/plPipeDebugFlags.h" -#include "../plPipeline/plTransitionMgr.h" -#include "../plPipeline/plCaptureRender.h" -#include "../plPipeline/plDynamicEnvMap.h" -#include "../plNetClient/plLinkEffectsMgr.h" -#include "../plAvatar/plAvatarClothing.h" -#include "../plAvatar/plArmatureMod.h" -#include "../pnMessage/plProxyDrawMsg.h" - -#include "../plScene/plRenderRequest.h" -#include "../plDrawable/plAccessGeometry.h" +#include "plPipeline/plPipelineCreate.h" +#include "plPipeline/plPipeDebugFlags.h" +#include "plPipeline/plTransitionMgr.h" +#include "plPipeline/plCaptureRender.h" +#include "plPipeline/plDynamicEnvMap.h" +#include "plNetClient/plLinkEffectsMgr.h" +#include "plAvatar/plAvatarClothing.h" +#include "plAvatar/plArmatureMod.h" +#include "pnMessage/plProxyDrawMsg.h" + +#include "plScene/plRenderRequest.h" +#include "plDrawable/plAccessGeometry.h" #include "plPipeResReq.h" -#include "../plDrawable/plVisLOSMgr.h" - -#include "../plGImage/plBitmap.h" - -#include "../plStatusLog/plStatusLog.h" -#include "../plProgressMgr/plProgressMgr.h" -#include "../plPipeline/plDTProgressMgr.h" -#include "../plPipeline/plBinkPlayer.h" -#include "../pfMoviePlayer/plMoviePlayer.h" -#include "../plMessage/plMovieMsg.h" - -#include "../plSDL/plSDL.h" - -#include "../pnDispatch/plDispatch.h" -#include "../pnDispatch/plDispatchLogBase.h" -#include "../pfGameGUIMgr/pfGameGUIMgr.h" -#include "../pfPython/cyMisc.h" -#include "../plMessage/plInputEventMsg.h" -#include "../plMessage/plRenderRequestMsg.h" -#include "../pnMessage/plEventCallbackMsg.h" -#include "../plModifier/plSimpleModifier.h" +#include "plDrawable/plVisLOSMgr.h" + +#include "plGImage/plBitmap.h" + +#include "plStatusLog/plStatusLog.h" +#include "plProgressMgr/plProgressMgr.h" +#include "plPipeline/plDTProgressMgr.h" +#include "plPipeline/plBinkPlayer.h" +#include "pfMoviePlayer/plMoviePlayer.h" +#include "plMessage/plMovieMsg.h" + +#include "plSDL/plSDL.h" + +#include "pnDispatch/plDispatch.h" +#include "pnDispatch/plDispatchLogBase.h" +#include "pfGameGUIMgr/pfGameGUIMgr.h" +#include "pfPython/cyMisc.h" +#include "plMessage/plInputEventMsg.h" +#include "plMessage/plRenderRequestMsg.h" +#include "pnMessage/plEventCallbackMsg.h" +#include "plModifier/plSimpleModifier.h" #include "plAudible.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../pnMessage/plSoundMsg.h" -#include "../pnMessage/plAudioSysMsg.h" -#include "../plMessage/plRenderMsg.h" -#include "../plAgeLoader/plResPatcher.h" -#include "../pfPython/cyPythonInterface.h" -#include "../plUnifiedTime/plClientUnifiedTime.h" -#include "../pfAnimation/plAnimDebugList.h" -#include "../pfGameGUIMgr/pfGUICtrlGenerator.h" +#include "plMessage/plAnimCmdMsg.h" +#include "pnMessage/plSoundMsg.h" +#include "pnMessage/plAudioSysMsg.h" +#include "plMessage/plRenderMsg.h" +#include "plAgeLoader/plResPatcher.h" +#include "pfPython/cyPythonInterface.h" +#include "plUnifiedTime/plClientUnifiedTime.h" +#include "pfAnimation/plAnimDebugList.h" +#include "pfGameGUIMgr/pfGUICtrlGenerator.h" -#include "../plGImage/plWinFontCache.h" -#include "../plGImage/plFontCache.h" +#include "plGImage/plWinFontCache.h" +#include "plGImage/plFontCache.h" -#include "../pfJournalBook/pfJournalBook.h" +#include "pfJournalBook/pfJournalBook.h" -#include "../plAvatar/plAGAnimInstance.h" -#include "../plAgeLoader/plAgeLoader.h" -#include "../plClientKey/plClientKey.h" +#include "plAvatar/plAGAnimInstance.h" +#include "plAgeLoader/plAgeLoader.h" +#include "plClientKey/plClientKey.h" -#include "../CoreLib/plQuality.h" -#include "../plGLight/plShadowCaster.h" +#include "CoreLib/plQuality.h" +#include "plGLight/plShadowCaster.h" -#include "../plNetClient/plNetLinkingMgr.h" -#include "../plNetCommon/plNetCommonConstants.h" -#include "../plNetGameLib/plNetGameLib.h" +#include "plNetClient/plNetLinkingMgr.h" +#include "plNetCommon/plNetCommonConstants.h" +#include "plNetGameLib/plNetGameLib.h" -#include "../pfSecurePreloader/pfSecurePreloader.h" -#include "../pfLocalizationMgr/pfLocalizationMgr.h" +#include "pfSecurePreloader/pfSecurePreloader.h" +#include "pfLocalizationMgr/pfLocalizationMgr.h" -#include "../pfCsrSrv/pfCsrSrv.h" +#include "pfCsrSrv/pfCsrSrv.h" #include "plTweak.h" diff --git a/Sources/Plasma/Apps/plClient/plClientCreatable.h b/Sources/Plasma/Apps/plClient/plClientCreatable.h index 270cd672..74b432ab 100644 --- a/Sources/Plasma/Apps/plClient/plClientCreatable.h +++ b/Sources/Plasma/Apps/plClient/plClientCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plClientCreatable_inc #define plClientCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plClient.h" diff --git a/Sources/Plasma/Apps/plClient/winmain.cpp b/Sources/Plasma/Apps/plClient/winmain.cpp index 7ac2e06b..f0de64ae 100644 --- a/Sources/Plasma/Apps/plClient/winmain.cpp +++ b/Sources/Plasma/Apps/plClient/winmain.cpp @@ -54,25 +54,25 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "hsUtils.h" #include "plClient.h" -#include "../plClientResMgr/plClientResMgr.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plNetClient/plNetLinkingMgr.h" -#include "../plInputCore/plInputManager.h" -#include "../plInputCore/plInputDevice.h" -#include "../plUnifiedTime/plUnifiedTime.h" +#include "plClientResMgr/plClientResMgr.h" +#include "plNetClient/plNetClientMgr.h" +#include "plNetClient/plNetLinkingMgr.h" +#include "plInputCore/plInputManager.h" +#include "plInputCore/plInputDevice.h" +#include "plUnifiedTime/plUnifiedTime.h" #include "plPipeline.h" -#include "../plResMgr/plResManager.h" -#include "../plResMgr/plLocalization.h" -#include "../plFile/plEncryptedStream.h" +#include "plResMgr/plResManager.h" +#include "plResMgr/plLocalization.h" +#include "plFile/plEncryptedStream.h" -#include "../plStatusLog/plStatusLog.h" -#include "../pnProduct/pnProduct.h" -#include "../plNetGameLib/plNetGameLib.h" -#include "../plFile/plFileUtils.h" +#include "plStatusLog/plStatusLog.h" +#include "pnProduct/pnProduct.h" +#include "plNetGameLib/plNetGameLib.h" +#include "plFile/plFileUtils.h" -#include "../plPhysX/plSimulationMgr.h" +#include "plPhysX/plSimulationMgr.h" -#include "res\resource.h" +#include "res/resource.h" #include #include "WinHttp.h" diff --git a/Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp b/Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp index f524275d..6c968cfa 100644 --- a/Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp +++ b/Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp @@ -494,7 +494,7 @@ static void ProcessManifestEntry (void * param, ENetError error) { s_workingDir, p->mr->manifest[p->index].clientName ); - dword start = TimeGetTime() / kTimeIntervalsPerMs; + dword start = (dword)(TimeGetTime() / kTimeIntervalsPerMs); if(!MD5Check(path, p->mr->manifest[p->index].md5)) { p->mr->critsect.Enter(); p->mr->indices.Add(p->index); diff --git a/Sources/Plasma/CMakeLists.txt b/Sources/Plasma/CMakeLists.txt index 38f6b401..b377f657 100644 --- a/Sources/Plasma/CMakeLists.txt +++ b/Sources/Plasma/CMakeLists.txt @@ -1,3 +1,4 @@ +add_subdirectory(Apps) add_subdirectory(CoreLib) add_subdirectory(CoreLibExe) add_subdirectory(FeatureLib) diff --git a/Sources/Plasma/FeatureLib/inc/pfAllCreatables.h b/Sources/Plasma/FeatureLib/inc/pfAllCreatables.h index 7e32b0e0..4a715cec 100644 --- a/Sources/Plasma/FeatureLib/inc/pfAllCreatables.h +++ b/Sources/Plasma/FeatureLib/inc/pfAllCreatables.h @@ -44,21 +44,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define pfAllCreatables_inc -#include "../pfCharacter/pfCharacterCreatable.h" -#include "../pfCamera/pfCameraCreatable.h" -#include "../pfAnimation/pfAnimationCreatable.h" -#include "../pfConditional/plConditionalObjectCreatable.h" -#include "../pfConsole/pfConsoleCreatable.h" -#include "../pfSurface/pfSurfaceCreatable.h" -#include "../pfMessage/pfMessageCreatable.h" -#include "../pfAudio/pfAudioCreatable.h" -#include "../pfPython/pfPythonCreatable.h" -#include "../pfGameGUIMgr/pfGameGUIMgrCreatable.h" +#include "pfCharacter/pfCharacterCreatable.h" +#include "pfCamera/pfCameraCreatable.h" +#include "pfAnimation/pfAnimationCreatable.h" +#include "pfConditional/plConditionalObjectCreatable.h" +#include "pfConsole/pfConsoleCreatable.h" +#include "pfSurface/pfSurfaceCreatable.h" +#include "pfMessage/pfMessageCreatable.h" +#include "pfAudio/pfAudioCreatable.h" +#include "pfPython/pfPythonCreatable.h" +#include "pfGameGUIMgr/pfGameGUIMgrCreatable.h" #ifdef PLASMA_CCR_RELEASE -#include "../pfCCR/plCCRCreatable.h" +#include "pfCCR/plCCRCreatable.h" #endif // PLASMA_CCR_RELEASE -#include "../pfJournalBook/pfJournalBookCreatable.h" -#include "../pfGameMgr/pfGameMgrCreatables.h" -#include "../pfSecurePreloader/pfSecurePreloaderCreatable.h" +#include "pfJournalBook/pfJournalBookCreatable.h" +#include "pfGameMgr/pfGameMgrCreatables.h" +#include "pfSecurePreloader/pfSecurePreloaderCreatable.h" #endif // pfAllCreatables_inc diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfGameGUIMgr/CMakeLists.txt index b66a9876..6e8a6e20 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/CMakeLists.txt +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/CMakeLists.txt @@ -15,6 +15,7 @@ set(pfGameGUIMgr_SOURCES pfGUIDialogMod.cpp pfGUIDialogNotifyProc.cpp pfGUIDragBarCtrl.cpp + pfGUIDraggableMod.cpp pfGUIDynDisplayCtrl.cpp pfGUIEditBoxMod.cpp pfGUIKnobCtrl.cpp diff --git a/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt index d5e41676..64137819 100644 --- a/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt +++ b/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt @@ -209,6 +209,7 @@ set(pfPython_GLUE pyColorGlue.cpp pyCritterBrainGlue.cpp pyDniCoordinatesGlue.cpp + pyDniInfoSourceGlue.cpp pyDrawControlGlue.cpp pyDynamicTextGlue.cpp pyGameScoreGlue.cpp @@ -278,6 +279,7 @@ set(pfPython_GAME_GLUE Games/pyGameMgrMsg.cpp Games/pyGameMgrMsg.h Games/pyGameMgrMsg.cpp + Games/pyGameMgrMsgGlue.cpp ) set(pfPython_TTT @@ -295,7 +297,7 @@ set(pfPython_HEEK Games/Heek/pyHeekGameGlue.cpp Games/Heek/pyHeekMsg.cpp Games/Heek/pyHeekMsg.h - Games/Heek/pyHeekGameGlue.cpp + Games/Heek/pyHeekMsgGlue.cpp ) set(pfPython_MARKER diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnNetCommon/CMakeLists.txt index 30c6d535..c5af8367 100644 --- a/Sources/Plasma/NucleusLib/pnNetCommon/CMakeLists.txt +++ b/Sources/Plasma/NucleusLib/pnNetCommon/CMakeLists.txt @@ -27,6 +27,7 @@ set(pnNetCommon_SOURCES plSDLTypes.cpp plSynchedObject.cpp plSynchedValue.cpp + pnNetCommon.cpp ) add_library(pnNetCommon STATIC ${pnNetCommon_HEADERS} ${pnNetCommon_SOURCES}) diff --git a/Sources/Plasma/PubUtilLib/CMakeLists.txt b/Sources/Plasma/PubUtilLib/CMakeLists.txt index 5fd9b82d..6073f573 100644 --- a/Sources/Plasma/PubUtilLib/CMakeLists.txt +++ b/Sources/Plasma/PubUtilLib/CMakeLists.txt @@ -14,7 +14,7 @@ add_subdirectory(plEncryption) add_subdirectory(plFile) #add_subdirectory(plGClip) # Not being used by any current slns #add_subdirectory(plGeometry) # Not being used by any current slns -#add_subdirectory(plGImage) +add_subdirectory(plGImage) add_subdirectory(plGLight) #add_subdirectory(plGRenderProcs) # Not being used by any current slns add_subdirectory(plInputCore) diff --git a/Sources/Plasma/PubUtilLib/plGImage/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plGImage/CMakeLists.txt new file mode 100644 index 00000000..cd0e95e6 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plGImage/CMakeLists.txt @@ -0,0 +1,47 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plGImage_SOURCES + hsCodecManager.cpp + hsDXTDirectXCodec.cpp + hsDXTSoftwareCodec.cpp + plAVIWriter.cpp + plBitmap.cpp + plBumpMapGen.cpp + plCubicEnvironmap.cpp + plDynamicTextMap.cpp + plDynSurfaceWriter.cpp + plFont.cpp + plFontCache.cpp + plLODMipmap.cpp + plMipmap.cpp + plTGAWriter.cpp + plWinFontCache.cpp +) + +set(plGImage_HEADERS + hsCodecManager.h + hsDXTDirectXCodec.h + hsDXTSoftwareCodec.h + hsRect.h + plAVIWriter.h + plBitmap.h + plBumpMapGen.h + plCubicEnvironmap.h + plDynamicTextMap.h + plDynSurfaceWriter.h + plFont.h + plFontCache.h + plGImageCreatable.h + plLODMipmap.h + plMipmap.h + plTGAWriter.h + plWinFontCache.h +) + +add_library(plGImage STATIC ${plGImage_SOURCES} ${plGImage_HEADERS}) + +source_group("Source Files" FILES ${plGImage_SOURCES}) +source_group("Header Files" FILES ${plGImage_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plGImage/hsDXTDirectXCodec.cpp b/Sources/Plasma/PubUtilLib/plGImage/hsDXTDirectXCodec.cpp index 9993b252..c49a1317 100644 --- a/Sources/Plasma/PubUtilLib/plGImage/hsDXTDirectXCodec.cpp +++ b/Sources/Plasma/PubUtilLib/plGImage/hsDXTDirectXCodec.cpp @@ -61,7 +61,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsDXTDirectXCodec.h" #include "plMipmap.h" #include "hsCodecManager.h" -#include "../plPipeline/hsGDDrawDllLoad.h" +#include "plPipeline/hsGDDrawDllLoad.h" namespace { typedef HRESULT(WINAPI * DIRECTDRAWCREATEEX)( GUID*, VOID**, REFIID, IUnknown* ); diff --git a/Sources/Plasma/PubUtilLib/plGImage/plAVIWriter.cpp b/Sources/Plasma/PubUtilLib/plGImage/plAVIWriter.cpp index bd141c7d..fe313d0c 100644 --- a/Sources/Plasma/PubUtilLib/plGImage/plAVIWriter.cpp +++ b/Sources/Plasma/PubUtilLib/plGImage/plAVIWriter.cpp @@ -48,10 +48,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTimer.h" #include "plMipmap.h" -#include "../plMessage/plRenderMsg.h" +#include "plMessage/plRenderMsg.h" #include "plPipeline.h" -#include "../pnDispatch/plDispatch.h" -#include "../pnKeyedObject/plFixedKey.h" +#include "pnDispatch/plDispatch.h" +#include "pnKeyedObject/plFixedKey.h" bool plAVIWriter::fInitialized = false; diff --git a/Sources/Plasma/PubUtilLib/plGImage/plAVIWriter.h b/Sources/Plasma/PubUtilLib/plGImage/plAVIWriter.h index 651b5ee5..8d291176 100644 --- a/Sources/Plasma/PubUtilLib/plGImage/plAVIWriter.h +++ b/Sources/Plasma/PubUtilLib/plGImage/plAVIWriter.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAVIWriter_h_inc #define plAVIWriter_h_inc -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" class plPipeline; @@ -68,4 +68,4 @@ public: virtual void Close()=0; }; -#endif // plAVIWriter_h_inc \ No newline at end of file +#endif // plAVIWriter_h_inc diff --git a/Sources/Plasma/PubUtilLib/plGImage/plBitmap.cpp b/Sources/Plasma/PubUtilLib/plGImage/plBitmap.cpp index 73fe6982..b47a6e28 100644 --- a/Sources/Plasma/PubUtilLib/plGImage/plBitmap.cpp +++ b/Sources/Plasma/PubUtilLib/plGImage/plBitmap.cpp @@ -57,8 +57,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "hsStream.h" -#include "../pnKeyedObject/plKey.h" -#include "../plPipeline/hsGDeviceRef.h" +#include "pnKeyedObject/plKey.h" +#include "plPipeline/hsGDeviceRef.h" //// Static Members /////////////////////////////////////////////////////////// @@ -113,8 +113,8 @@ UInt32 plBitmap::Read( hsStream *s ) fFlags = s->ReadSwap16(); fCompressionType = s->ReadByte(); - if( fCompressionType == kUncompressed || fCompressionType == kJPEGCompression || - fCompressionType == kPNGCompression ) + if( (fCompressionType == kUncompressed) || (fCompressionType == kJPEGCompression) || + (fCompressionType == kPNGCompression) ) { fUncompressedInfo.fType = s->ReadByte(); read++; @@ -146,8 +146,8 @@ UInt32 plBitmap::Write( hsStream *s ) s->WriteSwap16( fFlags ); s->WriteByte( fCompressionType ); - if( fCompressionType == kUncompressed || fCompressionType == kJPEGCompression || - fCompressionType == kPNGCompression ) + if( (fCompressionType == kUncompressed) || (fCompressionType == kJPEGCompression) || + (fCompressionType == kPNGCompression) ) { s->WriteByte( fUncompressedInfo.fType ); written++; diff --git a/Sources/Plasma/PubUtilLib/plGImage/plDynSurfaceWriter.cpp b/Sources/Plasma/PubUtilLib/plGImage/plDynSurfaceWriter.cpp index 62b85a7a..dbace951 100644 --- a/Sources/Plasma/PubUtilLib/plGImage/plDynSurfaceWriter.cpp +++ b/Sources/Plasma/PubUtilLib/plGImage/plDynSurfaceWriter.cpp @@ -62,10 +62,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsExceptions.h" #include "hsUtils.h" #include "hsMatrix44.h" -#include "../plMessage/plDynamicTextMsg.h" -#include "../pnKeyedObject/plKey.h" +#include "plMessage/plDynamicTextMsg.h" +#include "pnKeyedObject/plKey.h" #include "plProfile.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" #include "plWinFontCache.h" @@ -1122,4 +1122,4 @@ void plDynSurfaceWriter::DrawClippedImage( UInt16 x, UInt16 y, plMipmap *image, ::DeleteObject( brush ); } } -*/ \ No newline at end of file +*/ diff --git a/Sources/Plasma/PubUtilLib/plGImage/plDynamicTextMap.cpp b/Sources/Plasma/PubUtilLib/plGImage/plDynamicTextMap.cpp index aadd54cc..b33d2bdc 100644 --- a/Sources/Plasma/PubUtilLib/plGImage/plDynamicTextMap.cpp +++ b/Sources/Plasma/PubUtilLib/plGImage/plDynamicTextMap.cpp @@ -58,14 +58,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsExceptions.h" #include "hsUtils.h" #include "hsMatrix44.h" -#include "../plPipeline/hsGDeviceRef.h" -#include "../plMessage/plDynamicTextMsg.h" -#include "../pnKeyedObject/plKey.h" +#include "plPipeline/hsGDeviceRef.h" +#include "plMessage/plDynamicTextMsg.h" +#include "pnKeyedObject/plKey.h" #include "plProfile.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" #include "plFont.h" #include "plFontCache.h" -#include "../plResMgr/plLocalization.h" +#include "plResMgr/plLocalization.h" plProfile_CreateMemCounter("DynaTextMem", "PipeC", DynaTextMem); diff --git a/Sources/Plasma/PubUtilLib/plGImage/plFont.h b/Sources/Plasma/PubUtilLib/plGImage/plFont.h index 30a0d7bb..1984bb35 100644 --- a/Sources/Plasma/PubUtilLib/plGImage/plFont.h +++ b/Sources/Plasma/PubUtilLib/plGImage/plFont.h @@ -67,7 +67,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTemplates.h" #include "pcSmallRect.h" -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include diff --git a/Sources/Plasma/PubUtilLib/plGImage/plFontCache.cpp b/Sources/Plasma/PubUtilLib/plGImage/plFontCache.cpp index 4ca21acc..b399d366 100644 --- a/Sources/Plasma/PubUtilLib/plGImage/plFontCache.cpp +++ b/Sources/Plasma/PubUtilLib/plGImage/plFontCache.cpp @@ -56,12 +56,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plFontCache.h" #include "plFont.h" -#include "../plStatusLog/plStatusLog.h" -#include "../plFile/hsFiles.h" -#include "../pnMessage/plRefMsg.h" +#include "plStatusLog/plStatusLog.h" +#include "plFile/hsFiles.h" +#include "pnMessage/plRefMsg.h" #include "hsResMgr.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plUoid.h" char *plFontCache::kCustFontExtension = ".prf"; diff --git a/Sources/Plasma/PubUtilLib/plGImage/plFontCache.h b/Sources/Plasma/PubUtilLib/plGImage/plFontCache.h index 3c89fa28..6cd08955 100644 --- a/Sources/Plasma/PubUtilLib/plGImage/plFontCache.h +++ b/Sources/Plasma/PubUtilLib/plGImage/plFontCache.h @@ -58,7 +58,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsTemplates.h" -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" //// Class Definition ///////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plGImage/plGImageCreatable.h b/Sources/Plasma/PubUtilLib/plGImage/plGImageCreatable.h index 35e3328c..286841c5 100644 --- a/Sources/Plasma/PubUtilLib/plGImage/plGImageCreatable.h +++ b/Sources/Plasma/PubUtilLib/plGImage/plGImageCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plGImageCreatable_inc #define plGImageCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" /* #include "hsGMipmap.h" diff --git a/Sources/Plasma/PubUtilLib/plGImage/plLODMipmap.cpp b/Sources/Plasma/PubUtilLib/plGImage/plLODMipmap.cpp index 238c7e4d..fcfd34b9 100644 --- a/Sources/Plasma/PubUtilLib/plGImage/plLODMipmap.cpp +++ b/Sources/Plasma/PubUtilLib/plGImage/plLODMipmap.cpp @@ -44,11 +44,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plLODMipmap.h" #include "hsResMgr.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plUoid.h" -#include "../pnMessage/plRefMsg.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plUoid.h" +#include "pnMessage/plRefMsg.h" -#include "../plPipeline/hsGDeviceRef.h" +#include "plPipeline/hsGDeviceRef.h" plLODMipmap::plLODMipmap() diff --git a/Sources/Plasma/PubUtilLib/plGImage/plMipmap.cpp b/Sources/Plasma/PubUtilLib/plGImage/plMipmap.cpp index 55d1ce81..5b1d8b19 100644 --- a/Sources/Plasma/PubUtilLib/plGImage/plMipmap.cpp +++ b/Sources/Plasma/PubUtilLib/plGImage/plMipmap.cpp @@ -57,9 +57,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsExceptions.h" #include "hsUtils.h" #include "hsColorRGBA.h" -#include "../plPipeline/hsGDeviceRef.h" +#include "plPipeline/hsGDeviceRef.h" #include "plProfile.h" -#include "../plJPEG/plJPEG.h" +#include "plJPEG/plJPEG.h" #include "plPNG.h" plProfile_CreateMemCounter("Mipmaps", "Memory", MemMipmaps); @@ -123,8 +123,8 @@ void plMipmap::Create( UInt32 width, UInt32 height, unsigned config, UInt8 numLe } fCompressionType = compType; - if( compType == kUncompressed || compType == kJPEGCompression || - compType == kPNGCompression ) + if( (compType == kUncompressed) || (compType == kJPEGCompression) || + (compType == kPNGCompression) ) { fUncompressedInfo.fType = format; } diff --git a/Sources/Plasma/PubUtilLib/plGImage/plWinFontCache.cpp b/Sources/Plasma/PubUtilLib/plGImage/plWinFontCache.cpp index 2539781a..d6b19068 100644 --- a/Sources/Plasma/PubUtilLib/plGImage/plWinFontCache.cpp +++ b/Sources/Plasma/PubUtilLib/plGImage/plWinFontCache.cpp @@ -62,9 +62,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsWindows.h" #include "plWinFontCache.h" -#include "../plStatusLog/plStatusLog.h" -#include "../plFile/hsFiles.h" -#include "../plGImage/plDynSurfaceWriter.h" +#include "plStatusLog/plStatusLog.h" +#include "plFile/hsFiles.h" +#include "plGImage/plDynSurfaceWriter.h" #if HS_BUILD_FOR_WIN32 diff --git a/Sources/Plasma/PubUtilLib/plUnifiedTime/plUnifiedTime.cpp b/Sources/Plasma/PubUtilLib/plUnifiedTime/plUnifiedTime.cpp index c22d2f4b..50c2488e 100644 --- a/Sources/Plasma/PubUtilLib/plUnifiedTime/plUnifiedTime.cpp +++ b/Sources/Plasma/PubUtilLib/plUnifiedTime/plUnifiedTime.cpp @@ -16,6 +16,12 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . +You can contact Cyan Worlds, Inc. by email legal@cyan.com + or by snail mail at: + Cyan Worlds, Inc. + 14617 N Newport Hwy + Mead, WA 99021^M + Additional permissions under GNU GPL version 3 section 7 If you modify this Program, or any covered work, by linking or @@ -32,13 +38,8 @@ non-source form of such a combination shall include the source code for the parts of OpenSSL and IJG JPEG Library used as well as that of the covered work. -You can contact Cyan Worlds, Inc. by email legal@cyan.com - or by snail mail at: - Cyan Worlds, Inc. - 14617 N Newport Hwy - Mead, WA 99021 +/*==LICENSE==* -*==LICENSE==*/ #include #include "plUnifiedTime.h" #include "hsStlUtils.h" @@ -75,7 +76,7 @@ hsBool plUnifiedTime::SetFromWinFileTime(const FILETIME ft) if (ffsecs >= MAGICWINDOWSOFFSET) // make sure we won't end up negatice { - fSecs = (time_t)(ffsecs-MAGICWINDOWSOFFSET); + fSecs = (UInt32)(ffsecs-MAGICWINDOWSOFFSET); fMicros = (UInt32)(ff % 10000000)/10; return true; } @@ -216,14 +217,14 @@ const plUnifiedTime & plUnifiedTime::operator=(const plUnifiedTime * src) const plUnifiedTime & plUnifiedTime::operator=(time_t src) { - fSecs = src; + fSecs = (UInt32)src; fMicros = 0; return *this; } const plUnifiedTime & plUnifiedTime::operator=(unsigned long src) { - fSecs = (time_t)src; + fSecs = src; fMicros = 0; return *this; } @@ -238,7 +239,7 @@ const plUnifiedTime & plUnifiedTime::operator=(const struct timeval & src) const plUnifiedTime & plUnifiedTime::operator=(const struct tm & src) { struct tm atm = src; - fSecs = mktime(&atm); + fSecs = (UInt32)mktime(&atm); // this won't work after 2030 something, sorry return *this; } @@ -247,19 +248,25 @@ void plUnifiedTime::SetSecsDouble(double secs) hsAssert(secs>=0, "plUnifiedTime::SetSecsDouble negative time"); double x,y; x = modf(secs,&y); - fSecs = (time_t)y; + fSecs = (UInt32)y; fMicros = (UInt32)(x*1000000); } +void plUnifiedTime::FromMillis(UInt32 millis) +{ + fSecs = millis/1000; + fMicros = 0; +} + void plUnifiedTime::ToCurrentTime() { SetToUTC(); } -hsBool plUnifiedTime::SetGMTime(short year, short month, short day, short hour, short minute, short second, unsigned long usec) +hsBool plUnifiedTime::SetGMTime(short year, short month, short day, short hour, short minute, short second, unsigned long usec, int dst) { - if( !SetTime( year, month, day, hour, minute, second, usec, 0 ) ) + if( !SetTime( year, month, day, hour, minute, second, usec, dst ) ) return false; fSecs -= IGetLocalTimeZoneOffset(); @@ -278,7 +285,7 @@ hsBool plUnifiedTime::SetTime(short year, short month, short day, short hour, sh atm.tm_mon = month - 1; atm.tm_year = year - 1900; atm.tm_isdst = dst; - fSecs = mktime(&atm); + fSecs = (UInt32)mktime(&atm); // this won't work after 2030 something, sorry if (fSecs == -1) return false; if (fMicros >= 1000000) @@ -290,7 +297,7 @@ hsBool plUnifiedTime::SetTime(short year, short month, short day, short hour, sh hsBool plUnifiedTime::GetTime(short &year, short &month, short &day, short &hour, short &minute, short &second) const { - struct tm* time = IGetTime(&fSecs); + struct tm* time = IGetTime((const time_t *)&fSecs); if (!time) return false; year = time->tm_year+1900; @@ -318,8 +325,8 @@ const char* plUnifiedTime::Print() const const char* plUnifiedTime::PrintWMillis() const { static std::string s; - xtl::format(s,"%s,s:%lu,ms:%d", - Print(), (unsigned long)GetSecs(), GetMillis() ); + xtl::format(s,"%s,s:%d,ms:%d", + Print(), GetSecs(), GetMillis() ); return s.c_str(); } @@ -327,11 +334,11 @@ struct tm * plUnifiedTime::GetTm(struct tm * ptm) const { if (ptm != nil) { - *ptm = *IGetTime(&fSecs); + *ptm = *IGetTime((const time_t *)&fSecs); return ptm; } else - return IGetTime(&fSecs); + return IGetTime((const time_t *)&fSecs); } int plUnifiedTime::GetYear() const @@ -377,12 +384,15 @@ double plUnifiedTime::GetSecsDouble() const } #pragma optimize( "", on ) // restore optimizations to their defaults +UInt32 plUnifiedTime::AsMillis() +{ + return GetSecs()*1000; +} + void plUnifiedTime::Read(hsStream* s) { s->LogSubStreamStart("UnifiedTime"); - UInt32 secs; - s->LogReadSwap(&secs,"Seconds"); - fSecs = (time_t)secs; + s->LogReadSwap(&fSecs,"Seconds"); s->LogReadSwap(&fMicros,"MicroSeconds"); s->LogSubStreamEnd(); // preserve fMode @@ -390,7 +400,7 @@ void plUnifiedTime::Read(hsStream* s) void plUnifiedTime::Write(hsStream* s) const { - s->WriteSwap((UInt32)fSecs); + s->WriteSwap(fSecs); s->WriteSwap(fMicros); // preserve fMode } @@ -449,12 +459,7 @@ bool plUnifiedTime::operator>=(const plUnifiedTime & rhs) const plUnifiedTime::operator timeval() const { -#if HS_BUILD_FOR_WIN32 - // tv_secs should be a time_t, but on Windows it is a long - struct timeval t = {(long)fSecs, (long)fMicros}; -#else struct timeval t = {fSecs, fMicros}; -#endif return t; } @@ -468,7 +473,7 @@ plUnifiedTime::operator struct tm() const std::string plUnifiedTime::Format(const char * fmt) const { char buf[128]; - struct tm * t = IGetTime(&fSecs); + struct tm * t = IGetTime((const time_t *)&fSecs); if (t == nil || !strftime(buf, sizeof(buf), fmt, t)) buf[0] = '\0'; From 53d12c70c9889fe2d9cec08029f8bbba9e8feece Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Sat, 9 Apr 2011 17:37:10 -0700 Subject: [PATCH 15/18] Make python link (dynamically) (cherry picked from commit c6c5f3aad930a179f88734fa57b88328ce1c49bf) --- Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt index 64137819..c8f3a9b3 100644 --- a/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt +++ b/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt @@ -11,7 +11,6 @@ include_directories(${OPENSSL_INCLUDE_DIR}) if(WIN32) add_definitions(-DWIN32) - add_definitions(-DMS_NO_COREDLL) endif(WIN32) set(pfPython_SOURCES From 95eaaf82a04bdab1a23232f52bd6683ef9b80b5a Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Sat, 9 Apr 2011 18:31:52 -0700 Subject: [PATCH 16/18] Fix some more include paths (cherry picked from commit 65ace75aa9350a48214d5f33f5bea4e16106a398) --- Sources/Plasma/Apps/plClient/plClient.cpp | 2 +- Sources/Plasma/NucleusLib/pnNetCommon/plGenericVar.h | 2 +- Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.cpp | 2 +- Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.h | 6 +++--- Sources/Plasma/NucleusLib/pnNetCommon/plNetGroup.h | 2 +- .../Plasma/NucleusLib/pnNetCommon/plNetResManager.cpp | 10 +++++----- .../Plasma/NucleusLib/pnNetCommon/plNetSharedState.cpp | 2 +- .../Plasma/NucleusLib/pnNetCommon/plSynchedObject.cpp | 8 ++++---- .../Plasma/NucleusLib/pnNetCommon/plSynchedObject.h | 4 ++-- .../Plasma/NucleusLib/pnNetCommon/plSynchedValue.cpp | 8 ++++---- Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.cpp | 2 +- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Sources/Plasma/Apps/plClient/plClient.cpp b/Sources/Plasma/Apps/plClient/plClient.cpp index c13b7d41..73898121 100644 --- a/Sources/Plasma/Apps/plClient/plClient.cpp +++ b/Sources/Plasma/Apps/plClient/plClient.cpp @@ -978,7 +978,7 @@ void plClient::SetHoldLoadRequests(bool hold) ILoadNextRoom(); } -#include "../plResMgr/plPageInfo.h" +#include "plResMgr/plPageInfo.h" void plClient::IQueueRoomLoad(const std::vector& locs, bool hold) { diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/plGenericVar.h b/Sources/Plasma/NucleusLib/pnNetCommon/plGenericVar.h index f8bcd5b4..e18b4d39 100644 --- a/Sources/Plasma/NucleusLib/pnNetCommon/plGenericVar.h +++ b/Sources/Plasma/NucleusLib/pnNetCommon/plGenericVar.h @@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsUtils.h" #include "hsStlUtils.h" -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" class hsStream; diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.cpp b/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.cpp index ccf0737f..48316716 100644 --- a/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.cpp +++ b/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plNetApp.h" #include "hsStlUtils.h" -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" plNetApp* plNetApp::fInstance = nil; plNetObjectDebuggerBase* plNetObjectDebuggerBase::fInstance=nil; diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.h b/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.h index dfa378f4..f4a21991 100644 --- a/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.h +++ b/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.h @@ -47,11 +47,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsBitVector.h" #include "plNetGroup.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/plUoid.h" -#include "../../PubUtilLib/plStatusLog/plLoggable.h" +#include "plStatusLog/plLoggable.h" #include diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/plNetGroup.h b/Sources/Plasma/NucleusLib/pnNetCommon/plNetGroup.h index b19a9547..78121ea2 100644 --- a/Sources/Plasma/NucleusLib/pnNetCommon/plNetGroup.h +++ b/Sources/Plasma/NucleusLib/pnNetCommon/plNetGroup.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plNetGroup_h #define plNetGroup_h -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plUoid.h" #include "hsStream.h" #include "hsStlUtils.h" diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.cpp b/Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.cpp index 567aca5b..7bc5cef6 100644 --- a/Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.cpp +++ b/Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.cpp @@ -61,11 +61,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////////////// #include "plNetResManager.h" -#include "../pnKeyedObject/plKeyImp.h" -#include "../pnKeyedObject/plUoid.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnFactory/plCreatable.h" -#include "../pnNetCommon/plNetApp.h" +#include "pnKeyedObject/plKeyImp.h" +#include "pnKeyedObject/plUoid.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnFactory/plCreatable.h" +#include "pnNetCommon/plNetApp.h" #include "hsStream.h" plNetResManager::plNetResManager() diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/plNetSharedState.cpp b/Sources/Plasma/NucleusLib/pnNetCommon/plNetSharedState.cpp index 2f4bb2d9..d1996ef5 100644 --- a/Sources/Plasma/NucleusLib/pnNetCommon/plNetSharedState.cpp +++ b/Sources/Plasma/NucleusLib/pnNetCommon/plNetSharedState.cpp @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "plNetSharedState.h" #include "plGenericVar.h" -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" plNetSharedState::plNetSharedState(char* name) : fServerMayDelete(false) { diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.cpp b/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.cpp index eec71b63..5d889f03 100644 --- a/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.cpp +++ b/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.cpp @@ -44,10 +44,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNetApp.h" #include "plNetGroup.h" #include "hsResMgr.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnMessage/plSDLModifierMsg.h" -#include "../pnMessage/plSetNetGroupIDMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnKeyedObject/plKey.h" +#include "pnMessage/plSDLModifierMsg.h" +#include "pnMessage/plSetNetGroupIDMsg.h" #include diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.h b/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.h index 0142dcfa..0c429e75 100644 --- a/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.h +++ b/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define PLSYNCHOBJ_inc #include "hsTypes.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/plKey.h" #include "hsStlUtils.h" #include "plNetGroup.h" diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedValue.cpp b/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedValue.cpp index 56ce188b..51312387 100644 --- a/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedValue.cpp +++ b/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedValue.cpp @@ -42,12 +42,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plSynchedValue.h" #ifdef USE_SYNCHED_VALUES -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include "hsBitVector.h" -#include "../pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plSceneObject.h" #include "hsResMgr.h" -#include "../pnKeyedObject/plUoid.h" -#include "../pnSceneObject/plCoordinateInterface.h" +#include "pnKeyedObject/plUoid.h" +#include "pnSceneObject/plCoordinateInterface.h" #define ISaveOrLoadSimpleType() \ { \ diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.cpp b/Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.cpp index 17c4812a..3868b390 100644 --- a/Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.cpp +++ b/Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.cpp @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pnNetCommon.h" -#include "../pnAddrInfo/pnAddrInfo.h" +#include "pnAddrInfo/pnAddrInfo.h" #ifdef HS_BUILD_FOR_WIN32 # include "hsWindows.h" #elif HS_BUILD_FOR_UNIX From e9d004b2af0215cce9b59e4327fd24120a8be090 Mon Sep 17 00:00:00 2001 From: Branan Purvine-Riley Date: Sat, 9 Apr 2011 18:39:39 -0700 Subject: [PATCH 17/18] CMakeify plPythonPack (cherry picked from commit 3a24302f745d0bb9e8b947ec5b7f08c114697f70) --- Sources/Plasma/Apps/CMakeLists.txt | 9 +++++---- .../Plasma/Apps/plPythonPack/CMakeLists.txt | 19 +++++++++++++++++++ .../Apps/plPythonPack/PythonInterface.cpp | 4 ++++ Sources/Plasma/Apps/plPythonPack/main.cpp | 2 +- 4 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 Sources/Plasma/Apps/plPythonPack/CMakeLists.txt diff --git a/Sources/Plasma/Apps/CMakeLists.txt b/Sources/Plasma/Apps/CMakeLists.txt index 23df716f..832661cd 100644 --- a/Sources/Plasma/Apps/CMakeLists.txt +++ b/Sources/Plasma/Apps/CMakeLists.txt @@ -1,4 +1,5 @@ -add_definitions(-D_LIB) # We shouldn't actually need this here, but - # Cyan uses it, so meh - -add_subdirectory(plClient) +add_definitions(-D_LIB) # We shouldn't actually need this here, but + # Cyan uses it, so meh + +add_subdirectory(plClient) +add_subdirectory(plPythonPack) diff --git a/Sources/Plasma/Apps/plPythonPack/CMakeLists.txt b/Sources/Plasma/Apps/plPythonPack/CMakeLists.txt new file mode 100644 index 00000000..aff647ac --- /dev/null +++ b/Sources/Plasma/Apps/plPythonPack/CMakeLists.txt @@ -0,0 +1,19 @@ +include_directories(../../CoreLib) +include_directories(../../PubUtilLib) + +include_directories(${PYTHON_INCLUDE_DIR}) + +set(plPythonPack_SOURCES + main.cpp + PythonInterface.cpp +) + +set(plPythonPack_HEADERS + PythonInterface.h +) + +add_executable(plPythonPack ${plPythonPack_SOURCES} ${plPythonPack_HEADERS}) +target_link_libraries(plPythonPack ${PYTHON_LIBRARY} CoreLib CoreLibExe plFile) + +source_group("Source Files" FILES ${plPythonPack_SOURCES}) +source_group("Header Files" FILES ${plPythonPack_HEADERS}) diff --git a/Sources/Plasma/Apps/plPythonPack/PythonInterface.cpp b/Sources/Plasma/Apps/plPythonPack/PythonInterface.cpp index e05b29aa..3c1ae0bc 100644 --- a/Sources/Plasma/Apps/plPythonPack/PythonInterface.cpp +++ b/Sources/Plasma/Apps/plPythonPack/PythonInterface.cpp @@ -155,7 +155,11 @@ hsBool PythonInterface::DumpObject(PyObject* pyobj, char** pickle, Int32* size) { PyObject *s; // the python string object where the marsalled object wil go // convert object to a marshalled string python object +#if (PY_MAJOR_VERSION == 2) && (PY_MINOR_VERSION < 4) s = PyMarshal_WriteObjectToString(pyobj); +#else + s = PyMarshal_WriteObjectToString(pyobj, 0); +#endif // did it actually do it? if ( s != NULL ) { diff --git a/Sources/Plasma/Apps/plPythonPack/main.cpp b/Sources/Plasma/Apps/plPythonPack/main.cpp index 13df5c37..2034312b 100644 --- a/Sources/Plasma/Apps/plPythonPack/main.cpp +++ b/Sources/Plasma/Apps/plPythonPack/main.cpp @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsStream.h" -#include "../plFile/hsFiles.h" +#include "plFile/hsFiles.h" #include "PythonInterface.h" From c8c3c701db4e9029175fea1434a2a49628bb1a5c Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Sat, 9 Apr 2011 18:45:42 -0700 Subject: [PATCH 18/18] A few more fixes (cherry picked from commit 0cbab3fb6ec5c1b713d95314c50517796420c768) --- Sources/Plasma/Apps/plClient/res/plClient.rc | 4 +- .../Plasma/FeatureLib/pfPython/CMakeLists.txt | 4 -- .../NucleusLib/pnDispatch/CMakeLists.txt | 1 + .../NucleusLib/pnKeyedObject/CMakeLists.txt | 57 ++++++++++--------- .../NucleusLib/pnSceneObject/CMakeLists.txt | 55 +++++++++--------- 5 files changed, 60 insertions(+), 61 deletions(-) diff --git a/Sources/Plasma/Apps/plClient/res/plClient.rc b/Sources/Plasma/Apps/plClient/res/plClient.rc index dcdd610d..f72a0d71 100644 --- a/Sources/Plasma/Apps/plClient/res/plClient.rc +++ b/Sources/Plasma/Apps/plClient/res/plClient.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +34,7 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" + "#include \r\n" "\0" END diff --git a/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt index c8f3a9b3..4cde1637 100644 --- a/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt +++ b/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt @@ -9,10 +9,6 @@ include_directories(${PYTHON_INCLUDE_DIR}) include_directories(${OPENAL_INCLUDE_DIR}) include_directories(${OPENSSL_INCLUDE_DIR}) -if(WIN32) - add_definitions(-DWIN32) -endif(WIN32) - set(pfPython_SOURCES cyAccountManagement.cpp cyAnimation.cpp diff --git a/Sources/Plasma/NucleusLib/pnDispatch/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnDispatch/CMakeLists.txt index 381d8318..7e8eaf6e 100644 --- a/Sources/Plasma/NucleusLib/pnDispatch/CMakeLists.txt +++ b/Sources/Plasma/NucleusLib/pnDispatch/CMakeLists.txt @@ -1,6 +1,7 @@ include_directories(../../CoreLib) include_directories(../../NucleusLib) include_directories(../../NucleusLib/inc) +include_directories("../../PubUtilLib") set(pnDispatch_SOURCES plDispatch.cpp diff --git a/Sources/Plasma/NucleusLib/pnKeyedObject/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnKeyedObject/CMakeLists.txt index 614a6ef1..11ebd1fa 100644 --- a/Sources/Plasma/NucleusLib/pnKeyedObject/CMakeLists.txt +++ b/Sources/Plasma/NucleusLib/pnKeyedObject/CMakeLists.txt @@ -1,28 +1,29 @@ -include_directories("../../CoreLib") -include_directories("../../NucleusLib") -include_directories("../../NucleusLib/inc") - -set(pnKeyedObject_HEADERS - hsKeyedObject.h - plFixedKey.h - plKey.h - plKeyImp.h - plMsgForwarder.h - plReceiver.h - plUoid.h - pnKeyedObjectCreatable.h -) - -set(pnKeyedObject_SOURCES - hsKeyedObject.cpp - plFixedKey.cpp - plKey.cpp - plKeyImp.cpp - plMsgForwarder.cpp - plUoid.cpp -) - -add_library(pnKeyedObject STATIC ${pnKeyedObject_HEADERS} ${pnKeyedObject_SOURCES}) - -source_group("Header Files" FILES ${pnKeyedObject_HEADERS}) -source_group("Source Files" FILES ${pnKeyedObject_SOURCES}) +include_directories("../../CoreLib") +include_directories("../../NucleusLib") +include_directories("../../NucleusLib/inc") +include_directories("../../PubUtilLib") + +set(pnKeyedObject_HEADERS + hsKeyedObject.h + plFixedKey.h + plKey.h + plKeyImp.h + plMsgForwarder.h + plReceiver.h + plUoid.h + pnKeyedObjectCreatable.h +) + +set(pnKeyedObject_SOURCES + hsKeyedObject.cpp + plFixedKey.cpp + plKey.cpp + plKeyImp.cpp + plMsgForwarder.cpp + plUoid.cpp +) + +add_library(pnKeyedObject STATIC ${pnKeyedObject_HEADERS} ${pnKeyedObject_SOURCES}) + +source_group("Header Files" FILES ${pnKeyedObject_HEADERS}) +source_group("Source Files" FILES ${pnKeyedObject_SOURCES}) diff --git a/Sources/Plasma/NucleusLib/pnSceneObject/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnSceneObject/CMakeLists.txt index 11ad2c4a..c93d2bd1 100644 --- a/Sources/Plasma/NucleusLib/pnSceneObject/CMakeLists.txt +++ b/Sources/Plasma/NucleusLib/pnSceneObject/CMakeLists.txt @@ -1,27 +1,28 @@ -include_directories("../../CoreLib") -include_directories("../../NucleusLib") -include_directories("../../NucleusLib/inc") - -set(pnSceneObject_HEADERS - plAudioInterface.h - plCoordinateInterface.h - plDrawInterface.h - plObjInterface.h - plSceneObject.h - plSimulationInterface.h - pnSceneObjectCreatable.h -) - -set(pnSceneObject_SOURCES - plAudioInterface.cpp - plCoordinateInterface.cpp - plDrawInterface.cpp - plObjInterface.cpp - plSceneObject.cpp - plSimulationInterface.cpp -) - -add_library(pnSceneObject STATIC ${pnSceneObject_HEADERS} ${pnSceneObject_SOURCES}) - -source_group("Header Files" FILES ${pnSceneObject_HEADERS}) -source_group("Source Files" FILES ${pnSceneObject_SOURCES}) +include_directories("../../CoreLib") +include_directories("../../NucleusLib") +include_directories("../../NucleusLib/inc") +include_directories("../../PubUtilLib") + +set(pnSceneObject_HEADERS + plAudioInterface.h + plCoordinateInterface.h + plDrawInterface.h + plObjInterface.h + plSceneObject.h + plSimulationInterface.h + pnSceneObjectCreatable.h +) + +set(pnSceneObject_SOURCES + plAudioInterface.cpp + plCoordinateInterface.cpp + plDrawInterface.cpp + plObjInterface.cpp + plSceneObject.cpp + plSimulationInterface.cpp +) + +add_library(pnSceneObject STATIC ${pnSceneObject_HEADERS} ${pnSceneObject_SOURCES}) + +source_group("Header Files" FILES ${pnSceneObject_HEADERS}) +source_group("Source Files" FILES ${pnSceneObject_SOURCES})