Browse Source

Finished PubUtilLib cmakification

--HG--
rename : MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plOGGCodec.cpp => MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plOGGCodec.cpp
rename : MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plOGGCodec.h => MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plOGGCodec.h
rename : MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWavFile.cpp => MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.cpp
rename : MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWavFile.h => MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.h

(cherry picked from commit 0477edc597)
rarified/huru-merge-work/cmake-building
Zrax 13 years ago committed by rarified
parent
commit
afdcfc9fd3
  1. 12
      CMakeLists.txt
  2. 2
      Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt
  3. 16
      Sources/Plasma/PubUtilLib/CMakeLists.txt
  4. 50
      Sources/Plasma/PubUtilLib/plAudio/CMakeLists.txt
  5. 6
      Sources/Plasma/PubUtilLib/plAudio/plAudioCaps.cpp
  6. 2
      Sources/Plasma/PubUtilLib/plAudio/plAudioCreatable.h
  7. 22
      Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.cpp
  8. 2
      Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.h
  9. 8
      Sources/Plasma/PubUtilLib/plAudio/plDSoundBuffer.cpp
  10. 4
      Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp
  11. 4
      Sources/Plasma/PubUtilLib/plAudio/plEAXListenerMod.cpp
  12. 2
      Sources/Plasma/PubUtilLib/plAudio/plEAXListenerMod.h
  13. 32
      Sources/Plasma/PubUtilLib/plAudio/plSound.cpp
  14. 8
      Sources/Plasma/PubUtilLib/plAudio/plSound.h
  15. 4
      Sources/Plasma/PubUtilLib/plAudio/plSoundEvent.cpp
  16. 26
      Sources/Plasma/PubUtilLib/plAudio/plVoiceChat.cpp
  17. 2
      Sources/Plasma/PubUtilLib/plAudio/plWAVClipBuffer.cpp
  18. 8
      Sources/Plasma/PubUtilLib/plAudio/plWin32GroupedSound.cpp
  19. 18
      Sources/Plasma/PubUtilLib/plAudio/plWin32Sound.cpp
  20. 18
      Sources/Plasma/PubUtilLib/plAudio/plWin32StaticSound.cpp
  21. 12
      Sources/Plasma/PubUtilLib/plAudio/plWin32StreamingSound.cpp
  22. 2
      Sources/Plasma/PubUtilLib/plAudio/plWin32StreamingSound.h
  23. 34
      Sources/Plasma/PubUtilLib/plAudioCore/CMakeLists.txt
  24. 10
      Sources/Plasma/PubUtilLib/plAudioCore/plAudioFileReader.cpp
  25. 2
      Sources/Plasma/PubUtilLib/plAudioCore/plBufferedFileReader.h
  26. 2
      Sources/Plasma/PubUtilLib/plAudioCore/plOGGCodec.cpp
  27. 2
      Sources/Plasma/PubUtilLib/plAudioCore/plOGGCodec.h
  28. 12
      Sources/Plasma/PubUtilLib/plAudioCore/plSoundBuffer.cpp
  29. 4
      Sources/Plasma/PubUtilLib/plAudioCore/plSoundBuffer.h
  30. 0
      Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.cpp
  31. 2
      Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.h
  32. 37
      Sources/Plasma/PubUtilLib/plInputCore/CMakeLists.txt
  33. 26
      Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.cpp
  34. 2
      Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.h
  35. 2
      Sources/Plasma/PubUtilLib/plInputCore/plDInputDevice.cpp
  36. 8
      Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.cpp
  37. 2
      Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.h
  38. 12
      Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp
  39. 4
      Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h
  40. 4
      Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.cpp
  41. 4
      Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.h
  42. 24
      Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.cpp
  43. 4
      Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.h
  44. 12
      Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp
  45. 4
      Sources/Plasma/PubUtilLib/plInputCore/plInputManager.h
  46. 66
      Sources/Plasma/PubUtilLib/plInputCore/plSceneInputInterface.cpp
  47. 4
      Sources/Plasma/PubUtilLib/plInputCore/plSceneInputInterface.h
  48. 2
      Sources/Plasma/PubUtilLib/plInputCore/plTelescopeInputInterface.cpp
  49. 2
      Sources/Plasma/PubUtilLib/plInputCore/plTelescopeInputInterface.h
  50. 59
      Sources/Plasma/PubUtilLib/plModifier/CMakeLists.txt
  51. 8
      Sources/Plasma/PubUtilLib/plModifier/plAnimEventModifier.cpp
  52. 2
      Sources/Plasma/PubUtilLib/plModifier/plAnimEventModifier.h
  53. 4
      Sources/Plasma/PubUtilLib/plModifier/plAnimTimeConvertSDLModifier.cpp
  54. 2
      Sources/Plasma/PubUtilLib/plModifier/plAnimTimeConvertSDLModifier.h
  55. 26
      Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.cpp
  56. 2
      Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.h
  57. 14
      Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.cpp
  58. 2
      Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.h
  59. 8
      Sources/Plasma/PubUtilLib/plModifier/plDecalEnableMod.cpp
  60. 4
      Sources/Plasma/PubUtilLib/plModifier/plDecalEnableMod.h
  61. 2
      Sources/Plasma/PubUtilLib/plModifier/plDetectorLog.cpp
  62. 26
      Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.cpp
  63. 4
      Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.h
  64. 6
      Sources/Plasma/PubUtilLib/plModifier/plGameMarkerModifier.cpp
  65. 2
      Sources/Plasma/PubUtilLib/plModifier/plGameMarkerModifier.h
  66. 4
      Sources/Plasma/PubUtilLib/plModifier/plImageLibMod.cpp
  67. 4
      Sources/Plasma/PubUtilLib/plModifier/plImageLibMod.h
  68. 2
      Sources/Plasma/PubUtilLib/plModifier/plInterfaceInfoModifier.cpp
  69. 4
      Sources/Plasma/PubUtilLib/plModifier/plInterfaceInfoModifier.h
  70. 4
      Sources/Plasma/PubUtilLib/plModifier/plLayerSDLModifier.cpp
  71. 2
      Sources/Plasma/PubUtilLib/plModifier/plLayerSDLModifier.h
  72. 34
      Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.cpp
  73. 2
      Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.h
  74. 4
      Sources/Plasma/PubUtilLib/plModifier/plMaintainersMarkerModifier.cpp
  75. 4
      Sources/Plasma/PubUtilLib/plModifier/plMaintainersMarkerModifier.h
  76. 2
      Sources/Plasma/PubUtilLib/plModifier/plModifierCreatable.h
  77. 50
      Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.cpp
  78. 4
      Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.h
  79. 2
      Sources/Plasma/PubUtilLib/plModifier/plResponderSDLModifier.cpp
  80. 2
      Sources/Plasma/PubUtilLib/plModifier/plResponderSDLModifier.h
  81. 18
      Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.cpp
  82. 10
      Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.cpp
  83. 2
      Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.h
  84. 8
      Sources/Plasma/PubUtilLib/plModifier/plSoundSDLModifier.cpp
  85. 2
      Sources/Plasma/PubUtilLib/plModifier/plSoundSDLModifier.h
  86. 16
      Sources/Plasma/PubUtilLib/plModifier/plSpawnModifier.cpp
  87. 4
      Sources/Plasma/PubUtilLib/plModifier/plSpawnModifier.h
  88. 47
      Sources/Plasma/PubUtilLib/plNetClient/CMakeLists.txt
  89. 42
      Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.cpp
  90. 2
      Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.h
  91. 34
      Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.cpp
  92. 4
      Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.h
  93. 24
      Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.cpp
  94. 4
      Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.h
  95. 4
      Sources/Plasma/PubUtilLib/plNetClient/plNetClientCommInterface.cpp
  96. 4
      Sources/Plasma/PubUtilLib/plNetClient/plNetClientCreatable.h
  97. 4
      Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.cpp
  98. 2
      Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h
  99. 106
      Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp
  100. 12
      Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h
  101. Some files were not shown because too many files have changed in this diff Show More

12
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(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)

2
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})

16
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)

50
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})

6
Sources/Plasma/PubUtilLib/plAudio/plAudioCaps.cpp

@ -46,8 +46,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
//////////////////////////////////////////////////////////////////////////////
#include "HeadSpin.h"
#include "al.h"
#include "alc.h"
#include <al.h>
#include <alc.h>
#include "plEAXEffects.h"
#include "plAudioCaps.h"
@ -57,7 +57,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#endif
#include <DShow.h>
#include "../plStatusLog/plStatusLog.h"
#include "plStatusLog/plStatusLog.h"
#define MAX_NUM_SOURCES 128
#define kLogMe if( fLog != nil ) fLog->AddLineF(

2
Sources/Plasma/PubUtilLib/plAudio/plAudioCreatable.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plAudioCreatable_inc
#define plAudioCreatable_inc
#include "../pnFactory/plCreator.h"
#include "pnFactory/plCreator.h"
#include "plAudioSystem.h"

22
Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.cpp

@ -40,9 +40,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "HeadSpin.h"
#include "al.h"
#include "alc.h"
#include "efx.h"
#include <al.h>
#include <alc.h>
#include <efx.h>
#include <MMREG.H>
#ifdef EAX_SDK_AVAILABLE
#include <eax.h>
@ -52,7 +52,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsGeometry3.h"
#include "plgDispatch.h"
#include "plProfile.h"
#include "../plStatusLog/plStatusLog.h"
#include "plStatusLog/plStatusLog.h"
#include "plSound.h"
#include "plAudioCaps.h"
@ -62,14 +62,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plEAXListenerMod.h"
#include "plVoiceChat.h"
#include "../pnMessage/plAudioSysMsg.h"
#include "../plMessage/plRenderMsg.h"
#include "../pnMessage/plRefMsg.h"
#include "../plMessage/plAgeLoadedMsg.h"
#include "../pnMessage/plTimeMsg.h"
#include "pnMessage/plAudioSysMsg.h"
#include "plMessage/plRenderMsg.h"
#include "pnMessage/plRefMsg.h"
#include "plMessage/plAgeLoadedMsg.h"
#include "pnMessage/plTimeMsg.h"
#include "../pnKeyedObject/plFixedKey.h"
#include "../pnKeyedObject/plKey.h"
#include "pnKeyedObject/plFixedKey.h"
#include "pnKeyedObject/plKey.h"
#define SAFE_RELEASE(p) if(p){ p->Release(); p = nil; }

