From 0477edc597375923fc2b6580172e9ce841564d03 Mon Sep 17 00:00:00 2001 From: Zrax Date: Fri, 8 Apr 2011 18:09:44 -0700 Subject: [PATCH] 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 --- .../Plasma20/CMakeLists.txt | 16 ++- .../Plasma/FeatureLib/pfPython/CMakeLists.txt | 2 +- .../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 | 5 +- .../PubUtilLib/plAudio/plEAXListenerMod.cpp | 4 +- .../PubUtilLib/plAudio/plEAXListenerMod.h | 2 +- .../Plasma/PubUtilLib/plAudio/plSound.cpp | 32 +++--- .../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/plAudioCoreCreatable.h | 2 +- .../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 +- .../plInputCore/plInputCoreCreatable.h | 2 +- .../PubUtilLib/plInputCore/plInputDevice.cpp | 10 +- .../PubUtilLib/plInputCore/plInputDevice.h | 6 +- .../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 | 66 +++++------ .../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 | 28 ++--- .../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 | 32 +++--- .../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 | 38 +++---- .../Plasma/PubUtilLib/plPhysX/plPXPhysical.h | 2 +- .../plPhysX/plPXPhysicalController.cpp | 32 +++--- .../plPhysX/plPXPhysicalController.h | 2 +- .../Plasma/PubUtilLib/plPhysX/plPXStream.h | 4 +- .../PubUtilLib/plPhysX/plPhysXCreatable.h | 2 +- .../PubUtilLib/plPhysX/plSimulationMgr.cpp | 18 +-- .../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.cpp | 2 +- .../PubUtilLib/plPipeline/plDTProgressMgr.h | 2 +- .../PubUtilLib/plPipeline/plDXDeviceRefs.cpp | 8 +- .../PubUtilLib/plPipeline/plDXPipeline.cpp | 74 ++++++------ .../PubUtilLib/plPipeline/plDXPipeline.h | 4 +- .../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 | 12 +- .../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 +- .../Plasma20/cmake/FindOgg.cmake | 30 +++++ .../Plasma20/cmake/FindPhysX.cmake | 61 ++++++++++ .../Plasma20/cmake/FindSpeex.cmake | 30 +++++ .../Plasma20/cmake/FindVorbis.cmake | 37 ++++++ 171 files changed, 1383 insertions(+), 838 deletions(-) create mode 100644 MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/CMakeLists.txt create mode 100644 MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/CMakeLists.txt rename MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/{plAudio => plAudioCore}/plOGGCodec.cpp (96%) rename MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/{plAudio => plAudioCore}/plOGGCodec.h (95%) rename MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/{plAudio => plAudioCore}/plWavFile.cpp (100%) rename MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/{plAudio => plAudioCore}/plWavFile.h (95%) create mode 100644 MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/CMakeLists.txt create mode 100644 MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/CMakeLists.txt create mode 100644 MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/CMakeLists.txt create mode 100644 MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/CMakeLists.txt create mode 100644 MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/CMakeLists.txt create mode 100644 MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt create mode 100644 MOULOpenSourceClientPlugin/Plasma20/cmake/FindOgg.cmake create mode 100644 MOULOpenSourceClientPlugin/Plasma20/cmake/FindPhysX.cmake create mode 100644 MOULOpenSourceClientPlugin/Plasma20/cmake/FindSpeex.cmake create mode 100644 MOULOpenSourceClientPlugin/Plasma20/cmake/FindVorbis.cmake diff --git a/MOULOpenSourceClientPlugin/Plasma20/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/CMakeLists.txt index 1adcbda7..cdd8d488 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/CMakeLists.txt +++ b/MOULOpenSourceClientPlugin/Plasma20/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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt index cbb98087..d5e41676 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt @@ -354,4 +354,4 @@ 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}) +source_group("Game Glue\\VarSync" FILES ${pfPython_VSYNC}) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/CMakeLists.txt index e8da53cc..5fd9b82d 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/CMakeLists.txt +++ b/MOULOpenSourceClientPlugin/Plasma20/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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/CMakeLists.txt new file mode 100644 index 00000000..de3ff98f --- /dev/null +++ b/MOULOpenSourceClientPlugin/Plasma20/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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plAudioCaps.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plAudioCaps.cpp index 594c36f8..f0e96db4 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plAudioCaps.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plAudioCaps.cpp @@ -30,8 +30,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" @@ -41,7 +41,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plAudioCreatable.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plAudioCreatable.h index 55e24882..debb9530 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plAudioCreatable.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plAudioCreatable.h @@ -27,7 +27,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.cpp index 6ac8bdb9..de959e35 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.cpp @@ -24,9 +24,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 @@ -36,7 +36,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" @@ -46,14 +46,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.h index ba5a7dc4..0e773563 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.h @@ -30,7 +30,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plDSoundBuffer.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plDSoundBuffer.cpp index ad62b1b9..ae618165 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plDSoundBuffer.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plDSoundBuffer.cpp @@ -34,17 +34,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp index 32ae6666..f10c295c 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp @@ -36,7 +36,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" @@ -44,14 +44,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAudioSystem.h" #include -#include #include #ifdef EAX_SDK_AVAILABLE #include #include #include #endif -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" #define kDebugLog if( myLog != nil ) myLog->AddLineF( diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plEAXListenerMod.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plEAXListenerMod.cpp index 51492102..1bc1a71f 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plEAXListenerMod.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plEAXListenerMod.cpp @@ -34,11 +34,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plEAXListenerMod.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plEAXListenerMod.h index 724da41f..257e433f 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plEAXListenerMod.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plEAXListenerMod.h @@ -33,7 +33,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plSound.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plSound.cpp index 92bf0158..53cad99f 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plSound.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plSound.cpp @@ -36,22 +36,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plSound.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plSound.h index 1eebfc58..858d1910 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plSound.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plSound.h @@ -41,10 +41,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plSoundEvent.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plSoundEvent.cpp index 129d534b..2044018b 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plSoundEvent.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plSoundEvent.cpp @@ -37,8 +37,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plVoiceChat.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plVoiceChat.cpp index 017956e6..0440fbbe 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plVoiceChat.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plVoiceChat.cpp @@ -27,28 +27,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 121 #define TALKING 122 diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWAVClipBuffer.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWAVClipBuffer.cpp index 77b9ad52..bd1e0708 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWAVClipBuffer.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWAVClipBuffer.cpp @@ -47,7 +47,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWin32GroupedSound.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWin32GroupedSound.cpp index b3a8fb40..e9a72384 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWin32GroupedSound.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWin32GroupedSound.cpp @@ -38,12 +38,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWin32Sound.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWin32Sound.cpp index 30da33f1..847bd84d 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWin32Sound.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWin32Sound.cpp @@ -35,15 +35,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWin32StaticSound.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWin32StaticSound.cpp index 1692cc9c..d0010985 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWin32StaticSound.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWin32StaticSound.cpp @@ -32,15 +32,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWin32StreamingSound.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWin32StreamingSound.cpp index 8afdf44d..98d467ab 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWin32StreamingSound.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWin32StreamingSound.cpp @@ -35,12 +35,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWin32StreamingSound.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWin32StreamingSound.h index 09c2228c..f0f2e2b0 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWin32StreamingSound.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWin32StreamingSound.h @@ -27,7 +27,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/CMakeLists.txt new file mode 100644 index 00000000..249f3b5e --- /dev/null +++ b/MOULOpenSourceClientPlugin/Plasma20/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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plAudioCoreCreatable.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plAudioCoreCreatable.h index d0f6fa1b..8441cf95 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plAudioCoreCreatable.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plAudioCoreCreatable.h @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAudioCoreCreatable_inc #define plAudioCoreCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plSoundBuffer.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plAudioFileReader.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plAudioFileReader.cpp index 82d2c60d..8bf80153 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plAudioFileReader.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plAudioFileReader.cpp @@ -39,13 +39,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plBufferedFileReader.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plBufferedFileReader.h index 8611ac8d..1a25df0b 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plBufferedFileReader.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plBufferedFileReader.h @@ -35,7 +35,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plOGGCodec.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plOGGCodec.cpp similarity index 96% rename from MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plOGGCodec.cpp rename to MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plOGGCodec.cpp index 7af99edc..eb83dc97 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plOGGCodec.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plOGGCodec.cpp @@ -45,7 +45,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plOGGCodec.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plOGGCodec.h similarity index 95% rename from MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plOGGCodec.h rename to MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plOGGCodec.h index 0d3db1a3..b39797ac 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plOGGCodec.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plOGGCodec.h @@ -32,7 +32,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plSoundBuffer.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plSoundBuffer.cpp index ec2eccdd..04e9a6dc 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plSoundBuffer.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plSoundBuffer.cpp @@ -32,12 +32,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plSoundBuffer.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plSoundBuffer.h index bd89efcf..59baf77c 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plSoundBuffer.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plSoundBuffer.h @@ -36,10 +36,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWavFile.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.cpp similarity index 100% rename from MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWavFile.cpp rename to MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.cpp diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWavFile.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.h similarity index 95% rename from MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWavFile.h rename to MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.h index 5b67b875..e954494e 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWavFile.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.h @@ -33,7 +33,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/CMakeLists.txt new file mode 100644 index 00000000..b127f94b --- /dev/null +++ b/MOULOpenSourceClientPlugin/Plasma20/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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.cpp index 78f05eb4..c988ccbc 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.cpp @@ -38,27 +38,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" @@ -66,10 +66,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.h index 5dfd0d56..b14627f7 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.h @@ -33,7 +33,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plDInputDevice.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plDInputDevice.cpp index fd58d099..58c2ef87 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plDInputDevice.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plDInputDevice.cpp @@ -30,7 +30,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.cpp index edda6a9d..1ce39a76 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.cpp @@ -38,10 +38,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.h index 47e4412f..f4f7cb30 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.h @@ -33,7 +33,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputCoreCreatable.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputCoreCreatable.h index 8488346c..40e014ef 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputCoreCreatable.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputCoreCreatable.h @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plInputCoreCreatable_inc #define plInputCoreCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plInputManager.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp index bcc02193..03121de1 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp @@ -32,16 +32,16 @@ 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 "plPipeline/plPlates.h" +#include "plPipeline/plDebugText.h" #include "hsWindows.h" -#include "../NucleusLib/inc/plPipeline.h" +#include "plPipeline.h" // base size of the cursor #define CURSOR_SIZE_X 0.0675f diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h index 5c4911bb..78c07699 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h @@ -30,11 +30,11 @@ 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" -#include "../../apps/plClient/res/resource.h" +#include "../../Apps/plClient/res/resource.h" class plMessage; enum plKeyDef; struct plMouseInfo; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.cpp index 1f4f7b3a..e2c22bdb 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.cpp @@ -39,8 +39,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.h index f6bedb8d..1fee5eb3 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.h @@ -51,8 +51,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.cpp index 3948b503..17a675b7 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.cpp @@ -40,24 +40,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.h index de40327b..20e1a85a 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.h @@ -36,10 +36,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp index d262b712..e04df61d 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp @@ -35,17 +35,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.h index 39c0f9cf..59d53144 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.h @@ -31,8 +31,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plSceneInputInterface.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plSceneInputInterface.cpp index 6003f03b..0d43c7d2 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plSceneInputInterface.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plSceneInputInterface.cpp @@ -39,44 +39,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/plAvCallbackAction.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/plAvCallbackAction.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 diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plSceneInputInterface.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plSceneInputInterface.h index 41ee7dd0..230e91fe 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plSceneInputInterface.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plSceneInputInterface.h @@ -34,8 +34,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plTelescopeInputInterface.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plTelescopeInputInterface.cpp index c0edc354..e93e36c0 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plTelescopeInputInterface.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plTelescopeInputInterface.cpp @@ -38,7 +38,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plTelescopeInputInterface.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plTelescopeInputInterface.h index 8e4ffb3f..0bb095b6 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plTelescopeInputInterface.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plTelescopeInputInterface.h @@ -33,7 +33,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/CMakeLists.txt new file mode 100644 index 00000000..a750a6d6 --- /dev/null +++ b/MOULOpenSourceClientPlugin/Plasma20/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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plAnimEventModifier.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plAnimEventModifier.cpp index 16053a5f..0592d3ad 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plAnimEventModifier.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plAnimEventModifier.cpp @@ -26,11 +26,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plAnimEventModifier.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plAnimEventModifier.h index e0c85cec..7e8ba42a 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plAnimEventModifier.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plAnimEventModifier.h @@ -26,7 +26,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plAnimTimeConvertSDLModifier.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plAnimTimeConvertSDLModifier.cpp index 3526b43a..d8b063bd 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plAnimTimeConvertSDLModifier.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plAnimTimeConvertSDLModifier.cpp @@ -25,8 +25,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plAnimTimeConvertSDLModifier.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plAnimTimeConvertSDLModifier.h index 63c11e78..fe8bfb54 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plAnimTimeConvertSDLModifier.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plAnimTimeConvertSDLModifier.h @@ -26,7 +26,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.cpp index f5878dfb..5e0cfc9b 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.cpp @@ -28,19 +28,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.h index 7a9894c2..33f2139b 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.h @@ -28,7 +28,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.cpp index 954e7d2d..d5dd6325 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.cpp @@ -26,15 +26,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.h index d59df73b..2a549eec 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.h @@ -26,7 +26,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plDecalEnableMod.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plDecalEnableMod.cpp index d2fdff2f..eae18888 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plDecalEnableMod.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plDecalEnableMod.cpp @@ -27,11 +27,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plDecalEnableMod.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plDecalEnableMod.h index 50168443..55255d29 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plDecalEnableMod.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plDecalEnableMod.h @@ -28,8 +28,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plDetectorLog.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plDetectorLog.cpp index 39ff5a0b..a7567d06 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plDetectorLog.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plDetectorLog.cpp @@ -24,7 +24,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.cpp index 8071e66c..c35ac0de 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.cpp @@ -24,30 +24,30 @@ 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 "../plAvatar/plAvCallbackAction.h" +#include "plPhysical/plSimDefs.h" +#include "plAvatar/plAvCallbackAction.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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.h index e8411b69..79272cd4 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.h @@ -26,10 +26,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plGameMarkerModifier.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plGameMarkerModifier.cpp index 31c6f5c2..8de18d00 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plGameMarkerModifier.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plGameMarkerModifier.cpp @@ -24,10 +24,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plGameMarkerModifier.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plGameMarkerModifier.h index f7d52336..f753499e 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plGameMarkerModifier.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plGameMarkerModifier.h @@ -26,7 +26,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plImageLibMod.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plImageLibMod.cpp index f7d266b0..95e89575 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plImageLibMod.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plImageLibMod.cpp @@ -28,8 +28,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plImageLibMod.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plImageLibMod.h index 49971054..4a00ceb3 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plImageLibMod.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plImageLibMod.h @@ -28,8 +28,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plInterfaceInfoModifier.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plInterfaceInfoModifier.cpp index e86a53a3..23a71153 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plInterfaceInfoModifier.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plInterfaceInfoModifier.cpp @@ -27,7 +27,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plInterfaceInfoModifier.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plInterfaceInfoModifier.h index 6c579899..6b46d218 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plInterfaceInfoModifier.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plInterfaceInfoModifier.h @@ -27,8 +27,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plLayerSDLModifier.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plLayerSDLModifier.cpp index 10233690..ca65d648 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plLayerSDLModifier.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plLayerSDLModifier.cpp @@ -25,8 +25,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plLayerSDLModifier.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plLayerSDLModifier.h index a3335e22..c1b4a65d 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plLayerSDLModifier.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plLayerSDLModifier.h @@ -26,7 +26,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.cpp index 8516bfdb..9389f4e9 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.cpp @@ -26,23 +26,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 "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 "plModifier/plDetectorLog.h" +#include "plInputCore/plSceneInputInterface.h" +#include "pfConditional/plFacingConditionalObject.h" +#include "pfConditional/plObjectInBoxConditionalObject.h" plLogicModifier::plLogicModifier() diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.h index 3bac1b18..862a7ac8 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.h @@ -27,7 +27,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plMaintainersMarkerModifier.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plMaintainersMarkerModifier.cpp index 072b08d9..2f84cac2 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plMaintainersMarkerModifier.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plMaintainersMarkerModifier.cpp @@ -24,8 +24,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plMaintainersMarkerModifier.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plMaintainersMarkerModifier.h index a9bc6250..f452c31f 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plMaintainersMarkerModifier.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plMaintainersMarkerModifier.h @@ -27,8 +27,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plModifierCreatable.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plModifierCreatable.h index b3c43771..ac7e1324 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plModifierCreatable.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plModifierCreatable.h @@ -27,7 +27,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.cpp index 260844e5..9e7c2332 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.cpp @@ -31,33 +31,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.h index 2bbf4920..dc8cd402 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.h @@ -27,8 +27,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plResponderSDLModifier.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plResponderSDLModifier.cpp index 2179b554..d3a0ac13 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plResponderSDLModifier.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plResponderSDLModifier.cpp @@ -24,7 +24,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plResponderSDLModifier.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plResponderSDLModifier.h index 22e3fb87..d8f6d023 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plResponderSDLModifier.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plResponderSDLModifier.h @@ -26,7 +26,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.cpp index 628f4c87..c967d644 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.cpp @@ -25,15 +25,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.cpp index 99e98949..b2af7334 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.cpp @@ -29,12 +29,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.h index 544a465d..0a8ab9f6 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.h @@ -29,7 +29,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plSoundSDLModifier.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plSoundSDLModifier.cpp index 8fbe10af..ad306daf 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plSoundSDLModifier.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plSoundSDLModifier.cpp @@ -24,10 +24,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plSoundSDLModifier.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plSoundSDLModifier.h index bf0a67ae..c70c0fc6 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plSoundSDLModifier.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plSoundSDLModifier.h @@ -26,7 +26,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plSpawnModifier.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plSpawnModifier.cpp index 9b5ad425..a4984f17 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plSpawnModifier.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plSpawnModifier.cpp @@ -27,17 +27,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plSpawnModifier.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plSpawnModifier.h index 229013d5..c6fc3643 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plSpawnModifier.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plSpawnModifier.h @@ -27,8 +27,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/CMakeLists.txt new file mode 100644 index 00000000..10834491 --- /dev/null +++ b/MOULOpenSourceClientPlugin/Plasma20/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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.cpp index 1a849d7a..e68eddae 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.cpp @@ -24,37 +24,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.h index 94a75ed7..6326cb78 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.h @@ -26,7 +26,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.cpp index ec076027..8e42395b 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.cpp @@ -35,28 +35,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.h index 6c0a766a..305084e2 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.h @@ -34,8 +34,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.cpp index cf3fe27d..881655ed 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.cpp @@ -33,18 +33,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.h index a6b18ca0..8694f3a5 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.h @@ -34,8 +34,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientCommInterface.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientCommInterface.cpp index 860c9a2f..fc988cbf 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientCommInterface.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientCommInterface.cpp @@ -27,8 +27,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientCreatable.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientCreatable.h index 69fa1afa..6b7c86aa 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientCreatable.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientCreatable.h @@ -26,12 +26,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.cpp index ad007669..e20305eb 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.cpp @@ -25,8 +25,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h index f4a2f567..44f0cb25 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h @@ -27,7 +27,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp index 6c314281..fe2ed196 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp @@ -33,62 +33,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h index b691f4db..7458793e 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h @@ -35,13 +35,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrLoad.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrLoad.cpp index 1d29c25c..8ddab4b9 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrLoad.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrLoad.cpp @@ -26,8 +26,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" @@ -36,38 +36,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrRecord.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrRecord.cpp index d72ad6b2..0a35a3ad 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrRecord.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrRecord.cpp @@ -26,10 +26,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrSend.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrSend.cpp index 500dcaca..17c2db7b 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrSend.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrSend.cpp @@ -30,29 +30,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrShow.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrShow.cpp index 688cc229..112d890b 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrShow.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrShow.cpp @@ -26,13 +26,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrVoice.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrVoice.cpp index b982c133..e9dcb9d3 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrVoice.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrVoice.cpp @@ -29,17 +29,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.cpp index 03949fb1..ceafd3dc 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.cpp @@ -32,36 +32,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 //////////////////////////////////////////////////////////////////////// @@ -225,7 +225,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.h index 86ed2d1d..f789af88 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.h @@ -26,7 +26,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgScreener.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgScreener.cpp index 7d1abedb..9cd597a2 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgScreener.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgScreener.cpp @@ -26,12 +26,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgScreener.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgScreener.h index e61fd5fd..77c5fffb 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgScreener.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgScreener.h @@ -26,7 +26,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.cpp index 04d1eb6a..3322293a 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.cpp @@ -28,25 +28,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.h index d254b51f..c9d4b555 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.h @@ -29,9 +29,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.cpp index df100eb2..d79ccd77 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.cpp @@ -27,13 +27,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.h index b9f0ca9c..c8f8b8bb 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.h @@ -28,8 +28,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetVoiceList.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetVoiceList.cpp index c984065b..81385863 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetVoiceList.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetVoiceList.cpp @@ -27,10 +27,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/CMakeLists.txt new file mode 100644 index 00000000..78ba1c73 --- /dev/null +++ b/MOULOpenSourceClientPlugin/Plasma20/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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.cpp index 82d3066c..3f170fa9 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.cpp @@ -27,8 +27,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.h index b0d8e8af..b2a52768 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.h @@ -28,8 +28,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.cpp index f922534e..0bbe4b23 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.cpp @@ -25,7 +25,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonCreatable.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonCreatable.h index 6b77ec5a..748083fa 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonCreatable.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonCreatable.h @@ -26,7 +26,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.cpp index 45ed8cc3..d30ed6e7 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.cpp @@ -28,8 +28,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetMsgScreener.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetMsgScreener.cpp index 2266d130..cd51929e 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetMsgScreener.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetMsgScreener.cpp @@ -27,24 +27,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetMsgScreener.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetMsgScreener.h index bee16a25..27a2853b 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetMsgScreener.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetMsgScreener.h @@ -26,8 +26,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.cpp index 96b8aef7..26cc4028 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.cpp @@ -25,11 +25,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plSpawnPointInfo.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plSpawnPointInfo.cpp index 92f7b984..839dd92e 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plSpawnPointInfo.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plSpawnPointInfo.cpp @@ -24,7 +24,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/CMakeLists.txt new file mode 100644 index 00000000..2082ad06 --- /dev/null +++ b/MOULOpenSourceClientPlugin/Plasma20/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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plLOSDispatch.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plLOSDispatch.cpp index c49467b4..0c90b0d3 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plLOSDispatch.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plLOSDispatch.cpp @@ -26,19 +26,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plLOSDispatch.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plLOSDispatch.h index 38963775..584b4b74 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plLOSDispatch.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plLOSDispatch.h @@ -23,7 +23,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPXConvert.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPXConvert.h index c1e577b3..3c5c40ef 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPXConvert.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPXConvert.h @@ -30,9 +30,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp index a9de1f77..85bcd8ce 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp @@ -25,7 +25,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plPXPhysical.h" -#include "NxPhysics.h" +#include #include "hsResMgr.h" #include "hsStream.h" @@ -35,24 +35,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.h index 2bd5a243..ae08c6e1 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.h @@ -28,7 +28,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysicalController.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysicalController.cpp index 6a5c7d1d..41ca693d 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysicalController.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysicalController.cpp @@ -27,21 +27,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plSimulationMgr.h" #include "plPXPhysical.h" #include "plPXConvert.h" -#include "../pnSceneObject/plSimulationInterface.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnMessage/plCorrectionMsg.h" -#include "../plAvatar/plArmatureMod.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../plDrawable/plDrawableGenerator.h" -#include "../plPhysical/plPhysicalProxy.h" - -#include "../pnMessage/plSetNetGroupIDMsg.h" -#include "../plMessage/plCollideMsg.h" - -#include "NxPhysics.h" -#include "ControllerManager.h" -#include "NxCapsuleController.h" -#include "NxCapsuleShape.h" +#include "pnSceneObject/plSimulationInterface.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnMessage/plCorrectionMsg.h" +#include "plAvatar/plArmatureMod.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "plDrawable/plDrawableGenerator.h" +#include "plPhysical/plPhysicalProxy.h" + +#include "pnMessage/plSetNetGroupIDMsg.h" +#include "plMessage/plCollideMsg.h" + +#include +#include +#include +#include #define kPhysxSkinWidth 0.1f #define kPhysZOffset ((fRadius + (fHeight / 2)) + kPhysxSkinWidth) @@ -60,7 +60,7 @@ hsBool plPXPhysicalController::fDebugDisplay = false; static ControllerManager gControllerMgr; static std::vector gControllers; -static gRebuildCache = false; +static bool gRebuildCache = false; // KLUDGE: From plPXPhysical.cpp bool CompareMatrices(const hsMatrix44 &matA, const hsMatrix44 &matB, float tolerance); diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysicalController.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysicalController.h index b85e220e..261a4b6f 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysicalController.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysicalController.h @@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPXPhysicalController_h_inc #define plPXPhysicalController_h_inc -#include "../plAvatar/plAvCallbackAction.h" +#include "plAvatar/plAvCallbackAction.h" #include "hsQuat.h" #define PHYSX_ONLY_TRIGGER_FROM_KINEMATIC 1 diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPXStream.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPXStream.h index 4a16fd13..6d6bf2d3 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPXStream.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPXStream.h @@ -27,8 +27,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPhysXCreatable.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPhysXCreatable.h index 98dc35d7..98cc48f4 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPhysXCreatable.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPhysXCreatable.h @@ -26,7 +26,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.cpp index 64e35a6c..e59e88cb 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.cpp @@ -25,7 +25,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plSimulationMgr.h" -#include "NxPhysics.h" +#include #include "hsTimer.h" #include "plProfile.h" @@ -33,14 +33,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.h index cf5ee626..01e063d6 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.h @@ -27,7 +27,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt new file mode 100644 index 00000000..c76d511a --- /dev/null +++ b/MOULOpenSourceClientPlugin/Plasma20/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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/hsG3DDeviceSelector.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/hsG3DDeviceSelector.cpp index bee6d217..6e06b9d9 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/hsG3DDeviceSelector.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/hsG3DDeviceSelector.cpp @@ -39,9 +39,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plCaptureRender.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plCaptureRender.cpp index b3e7ffee..145b5126 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plCaptureRender.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plCaptureRender.cpp @@ -29,16 +29,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plCaptureRender.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plCaptureRender.h index 2bec2571..cff8123a 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plCaptureRender.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plCaptureRender.h @@ -29,7 +29,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plCubicRenderTargetModifier.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plCubicRenderTargetModifier.cpp index 69ba5caf..8a44190f 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plCubicRenderTargetModifier.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plCubicRenderTargetModifier.cpp @@ -42,12 +42,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plCubicRenderTargetModifier.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plCubicRenderTargetModifier.h index 13908fdc..be12f2e6 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plCubicRenderTargetModifier.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plCubicRenderTargetModifier.h @@ -41,8 +41,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plCullTree.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plCullTree.cpp index 2997b09c..108b39e1 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plCullTree.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plCullTree.cpp @@ -26,7 +26,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plCullTree.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plCullTree.h index eb253c0a..17e00001 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plCullTree.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plCullTree.h @@ -31,7 +31,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDTProgressMgr.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDTProgressMgr.cpp index d9a58592..2171f094 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDTProgressMgr.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDTProgressMgr.cpp @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plDebugText.h" #include "plPlates.h" -#include "../Apps/plClient/res/resource.h" +#include "../../Apps/plClient/res/resource.h" #include "hsTimer.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDTProgressMgr.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDTProgressMgr.h index ade2ba4d..10aa70eb 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDTProgressMgr.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDTProgressMgr.h @@ -36,7 +36,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXDeviceRefs.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXDeviceRefs.cpp index b3e18dbd..9b31d04e 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXDeviceRefs.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXDeviceRefs.cpp @@ -48,15 +48,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp index 4df7f818..ecd2c8e1 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp @@ -61,40 +61,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" @@ -103,32 +103,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" @@ -10559,7 +10559,7 @@ inline void inlTESTPOINT(const hsPoint3& destP, void plDXPipeline::IBlendVertsIntoBuffer( plSpan* span, hsMatrix44* matrixPalette, int numMatrices, - UInt8 *src, UInt8 format, UInt32 srcStride, + const UInt8 *src, UInt8 format, UInt32 srcStride, UInt8 *dest, UInt32 destStride, UInt32 count, UInt16 localUVWChans ) { diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.h index cbf603a3..8b871b98 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.h @@ -29,7 +29,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" @@ -448,7 +448,7 @@ protected: hsBool IAvatarSort(plDrawableSpans* d, const hsTArray& visList); void IBlendVertsIntoBuffer( plSpan* span, hsMatrix44* matrixPalette, int numMatrices, - UInt8 *src, UInt8 format, UInt32 srcStride, + const UInt8 *src, UInt8 format, UInt32 srcStride, UInt8 *dest, UInt32 destStride, UInt32 count, UInt16 localUVWChans ); hsBool ISoftwareVertexBlend( plDrawableSpans* drawable, const hsTArray& visList ); diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPixelShader.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPixelShader.cpp index 60c9583d..d21616e2 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPixelShader.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPixelShader.cpp @@ -33,7 +33,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXShader.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXShader.cpp index d2807272..2b99dec9 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXShader.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXShader.cpp @@ -33,7 +33,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXVertexShader.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXVertexShader.cpp index a993c792..49ec4550 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXVertexShader.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXVertexShader.cpp @@ -33,7 +33,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDynamicEnvMap.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDynamicEnvMap.cpp index 1c9939cd..784a6d1b 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDynamicEnvMap.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDynamicEnvMap.cpp @@ -36,20 +36,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDynamicEnvMap.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDynamicEnvMap.h index 6444d1e7..58c1ef66 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDynamicEnvMap.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDynamicEnvMap.h @@ -28,7 +28,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plFogEnvironment.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plFogEnvironment.h index 1fc20422..b27a3069 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plFogEnvironment.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plFogEnvironment.h @@ -32,7 +32,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plGBufferGroup.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plGBufferGroup.cpp index 7b84a1b2..688f5c89 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plGBufferGroup.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plGBufferGroup.cpp @@ -39,8 +39,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plPipelineCreatable.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plPipelineCreatable.h index ee0e9c22..28b1ab39 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plPipelineCreatable.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plPipelineCreatable.h @@ -27,7 +27,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plPlates.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plPlates.cpp index b5b3e343..8606c4d0 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plPlates.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plPlates.cpp @@ -34,12 +34,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPipeline.h" #include "plPlates.h" -#include "../plJPEG/plJPEG.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/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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plRenderTarget.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plRenderTarget.cpp index 33e40bc9..bf832715 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plRenderTarget.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plRenderTarget.cpp @@ -42,7 +42,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plRenderTarget.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plRenderTarget.h index 67b9b2fb..f16d4aa5 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plRenderTarget.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plRenderTarget.h @@ -39,7 +39,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plStatusLogDrawer.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plStatusLogDrawer.cpp index 62b0385e..e73c67b9 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plStatusLogDrawer.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plStatusLogDrawer.cpp @@ -33,7 +33,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plStatusLogDrawer.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plStatusLogDrawer.h index 49759432..e90f7013 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plStatusLogDrawer.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plStatusLogDrawer.h @@ -32,7 +32,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plTextGenerator.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plTextGenerator.cpp index 78a5b54f..f300564b 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plTextGenerator.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plTextGenerator.cpp @@ -37,11 +37,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plTransitionMgr.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plTransitionMgr.cpp index 2f07e215..0fe19c5d 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plTransitionMgr.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plTransitionMgr.cpp @@ -41,26 +41,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/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plTransitionMgr.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plTransitionMgr.h index 08a25003..6558d127 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plTransitionMgr.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plTransitionMgr.h @@ -34,7 +34,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/MOULOpenSourceClientPlugin/Plasma20/cmake/FindOgg.cmake b/MOULOpenSourceClientPlugin/Plasma20/cmake/FindOgg.cmake new file mode 100644 index 00000000..2312e8d8 --- /dev/null +++ b/MOULOpenSourceClientPlugin/Plasma20/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/MOULOpenSourceClientPlugin/Plasma20/cmake/FindPhysX.cmake b/MOULOpenSourceClientPlugin/Plasma20/cmake/FindPhysX.cmake new file mode 100644 index 00000000..6bd434dd --- /dev/null +++ b/MOULOpenSourceClientPlugin/Plasma20/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/MOULOpenSourceClientPlugin/Plasma20/cmake/FindSpeex.cmake b/MOULOpenSourceClientPlugin/Plasma20/cmake/FindSpeex.cmake new file mode 100644 index 00000000..79cdf428 --- /dev/null +++ b/MOULOpenSourceClientPlugin/Plasma20/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/MOULOpenSourceClientPlugin/Plasma20/cmake/FindVorbis.cmake b/MOULOpenSourceClientPlugin/Plasma20/cmake/FindVorbis.cmake new file mode 100644 index 00000000..5f4fd1b7 --- /dev/null +++ b/MOULOpenSourceClientPlugin/Plasma20/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()