2
Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.h

@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsWindowHndl.h"
#include "hsTemplates.h"
#include "hsGeometry3.h"
#include "../pnKeyedObject/hsKeyedObject.h"
#include "pnKeyedObject/hsKeyedObject.h"
#define DEFAULT_AUDIO_DEVICE_NAME "Generic Software"

8
Sources/Plasma/PubUtilLib/plAudio/plDSoundBuffer.cpp

@ -50,17 +50,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h"
#include "hsThread.h"
#include "plDSoundBuffer.h"
#include "al.h"
#include <al.h>
#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 <dsound.h>

4
Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp

@ -64,7 +64,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include <EFX-Util.h>
#endif
#include "plEAXEffects.h"
#include "../plAudioCore/plAudioCore.h"
#include "plAudioCore/plAudioCore.h"
#include "plDSoundBuffer.h"
#include "hsTemplates.h"
#include "plEAXListenerMod.h"
@ -78,7 +78,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include <eax-util.h>
#include <eaxlegacy.h>
#endif
#include "../plStatusLog/plStatusLog.h"
#include "plStatusLog/plStatusLog.h"
#define kDebugLog if( myLog != nil ) myLog->AddLineF(

4
Sources/Plasma/PubUtilLib/plAudio/plEAXListenerMod.cpp

@ -50,11 +50,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#endif
#include "hsTypes.h"
#include "plEAXListenerMod.h"
#include "../plIntersect/plSoftVolume.h"
#include "plIntersect/plSoftVolume.h"
#include "hsResMgr.h"
#include "plgDispatch.h"
#include "plAudioSystem.h"
#include "../pnMessage/plAudioSysMsg.h"
#include "pnMessage/plAudioSysMsg.h"
#ifdef EAX_SDK_AVAILABLE
#include <eax-util.h>

2
Sources/Plasma/PubUtilLib/plAudio/plEAXListenerMod.h

@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define _plEAXListenerMod_h
#include "../pnModifier/plSingleModifier.h"
#include "pnModifier/plSingleModifier.h"
class plMessage;
class plSoftVolume;

32
Sources/Plasma/PubUtilLib/plAudio/plSound.cpp

@ -52,22 +52,22 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plSound.h"
#include "plWin32Sound.h"
#include "../plAudioCore/plSoundBuffer.h"
#include "../plDrawable/plDrawableGenerator.h"
#include "../pnMessage/plRefMsg.h"
#include "../pnMessage/plTimeMsg.h"
#include "../pnMessage/plAudioSysMsg.h"
#include "../pnMessage/plSoundMsg.h"
#include "../plMessage/plListenerMsg.h"
#include "../plIntersect/plSoftVolume.h"
#include "../plStatusLog/plStatusLog.h"
#include "../plPipeline/plPlates.h"
#include "../pnKeyedObject/plKey.h"
#include "../pnNetCommon/plSDLTypes.h"
#include "../plAvatar/plScalarChannel.h"
#include "../plAvatar/plAGModifier.h"
#include "../pnSceneObject/plSceneObject.h"
#include "../pnSceneObject/plAudioInterface.h"
#include "plAudioCore/plSoundBuffer.h"
#include "plDrawable/plDrawableGenerator.h"
#include "pnMessage/plRefMsg.h"
#include "pnMessage/plTimeMsg.h"
#include "pnMessage/plAudioSysMsg.h"
#include "pnMessage/plSoundMsg.h"
#include "plMessage/plListenerMsg.h"
#include "plIntersect/plSoftVolume.h"
#include "plStatusLog/plStatusLog.h"
#include "plPipeline/plPlates.h"
#include "pnKeyedObject/plKey.h"
#include "pnNetCommon/plSDLTypes.h"
#include "plAvatar/plScalarChannel.h"
#include "plAvatar/plAGModifier.h"
#include "pnSceneObject/plSceneObject.h"
#include "pnSceneObject/plAudioInterface.h"
plProfile_CreateCounterNoReset( "Loaded", "Sound", SoundNumLoaded );
plProfile_CreateCounterNoReset( "Waiting to Die", "Sound", WaitingToDie );

8
Sources/Plasma/PubUtilLib/plAudio/plSound.h

@ -57,10 +57,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTemplates.h"
#include "hsGeometry3.h"
#include "plEAXEffects.h"
#include "../pnNetCommon/plSynchedObject.h"
#include "../plAvatar/plAGChannel.h"
#include "../plAvatar/plAGApplicator.h"
#include "../plAudioCore/plSoundBuffer.h"
#include "pnNetCommon/plSynchedObject.h"
#include "plAvatar/plAGChannel.h"
#include "plAvatar/plAGApplicator.h"
#include "plAudioCore/plSoundBuffer.h"
class hsResMgr;
class hsStream;

4
Sources/Plasma/PubUtilLib/plAudio/plSoundEvent.cpp

@ -53,8 +53,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plSoundEvent.h"
#include "plgDispatch.h"
#include "../pnMessage/plEventCallbackMsg.h"
#include "../pnMessage/plSoundMsg.h"
#include "pnMessage/plEventCallbackMsg.h"
#include "pnMessage/plSoundMsg.h"
#include "plSound.h"
plSoundEvent::plSoundEvent( Types type, plSound *owner )

26
Sources/Plasma/PubUtilLib/plAudio/plVoiceChat.cpp

@ -43,28 +43,28 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsWindows.h"
#include "hsTimer.h"
#include "hsResMgr.h"
#include "al.h"
#include "alc.h"
#include <al.h>
#include <alc.h>
#include "plDSoundBuffer.h"
#include "speex.h"
#include "speex_bits.h"
#include <speex.h>
#include <speex_bits.h>
#include "hsGeometry3.h"
#include "plVoiceChat.h"
#include "plAudioSystem.h"
#include "plgDispatch.h"
#include "../plAudible/plWinAudible.h"
#include "../plNetMessage/plNetMessage.h"
#include "../plPipeline/plPlates.h"
#include "plAudible/plWinAudible.h"
#include "plNetMessage/plNetMessage.h"
#include "plPipeline/plPlates.h"
#include "hsConfig.h"
#include "../plAvatar/plAvatarMgr.h"
#include "../plAvatar/plArmatureMod.h"
#include "plAvatar/plAvatarMgr.h"
#include "plAvatar/plArmatureMod.h"
#include "hsQuat.h"
#include "../plAudioCore/plAudioCore.h"
#include "plAudioCore/plAudioCore.h"
// DEBUG for printing to the console
#include "../plMessage/plConsoleMsg.h"
#include "../plPipeline/plDebugText.h"
#include "../plStatusLog/plStatusLog.h"
#include "plMessage/plConsoleMsg.h"
#include "plPipeline/plDebugText.h"
#include "plStatusLog/plStatusLog.h"
#define MICROPHONE "ui_microphone.png"
#define TALKING "ui_speaker.png"

2
Sources/Plasma/PubUtilLib/plAudio/plWAVClipBuffer.cpp

@ -63,7 +63,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsStream.h"
#include "hsUtils.h"
#include "plWavFile.h"
#include "plAudioCore/plWavFile.h"
//// Constructor/Destructor //////////////////////////////////////////////////

8
Sources/Plasma/PubUtilLib/plAudio/plWin32GroupedSound.cpp

@ -54,12 +54,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plDSoundBuffer.h"
#include "plAudioSystem.h"
#include "../plAudioCore/plSoundBuffer.h"
#include "../plAudioCore/plSoundDeswizzler.h"
#include "plAudioCore/plSoundBuffer.h"
#include "plAudioCore/plSoundDeswizzler.h"
#include "plgDispatch.h"
#include "../pnMessage/plSoundMsg.h"
#include "pnMessage/plSoundMsg.h"
#include "../plStatusLog/plStatusLog.h"
#include "plStatusLog/plStatusLog.h"
#include "plProfile.h"
#include "hsResMgr.h"

18
Sources/Plasma/PubUtilLib/plAudio/plWin32Sound.cpp

@ -50,15 +50,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plWin32Sound.h"
#include "plAudioSystem.h"
#include "plDSoundBuffer.h"
#include "plWavFile.h"
#include "../plAudible/plWinAudible.h"
#include "../plNetMessage/plNetMessage.h"
#include "../pnNetCommon/plNetApp.h"
#include "../pnMessage/plSoundMsg.h"
#include "../pnMessage/plEventCallbackMsg.h"
#include "../plPipeline/plPlates.h"
#include "../plStatusLog/plStatusLog.h"
#include "plAudioCore/plWavFile.h"
#include "plAudible/plWinAudible.h"
#include "plNetMessage/plNetMessage.h"
#include "pnNetCommon/plNetApp.h"
#include "pnMessage/plSoundMsg.h"
#include "pnMessage/plEventCallbackMsg.h"
#include "plPipeline/plPlates.h"
#include "plStatusLog/plStatusLog.h"
plProfile_CreateMemCounter("Sounds", "Memory", MemSounds);
plProfile_Extern(SoundPlaying);

18
Sources/Plasma/PubUtilLib/plAudio/plWin32StaticSound.cpp

@ -48,15 +48,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plWin32Sound.h"
#include "plDSoundBuffer.h"
#include "plAudioSystem.h"
#include "../plAudioCore/plSoundBuffer.h"
#include "../plAudioCore/plSoundDeswizzler.h"
#include "../pnMessage/plEventCallbackMsg.h"
#include "../pnMessage/plAudioSysMsg.h"
#include "../plMessage/plLinkToAgeMsg.h"
#include "../plMessage/plAvatarMsg.h"
#include "../plPipeline/plPlates.h"
#include "../plStatusLog/plStatusLog.h"
#include "plAudioCore/plSoundBuffer.h"
#include "plAudioCore/plSoundDeswizzler.h"
#include "pnMessage/plEventCallbackMsg.h"
#include "pnMessage/plAudioSysMsg.h"
#include "plMessage/plLinkToAgeMsg.h"
#include "plMessage/plAvatarMsg.h"
#include "plPipeline/plPlates.h"
#include "plStatusLog/plStatusLog.h"
plProfile_Extern(MemSounds);
plProfile_CreateAsynchTimer( "Static Shove Time", "Sound", StaticSndShoveTime );

12
Sources/Plasma/PubUtilLib/plAudio/plWin32StreamingSound.cpp

@ -51,12 +51,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plDSoundBuffer.h"
#include "plAudioSystem.h"
#include "../plAudioCore/plAudioFileReader.h"
#include "../plAudioCore/plSoundBuffer.h"
#include "../plAudioCore/plSoundDeswizzler.h"
#include "../pnMessage/plSoundMsg.h"
#include "../pnMessage/plEventCallbackMsg.h"
#include "../plStatusLog/plStatusLog.h"
#include "plAudioCore/plAudioFileReader.h"
#include "plAudioCore/plSoundBuffer.h"
#include "plAudioCore/plSoundDeswizzler.h"
#include "pnMessage/plSoundMsg.h"
#include "pnMessage/plEventCallbackMsg.h"
#include "plStatusLog/plStatusLog.h"
#define STREAMING_UPDATE_MS 200

2
Sources/Plasma/PubUtilLib/plAudio/plWin32StreamingSound.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define plWin32StreamingSound_h
#include "plWin32Sound.h"
#include "../pnUtils/pnUtils.h"
#include "pnUtils/pnUtils.h"
class plDSoundBuffer;
class DSoundCallbackHandle;

34
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})

10
Sources/Plasma/PubUtilLib/plAudioCore/plAudioFileReader.cpp

@ -55,13 +55,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plAudioCore.h"
//#include "hsTimer.h"
#include "hsUtils.h"
#include "../plFile/hsFiles.h"
#include "../plFile/plFileUtils.h"
#include "../plUnifiedTime/plUnifiedTime.h"
#include "plFile/hsFiles.h"
#include "plFile/plFileUtils.h"
#include "plUnifiedTime/plUnifiedTime.h"
#include "plBufferedFileReader.h"
#include "plFastWavReader.h"
#include "../plAudio/plOGGCodec.h"
#include "../plAudio/plWavFile.h"
#include "plOGGCodec.h"
#include "plWavFile.h"
#define kCacheDirName "streamingCache"

2
Sources/Plasma/PubUtilLib/plAudioCore/plBufferedFileReader.h

@ -51,7 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef _plBufferedFileReader_h
#define _plBufferedFileReader_h
#include "../plAudioCore/plAudioFileReader.h"
#include "plAudioCore/plAudioFileReader.h"
//// Class Definition ////////////////////////////////////////////////////////

2
Sources/Plasma/PubUtilLib/plAudio/plOGGCodec.cpp → Sources/Plasma/PubUtilLib/plAudioCore/plOGGCodec.cpp

@ -61,7 +61,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plOGGCodec.h"
#include "hsTimer.h"
#include "../pnNetCommon/plNetApp.h"
#include "pnNetCommon/plNetApp.h"
plOGGCodec::DecodeFormat plOGGCodec::fDecodeFormat = plOGGCodec::k16bitSigned;
UInt8 plOGGCodec::fDecodeFlags = 0;

2
Sources/Plasma/PubUtilLib/plAudio/plOGGCodec.h → Sources/Plasma/PubUtilLib/plAudioCore/plOGGCodec.h

@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef _plOGGCodec_h
#define _plOGGCodec_h
#include "../plAudioCore/plAudioFileReader.h"
#include "plAudioFileReader.h"
//// Class Definition ////////////////////////////////////////////////////////

12
Sources/Plasma/PubUtilLib/plAudioCore/plSoundBuffer.cpp

@ -48,12 +48,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plgDispatch.h"
#include "hsResMgr.h"
#include "../pnMessage/plRefMsg.h"
#include "../plFile/plFileUtils.h"
#include "../plFile/hsFiles.h"
#include "../plUnifiedTime/plUnifiedTime.h"
#include "../pnUtils/pnUtils.h"
#include "../plStatusLog/plStatusLog.h"
#include "pnMessage/plRefMsg.h"
#include "plFile/plFileUtils.h"
#include "plFile/hsFiles.h"
#include "plUnifiedTime/plUnifiedTime.h"
#include "pnUtils/pnUtils.h"
#include "plStatusLog/plStatusLog.h"
#include "hsTimer.h"
static bool s_running;

4
Sources/Plasma/PubUtilLib/plAudioCore/plSoundBuffer.h

@ -52,10 +52,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef _plSoundBuffer_h
#define _plSoundBuffer_h
#include "../pnKeyedObject/hsKeyedObject.h"
#include "pnKeyedObject/hsKeyedObject.h"
#include "plAudioCore.h"
#include "plAudioFileReader.h"
#include "../pnUtils/pnUtils.h"
#include "pnUtils/pnUtils.h"
//// Class Definition ////////////////////////////////////////////////////////

0
Sources/Plasma/PubUtilLib/plAudio/plWavFile.cpp → Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.cpp

2
Sources/Plasma/PubUtilLib/plAudio/plWavFile.h → Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.h

@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsWindows.h"
#include "hsStlUtils.h"
#include <mmsystem.h>
#include "../plAudioCore/plAudioFileReader.h"
#include "plAudioFileReader.h"
struct plSoundMarker

37
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})

26
Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.cpp

@ -54,27 +54,27 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h"
#include "plAvatarInputInterface.h"
#include "../pnInputCore/plKeyMap.h"
#include "../plMessage/plInputEventMsg.h"
#include "pnInputCore/plKeyMap.h"
#include "plMessage/plInputEventMsg.h"
#include "plInputInterfaceMgr.h"
#include "plInputManager.h"
#include "plInputDevice.h"
#include "../pnKeyedObject/plKey.h"
#include "../pnKeyedObject/plFixedKey.h"
#include "../pnSceneObject/plSceneObject.h"
#include "../pnMessage/plProxyDrawMsg.h"
#include "../pnMessage/plCmdIfaceModMsg.h"
#include "pnKeyedObject/plKey.h"
#include "pnKeyedObject/plFixedKey.h"
#include "pnSceneObject/plSceneObject.h"
#include "pnMessage/plProxyDrawMsg.h"
#include "pnMessage/plCmdIfaceModMsg.h"
// DEHACK
// used to run debug drawing stuff only; should never be checked in with this enabled
#if 0
#include "../FeatureLib/pfCamera/plVirtualCam.h"
#include "../plDrawable/plDrawableSpans.h"
#include "FeatureLib/pfCamera/plVirtualCam.h"
#include "plDrawable/plDrawableSpans.h"
#endif
#include "../plAudio/plVoiceChat.h"
#include "plAudio/plVoiceChat.h"
#include "plInputDevice.h"
#include "plInputManager.h"
#include "hsResMgr.h"
@ -82,10 +82,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsConfig.h"
#include "hsMatrix44.h"
#include "../pnSceneObject/plSceneObject.h"
#include "../pnSceneObject/plCoordinateInterface.h"
#include "pnSceneObject/plSceneObject.h"
#include "pnSceneObject/plCoordinateInterface.h"
#include "../pnNetCommon/plNetApp.h"
#include "pnNetCommon/plNetApp.h"
//// Constructor/Destructor //////////////////////////////////////////////////

2
Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.h

@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define plAvatarInputInterface_inc
#include "plInputInterface.h"
#include "../pnInputCore/plInputMap.h"
#include "pnInputCore/plInputMap.h"
#include "hsTemplates.h"

2
Sources/Plasma/PubUtilLib/plInputCore/plDInputDevice.cpp

@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plDInputDevice.h"
#include "plgDispatch.h"
#include "../plMessage/plInputEventMsg.h"
#include "plMessage/plInputEventMsg.h"
#define DIRECTINPUT_VERSION 0x0800
#include <dinput.h>
//

8
Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.cpp

@ -54,10 +54,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plInputManager.h"
#include "plInputDevice.h"
#include "../plMessage/plInputIfaceMgrMsg.h"
#include "../plMessage/plInputEventMsg.h"
#include "../pnKeyedObject/plKey.h"
#include "../pnInputCore/plKeyMap.h"
#include "plMessage/plInputIfaceMgrMsg.h"
#include "plMessage/plInputEventMsg.h"
#include "pnKeyedObject/plKey.h"
#include "pnInputCore/plKeyMap.h"
#include "plgDispatch.h"
#include "plPipeline.h"

2
Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.h

@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define _plDebugInputInterface_h
#include "plInputInterface.h"
#include "../pnInputCore/plInputMap.h"
#include "pnInputCore/plInputMap.h"
//// Class Definition ////////////////////////////////////////////////////////

12
Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp

@ -48,17 +48,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plInputDevice.h"
#include "plInputManager.h"
#include "plAvatarInputInterface.h"
#include "../plMessage/plInputEventMsg.h"
#include "../pnMessage/plTimeMsg.h"
#include "plMessage/plInputEventMsg.h"
#include "pnMessage/plTimeMsg.h"
#include "hsUtils.h"
#include "plgDispatch.h"
#include "../plPipeline/plPlates.h"
#include "../plPipeline/plDebugText.h"
#include "../plGImage/plMipmap.h"
#include "plPipeline/plPlates.h"
#include "plPipeline/plDebugText.h"
#include "plGImage/plMipmap.h"
#include "hsWindows.h"
#include "../NucleusLib/inc/plPipeline.h"
#include "plPipeline.h"
// The resolution that uses the base size of the cursor.
// All other resolutions will scale the cursor size to keep the same physical size.

4
Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h

@ -46,8 +46,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "HeadSpin.h"
#include "hsWindows.h"
//#include "../pnInputCore/plControlDefinition.h"
#include "../pnInputCore/plOSMsg.h"
//#include "pnInputCore/plControlDefinition.h"
#include "pnInputCore/plOSMsg.h"
#include "hsBitVector.h"
#include "hsTemplates.h"
class plMessage;

4
Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.cpp

@ -55,8 +55,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plInputInterface.h"
#include "plInputInterfaceMgr.h"
#include "../pnInputCore/plKeyMap.h"
#include "../plMessage/plInputEventMsg.h"
#include "pnInputCore/plKeyMap.h"
#include "plMessage/plInputEventMsg.h"
#include "hsResMgr.h"
#include "plgDispatch.h"

4
Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.h

@ -67,8 +67,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsBitVector.h"
// Needed for UNIX Build
// only windows will let you predeclare an enum
#include "../../NucleusLib/pnInputCore/plKeyDef.h"
#include "../../NucleusLib/pnInputCore/plControlEventCodes.h"
#include "pnInputCore/plKeyDef.h"
#include "pnInputCore/plControlEventCodes.h"
//// Class Definition ////////////////////////////////////////////////////////

24
Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.cpp

@ -56,24 +56,24 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plInputInterface.h"
#include "plInputDevice.h" // For mouse device stuff
#include "../pnInputCore/plKeyMap.h"
#include "../plMessage/plInputEventMsg.h"
#include "../plMessage/plInputIfaceMgrMsg.h"
#include "../pnMessage/plClientMsg.h"
#include "../pnMessage/plTimeMsg.h"
#include "../pnMessage/plCmdIfaceModMsg.h"
#include "../pnMessage/plPlayerPageMsg.h"
#include "pnInputCore/plKeyMap.h"
#include "plMessage/plInputEventMsg.h"
#include "plMessage/plInputIfaceMgrMsg.h"
#include "pnMessage/plClientMsg.h"
#include "pnMessage/plTimeMsg.h"
#include "pnMessage/plCmdIfaceModMsg.h"
#include "pnMessage/plPlayerPageMsg.h"
#include "../pnKeyedObject/plKey.h"
#include "../pnKeyedObject/plFixedKey.h"
#include "pnKeyedObject/plKey.h"
#include "pnKeyedObject/plFixedKey.h"
#include "../pnNetCommon/plNetApp.h"
#include "../plNetClient/plNetClientMgr.h"
#include "pnNetCommon/plNetApp.h"
#include "plNetClient/plNetClientMgr.h"
#include "hsResMgr.h"
#include "plgDispatch.h"
#include "plProfile.h"
#include "../plResMgr/plLocalization.h"
#include "plResMgr/plLocalization.h"
plProfile_CreateTimer("Input", "Update", Input);

4
Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.h

@ -52,10 +52,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef _plInputInterfaceMgr_h
#define _plInputInterfaceMgr_h
#include "../pnModifier/plSingleModifier.h"
#include "pnModifier/plSingleModifier.h"
#include "hsTemplates.h"
#include "hsGeometry3.h"
#include "../pnInputCore/plKeyMap.h"
#include "pnInputCore/plKeyMap.h"
//// Class Definition ////////////////////////////////////////////////////////

12
Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp

@ -51,17 +51,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plPipeline.h"
#include "plInputDevice.h"
#include "plDInputDevice.h"
#include "../plMessage/plInputEventMsg.h"
#include "plMessage/plInputEventMsg.h"
#include "plInputInterfaceMgr.h"
#include "hsStream.h"
#include "../pnKeyedObject/plKey.h"
#include "../pnKeyedObject/plFixedKey.h"
#include "pnKeyedObject/plKey.h"
#include "pnKeyedObject/plFixedKey.h"
#include "hsResMgr.h"
#include "hsTimer.h"
#include "plgDispatch.h"
#include "../pnMessage/plTimeMsg.h"
#include "../pnMessage/plCmdIfaceModMsg.h"
#include "../pnMessage/plPlayerPageMsg.h"
#include "pnMessage/plTimeMsg.h"
#include "pnMessage/plCmdIfaceModMsg.h"
#include "pnMessage/plPlayerPageMsg.h"
hsBool plInputManager::fUseDInput = false;
UInt8 plInputManager::bRecenterMouse = 0;

4
Sources/Plasma/PubUtilLib/plInputCore/plInputManager.h

@ -47,8 +47,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include <windows.h>
#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;

66
Sources/Plasma/PubUtilLib/plInputCore/plSceneInputInterface.cpp

@ -55,44 +55,44 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plInputManager.h"
#include "plInputDevice.h"
#include "../plPhysical/plPickingDetector.h"
#include "../plMessage/plInputEventMsg.h"
#include "../plMessage/plLOSRequestMsg.h"
#include "../plMessage/plLOSHitMsg.h"
#include "../plMessage/plPickedMsg.h"
#include "../plMessage/plRenderMsg.h"
#include "../plMessage/plInputIfaceMgrMsg.h"
#include "../plMessage/plVaultNotifyMsg.h"
#include "../pnMessage/plFakeOutMsg.h"
#include "../pnMessage/plNotifyMsg.h"
#include "../pnMessage/plRemoteAvatarInfoMsg.h"
#include "../pnMessage/plCursorChangeMsg.h"
#include "../pnMessage/plCameraMsg.h"
#include "../pnMessage/plPlayerPageMsg.h"
#include "../pnMessage/plCmdIfaceModMsg.h"
#include "../plAvatar/plArmatureMod.h"
#include "../plAvatar/plAvBrain.h"
#include "../plAvatar/plAvatarMgr.h"
#include "../plAvatar/plPhysicalControllerCore.h"
#include "../plModifier/plInterfaceInfoModifier.h"
#include "../pnModifier/plLogicModBase.h"
#include "../plVault/plVault.h"
#include "../plNetClient/plNetClientMgr.h"
#include "../plNetClient/plNetLinkingMgr.h"
#include "../plNetCommon/plNetServerSessionInfo.h"
#include "../plNetTransport/plNetTransport.h"
#include "../plNetTransport/plNetTransportMember.h"
#include "../pnSceneObject/plSceneObject.h"
#include "../pnSceneObject/plCoordinateInterface.h"
#include "../pnKeyedObject/plKey.h"
#include "../pnKeyedObject/plFixedKey.h"
#include "../pnInputCore/plKeyMap.h"
#include "plPhysical/plPickingDetector.h"
#include "plMessage/plInputEventMsg.h"
#include "plMessage/plLOSRequestMsg.h"
#include "plMessage/plLOSHitMsg.h"
#include "plMessage/plPickedMsg.h"
#include "plMessage/plRenderMsg.h"
#include "plMessage/plInputIfaceMgrMsg.h"
#include "plMessage/plVaultNotifyMsg.h"
#include "pnMessage/plFakeOutMsg.h"
#include "pnMessage/plNotifyMsg.h"
#include "pnMessage/plRemoteAvatarInfoMsg.h"
#include "pnMessage/plCursorChangeMsg.h"
#include "pnMessage/plCameraMsg.h"
#include "pnMessage/plPlayerPageMsg.h"
#include "pnMessage/plCmdIfaceModMsg.h"
#include "plAvatar/plArmatureMod.h"
#include "plAvatar/plAvBrain.h"
#include "plAvatar/plAvatarMgr.h"
#include "plAvatar/plPhysicalControllerCore.h"
#include "plModifier/plInterfaceInfoModifier.h"
#include "pnModifier/plLogicModBase.h"
#include "plVault/plVault.h"
#include "plNetClient/plNetClientMgr.h"
#include "plNetClient/plNetLinkingMgr.h"
#include "plNetCommon/plNetServerSessionInfo.h"
#include "plNetTransport/plNetTransport.h"
#include "plNetTransport/plNetTransportMember.h"
#include "pnSceneObject/plSceneObject.h"
#include "pnSceneObject/plCoordinateInterface.h"
#include "pnKeyedObject/plKey.h"
#include "pnKeyedObject/plFixedKey.h"
#include "pnInputCore/plKeyMap.h"
#include "plPhysical.h"
#include "plgDispatch.h"
#include "plPipeline.h"
#include "../plModifier/plDetectorLog.h"
#include "plModifier/plDetectorLog.h"
#define ID_FIND_CLICKABLE 2

4
Sources/Plasma/PubUtilLib/plInputCore/plSceneInputInterface.h

@ -50,8 +50,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plInputInterface.h"
#include "hsGeometry3.h"
#include "../pnKeyedObject/plKey.h"
#include "../pnUtils/pnUtils.h"
#include "pnKeyedObject/plKey.h"
#include "pnUtils/pnUtils.h"
//// Class Definition ////////////////////////////////////////////////////////

2
Sources/Plasma/PubUtilLib/plInputCore/plTelescopeInputInterface.cpp

@ -54,7 +54,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plInputInterfaceMgr.h"
#include "plInputManager.h"
#include "plInputDevice.h"
#include "../pnInputCore/plKeyMap.h"
#include "pnInputCore/plKeyMap.h"
#include "plgDispatch.h"

2
Sources/Plasma/PubUtilLib/plInputCore/plTelescopeInputInterface.h

@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define _plTelescopeInputInterface_h
#include "plInputInterface.h"
#include "../pnKeyedObject/plKey.h"
#include "pnKeyedObject/plKey.h"
//// Class Definition ////////////////////////////////////////////////////////

59
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})

8
Sources/Plasma/PubUtilLib/plModifier/plAnimEventModifier.cpp

@ -42,11 +42,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plAnimEventModifier.h"
#include "hsResMgr.h"
#include "../pnMessage/plMessage.h"
#include "pnMessage/plMessage.h"
#include "../pnMessage/plRefMsg.h"
#include "../pnMessage/plEnableMsg.h"
#include "../pnMessage/plEventCallbackMsg.h"
#include "pnMessage/plRefMsg.h"
#include "pnMessage/plEnableMsg.h"
#include "pnMessage/plEventCallbackMsg.h"
plAnimEventModifier::plAnimEventModifier() : fCallback(nil), fDisabled(false)
{

2
Sources/Plasma/PubUtilLib/plModifier/plAnimEventModifier.h

@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plAnimEventModifier_h_inc
#define plAnimEventModifier_h_inc
#include "../pnModifier/plSingleModifier.h"
#include "pnModifier/plSingleModifier.h"
#include "hsTemplates.h"
//

4
Sources/Plasma/PubUtilLib/plModifier/plAnimTimeConvertSDLModifier.cpp

@ -41,8 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "hsTimer.h"
#include "plAnimTimeConvertSDLModifier.h"
#include "../plSDL/plSDL.h"
#include "../plInterp/plAnimTimeConvert.h"
#include "plSDL/plSDL.h"
#include "plInterp/plAnimTimeConvert.h"
// static vars
char plAnimTimeConvertSDLModifier::AnimTimeConvertVarNames::kStrFlags[]="flags";

2
Sources/Plasma/PubUtilLib/plModifier/plAnimTimeConvertSDLModifier.h

@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plAnimTimeConvertSDLModifier_inc
#define plAnimTimeConvertSDLModifier_inc
#include "../plModifier/plSDLModifier.h"
#include "plModifier/plSDLModifier.h"
//
// This modifier (abstract baseclass) handles sending and recving

26
Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.cpp

@ -44,19 +44,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsUtils.h"
#include "plAxisAnimModifier.h"
#include "hsResMgr.h"
#include "../pnSceneObject/plSceneObject.h"
#include "../pnKeyedObject/plKey.h"
#include "../plNetMessage/plNetMsgHelpers.h"
#include "../pnMessage/plNotifyMsg.h"
#include "../pnMessage/plTimeMsg.h"
#include "../pnMessage/plCmdIfaceModMsg.h"
#include "../plMessage/plAnimCmdMsg.h"
#include "../plMessage/plInputEventMsg.h"
#include "../plMessage/plInputIfaceMgrMsg.h"
#include "../plInputCore/plInputDevice.h"
#include "../plInputCore/plInputManager.h"
#include "../plInputCore/plInputInterface.h"
#include "../pnNetCommon/plNetApp.h"
#include "pnSceneObject/plSceneObject.h"
#include "pnKeyedObject/plKey.h"
#include "plNetMessage/plNetMsgHelpers.h"
#include "pnMessage/plNotifyMsg.h"
#include "pnMessage/plTimeMsg.h"
#include "pnMessage/plCmdIfaceModMsg.h"
#include "plMessage/plAnimCmdMsg.h"
#include "plMessage/plInputEventMsg.h"
#include "plMessage/plInputIfaceMgrMsg.h"
#include "plInputCore/plInputDevice.h"
#include "plInputCore/plInputManager.h"
#include "plInputCore/plInputInterface.h"
#include "pnNetCommon/plNetApp.h"
#include "plgDispatch.h"
//// plAxisInputInterface ////////////////////////////////////////////////////

2
Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.h

@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define plAxisAnimMod_inc
#include "hsStlUtils.h"
#include "../pnModifier/plSingleModifier.h"
#include "pnModifier/plSingleModifier.h"
class plKey;

14
Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.cpp

@ -42,15 +42,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plCloneSpawnModifier.h"
#include "hsResMgr.h"
#include "../plResMgr/plResManager.h"
#include "../plResMgr/plKeyFinder.h"
#include "../pnSceneObject/plSceneObject.h"
#include "plResMgr/plResManager.h"
#include "plResMgr/plKeyFinder.h"
#include "pnSceneObject/plSceneObject.h"
#include "../plScene/plSceneNode.h"
#include "../pnMessage/plClientMsg.h"
#include "plScene/plSceneNode.h"
#include "pnMessage/plClientMsg.h"
#include "plgDispatch.h"
#include "../pnMessage/plWarpMsg.h"
#include "../pnMessage/plNodeRefMsg.h"
#include "pnMessage/plWarpMsg.h"
#include "pnMessage/plNodeRefMsg.h"
plCloneSpawnModifier::plCloneSpawnModifier() : fTemplateName(nil), fExportTime(false)
{

2
Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.h

@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plCloneSpawnModifier_inc
#define plCloneSpawnModifier_inc
#include "../pnModifier/plSingleModifier.h"
#include "pnModifier/plSingleModifier.h"
class plCloneSpawnModifier : public plSingleModifier
{

8
Sources/Plasma/PubUtilLib/plModifier/plDecalEnableMod.cpp

@ -43,11 +43,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h"
#include "plDecalEnableMod.h"
#include "../plMessage/plDynaDecalEnableMsg.h"
#include "../plMessage/plCollideMsg.h"
#include "plMessage/plDynaDecalEnableMsg.h"
#include "plMessage/plCollideMsg.h"
#include "../pnSceneObject/plSceneObject.h"
#include "../plAvatar/plArmatureMod.h"
#include "pnSceneObject/plSceneObject.h"
#include "plAvatar/plArmatureMod.h"
#include "hsTimer.h"
#include "hsStream.h"

4
Sources/Plasma/PubUtilLib/plModifier/plDecalEnableMod.h

@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define plDecalEnableMod_inc
#include "hsTemplates.h"
#include "../pnModifier/plSingleModifier.h"
#include "../pnKeyedObject/plKey.h"
#include "pnModifier/plSingleModifier.h"
#include "pnKeyedObject/plKey.h"
class plDecalEnableMod : public plSingleModifier
{

2
Sources/Plasma/PubUtilLib/plModifier/plDetectorLog.cpp

@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "plDetectorLog.h"
#include "../plStatusLog/plStatusLog.h"
#include "plStatusLog/plStatusLog.h"
// Don't bother logging detectors in the external release, since it isn't written to disk
#ifdef PLASMA_EXTERNAL_RELEASE

26
Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.cpp

@ -40,29 +40,29 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "plExcludeRegionModifier.h"
#include "../plMessage/plExcludeRegionMsg.h"
#include "plMessage/plExcludeRegionMsg.h"
#include "hsTemplates.h"
#include "hsResMgr.h"
#include "../pnSceneObject/plCoordinateInterface.h"
#include "pnSceneObject/plCoordinateInterface.h"
#include "plDetectorLog.h"
// For MsgReceive
#include "../plMessage/plCollideMsg.h"
#include "../pnSceneObject/plSceneObject.h"
#include "plMessage/plCollideMsg.h"
#include "pnSceneObject/plSceneObject.h"
// For IClear and IRelease
#include "../pnMessage/plWarpMsg.h"
#include "../plMessage/plAvatarMsg.h"
#include "pnMessage/plWarpMsg.h"
#include "plMessage/plAvatarMsg.h"
#include "plPhysical.h"
#include "../plPhysical/plSimDefs.h"
#include "plPhysical/plSimDefs.h"
#include "../plAvatar/plAvBrainGeneric.h"
#include "plAvatar/plAvBrainGeneric.h"
#include "../plSDL/plSDL.h"
#include "../pnMessage/plSDLModifierMsg.h"
#include "plSDL/plSDL.h"
#include "pnMessage/plSDLModifierMsg.h"
//for hack
#include "../plPhysX/plPXPhysical.h"
#include "../plPhysX/plPXPhysicalControllerCore.h"
#include "NxCapsule.h"
#include "plPhysX/plPXPhysical.h"
#include "plPhysX/plPXPhysicalControllerCore.h"
#include <NxCapsule.h>
static plPhysical* GetPhysical(plSceneObject* obj)
{
if (obj)

4
Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.h

@ -42,10 +42,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plExcludeRegionModifier_inc
#define plExcludeRegionModifier_inc
#include "../pnModifier/plSingleModifier.h"
#include "pnModifier/plSingleModifier.h"
#include "hsMatrix44.h"
#include "hsTemplates.h"
#include "../plModifier/plSDLModifier.h"
#include "plModifier/plSDLModifier.h"
//
// Moves all of the avatars out of the area it's SceneObject occupies and makes it

6
Sources/Plasma/PubUtilLib/plModifier/plGameMarkerModifier.cpp

@ -40,10 +40,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "plGameMarkerModifier.h"
#include "../plMessage/plCollideMsg.h"
#include "plMessage/plCollideMsg.h"
#include "../pnMessage/plNotifyMsg.h"
#include "../pnSceneObject/plSceneObject.h"
#include "pnMessage/plNotifyMsg.h"
#include "pnSceneObject/plSceneObject.h"
hsBool plGameMarkerModifier::MsgReceive(plMessage* msg)
{

2
Sources/Plasma/PubUtilLib/plModifier/plGameMarkerModifier.h

@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plGameMarkerModifier_h_inc
#define plGameMarkerModifier_h_inc
#include "../pnModifier/plSingleModifier.h"
#include "pnModifier/plSingleModifier.h"
class plGameMarkerModifier : public plSingleModifier
{

4
Sources/Plasma/PubUtilLib/plModifier/plImageLibMod.cpp

@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h"
#include "plImageLibMod.h"
#include "../plGImage/plBitmap.h"
#include "../pnMessage/plRefMsg.h"
#include "plGImage/plBitmap.h"
#include "pnMessage/plRefMsg.h"
#include "hsTimer.h"
#include "hsStream.h"

4
Sources/Plasma/PubUtilLib/plModifier/plImageLibMod.h

@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define plImageLibMod_inc
#include "hsTemplates.h"
#include "../pnModifier/plSingleModifier.h"
#include "../pnKeyedObject/plKey.h"
#include "pnModifier/plSingleModifier.h"
#include "pnKeyedObject/plKey.h"
class plBitmap;
class plImageLibMod : public plSingleModifier

2
Sources/Plasma/PubUtilLib/plModifier/plInterfaceInfoModifier.cpp

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h"
#include "plInterfaceInfoModifier.h"
#include "hsResMgr.h"
#include "../pnKeyedObject/plKey.h"
#include "pnKeyedObject/plKey.h"
plInterfaceInfoModifier::plInterfaceInfoModifier()

4
Sources/Plasma/PubUtilLib/plModifier/plInterfaceInfoModifier.h

@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plInterfaceInfoMod_inc
#define plInterfaceInfoMod_inc
#include "../pnModifier/plSingleModifier.h"
#include "../pnKeyedObject/plKey.h"
#include "pnModifier/plSingleModifier.h"
#include "pnKeyedObject/plKey.h"
#include "hsTemplates.h"
class plInterfaceInfoModifier : public plSingleModifier

4
Sources/Plasma/PubUtilLib/plModifier/plLayerSDLModifier.cpp

@ -41,8 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "hsMatrix44.h"
#include "plLayerSDLModifier.h"
#include "../plSDL/plSDL.h"
#include "../plSurface/plLayerAnimation.h"
#include "plSDL/plSDL.h"
#include "plSurface/plLayerAnimation.h"
// static vars
char plLayerSDLModifier::kStrAtc[]="atc";

2
Sources/Plasma/PubUtilLib/plModifier/plLayerSDLModifier.h

@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plLayerSDLModifier_inc
#define plLayerSDLModifier_inc
#include "../plModifier/plAnimTimeConvertSDLModifier.h"
#include "plModifier/plAnimTimeConvertSDLModifier.h"
//
// This modifier is responsible for sending and recving

34
Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.cpp

@ -42,23 +42,23 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h"
#include "plLogicModifier.h"
#include "plgDispatch.h"
#include "../pnTimer/plTimerCallbackManager.h"
#include "../pnModifier/plConditionalObject.h"
#include "../plPhysical/plDetectorModifier.h"
#include "../plMessage/plCondRefMsg.h"
#include "../plMessage/plTimerCallbackMsg.h"
#include "../plMessage/plActivatorMsg.h"
#include "../pnNetCommon/plNetApp.h"
#include "../pnSceneObject/plSceneObject.h"
#include "../pnKeyedObject/plKey.h"
#include "../pnMessage/plFakeOutMsg.h"
#include "../pnMessage/plCursorChangeMsg.h"
#include "../pnMessage/plNotifyMsg.h"
#include "../plModifier/plDetectorLog.h"
#include "../plInputCore/plSceneInputInterface.h"
#include "../../FeatureLib/pfConditional/plFacingConditionalObject.h"
#include "../../FeatureLib/pfConditional/plObjectInBoxConditionalObject.h"
#include "pnTimer/plTimerCallbackManager.h"
#include "pnModifier/plConditionalObject.h"
#include "plPhysical/plDetectorModifier.h"
#include "plMessage/plCondRefMsg.h"
#include "plMessage/plTimerCallbackMsg.h"
#include "plMessage/plActivatorMsg.h"
#include "pnNetCommon/plNetApp.h"
#include "pnSceneObject/plSceneObject.h"
#include "pnKeyedObject/plKey.h"
#include "pnMessage/plFakeOutMsg.h"
#include "pnMessage/plCursorChangeMsg.h"
#include "pnMessage/plNotifyMsg.h"
#include "plModifier/plDetectorLog.h"
#include "plInputCore/plSceneInputInterface.h"
#include "pfConditional/plFacingConditionalObject.h"
#include "pfConditional/plObjectInBoxConditionalObject.h"
plLogicModifier::plLogicModifier()

2
Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plLogicModifier_inc
#define plLogicModifier_inc
#include "../pnModifier/plLogicModBase.h"
#include "pnModifier/plLogicModBase.h"
class plLogicModifier : public plLogicModBase
{

4
Sources/Plasma/PubUtilLib/plModifier/plMaintainersMarkerModifier.cpp

@ -40,8 +40,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "plMaintainersMarkerModifier.h"
#include "../pnSceneObject/plSceneObject.h"
#include "../plAvatar/plAvatarMgr.h"
#include "pnSceneObject/plSceneObject.h"
#include "plAvatar/plAvatarMgr.h"
void plMaintainersMarkerModifier::AddTarget(plSceneObject* so)
{

4
Sources/Plasma/PubUtilLib/plModifier/plMaintainersMarkerModifier.h

@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plMaintainersMarkerModifier_inc
#define plMaintainersMarkerModifier_inc
#include "../pnModifier/plMultiModifier.h"
#include "../pnMessage/plMessage.h"
#include "pnModifier/plMultiModifier.h"
#include "pnMessage/plMessage.h"
class plMaintainersMarkerModifier : public plMultiModifier

2
Sources/Plasma/PubUtilLib/plModifier/plModifierCreatable.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plModifierCreatable_inc
#define plModifierCreatable_inc
#include "../pnFactory/plCreator.h"
#include "pnFactory/plCreator.h"
#include "plSpawnModifier.h"

50
Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.cpp

@ -47,33 +47,33 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plgDispatch.h"
#include "hsResMgr.h"
#include "plPhysical.h"
#include "../pnKeyedObject/plKey.h"
#include "../pnKeyedObject/plFixedKey.h"
#include "../pnSceneObject/plSceneObject.h"
#include "../pnMessage/plNotifyMsg.h"
#include "../pnNetCommon/plNetApp.h"
#include "pnKeyedObject/plKey.h"
#include "pnKeyedObject/plFixedKey.h"
#include "pnSceneObject/plSceneObject.h"
#include "pnMessage/plNotifyMsg.h"
#include "pnNetCommon/plNetApp.h"
// for localOnly cmd check
#include "../plMessage/plLinkToAgeMsg.h"
#include "../pnMessage/plCameraMsg.h"
#include "../pnMessage/plSoundMsg.h"
#include "../plMessage/plResponderMsg.h"
#include "../plMessage/plAnimCmdMsg.h"
#include "../plMessage/plLinkToAgeMsg.h"
#include "../pnMessage/plSDLModifierMsg.h"
#include "../../FeatureLib/pfMessage/plArmatureEffectMsg.h"
#include "../plStatusLog/plStatusLog.h"
#include "../plMessage/plTimerCallbackMsg.h"
#include "../pnTimer/plTimerCallbackManager.h"
#include "../plMessage/plSimStateMsg.h"
//#include "../plHavok1\plHKPhysical.h"
//#include "../plHavok1\plHKSubWorld.h"
#include "../plAvatar/plArmatureMod.h"
#include "../plAvatar/plAvatarMgr.h"
#include "plMessage/plLinkToAgeMsg.h"
#include "pnMessage/plCameraMsg.h"
#include "pnMessage/plSoundMsg.h"
#include "plMessage/plResponderMsg.h"
#include "plMessage/plAnimCmdMsg.h"
#include "plMessage/plLinkToAgeMsg.h"
#include "pnMessage/plSDLModifierMsg.h"
#include "pfMessage/plArmatureEffectMsg.h"
#include "plStatusLog/plStatusLog.h"
#include "plMessage/plTimerCallbackMsg.h"
#include "pnTimer/plTimerCallbackManager.h"
#include "plMessage/plSimStateMsg.h"
//#include "plHavok1\plHKPhysical.h"
//#include "plHavok1\plHKSubWorld.h"
#include "plAvatar/plArmatureMod.h"
#include "plAvatar/plAvatarMgr.h"
//#ifdef HS_DEBUGGING

4
Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.h

@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define plResponderModifier_inc
#include "hsStlUtils.h"
#include "../pnModifier/plSingleModifier.h"
#include "../pnMessage/plMessage.h"
#include "pnModifier/plSingleModifier.h"
#include "pnMessage/plMessage.h"
class plNotifyMsg;

2
Sources/Plasma/PubUtilLib/plModifier/plResponderSDLModifier.cpp

@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "plResponderSDLModifier.h"
#include "../plSDL/plSDL.h"
#include "plSDL/plSDL.h"
#include "plResponderModifier.h"
// static vars

2
Sources/Plasma/PubUtilLib/plModifier/plResponderSDLModifier.h

@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plResponderSDLModifier_inc
#define plResponderSDLModifier_inc
#include "../plModifier/plSDLModifier.h"
#include "plModifier/plSDLModifier.h"
//
// This modifier is responsible for sending and recving responder state

18
Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.cpp

@ -41,15 +41,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "plSDLModifier.h"
#include "../pnNetCommon/plSynchedObject.h"
#include "../pnDispatch/plDispatch.h"
#include "../pnSceneObject/plSceneObject.h"
#include "../pnMessage/plSDLModifierMsg.h"
#include "../plNetMessage/plNetMessage.h"
#include "../plSDL/plSDL.h"
#include "../plNetClient/plNetClientMgr.h"
#include "../plNetClient/plNetObjectDebugger.h"
#include "pnNetCommon/plSynchedObject.h"
#include "pnDispatch/plDispatch.h"
#include "pnSceneObject/plSceneObject.h"
#include "pnMessage/plSDLModifierMsg.h"
#include "plNetMessage/plNetMessage.h"
#include "plSDL/plSDL.h"
#include "plNetClient/plNetClientMgr.h"
#include "plNetClient/plNetObjectDebugger.h"
plSDLModifier::plSDLModifier() : fStateCache(nil), fSentOrRecvdState(false)
{

10
Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.cpp

@ -45,12 +45,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plgDispatch.h"
#include "hsStream.h"
#include "../pnSceneObject/plSceneObject.h"
#include "../pnMessage/plTimeMsg.h"
#include "../pnMessage/plRefMsg.h"
#include "pnSceneObject/plSceneObject.h"
#include "pnMessage/plTimeMsg.h"
#include "pnMessage/plRefMsg.h"
#include "hsTimer.h"
// #include "../pfConditional/plAnimationEventConditionalObject.h"
#include "../plMessage/plAnimCmdMsg.h"
// #include "pfConditional/plAnimationEventConditionalObject.h"
#include "plMessage/plAnimCmdMsg.h"
plSimpleModifier::plSimpleModifier()
:

2
Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.h

@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pnModifier/plModifier.h"
#include "pnNetCommon/plSynchedValue.h"
#include "../plInterp/plAnimTimeConvert.h"
#include "plInterp/plAnimTimeConvert.h"
class plSceneObject;
class plRefMsg;

8
Sources/Plasma/PubUtilLib/plModifier/plSoundSDLModifier.cpp

@ -40,10 +40,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "plSoundSDLModifier.h"
#include "../plSDL/plSDL.h"
#include "../pnSceneObject/plSceneObject.h"
#include "../pnSceneObject/plAudioInterface.h"
#include "../plAudio/plSound.h"
#include "plSDL/plSDL.h"
#include "pnSceneObject/plSceneObject.h"
#include "pnSceneObject/plAudioInterface.h"
#include "plAudio/plSound.h"
// static vars
char plSoundSDLModifier::kStrVolume[]="desiredVolume";

2
Sources/Plasma/PubUtilLib/plModifier/plSoundSDLModifier.h

@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plSoundSDLModifier_inc
#define plSoundSDLModifier_inc
#include "../plModifier/plSDLModifier.h"
#include "plModifier/plSDLModifier.h"
//
// This modifier is responsible for sending and recving

16
Sources/Plasma/PubUtilLib/plModifier/plSpawnModifier.cpp

@ -43,17 +43,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
//#include "hsTypes.h"
//#include "hsGeometry3.h"
//#include "plgDispatch.h"
//#include "../pnSceneObject/plDrawInterface.h"
//#include "../pnSceneObject/plCoordinateInterface.h"
//#include "pnSceneObject/plDrawInterface.h"
//#include "pnSceneObject/plCoordinateInterface.h"
//#include "hsBounds.h"
#include "plSpawnModifier.h"
#include "../pnSceneObject/plSceneObject.h"
#include "../plAvatar/plAvatarMgr.h"
//#include "../pnMessage/plTimeMsg.h"
//#include "../pnKeyedObject/plKey.h"
#include "pnSceneObject/plSceneObject.h"
#include "plAvatar/plAvatarMgr.h"
//#include "pnMessage/plTimeMsg.h"
//#include "pnKeyedObject/plKey.h"
//#include "../plMessage/plSpawnRequestMsg.h"
//#include "../plMessage/plSpawnModMsg.h"
//#include "plMessage/plSpawnRequestMsg.h"
//#include "plMessage/plSpawnModMsg.h"
//hsBool plSpawnModifier::MsgReceive(plMessage* msg)
//{

4
Sources/Plasma/PubUtilLib/plModifier/plSpawnModifier.h

@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plSpawnModifier_inc
#define plSpawnModifier_inc
#include "../pnModifier/plMultiModifier.h"
#include "../pnMessage/plMessage.h"
#include "pnModifier/plMultiModifier.h"
#include "pnMessage/plMessage.h"
class plSpawnModifier : public plMultiModifier
{

47
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})

42
Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.cpp

@ -40,37 +40,37 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "hsTypes.h"
#include "../pnKeyedObject/plKey.h"
#include "pnKeyedObject/plKey.h"
#include "hsTemplates.h"
#include "hsStream.h"
#include "plLinkEffectsMgr.h"
#include "../pnMessage/plEventCallbackMsg.h"
#include "../pnMessage/plTimeMsg.h"
#include "../pnMessage/plPlayerPageMsg.h"
#include "../plMessage/plLinkToAgeMsg.h"
#include "../plMessage/plTransitionMsg.h"
#include "pnMessage/plEventCallbackMsg.h"
#include "pnMessage/plTimeMsg.h"
#include "pnMessage/plPlayerPageMsg.h"
#include "plMessage/plLinkToAgeMsg.h"
#include "plMessage/plTransitionMsg.h"
#include "plgDispatch.h"
#include "hsResMgr.h"
#include "hsTimer.h"
#include "../pnNetCommon/plNetApp.h"
#include "../plNetClient/plNetClientMgr.h"
#include "../pnSceneObject/plSceneObject.h"
#include "../plNetTransport/plNetTransportMember.h"
#include "../plVault/plVault.h"
#include "../plNetClient/plNetLinkingMgr.h"
#include "../plAgeLoader/plAgeLoader.h"
#include "../pnSceneObject/plCoordinateInterface.h"
#include "../pnMessage/plWarpMsg.h"
#include "../pnKeyedObject/plFixedKey.h"
#include "pnNetCommon/plNetApp.h"
#include "plNetClient/plNetClientMgr.h"
#include "pnSceneObject/plSceneObject.h"
#include "plNetTransport/plNetTransportMember.h"
#include "plVault/plVault.h"
#include "plNetClient/plNetLinkingMgr.h"
#include "plAgeLoader/plAgeLoader.h"
#include "pnSceneObject/plCoordinateInterface.h"
#include "pnMessage/plWarpMsg.h"
#include "pnKeyedObject/plFixedKey.h"
// chronicle var
#define kCleftSolved L"CleftSolved"
#include "../plAvatar/plArmatureMod.h"
#include "../plAvatar/plAvatarTasks.h"
#include "../plAvatar/plAGAnim.h"
#include "../plMessage/plAvatarMsg.h"
#include "../plMessage/plLoadAgeMsg.h"
#include "plAvatar/plArmatureMod.h"
#include "plAvatar/plAvatarTasks.h"
#include "plAvatar/plAGAnim.h"
#include "plMessage/plAvatarMsg.h"
#include "plMessage/plLoadAgeMsg.h"
plLinkEffectsMgr::plLinkEffectsMgr()
{

2
Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.h

@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plLinkEffectsMgr_inc
#define plLinkEffectsMgr_inc
#include "../pnKeyedObject/hsKeyedObject.h"
#include "pnKeyedObject/hsKeyedObject.h"
class plLinkEffectsTriggerMsg;
class plPseudoLinkEffectMsg;

34
Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.cpp

@ -51,28 +51,28 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plNetClientMgr.h"
#include "plNetLinkingMgr.h"
#include "../pnSceneObject/plSceneObject.h"
#include "../pnSceneObject/plCoordinateInterface.h"
#include "pnSceneObject/plSceneObject.h"
#include "pnSceneObject/plCoordinateInterface.h"
#include "../pnMessage/plPlayerPageMsg.h"
#include "../pnMessage/plTimeMsg.h"
#include "pnMessage/plPlayerPageMsg.h"
#include "pnMessage/plTimeMsg.h"
#include "../plNetClientComm/plNetClientComm.h"
#include "../plAgeLoader/plAgeLoader.h"
#include "../plAgeLoader/plBackgroundDownloader.h"
#include "../plAvatar/plAvatarMgr.h"
#include "../plVault/plVault.h"
#include "plNetClientComm/plNetClientComm.h"
#include "plAgeLoader/plAgeLoader.h"
#include "plAgeLoader/plBackgroundDownloader.h"
#include "plAvatar/plAvatarMgr.h"
#include "plVault/plVault.h"
#include "../plNetMessage/plNetMessage.h"
#include "plNetMessage/plNetMessage.h"
#include "../plMessage/plNetCommMsgs.h"
#include "../plMessage/plAgeLoadedMsg.h"
#include "../plMessage/plInputIfaceMgrMsg.h"
#include "../plMessage/plNetClientMgrMsg.h"
#include "plMessage/plNetCommMsgs.h"
#include "plMessage/plAgeLoadedMsg.h"
#include "plMessage/plInputIfaceMgrMsg.h"
#include "plMessage/plNetClientMgrMsg.h"
#include "../plProgressMgr/plProgressMgr.h"
#include "../pnDispatch/plDispatch.h"
#include "../plResMgr/plResManager.h"
#include "plProgressMgr/plProgressMgr.h"
#include "pnDispatch/plDispatch.h"
#include "plResMgr/plResManager.h"
/*****************************************************************************

4
Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.h

@ -50,8 +50,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "HeadSpin.h"
#include "../pnUtils/pnUtils.h"
#include "../plNetClientComm/plNetClientComm.h"
#include "pnUtils/pnUtils.h"
#include "plNetClientComm/plNetClientComm.h"
/*****************************************************************************

24
Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.cpp

@ -49,18 +49,18 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plNetClientMgr.h"
#include "plNetLinkingMgr.h"
#include "../pnMessage/plTimeMsg.h"
#include "../plNetClientComm/plNetClientComm.h"
#include "../plNetGameLib/plNetGameLib.h"
#include "../plAgeLoader/plAgeLoader.h"
#include "../plAgeLoader/plBackgroundDownloader.h"
#include "../plAvatar/plAvatarMgr.h"
#include "../plVault/plVault.h"
#include "../plMessage/plLoadAgeMsg.h"
#include "../plMessage/plAgeLoadedMsg.h"
#include "../plMessage/plInputIfaceMgrMsg.h"
#include "pnMessage/plTimeMsg.h"
#include "plNetClientComm/plNetClientComm.h"
#include "plNetGameLib/plNetGameLib.h"
#include "plAgeLoader/plAgeLoader.h"
#include "plAgeLoader/plBackgroundDownloader.h"
#include "plAvatar/plAvatarMgr.h"
#include "plVault/plVault.h"
#include "plMessage/plLoadAgeMsg.h"
#include "plMessage/plAgeLoadedMsg.h"
#include "plMessage/plInputIfaceMgrMsg.h"

4
Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.h

@ -50,8 +50,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "HeadSpin.h"
#include "../pnUtils/pnUtils.h"
#include "../pnNetBase/pnNetBase.h"
#include "pnUtils/pnUtils.h"
#include "pnNetBase/pnNetBase.h"
/*****************************************************************************

4
Sources/Plasma/PubUtilLib/plNetClient/plNetClientCommInterface.cpp

@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plNetClientMgr.h"
#include "plNetLinkingMgr.h"
#include "../plNetClientRecorder/plNetClientRecorder.h"
#include "../plNetMessage/plNetMessage.h"
#include "plNetClientRecorder/plNetClientRecorder.h"
#include "plNetMessage/plNetMessage.h"
#include "plgDispatch.h"

4
Sources/Plasma/PubUtilLib/plNetClient/plNetClientCreatable.h

@ -42,12 +42,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plNetClientCreatable_inc
#define plNetClientCreatable_inc
#include "../pnFactory/plCreator.h"
#include "pnFactory/plCreator.h"
#include "plNetClientMgr.h"
REGISTER_CREATABLE( plNetClientMgr );
#include "../plNetTransport/plNetTransportMember.h"
#include "plNetTransport/plNetTransportMember.h"
REGISTER_CREATABLE( plNetTransportMember );
#include "plLinkEffectsMgr.h"

4
Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.cpp

@ -41,8 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "hsResMgr.h"
#include "plNetClientGroup.h"
#include "../plResMgr/plKeyFinder.h"
#include "../plResMgr/plPageInfo.h"
#include "plResMgr/plKeyFinder.h"
#include "plResMgr/plPageInfo.h"
//
// cache room desc string, from fID

2
Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define plNetClientGroup_h
#include "hsStlUtils.h"
#include "../../NucleusLib/pnNetCommon/plNetGroup.h"
#include "pnNetCommon/plNetGroup.h"
//
// represents a collection of net groups.

106
Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp

@ -49,62 +49,62 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plNetLinkingMgr.h"
#include "plNetObjectDebugger.h"
#include "../pnUtils/pnUtils.h"
#include "../pnProduct/pnProduct.h"
#include "../pnNetCommon/plSynchedObject.h"
#include "../pnNetCommon/plNetServers.h"
#include "../pnNetCommon/plSDLTypes.h"
#include "../pnKeyedObject/plKey.h"
#include "../pnKeyedObject/plFixedKey.h"
#include "../pnKeyedObject/hsKeyedObject.h"
#include "../pnSceneObject/plSceneObject.h"
#include "../pnSceneObject/plObjInterface.h"
#include "../pnSceneObject/plCoordinateInterface.h"
#include "../pnMessage/plClientMsg.h"
#include "../pnMessage/plSDLModifierMsg.h"
#include "../pnMessage/plPlayerPageMsg.h"
#include "../pnMessage/plTimeMsg.h"
#include "../pnModifier/plModifier.h"
#include "../pnAsyncCore/pnAsyncCore.h"
#include "../plAgeLoader/plAgeLoader.h"
#include "../plAgeLoader/plResPatcher.h"
#include "../plNetClientRecorder/plNetClientRecorder.h"
#include "../plScene/plSceneNode.h"
#include "../plNetCommon/plNetCommonConstants.h"
#include "../plNetMessage/plNetMessage.h"
#include "../plMessage/plLoadAvatarMsg.h"
#include "../plMessage/plLoadCloneMsg.h"
#include "../plMessage/plSynchEnableMsg.h"
#include "../plMessage/plLinkToAgeMsg.h"
#include "../plMessage/plLoadAgeMsg.h"
#include "../plMessage/plAgeLoadedMsg.h"
#include "../plMessage/plCCRMsg.h"
#include "../plMessage/plAvatarMsg.h"
#include "../plMessage/plNetVoiceListMsg.h"
#include "../plMessage/plNetCommMsgs.h"
#include "../plMessage/plNetClientMgrMsg.h"
#include "../plResMgr/plKeyFinder.h"
#include "../plResMgr/plPageInfo.h"
#include "../plNetTransport/plNetTransportMember.h"
#include "../plAgeDescription/plAgeDescription.h"
#include "../plAvatar/plAvatarClothing.h"
#include "../plAvatar/plArmatureMod.h"
#include "../plAvatar/plAvatarMgr.h"
#include "../plSurface/plLayerInterface.h"
#include "../plStatusLog/plStatusLog.h"
#include "../plSDL/plSDL.h"
#include "../plUnifiedTime/plUnifiedTime.h"
#include "../plFile/plEncryptedStream.h"
#include "../plProgressMgr/plProgressMgr.h"
#include "../plVault/plVault.h"
#include "../../FeatureLib/pfMessage/pfKIMsg.h" // Move this to PubUtil level
#include "pnUtils/pnUtils.h"
#include "pnProduct/pnProduct.h"
#include "pnNetCommon/plSynchedObject.h"
#include "pnNetCommon/plNetServers.h"
#include "pnNetCommon/plSDLTypes.h"
#include "pnKeyedObject/plKey.h"
#include "pnKeyedObject/plFixedKey.h"
#include "pnKeyedObject/hsKeyedObject.h"
#include "pnSceneObject/plSceneObject.h"
#include "pnSceneObject/plObjInterface.h"
#include "pnSceneObject/plCoordinateInterface.h"
#include "pnMessage/plClientMsg.h"
#include "pnMessage/plSDLModifierMsg.h"
#include "pnMessage/plPlayerPageMsg.h"
#include "pnMessage/plTimeMsg.h"
#include "pnModifier/plModifier.h"
#include "pnAsyncCore/pnAsyncCore.h"
#include "plAgeLoader/plAgeLoader.h"
#include "plAgeLoader/plResPatcher.h"
#include "plNetClientRecorder/plNetClientRecorder.h"
#include "plScene/plSceneNode.h"
#include "plNetCommon/plNetCommonConstants.h"
#include "plNetMessage/plNetMessage.h"
#include "plMessage/plLoadAvatarMsg.h"
#include "plMessage/plLoadCloneMsg.h"
#include "plMessage/plSynchEnableMsg.h"
#include "plMessage/plLinkToAgeMsg.h"
#include "plMessage/plLoadAgeMsg.h"
#include "plMessage/plAgeLoadedMsg.h"
#include "plMessage/plCCRMsg.h"
#include "plMessage/plAvatarMsg.h"
#include "plMessage/plNetVoiceListMsg.h"
#include "plMessage/plNetCommMsgs.h"
#include "plMessage/plNetClientMgrMsg.h"
#include "plResMgr/plKeyFinder.h"
#include "plResMgr/plPageInfo.h"
#include "plNetTransport/plNetTransportMember.h"
#include "plAgeDescription/plAgeDescription.h"
#include "plAvatar/plAvatarClothing.h"
#include "plAvatar/plArmatureMod.h"
#include "plAvatar/plAvatarMgr.h"
#include "plSurface/plLayerInterface.h"
#include "plStatusLog/plStatusLog.h"
#include "plSDL/plSDL.h"
#include "plUnifiedTime/plUnifiedTime.h"
#include "plFile/plEncryptedStream.h"
#include "plProgressMgr/plProgressMgr.h"
#include "plVault/plVault.h"
#include "pfMessage/pfKIMsg.h" // Move this to PubUtil level
#if 1 // for debugging
#include "plCreatableIndex.h"
#include "../plModifier/plResponderModifier.h"
#include "../plSurface/plLayerAnimation.h"
#include "plModifier/plResponderModifier.h"
#include "plSurface/plLayerAnimation.h"
#endif
#include <algorithm>

12
Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h

@ -51,13 +51,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plNetClientMsgHandler.h"
#include "plNetClientStats.h" // STATS Counters
#include "../pnNetCommon/plNetApp.h"
#include "pnNetCommon/plNetApp.h"
#include "../plNetTransport/plNetTransport.h"
#include "../plEncryption/plChecksum.h"
#include "../plNetCommon/plNetServerSessionInfo.h"
#include "../plNetClientComm/plNetClientComm.h"
#include "../plUnifiedTime/plUnifiedTime.h"
#include "plNetTransport/plNetTransport.h"
#include "plEncryption/plChecksum.h"
#include "plNetCommon/plNetServerSessionInfo.h"
#include "plNetClientComm/plNetClientComm.h"
#include "plUnifiedTime/plUnifiedTime.h"
#pragma warning(disable: 4284)
////////////////////////////////////////////////////////////////////

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save