Browse Source

Merge branch 'rarified/huru-merge-work/cmake-building' into rarified/huru-merge

Snapshot of pullover of changes to build with CMake after all cherry picks.
- Probably doesn't build yet, a massive amount of hand work to here.
rarified/huru-merge-fromhuru
rarified 4 years ago
parent
commit
0f8f6633a2
  1. 1
      .gitignore
  2. 55
      CMakeLists.txt
  3. 5
      Sources/Plasma/Apps/CMakeLists.txt
  4. 160
      Sources/Plasma/Apps/plClient/CMakeLists.txt
  5. 206
      Sources/Plasma/Apps/plClient/plClient.cpp
  6. 6
      Sources/Plasma/Apps/plClient/plClient.h
  7. 2
      Sources/Plasma/Apps/plClient/plClientCreatable.h
  8. 4
      Sources/Plasma/Apps/plClient/res/plClient.rc
  9. 30
      Sources/Plasma/Apps/plClient/winmain.cpp
  10. 2
      Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp
  11. 19
      Sources/Plasma/Apps/plPythonPack/CMakeLists.txt
  12. 4
      Sources/Plasma/Apps/plPythonPack/PythonInterface.cpp
  13. 2
      Sources/Plasma/Apps/plPythonPack/main.cpp
  14. 6
      Sources/Plasma/CMakeLists.txt
  15. 99
      Sources/Plasma/CoreLib/CMakeLists.txt
  16. 16
      Sources/Plasma/CoreLibExe/CMakeLists.txt
  17. 25
      Sources/Plasma/FeatureLib/CMakeLists.txt
  18. 28
      Sources/Plasma/FeatureLib/inc/pfAllCreatables.h
  19. 41
      Sources/Plasma/FeatureLib/pfAnimation/CMakeLists.txt
  20. 2
      Sources/Plasma/FeatureLib/pfAnimation/pfAnimationCreatable.h
  21. 16
      Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.cpp
  22. 2
      Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.h
  23. 16
      Sources/Plasma/FeatureLib/pfAnimation/plAnimDebugList.cpp
  24. 6
      Sources/Plasma/FeatureLib/pfAnimation/plBlower.cpp
  25. 4
      Sources/Plasma/FeatureLib/pfAnimation/plBlower.h
  26. 2
      Sources/Plasma/FeatureLib/pfAnimation/plFilterCoordInterface.h
  27. 12
      Sources/Plasma/FeatureLib/pfAnimation/plFollowMod.cpp
  28. 2
      Sources/Plasma/FeatureLib/pfAnimation/plFollowMod.h
  29. 4
      Sources/Plasma/FeatureLib/pfAnimation/plLightModifier.cpp
  30. 2
      Sources/Plasma/FeatureLib/pfAnimation/plLightModifier.h
  31. 22
      Sources/Plasma/FeatureLib/pfAnimation/plLineFollowMod.cpp
  32. 2
      Sources/Plasma/FeatureLib/pfAnimation/plLineFollowMod.h
  33. 6
      Sources/Plasma/FeatureLib/pfAnimation/plRandomCommandMod.cpp
  34. 2
      Sources/Plasma/FeatureLib/pfAnimation/plRandomCommandMod.h
  35. 6
      Sources/Plasma/FeatureLib/pfAnimation/plStereizer.cpp
  36. 2
      Sources/Plasma/FeatureLib/pfAnimation/plStereizer.h
  37. 14
      Sources/Plasma/FeatureLib/pfAnimation/plViewFaceModifier.cpp
  38. 2
      Sources/Plasma/FeatureLib/pfAnimation/plViewFaceModifier.h
  39. 25
      Sources/Plasma/FeatureLib/pfAudio/CMakeLists.txt
  40. 2
      Sources/Plasma/FeatureLib/pfAudio/pfAudioCreatable.h
  41. 30
      Sources/Plasma/FeatureLib/pfAudio/plListener.cpp
  42. 2
      Sources/Plasma/FeatureLib/pfAudio/plListener.h
  43. 16
      Sources/Plasma/FeatureLib/pfAudio/plRandomSoundMod.cpp
  44. 2
      Sources/Plasma/FeatureLib/pfAudio/plRandomSoundMod.h
  45. 19
      Sources/Plasma/FeatureLib/pfCCR/CMakeLists.txt
  46. 29
      Sources/Plasma/FeatureLib/pfCamera/CMakeLists.txt
  47. 2
      Sources/Plasma/FeatureLib/pfCamera/pfCameraCreatable.h
  48. 6
      Sources/Plasma/FeatureLib/pfCamera/pfCameraProxy.cpp
  49. 2
      Sources/Plasma/FeatureLib/pfCamera/pfCameraProxy.h
  50. 46
      Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.cpp
  51. 2
      Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.h
  52. 30
      Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.cpp
  53. 2
      Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.h
  54. 10
      Sources/Plasma/FeatureLib/pfCamera/plInterestingModifier.cpp
  55. 4
      Sources/Plasma/FeatureLib/pfCamera/plInterestingModifier.h
  56. 64
      Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp
  57. 2
      Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.h
  58. 25
      Sources/Plasma/FeatureLib/pfCharacter/CMakeLists.txt
  59. 24
      Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.cpp
  60. 4
      Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.h
  61. 14
      Sources/Plasma/FeatureLib/pfCharacter/pfMarkerMgr.cpp
  62. 2
      Sources/Plasma/FeatureLib/pfCharacter/pfMarkerMgr.h
  63. 40
      Sources/Plasma/FeatureLib/pfConditional/CMakeLists.txt
  64. 8
      Sources/Plasma/FeatureLib/pfConditional/plANDConditionalObject.cpp
  65. 2
      Sources/Plasma/FeatureLib/pfConditional/plANDConditionalObject.h
  66. 8
      Sources/Plasma/FeatureLib/pfConditional/plActivatorConditionalObject.cpp
  67. 2
      Sources/Plasma/FeatureLib/pfConditional/plActivatorConditionalObject.h
  68. 8
      Sources/Plasma/FeatureLib/pfConditional/plAnimationEventConditionalObject.cpp
  69. 6
      Sources/Plasma/FeatureLib/pfConditional/plAnimationEventConditionalObject.h
  70. 2
      Sources/Plasma/FeatureLib/pfConditional/plConditionalObjectCreatable.h
  71. 6
      Sources/Plasma/FeatureLib/pfConditional/plControlEventConditionalObject.cpp
  72. 4
      Sources/Plasma/FeatureLib/pfConditional/plControlEventConditionalObject.h
  73. 16
      Sources/Plasma/FeatureLib/pfConditional/plFacingConditionalObject.cpp
  74. 2
      Sources/Plasma/FeatureLib/pfConditional/plFacingConditionalObject.h
  75. 6
      Sources/Plasma/FeatureLib/pfConditional/plKeyPressConditionalObject.cpp
  76. 4
      Sources/Plasma/FeatureLib/pfConditional/plKeyPressConditionalObject.h
  77. 4
      Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerInBoxConditionalObject.cpp
  78. 2
      Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerInBoxConditionalObject.h
  79. 4
      Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerIntersectPlaneConditionalObject.cpp
  80. 2
      Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerIntersectPlaneConditionalObject.h
  81. 6
      Sources/Plasma/FeatureLib/pfConditional/plORConditionalObject.cpp
  82. 2
      Sources/Plasma/FeatureLib/pfConditional/plORConditionalObject.h
  83. 20
      Sources/Plasma/FeatureLib/pfConditional/plObjectInBoxConditionalObject.cpp
  84. 2
      Sources/Plasma/FeatureLib/pfConditional/plObjectInBoxConditionalObject.h
  85. 4
      Sources/Plasma/FeatureLib/pfConditional/plObjectIntersectPlaneConditionalObject.cpp
  86. 2
      Sources/Plasma/FeatureLib/pfConditional/plObjectIntersectPlaneConditionalObject.h
  87. 6
      Sources/Plasma/FeatureLib/pfConditional/plPickedConditionalObject.cpp
  88. 2
      Sources/Plasma/FeatureLib/pfConditional/plPickedConditionalObject.h
  89. 38
      Sources/Plasma/FeatureLib/pfConsole/CMakeLists.txt
  90. 72
      Sources/Plasma/FeatureLib/pfConsole/pfAvatarConsoleCommands.cpp
  91. 26
      Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp
  92. 2
      Sources/Plasma/FeatureLib/pfConsole/pfConsole.h
  93. 244
      Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp
  94. 60
      Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp
  95. 2
      Sources/Plasma/FeatureLib/pfConsole/pfConsoleEngine.cpp
  96. 16
      Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.cpp
  97. 2
      Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.h
  98. 30
      Sources/Plasma/FeatureLib/pfConsole/pfGameConsoleCommands.cpp
  99. 19
      Sources/Plasma/FeatureLib/pfCsrSrv/CMakeLists.txt
  100. 68
      Sources/Plasma/FeatureLib/pfGameGUIMgr/CMakeLists.txt
  101. Some files were not shown because too many files have changed in this diff Show More

1
.gitignore vendored

@ -0,0 +1 @@
build/*

55
CMakeLists.txt

@ -0,0 +1,55 @@
project(Plasma)
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(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: Don't hard code this
add_definitions(-DBUILD_TYPE=BUILD_TYPE_LIVE)
if(EXTERNAL_RELEASE)
add_definitions(-DPLASMA_EXTERNAL_RELEASE)
endif(EXTERNAL_RELEASE)
set(PLASMA_TARGETS Client
CACHE STRING "Which set of plasma targets to build and use")
set_property(CACHE PLASMA_TARGETS PROPERTY STRINGS
"Client" "Server" "Patcher" "Ethereal" "NoAvMsgs")
if(PLASMA_TARGETS STREQUAL "Patcher")
add_definitions(-DPATCHER)
endif(PLASMA_TARGETS STREQUAL "Patcher")
if(PLASMA_TARGETS STREQUAL "Server")
add_definitions(-DSERVER)
endif(PLASMA_TARGETS STREQUAL "Server")
if(PLASMA_TARGETS STREQUAL "NoAvMsgs")
add_definitions(-DNO_AV_MSGS)
endif(PLASMA_TARGETS STREQUAL "NoAvMsgs")
if(PLASMA_TARGETS STREQUAL "Ethereal")
add_definitions(-DSTREAM_LOGGER)
endif(PLASMA_TARGETS STREQUAL "Ethereal")
if(MSVC)
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
add_definitions(-D_SCL_SECURE_NO_WARNINGS)
endif(MSVC)
add_subdirectory(Sources/Plasma)
# add_subdirectory(Sources/Tools)

5
Sources/Plasma/Apps/CMakeLists.txt

@ -0,0 +1,5 @@
add_definitions(-D_LIB) # We shouldn't actually need this here, but
# Cyan uses it, so meh
add_subdirectory(plClient)
add_subdirectory(plPythonPack)

160
Sources/Plasma/Apps/plClient/CMakeLists.txt

@ -0,0 +1,160 @@
include_directories("../../Apps")
include_directories("../../CoreLib")
include_directories("../../FeatureLib/inc")
include_directories("../../FeatureLib")
include_directories("../../NucleusLib/inc")
include_directories("../../NucleusLib")
include_directories("../../PubUtilLib/inc")
include_directories("../../PubUtilLib")
include_directories(${OPENAL_INCLUDE_DIR})
include_directories(${OPENSSL_INCLUDE_DIR})
include_directories(${PYTHON_INCLUDE_DIR})
set(plClient_HEADERS
plClient.h
plClientCreatable.h
#plClientKey.h
plClientUpdateFormat.h
#plPluginClient.h
)
set(plClient_SOURCES
pfAllCreatables.cpp
plAllCreatables.cpp
plClient.cpp
#plClientKey.cpp
#plPluginClient.cpp
pnAllCreatables.cpp
winmain.cpp
)
set(plClient_TEXT
../../../../Docs/ReleaseNotes/ReleaseNotes.txt
)
set(plClient_RESOURCES
res/plClient.rc
res/resource.h
)
add_executable(plClient WIN32 ${plClient_SOURCES} ${plClient_HEADERS}
${plClient_TEXT} ${plClient_RESOURCES})
target_link_libraries(plClient CoreLib)
target_link_libraries(plClient CoreLibExe)
target_link_libraries(plClient pfAnimation)
target_link_libraries(plClient pfAudio)
target_link_libraries(plClient pfCamera)
target_link_libraries(plClient pfCCR)
target_link_libraries(plClient pfCharacter)
target_link_libraries(plClient pfConditional)
target_link_libraries(plClient pfConsole)
target_link_libraries(plClient pfCsrSrv)
target_link_libraries(plClient pfGameGUIMgr)
target_link_libraries(plClient pfGameMgr)
target_link_libraries(plClient pfGameScoreMgr)
target_link_libraries(plClient pfJournalBook)
target_link_libraries(plClient pfLocalizationMgr)
target_link_libraries(plClient pfMessage)
target_link_libraries(plClient pfPython)
target_link_libraries(plClient pfSecurePreloader)
target_link_libraries(plClient pfStackTrace)
target_link_libraries(plClient pfSurface)
target_link_libraries(plClient plAgeDescription)
target_link_libraries(plClient plAgeLoader)
target_link_libraries(plClient plAudible)
target_link_libraries(plClient plAudio)
target_link_libraries(plClient plAudioCore)
target_link_libraries(plClient plAvatar)
#target_link_libraries(plClient plClientKey)
target_link_libraries(plClient plCompression)
target_link_libraries(plClient plContainer)
target_link_libraries(plClient plDrawable)
target_link_libraries(plClient plEncryption)
target_link_libraries(plClient plFile)
target_link_libraries(plClient plGImage)
target_link_libraries(plClient plGLight)
target_link_libraries(plClient plInputCore)
target_link_libraries(plClient plInterp)
target_link_libraries(plClient plIntersect)
target_link_libraries(plClient plJPEG)
target_link_libraries(plClient plMath)
target_link_libraries(plClient plMessage)
target_link_libraries(plClient plModifier)
target_link_libraries(plClient plNetClient)
target_link_libraries(plClient plNetClientComm)
target_link_libraries(plClient plNetClientRecorder)
target_link_libraries(plClient plNetCommon)
target_link_libraries(plClient plNetGameLib)
target_link_libraries(plClient plNetMessage)
target_link_libraries(plClient plNetTransport)
target_link_libraries(plClient plParticleSystem)
target_link_libraries(plClient plPhysical)
target_link_libraries(plClient plPhysX)
target_link_libraries(plClient plPipeline)
target_link_libraries(plClient plProgressMgr)
target_link_libraries(plClient plResMgr)
target_link_libraries(plClient plScene)
target_link_libraries(plClient plSDL)
target_link_libraries(plClient plSockets)
target_link_libraries(plClient plStatGather)
target_link_libraries(plClient plStatusLog)
target_link_libraries(plClient plStreamLogger)
target_link_libraries(plClient plSurface)
target_link_libraries(plClient plTransform)
target_link_libraries(plClient plUnifiedTime)
target_link_libraries(plClient plUUID)
target_link_libraries(plClient plVault)
target_link_libraries(plClient pnAddrInfo)
target_link_libraries(plClient pnAsyncCore)
target_link_libraries(plClient pnAsyncCoreExe)
target_link_libraries(plClient pnCsrNet)
target_link_libraries(plClient pnDispatch)
target_link_libraries(plClient pnFactory)
target_link_libraries(plClient pnGameMgr)
target_link_libraries(plClient pnIni)
target_link_libraries(plClient pnIniExe)
target_link_libraries(plClient pnInputCore)
target_link_libraries(plClient pnKeyedObject)
target_link_libraries(plClient pnMessage)
target_link_libraries(plClient pnModifier)
target_link_libraries(plClient pnNetBase)
target_link_libraries(plClient pnNetCli)
target_link_libraries(plClient pnNetCommon)
target_link_libraries(plClient pnNetProtocol)
target_link_libraries(plClient pnNucleusInc)
target_link_libraries(plClient pnProduct)
target_link_libraries(plClient pnSceneObject)
target_link_libraries(plClient pnSimpleNet)
target_link_libraries(plClient pnTimer)
target_link_libraries(plClient pnUtils)
target_link_libraries(plClient pnUtilsExe)
target_link_libraries(plClient ${PYTHON_LIBRARY})
target_link_libraries(plClient ${PYTHON_DEBUG_LIBRARY})
target_link_libraries(plClient ${OPENAL_LIBRARY})
target_link_libraries(plClient ${OPENSSL_LIBRARIES})
target_link_libraries(plClient ${EXPAT_LIBRARY})
target_link_libraries(plClient ${JPEG_LIBRARY})
target_link_libraries(plClient ${Speex_LIBRARY})
target_link_libraries(plClient ${PHYSX_LIBRARIES})
target_link_libraries(plClient ${Ogg_LIBRARIES})
target_link_libraries(plClient ${Vorbis_LIBRARIES})
target_link_libraries(plClient ws2_32)
target_link_libraries(plClient winhttp)
target_link_libraries(plClient version)
target_link_libraries(plClient rpcrt4)
target_link_libraries(plClient vfw32)
target_link_libraries(plClient d3d9)
target_link_libraries(plClient d3dx9)
target_link_libraries(plClient ddraw)
target_link_libraries(plClient dinput8)
target_link_libraries(plClient dsound)
target_link_libraries(plClient dxerr9)
target_link_libraries(plClient dxguid)
target_link_libraries(plClient strmiids)
source_group("Source Files" FILES ${plClient_SOURCES})
source_group("Header Files" FILES ${plClient_HEADERS})
source_group("Text" FILES ${plClient_TEXT})
source_group("Resource Files" FILES ${plClient_RESOURCES})

206
Sources/Plasma/Apps/plClient/plClient.cpp

@ -45,120 +45,120 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsWindowHndl.h" #include "hsWindowHndl.h"
#include "plClient.h" #include "plClient.h"
#include "hsStream.h" #include "hsStream.h"
#include "../plResMgr/plResManager.h" #include "plResMgr/plResManager.h"
#include "../plResMgr/plKeyFinder.h" #include "plResMgr/plKeyFinder.h"
#include "../pnKeyedObject/plKey.h" #include "pnKeyedObject/plKey.h"
#include "../pnKeyedObject/plFixedKey.h" #include "pnKeyedObject/plFixedKey.h"
#include "../pnMessage/plRefMsg.h" #include "pnMessage/plRefMsg.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "../pnSceneObject/plCoordinateInterface.h" #include "pnSceneObject/plCoordinateInterface.h"
#include "../plScene/plSceneNode.h" #include "plScene/plSceneNode.h"
#include "../pnMessage/plTimeMsg.h" #include "pnMessage/plTimeMsg.h"
#include "../pnMessage/plClientMsg.h" #include "pnMessage/plClientMsg.h"
#include "../pfCamera/plVirtualCamNeu.h" #include "pfCamera/plVirtualCamNeu.h"
#include "hsTimer.h" #include "hsTimer.h"
#include "../plPipeline/hsG3DDeviceSelector.h" #include "plPipeline/hsG3DDeviceSelector.h"
#include "../plFile/plEncryptedStream.h" #include "plFile/plEncryptedStream.h"
#include "../plFile/plFileUtils.h" #include "plFile/plFileUtils.h"
#include "../plInputCore/plInputManager.h" #include "plInputCore/plInputManager.h"
#include "../plInputCore/plInputInterfaceMgr.h" #include "plInputCore/plInputInterfaceMgr.h"
#include "../plInputCore/plInputDevice.h" #include "plInputCore/plInputDevice.h"
#include "../plPhysX/plSimulationMgr.h" #include "plPhysX/plSimulationMgr.h"
#include "../plNetClient/plNetClientMgr.h" #include "plNetClient/plNetClientMgr.h"
#include "../plAvatar/plAvatarMgr.h" #include "plAvatar/plAvatarMgr.h"
#include "../plScene/plRelevanceMgr.h" #include "plScene/plRelevanceMgr.h"
#include "../pnTimer/plTimerCallbackManager.h" #include "pnTimer/plTimerCallbackManager.h"
#include "../pfAudio/plListener.h" #include "pfAudio/plListener.h"
#include "../pnMessage/plCmdIfaceModMsg.h" #include "pnMessage/plCmdIfaceModMsg.h"
#include "../plMessage/plRoomLoadNotifyMsg.h" #include "plMessage/plRoomLoadNotifyMsg.h"
#include "../pnMessage/plPlayerPageMsg.h" #include "pnMessage/plPlayerPageMsg.h"
#include "../pnMessage/plCameraMsg.h" #include "pnMessage/plCameraMsg.h"
#include "../plMessage/plTransitionMsg.h" #include "plMessage/plTransitionMsg.h"
#include "../plMessage/plLinkToAgeMsg.h" #include "plMessage/plLinkToAgeMsg.h"
#include "../plMessage/plPreloaderMsg.h" #include "plMessage/plPreloaderMsg.h"
#include "../plMessage/plNetCommMsgs.h" #include "plMessage/plNetCommMsgs.h"
#include "../plMessage/plAgeLoadedMsg.h" #include "plMessage/plAgeLoadedMsg.h"
#include "../pfConsole/pfConsoleEngine.h" #include "pfConsole/pfConsoleEngine.h"
#include "../pfConsole/pfConsole.h" #include "pfConsole/pfConsole.h"
#include "../pfConsole/pfConsoleDirSrc.h" #include "pfConsole/pfConsoleDirSrc.h"
#include "../plScene/plPageTreeMgr.h" #include "plScene/plPageTreeMgr.h"
#include "../plScene/plVisMgr.h" #include "plScene/plVisMgr.h"
#include "../plFile/hsFiles.h" #include "plFile/hsFiles.h"
#include "../pfKI/pfKI.h" #include "pfKI/pfKI.h"
#include "../plAudio/plAudioSystem.h" #include "plAudio/plAudioSystem.h"
#include "../plAudio/plAudioCaps.h" #include "plAudio/plAudioCaps.h"
#include "../plStatGather/plProfileManagerFull.h" #include "plStatGather/plProfileManagerFull.h"
#include "plPipeline.h" #include "plPipeline.h"
#include "../plPipeline/plPipelineCreate.h" #include "plPipeline/plPipelineCreate.h"
#include "../plPipeline/plPipeDebugFlags.h" #include "plPipeline/plPipeDebugFlags.h"
#include "../plPipeline/plTransitionMgr.h" #include "plPipeline/plTransitionMgr.h"
#include "../plPipeline/plCaptureRender.h" #include "plPipeline/plCaptureRender.h"
#include "../plPipeline/plDynamicEnvMap.h" #include "plPipeline/plDynamicEnvMap.h"
#include "../plNetClient/plLinkEffectsMgr.h" #include "plNetClient/plLinkEffectsMgr.h"
#include "../plAvatar/plAvatarClothing.h" #include "plAvatar/plAvatarClothing.h"
#include "../plAvatar/plArmatureMod.h" #include "plAvatar/plArmatureMod.h"
#include "../pnMessage/plProxyDrawMsg.h" #include "pnMessage/plProxyDrawMsg.h"
#include "../plScene/plRenderRequest.h" #include "plScene/plRenderRequest.h"
#include "../plDrawable/plAccessGeometry.h" #include "plDrawable/plAccessGeometry.h"
#include "plPipeResReq.h" #include "plPipeResReq.h"
#include "../plDrawable/plVisLOSMgr.h" #include "plDrawable/plVisLOSMgr.h"
#include "../plGImage/plBitmap.h" #include "plGImage/plBitmap.h"
#include "../plStatusLog/plStatusLog.h" #include "plStatusLog/plStatusLog.h"
#include "../plProgressMgr/plProgressMgr.h" #include "plProgressMgr/plProgressMgr.h"
#include "../plPipeline/plDTProgressMgr.h" #include "plPipeline/plDTProgressMgr.h"
#include "../plPipeline/plBinkPlayer.h" #include "plPipeline/plBinkPlayer.h"
#include "../pfMoviePlayer/plMoviePlayer.h" #include "pfMoviePlayer/plMoviePlayer.h"
#include "../plMessage/plMovieMsg.h" #include "plMessage/plMovieMsg.h"
#include "../plSDL/plSDL.h" #include "plSDL/plSDL.h"
#include "../pnDispatch/plDispatch.h" #include "pnDispatch/plDispatch.h"
#include "../pnDispatch/plDispatchLogBase.h" #include "pnDispatch/plDispatchLogBase.h"
#include "../pfGameGUIMgr/pfGameGUIMgr.h" #include "pfGameGUIMgr/pfGameGUIMgr.h"
#include "../pfPython/cyMisc.h" #include "pfPython/cyMisc.h"
#include "../plMessage/plInputEventMsg.h" #include "plMessage/plInputEventMsg.h"
#include "../plMessage/plRenderRequestMsg.h" #include "plMessage/plRenderRequestMsg.h"
#include "../pnMessage/plEventCallbackMsg.h" #include "pnMessage/plEventCallbackMsg.h"
#include "../plModifier/plSimpleModifier.h" #include "plModifier/plSimpleModifier.h"
#include "plAudible.h" #include "plAudible.h"
#include "../plMessage/plAnimCmdMsg.h" #include "plMessage/plAnimCmdMsg.h"
#include "../pnMessage/plSoundMsg.h" #include "pnMessage/plSoundMsg.h"
#include "../pnMessage/plAudioSysMsg.h" #include "pnMessage/plAudioSysMsg.h"
#include "../plMessage/plRenderMsg.h" #include "plMessage/plRenderMsg.h"
#include "../plAgeLoader/plResPatcher.h" #include "plAgeLoader/plResPatcher.h"
#include "../pfPython/cyPythonInterface.h" #include "pfPython/cyPythonInterface.h"
#include "../plUnifiedTime/plClientUnifiedTime.h" #include "plUnifiedTime/plClientUnifiedTime.h"
#include "../pfAnimation/plAnimDebugList.h" #include "pfAnimation/plAnimDebugList.h"
#include "../pfGameGUIMgr/pfGUICtrlGenerator.h" #include "pfGameGUIMgr/pfGUICtrlGenerator.h"
#include "../plGImage/plWinFontCache.h" #include "plGImage/plWinFontCache.h"
#include "../plGImage/plFontCache.h" #include "plGImage/plFontCache.h"
#include "../pfJournalBook/pfJournalBook.h" #include "pfJournalBook/pfJournalBook.h"
#include "../plAvatar/plAGAnimInstance.h" #include "plAvatar/plAGAnimInstance.h"
#include "../plAgeLoader/plAgeLoader.h" #include "plAgeLoader/plAgeLoader.h"
#include "../plClientKey/plClientKey.h" #include "plClientKey/plClientKey.h"
#include "../CoreLib/plQuality.h" #include "CoreLib/plQuality.h"
#include "../plGLight/plShadowCaster.h" #include "plGLight/plShadowCaster.h"
#include "../plNetClient/plNetLinkingMgr.h" #include "plNetClient/plNetLinkingMgr.h"
#include "../plNetCommon/plNetCommonConstants.h" #include "plNetCommon/plNetCommonConstants.h"
#include "../plNetGameLib/plNetGameLib.h" #include "plNetGameLib/plNetGameLib.h"
#include "../pfSecurePreloader/pfSecurePreloader.h" #include "pfSecurePreloader/pfSecurePreloader.h"
#include "../pfLocalizationMgr/pfLocalizationMgr.h" #include "pfLocalizationMgr/pfLocalizationMgr.h"
#include "../pfCsrSrv/pfCsrSrv.h" #include "pfCsrSrv/pfCsrSrv.h"
#include "plTweak.h" #include "plTweak.h"
@ -978,7 +978,7 @@ void plClient::SetHoldLoadRequests(bool hold)
ILoadNextRoom(); ILoadNextRoom();
} }
#include "../plResMgr/plPageInfo.h" #include "plResMgr/plPageInfo.h"
void plClient::IQueueRoomLoad(const std::vector<plLocation>& locs, bool hold) void plClient::IQueueRoomLoad(const std::vector<plLocation>& locs, bool hold)
{ {

6
Sources/Plasma/Apps/plClient/plClient.h

@ -52,9 +52,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTemplates.h" #include "hsTemplates.h"
#include "hsUtils.h" #include "hsUtils.h"
#include "hsStlUtils.h" #include "hsStlUtils.h"
#include "../pnKeyedObject/hsKeyedObject.h" #include "pnKeyedObject/hsKeyedObject.h"
#include "../pnKeyedObject/plUoid.h" #include "pnKeyedObject/plUoid.h"
#include "../plScene/plRenderRequest.h" #include "plScene/plRenderRequest.h"
class plSceneNode; class plSceneNode;
class plPipeline; class plPipeline;

2
Sources/Plasma/Apps/plClient/plClientCreatable.h

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

4
Sources/Plasma/Apps/plClient/res/plClient.rc

@ -7,7 +7,7 @@
// //
// Generated from the TEXTINCLUDE 2 resource. // Generated from the TEXTINCLUDE 2 resource.
// //
#include "afxres.h" #include <afxres.h>
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS #undef APSTUDIO_READONLY_SYMBOLS
@ -34,7 +34,7 @@ END
2 TEXTINCLUDE 2 TEXTINCLUDE
BEGIN BEGIN
"#include ""afxres.h""\r\n" "#include <afxres.h>\r\n"
"\0" "\0"
END END

30
Sources/Plasma/Apps/plClient/winmain.cpp

@ -54,25 +54,25 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsStream.h" #include "hsStream.h"
#include "hsUtils.h" #include "hsUtils.h"
#include "plClient.h" #include "plClient.h"
#include "../plClientResMgr/plClientResMgr.h" #include "plClientResMgr/plClientResMgr.h"
#include "../plNetClient/plNetClientMgr.h" #include "plNetClient/plNetClientMgr.h"
#include "../plNetClient/plNetLinkingMgr.h" #include "plNetClient/plNetLinkingMgr.h"
#include "../plInputCore/plInputManager.h" #include "plInputCore/plInputManager.h"
#include "../plInputCore/plInputDevice.h" #include "plInputCore/plInputDevice.h"
#include "../plUnifiedTime/plUnifiedTime.h" #include "plUnifiedTime/plUnifiedTime.h"
#include "plPipeline.h" #include "plPipeline.h"
#include "../plResMgr/plResManager.h" #include "plResMgr/plResManager.h"
#include "../plResMgr/plLocalization.h" #include "plResMgr/plLocalization.h"
#include "../plFile/plEncryptedStream.h" #include "plFile/plEncryptedStream.h"
#include "../plStatusLog/plStatusLog.h" #include "plStatusLog/plStatusLog.h"
#include "../pnProduct/pnProduct.h" #include "pnProduct/pnProduct.h"
#include "../plNetGameLib/plNetGameLib.h" #include "plNetGameLib/plNetGameLib.h"
#include "../plFile/plFileUtils.h" #include "plFile/plFileUtils.h"
#include "../plPhysX/plSimulationMgr.h" #include "plPhysX/plSimulationMgr.h"
#include "res\resource.h" #include "res/resource.h"
#include <shellapi.h> #include <shellapi.h>
#include "WinHttp.h" #include "WinHttp.h"

2
Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp

@ -494,7 +494,7 @@ static void ProcessManifestEntry (void * param, ENetError error) {
s_workingDir, s_workingDir,
p->mr->manifest[p->index].clientName p->mr->manifest[p->index].clientName
); );
dword start = TimeGetTime() / kTimeIntervalsPerMs; dword start = (dword)(TimeGetTime() / kTimeIntervalsPerMs);
if(!MD5Check(path, p->mr->manifest[p->index].md5)) { if(!MD5Check(path, p->mr->manifest[p->index].md5)) {
p->mr->critsect.Enter(); p->mr->critsect.Enter();
p->mr->indices.Add(p->index); p->mr->indices.Add(p->index);

19
Sources/Plasma/Apps/plPythonPack/CMakeLists.txt

@ -0,0 +1,19 @@
include_directories(../../CoreLib)
include_directories(../../PubUtilLib)
include_directories(${PYTHON_INCLUDE_DIR})
set(plPythonPack_SOURCES
main.cpp
PythonInterface.cpp
)
set(plPythonPack_HEADERS
PythonInterface.h
)
add_executable(plPythonPack ${plPythonPack_SOURCES} ${plPythonPack_HEADERS})
target_link_libraries(plPythonPack ${PYTHON_LIBRARY} CoreLib CoreLibExe plFile)
source_group("Source Files" FILES ${plPythonPack_SOURCES})
source_group("Header Files" FILES ${plPythonPack_HEADERS})

4
Sources/Plasma/Apps/plPythonPack/PythonInterface.cpp

@ -155,7 +155,11 @@ hsBool PythonInterface::DumpObject(PyObject* pyobj, char** pickle, Int32* size)
{ {
PyObject *s; // the python string object where the marsalled object wil go PyObject *s; // the python string object where the marsalled object wil go
// convert object to a marshalled string python object // convert object to a marshalled string python object
#if (PY_MAJOR_VERSION == 2) && (PY_MINOR_VERSION < 4)
s = PyMarshal_WriteObjectToString(pyobj); s = PyMarshal_WriteObjectToString(pyobj);
#else
s = PyMarshal_WriteObjectToString(pyobj, 0);
#endif
// did it actually do it? // did it actually do it?
if ( s != NULL ) if ( s != NULL )
{ {

2
Sources/Plasma/Apps/plPythonPack/main.cpp

@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include "hsStream.h" #include "hsStream.h"
#include "../plFile/hsFiles.h" #include "plFile/hsFiles.h"
#include "PythonInterface.h" #include "PythonInterface.h"

6
Sources/Plasma/CMakeLists.txt

@ -0,0 +1,6 @@
add_subdirectory(Apps)
add_subdirectory(CoreLib)
add_subdirectory(CoreLibExe)
add_subdirectory(FeatureLib)
add_subdirectory(NucleusLib)
add_subdirectory(PubUtilLib)

99
Sources/Plasma/CoreLib/CMakeLists.txt

@ -0,0 +1,99 @@
add_definitions(-D_LIB)
set(CoreLib_SOURCES
HeadSpin.cpp
hsBitVector.cpp
hsBounds.cpp
hsCritSect.cpp
hsExceptionStack.cpp
hsFastMath.cpp
hsGeometry3.cpp
hsMalloc.cpp
hsMatrix33.cpp
hsMatrix44.cpp
hsMemory.cpp
hsMMIOStream.cpp
hsQuat.cpp
hsSafeRefCnt.cpp
hsSTLStream.cpp
hsStlUtils.cpp
hsStream.cpp
hsStringTokenizer.cpp
hsTemplates.cpp
hsThread.cpp
hsUtils.cpp
hsWide.cpp
pcSmallRect.cpp
plGeneric.cpp
plLoadMask.cpp
plViewTransform.cpp
)
if(WIN32 AND NOT CYGWIN)
set(CoreLib_SOURCES ${CoreLib_SOURCES}
hsThread_Win.cpp
)
endif(WIN32 AND NOT CYGWIN)
if(UNIX)
set(CoreLib_SOURCES ${CoreLib_SOURCES}
hsThread_Unix.cpp
)
endif(UNIX)
# for now we use the Unix file on mac... I think this is Carbon code, which
# we don't want to use. I don't think it's worth support OS9 anymore
#if(APPLE)
# set(CoreLib_SOURCES ${CoreLib_SOURCES}
# hsThread_Mac.cpp
# )
#endif(APPLE)
set(CoreLib_HEADERS
HeadSpin.h
hsBiExpander.h
hsBitVector.h
hsBounds.h
hsColorRGBA.h
hsConfig.h
hsCritSect.h
hsExceptions.h
hsFastMath.h
hsFixedTypes.h
hsGeometry3.h
hsHashTable.h
hsMalloc.h
hsMatrix44.h
hsMemory.h
hsMMIOStream.h
hsPoint2.h
hsQuat.h
hsQueue.h
hsRefCnt.h
hsSafeRefCnt.h
hsScalar.h
hsStlSortUtils.h
hsSTLStream.h
hsStream.h
hsStringTokenizer.h
hsTemplates.h
hsTempPointer.h
hsThread.h
hsTypes.h
hsUtils.h
hsWide.h
hsWindowHndl.h
hsWindows.h
pcSmallRect.h
plGeneric.h
plLoadMask.h
plQuality.h
plRefCnt.h
plTweak.h
plViewTransform.h
)
add_library(CoreLib STATIC ${CoreLib_SOURCES} ${CoreLib_HEADERS})
source_group("Source Files" FILES ${CoreLib_SOURCES})
source_group("Header Files" FILES ${CoreLib_HEADERS})

16
Sources/Plasma/CoreLibExe/CMakeLists.txt

@ -0,0 +1,16 @@
add_definitions(-D_LIB)
set(CoreLibExe_SOURCES
hsExeError.cpp
hsExeMalloc.cpp
)
set(CoreLibExe_HEADERS
Intern.h
Pch.h
)
add_library(CoreLibExe STATIC ${CoreLibExe_SOURCES} ${CoreLibExe_HEADERS})
source_group("Source Files" FILES ${CoreLibExe_SOURCES})
source_group("Header Files" FILES ${CoreLibExe_HEADERS})

25
Sources/Plasma/FeatureLib/CMakeLists.txt

@ -0,0 +1,25 @@
add_definitions(-D_LIB)
add_subdirectory(pfAnimation)
add_subdirectory(pfAudio)
add_subdirectory(pfCCR)
add_subdirectory(pfCamera)
add_subdirectory(pfCharacter)
add_subdirectory(pfConditional)
add_subdirectory(pfConsole)
add_subdirectory(pfCsrSrv)
add_subdirectory(pfGameGUIMgr)
add_subdirectory(pfGameMgr)
add_subdirectory(pfGameScoreMgr)
add_subdirectory(pfJournalBook)
# pfKI is apparently just a historical oddity at this point
# add_subdirectory(pfKI)
add_subdirectory(pfLocalizationMgr)
# This is missing required parts in other plasma libraries.
# Also not referenced by any sln file
# add_subdirectory(pfLoginDialog)
add_subdirectory(pfMessage)
add_subdirectory(pfPython)
add_subdirectory(pfSecurePreloader)
add_subdirectory(pfStackTrace)
add_subdirectory(pfSurface)

28
Sources/Plasma/FeatureLib/inc/pfAllCreatables.h

@ -44,21 +44,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define pfAllCreatables_inc #define pfAllCreatables_inc
#include "../pfCharacter/pfCharacterCreatable.h" #include "pfCharacter/pfCharacterCreatable.h"
#include "../pfCamera/pfCameraCreatable.h" #include "pfCamera/pfCameraCreatable.h"
#include "../pfAnimation/pfAnimationCreatable.h" #include "pfAnimation/pfAnimationCreatable.h"
#include "../pfConditional/plConditionalObjectCreatable.h" #include "pfConditional/plConditionalObjectCreatable.h"
#include "../pfConsole/pfConsoleCreatable.h" #include "pfConsole/pfConsoleCreatable.h"
#include "../pfSurface/pfSurfaceCreatable.h" #include "pfSurface/pfSurfaceCreatable.h"
#include "../pfMessage/pfMessageCreatable.h" #include "pfMessage/pfMessageCreatable.h"
#include "../pfAudio/pfAudioCreatable.h" #include "pfAudio/pfAudioCreatable.h"
#include "../pfPython/pfPythonCreatable.h" #include "pfPython/pfPythonCreatable.h"
#include "../pfGameGUIMgr/pfGameGUIMgrCreatable.h" #include "pfGameGUIMgr/pfGameGUIMgrCreatable.h"
#ifdef PLASMA_CCR_RELEASE #ifdef PLASMA_CCR_RELEASE
#include "../pfCCR/plCCRCreatable.h" #include "pfCCR/plCCRCreatable.h"
#endif // PLASMA_CCR_RELEASE #endif // PLASMA_CCR_RELEASE
#include "../pfJournalBook/pfJournalBookCreatable.h" #include "pfJournalBook/pfJournalBookCreatable.h"
#include "../pfGameMgr/pfGameMgrCreatables.h" #include "pfGameMgr/pfGameMgrCreatables.h"
#include "../pfSecurePreloader/pfSecurePreloaderCreatable.h" #include "pfSecurePreloader/pfSecurePreloaderCreatable.h"
#endif // pfAllCreatables_inc #endif // pfAllCreatables_inc

41
Sources/Plasma/FeatureLib/pfAnimation/CMakeLists.txt

@ -0,0 +1,41 @@
include_directories("../../CoreLib")
include_directories("../../NucleusLib")
include_directories("../../NucleusLib/inc")
include_directories("../../PubUtilLib")
include_directories(${OPENSSL_INCLUDE_DIR})
# this is in the vcproj, but it seems silly for animation...
# find_package(OpenSSL REQUIRED)
set(pfAnimation_SOURCES
pfObjectFlocker.cpp
plAnimDebugList.cpp
plBlower.cpp
plFilterCoordInterface.cpp
plFollowMod.cpp
plLightModifier.cpp
plLineFollowMod.cpp
plRandomCommandMod.cpp
plStereizer.cpp
plViewFaceModifier.cpp
)
set(pfAnimation_HEADERS
pfAnimationCreatable.h
pfObjectFlocker.h
plAnimDebugList.h
plBlower.h
plFilterCoordInterface.h
plFollowMod.h
plLightModifier.h
plLineFollowMod.h
plRandomCommandMod.h
plStereizer.h
plViewFaceModifier.h
)
add_library(pfAnimation STATIC ${pfAnimation_SOURCES} ${pfAnimation_HEADERS})
source_group("Source Files" FILES ${pfAnimation_SOURCES})
source_group("Header Files" FILES ${pfAnimation_HEADERS})

2
Sources/Plasma/FeatureLib/pfAnimation/pfAnimationCreatable.h

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

16
Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.cpp

@ -45,15 +45,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsGeometry3.h" #include "hsGeometry3.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "hsResMgr.h" #include "hsResMgr.h"
#include "../pnMessage/plTimeMsg.h" #include "pnMessage/plTimeMsg.h"
#include "../pnMessage/plRefMsg.h" #include "pnMessage/plRefMsg.h"
#include "../plMessage/plAgeLoadedMsg.h" #include "plMessage/plAgeLoadedMsg.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "hsTimer.h" #include "hsTimer.h"
#include "../plMath/plRandom.h" #include "plMath/plRandom.h"
#include "../pnMessage/plEnableMsg.h" #include "pnMessage/plEnableMsg.h"
#include "../plMessage/plAnimCmdMsg.h" #include "plMessage/plAnimCmdMsg.h"
#include "../plMessage/plLoadCloneMsg.h" #include "plMessage/plLoadCloneMsg.h"
//#include "../plPipeline/plDebugGeometry.h" //#include "../plPipeline/plDebugGeometry.h"

2
Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.h

@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef OBJECT_FLOCKER_H #ifndef OBJECT_FLOCKER_H
#define OBJECT_FLOCKER_H #define OBJECT_FLOCKER_H
#include "../pnModifier/plSingleModifier.h" #include "pnModifier/plSingleModifier.h"
class hsStream; class hsStream;
class hsResMgr; class hsResMgr;

16
Sources/Plasma/FeatureLib/pfAnimation/plAnimDebugList.cpp

@ -44,14 +44,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTemplates.h" #include "hsTemplates.h"
#include "hsTimer.h" #include "hsTimer.h"
#include "plAnimDebugList.h" #include "plAnimDebugList.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "../plSurface/hsGMaterial.h" #include "plSurface/hsGMaterial.h"
#include "../plSurface/plLayerAnimation.h" #include "plSurface/plLayerAnimation.h"
#include "../plAvatar/plAGMasterMod.h" #include "plAvatar/plAGMasterMod.h"
#include "../plAvatar/plAGAnimInstance.h" #include "plAvatar/plAGAnimInstance.h"
#include "../plAvatar/plAGAnim.h" #include "plAvatar/plAGAnim.h"
#include "../plResMgr/plKeyFinder.h" #include "plResMgr/plKeyFinder.h"
#include "../plPipeline/plDebugText.h" #include "plPipeline/plDebugText.h"
void plAnimDebugList::AddObjects(char *subString) void plAnimDebugList::AddObjects(char *subString)
{ {

6
Sources/Plasma/FeatureLib/pfAnimation/plBlower.cpp

@ -44,9 +44,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plBlower.h" #include "plBlower.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "hsFastMath.h" #include "hsFastMath.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "../pnSceneObject/plCoordinateInterface.h" #include "pnSceneObject/plCoordinateInterface.h"
#include "../pnMessage/plTimeMsg.h" #include "pnMessage/plTimeMsg.h"
#include "hsTimer.h" #include "hsTimer.h"
plRandom plBlower::fRandom; plRandom plBlower::fRandom;

4
Sources/Plasma/FeatureLib/pfAnimation/plBlower.h

@ -43,9 +43,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plBlower_inc #ifndef plBlower_inc
#define plBlower_inc #define plBlower_inc
#include "../pnModifier/plSingleModifier.h" #include "pnModifier/plSingleModifier.h"
#include "hsGeometry3.h" #include "hsGeometry3.h"
#include "../plMath/plRandom.h" #include "plMath/plRandom.h"
#include "hsTemplates.h" #include "hsTemplates.h"
class plSceneObject; class plSceneObject;

2
Sources/Plasma/FeatureLib/pfAnimation/plFilterCoordInterface.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plFilterCoordInterface_inc #ifndef plFilterCoordInterface_inc
#define plFilterCoordInterface_inc #define plFilterCoordInterface_inc
#include "../pnSceneObject/plCoordinateInterface.h" #include "pnSceneObject/plCoordinateInterface.h"
class plFilterCoordInterface : public plCoordinateInterface class plFilterCoordInterface : public plCoordinateInterface
{ {

12
Sources/Plasma/FeatureLib/pfAnimation/plFollowMod.cpp

@ -43,12 +43,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h" #include "hsTypes.h"
#include "plFollowMod.h" #include "plFollowMod.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "../pnNetCommon/plNetApp.h" #include "pnNetCommon/plNetApp.h"
#include "../plMessage/plListenerMsg.h" #include "plMessage/plListenerMsg.h"
#include "../plMessage/plRenderMsg.h" #include "plMessage/plRenderMsg.h"
#include "../pnMessage/plTimeMsg.h" #include "pnMessage/plTimeMsg.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "../pnMessage/plRefMsg.h" #include "pnMessage/plRefMsg.h"
#include "hsResMgr.h" #include "hsResMgr.h"
#include "plPipeline.h" #include "plPipeline.h"

2
Sources/Plasma/FeatureLib/pfAnimation/plFollowMod.h

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

4
Sources/Plasma/FeatureLib/pfAnimation/plLightModifier.cpp

@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h" #include "hsTypes.h"
#include "plLightModifier.h" #include "plLightModifier.h"
#include "../plGLight/plLightInfo.h" #include "plGLight/plLightInfo.h"
#include "../plInterp/plController.h" #include "plInterp/plController.h"
#include "hsStream.h" #include "hsStream.h"
#include "hsResMgr.h" #include "hsResMgr.h"

2
Sources/Plasma/FeatureLib/pfAnimation/plLightModifier.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plLightModifier_inc #ifndef plLightModifier_inc
#define plLightModifier_inc #define plLightModifier_inc
#include "../../PubUtilLib/plModifier/plSimpleModifier.h" #include "plModifier/plSimpleModifier.h"
#include "hsGeometry3.h" #include "hsGeometry3.h"
class plController; class plController;

22
Sources/Plasma/FeatureLib/pfAnimation/plLineFollowMod.cpp

@ -43,22 +43,22 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h" #include "hsTypes.h"
#include "plLineFollowMod.h" #include "plLineFollowMod.h"
#include "plStereizer.h" #include "plStereizer.h"
#include "../plInterp/plAnimPath.h" #include "plInterp/plAnimPath.h"
#include "hsResMgr.h" #include "hsResMgr.h"
#include "../pnMessage/plRefMsg.h" #include "pnMessage/plRefMsg.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "../pnSceneObject/plCoordinateInterface.h" #include "pnSceneObject/plCoordinateInterface.h"
#include "../pnSceneObject/plDrawInterface.h" #include "pnSceneObject/plDrawInterface.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "../plMessage/plListenerMsg.h" #include "plMessage/plListenerMsg.h"
#include "../plMessage/plRenderMsg.h" #include "plMessage/plRenderMsg.h"
#include "../pnMessage/plTimeMsg.h" #include "pnMessage/plTimeMsg.h"
#include "hsBounds.h" #include "hsBounds.h"
#include "plPipeline.h" #include "plPipeline.h"
#include "hsFastMath.h" #include "hsFastMath.h"
#include "../pnMessage/plPlayerPageMsg.h" #include "pnMessage/plPlayerPageMsg.h"
#include "../pnNetCommon/plNetApp.h" #include "pnNetCommon/plNetApp.h"
#include "../plNetClient/plNetClientMgr.h" #include "plNetClient/plNetClientMgr.h"
#include "hsTimer.h" #include "hsTimer.h"
plLineFollowMod::plLineFollowMod() plLineFollowMod::plLineFollowMod()

2
Sources/Plasma/FeatureLib/pfAnimation/plLineFollowMod.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plLineFollowMod_inc #ifndef plLineFollowMod_inc
#define plLineFollowMod_inc #define plLineFollowMod_inc
#include "../pnModifier/plMultiModifier.h" #include "pnModifier/plMultiModifier.h"
#include "hsGeometry3.h" #include "hsGeometry3.h"
#include "hsMatrix44.h" #include "hsMatrix44.h"

6
Sources/Plasma/FeatureLib/pfAnimation/plRandomCommandMod.cpp

@ -44,9 +44,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h" #include "hsTypes.h"
#include "plRandomCommandMod.h" #include "plRandomCommandMod.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "../plMessage/plAnimCmdMsg.h" #include "plMessage/plAnimCmdMsg.h"
#include "../pnMessage/plEventCallbackMsg.h" #include "pnMessage/plEventCallbackMsg.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "hsTimer.h" #include "hsTimer.h"
#include "hsUtils.h" #include "hsUtils.h"

2
Sources/Plasma/FeatureLib/pfAnimation/plRandomCommandMod.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plRandomCommandMod_inc #ifndef plRandomCommandMod_inc
#define plRandomCommandMod_inc #define plRandomCommandMod_inc
#include "../pnModifier/plSingleModifier.h" #include "pnModifier/plSingleModifier.h"
#include "hsTemplates.h" #include "hsTemplates.h"
class plRandomCommandMod : public plSingleModifier class plRandomCommandMod : public plSingleModifier

6
Sources/Plasma/FeatureLib/pfAnimation/plStereizer.cpp

@ -48,11 +48,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plStereizer.h" #include "plStereizer.h"
#include "plLineFollowMod.h" #include "plLineFollowMod.h"
#include "../plMessage/plListenerMsg.h" #include "plMessage/plListenerMsg.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "../pnSceneObject/plCoordinateInterface.h" #include "pnSceneObject/plCoordinateInterface.h"
#include "hsFastMath.h" #include "hsFastMath.h"

2
Sources/Plasma/FeatureLib/pfAnimation/plStereizer.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plStereizer_inc #ifndef plStereizer_inc
#define plStereizer_inc #define plStereizer_inc
#include "../pnModifier/plSingleModifier.h" #include "pnModifier/plSingleModifier.h"
#include "hsGeometry3.h" #include "hsGeometry3.h"
#include "hsMatrix44.h" #include "hsMatrix44.h"

14
Sources/Plasma/FeatureLib/pfAnimation/plViewFaceModifier.cpp

@ -43,16 +43,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h" #include "hsTypes.h"
#include "plViewFaceModifier.h" #include "plViewFaceModifier.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "../pnSceneObject/plCoordinateInterface.h" #include "pnSceneObject/plCoordinateInterface.h"
#include "hsFastMath.h" #include "hsFastMath.h"
#include "plPipeline.h" #include "plPipeline.h"
#include "../plMessage/plRenderMsg.h" #include "plMessage/plRenderMsg.h"
#include "../plMessage/plListenerMsg.h" #include "plMessage/plListenerMsg.h"
#include "../plMessage/plAvatarMsg.h" #include "plMessage/plAvatarMsg.h"
#include "../plAvatar/plAvBrainHuman.h" #include "plAvatar/plAvBrainHuman.h"
#include "../plAvatar/plArmatureMod.h" #include "plAvatar/plArmatureMod.h"
plViewFaceModifier::plViewFaceModifier() plViewFaceModifier::plViewFaceModifier()
: fFacePoint(0,0,0), : fFacePoint(0,0,0),

2
Sources/Plasma/FeatureLib/pfAnimation/plViewFaceModifier.h

@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsMatrix44.h" #include "hsMatrix44.h"
#include "hsBounds.h" #include "hsBounds.h"
#include "../pnModifier/plSingleModifier.h" #include "pnModifier/plSingleModifier.h"
class plGenRefMsg; class plGenRefMsg;
class plPipeline; class plPipeline;

25
Sources/Plasma/FeatureLib/pfAudio/CMakeLists.txt

@ -0,0 +1,25 @@
include_directories(../../CoreLib)
include_directories(../../FeatureLib)
include_directories(../../NucleusLib)
include_directories(../../NucleusLib/inc)
include_directories(../../PubUtilLib)
#include_directories(../../PubUtilLib/inc)
include_directories(${OPENSSL_INCLUDE_DIR})
include_directories(${OPENAL_INCLUDE_DIR})
set(pfAudio_SOURCES
plListener.cpp
plRandomSoundMod.cpp
)
set(pfAudio_HEADERS
pfAudioCreatable.h
plListener.h
plRandomSoundMod.h
)
add_library(pfAudio STATIC ${pfAudio_SOURCES} ${pfAudio_HEADERS})
source_group("Source Files" FILES ${pfAudio_SOURCES})
source_group("Header Files" FILES ${pfAudio_HEADERS})

2
Sources/Plasma/FeatureLib/pfAudio/pfAudioCreatable.h

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

30
Sources/Plasma/FeatureLib/pfAudio/plListener.cpp

@ -43,21 +43,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h" #include "hsTypes.h"
#include "plListener.h" #include "plListener.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "../plAudio/plAudioSystem.h" #include "plAudio/plAudioSystem.h"
#include "../pnMessage/plTimeMsg.h" #include "pnMessage/plTimeMsg.h"
#include "../pnMessage/plAudioSysMsg.h" #include "pnMessage/plAudioSysMsg.h"
#include "../pnKeyedObject/plKey.h" #include "pnKeyedObject/plKey.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "../pnSceneObject/plCoordinateInterface.h" #include "pnSceneObject/plCoordinateInterface.h"
#include "../pnSceneObject/plSimulationInterface.h" #include "pnSceneObject/plSimulationInterface.h"
#include "../pfCamera/plVirtualCamNeu.h" #include "pfCamera/plVirtualCamNeu.h"
#include "../plMessage/plListenerMsg.h" #include "plMessage/plListenerMsg.h"
#include "../plNetClient/plNetClientMgr.h" #include "plNetClient/plNetClientMgr.h"
#include "../plPipeline/plDebugText.h" #include "plPipeline/plDebugText.h"
#include "../plAvatar/plAvatarMgr.h" #include "plAvatar/plAvatarMgr.h"
#include "../plAvatar/plArmatureMod.h" #include "plAvatar/plArmatureMod.h"
#include "../plAvatar/plPhysicalControllerCore.h" #include "plAvatar/plAvCallbackAction.h"
hsBool plListener::fPrintDbgInfo = false; hsBool plListener::fPrintDbgInfo = false;

2
Sources/Plasma/FeatureLib/pfAudio/plListener.h

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

16
Sources/Plasma/FeatureLib/pfAudio/plRandomSoundMod.cpp

@ -42,16 +42,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h" #include "hsTypes.h"
#include "plRandomSoundMod.h" #include "plRandomSoundMod.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "../pnSceneObject/plAudioInterface.h" #include "pnSceneObject/plAudioInterface.h"
#include "../pnMessage/plSoundMsg.h" #include "pnMessage/plSoundMsg.h"
#include "../plMessage/plAnimCmdMsg.h" #include "plMessage/plAnimCmdMsg.h"
#include "../plAudio/plAudioSystem.h" #include "plAudio/plAudioSystem.h"
#include "../plAudio/plSound.h" #include "plAudio/plSound.h"
#include "../plAudio/plWin32GroupedSound.h" // EEK BAD #include "plAudio/plWin32GroupedSound.h" // EEK BAD
#include "plgDispatch.h" #include "plgDispatch.h"
#include "hsTimer.h" #include "hsTimer.h"
#include "../plStatusLog/plStatusLog.h" #include "plStatusLog/plStatusLog.h"
plRandomSoundModGroup::plRandomSoundModGroup() : fNumSounds(0), fIndices(nil), fGroupedIdx(-1), fCurrent(-1) plRandomSoundModGroup::plRandomSoundModGroup() : fNumSounds(0), fIndices(nil), fGroupedIdx(-1), fCurrent(-1)
{ {

2
Sources/Plasma/FeatureLib/pfAudio/plRandomSoundMod.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plRandomSoundMod_inc #ifndef plRandomSoundMod_inc
#define plRandomSoundMod_inc #define plRandomSoundMod_inc
#include "../pfAnimation/plRandomCommandMod.h" #include "pfAnimation/plRandomCommandMod.h"
class plSound; class plSound;
struct hsPoint3; struct hsPoint3;

19
Sources/Plasma/FeatureLib/pfCCR/CMakeLists.txt

@ -0,0 +1,19 @@
include_directories(../../CoreLib)
include_directories(../../NucleusLib)
include_directories(../../NucleusLib/inc)
set(pfCCR_SOURCES
plCCRMgr.cpp
plCCRVault.cpp
)
set(pfCCR_HEADERS
plCCRCreatable.h
plCCRMgr.h
plCCRVault.h
)
add_library(pfCCR STATIC ${pfCCR_SOURCES} ${pfCCR_HEADERS})
source_group("Source Files" FILES ${pfCCR_SOURCES})
source_group("Header Files" FILES ${pfCCR_HEADERS})

29
Sources/Plasma/FeatureLib/pfCamera/CMakeLists.txt

@ -0,0 +1,29 @@
include_directories(../../CoreLib)
include_directories(../../FeatureLib)
include_directories(../../NucleusLib)
include_directories(../../NucleusLib/inc)
include_directories(../../PubUtilLib)
include_directories(${OPENSSL_INCLUDE_DIR})
set(pfCamera_SOURCES
pfCameraProxy.cpp
plCameraBrain.cpp
plCameraModifier.cpp
plInterestingModifier.cpp
plVirtualCamNeu.cpp
)
set(pfCamera_HEADERS
pfCameraCreatable.h
pfCameraProxy.h
plCameraBrain.h
plCameraModifier.h
plInterestingModifier.h
plVirtualCamNeu.h
)
add_library(pfCamera STATIC ${pfCamera_SOURCES} ${pfCamera_HEADERS})
source_group("Source Files" FILES ${pfCamera_SOURCES})
source_group("Header Files" FILES ${pfCamera_HEADERS})

2
Sources/Plasma/FeatureLib/pfCamera/pfCameraCreatable.h

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

6
Sources/Plasma/FeatureLib/pfCamera/pfCameraProxy.cpp

@ -43,9 +43,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h" #include "hsTypes.h"
#include "pfCameraProxy.h" #include "pfCameraProxy.h"
#include "plVirtualCamNeu.h" #include "plVirtualCamNeu.h"
#include "../plDrawable/plDrawableGenerator.h" #include "plDrawable/plDrawableGenerator.h"
#include "../pnMessage/plProxyDrawMsg.h" #include "pnMessage/plProxyDrawMsg.h"
#include "../plScene/plSceneNode.h" #include "plScene/plSceneNode.h"
plCameraProxy::plCameraProxy() plCameraProxy::plCameraProxy()
: plProxyGen(hsColorRGBA().Set(0.2f,0.2f,0.8f,1.f), hsColorRGBA().Set(1.f,0.5f,0.5f,1.f), 0.2f), : plProxyGen(hsColorRGBA().Set(0.2f,0.2f,0.8f,1.f), hsColorRGBA().Set(1.f,0.5f,0.5f,1.f), 0.2f),

2
Sources/Plasma/FeatureLib/pfCamera/pfCameraProxy.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plCameraProxy_inc #ifndef plCameraProxy_inc
#define plCameraProxy_inc #define plCameraProxy_inc
#include "../plDrawable/plProxyGen.h" #include "plDrawable/plProxyGen.h"
class plVirtualCam1; class plVirtualCam1;
class plSceneNode; class plSceneNode;

46
Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.cpp

@ -48,29 +48,29 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plCameraModifier.h" #include "plCameraModifier.h"
#include "plVirtualCamNeu.h" #include "plVirtualCamNeu.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "../plInterp/plController.h" #include "plInterp/plController.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "../pnSceneObject/plCoordinateInterface.h" #include "pnSceneObject/plCoordinateInterface.h"
#include "../pnSceneObject/plSimulationInterface.h" #include "pnSceneObject/plSimulationInterface.h"
#include "../pnSceneObject/plDrawInterface.h" #include "pnSceneObject/plDrawInterface.h"
#include "../plScene/plSceneNode.h" #include "plScene/plSceneNode.h"
#include "../pnMessage/plCameraMsg.h" #include "pnMessage/plCameraMsg.h"
#include "../pnMessage/plPlayerPageMsg.h" #include "pnMessage/plPlayerPageMsg.h"
#include "../pnMessage/plEnableMsg.h" #include "pnMessage/plEnableMsg.h"
#include "../pnMessage/plTimeMsg.h" #include "pnMessage/plTimeMsg.h"
#include "../plMessage/plInputEventMsg.h" #include "plMessage/plInputEventMsg.h"
#include "../plMessage/plLOSRequestMsg.h" #include "plMessage/plLOSRequestMsg.h"
#include "../plMessage/plLOSHitMsg.h" #include "plMessage/plLOSHitMsg.h"
#include "../plMessage/plAvatarMsg.h" #include "plMessage/plAvatarMsg.h"
#include "../pnKeyedObject/plKey.h" #include "pnKeyedObject/plKey.h"
#include "../plInputCore/plInputDevice.h" #include "plInputCore/plInputDevice.h"
#include "../plInputCore/plInputManager.h" #include "plInputCore/plInputManager.h"
#include "../pnNetCommon/plNetApp.h" #include "pnNetCommon/plNetApp.h"
#include "../pfAnimation/plLineFollowMod.h" #include "pfAnimation/plLineFollowMod.h"
#include "../plAvatar/plAvatarMgr.h" #include "plAvatar/plAvatarMgr.h"
#include "../plAvatar/plArmatureMod.h" #include "plAvatar/plArmatureMod.h"
#include "../plAvatar/plAvBrainHuman.h" #include "plAvatar/plAvBrainHuman.h"
#include "../plNetClient/plNetClientMgr.h" #include "plNetClient/plNetClientMgr.h"
hsBool plCameraBrain1_FirstPerson::fDontFade = false; hsBool plCameraBrain1_FirstPerson::fDontFade = false;
hsScalar plCameraBrain1::fFallAccel = 20.0f; hsScalar plCameraBrain1::fFallAccel = 20.0f;

2
Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.h

@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plCameraBrain_inc #ifndef plCameraBrain_inc
#define plCameraBrain_inc #define plCameraBrain_inc
#include "../pnKeyedObject/hsKeyedObject.h" #include "pnKeyedObject/hsKeyedObject.h"
#include "hsMatrix44.h" #include "hsMatrix44.h"
#include "hsBitVector.h" #include "hsBitVector.h"
#include "hsTemplates.h" #include "hsTemplates.h"

30
Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.cpp

@ -46,24 +46,24 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plVirtualCamNeu.h" #include "plVirtualCamNeu.h"
#include "hsTimer.h" #include "hsTimer.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "../pnSceneObject/plCoordinateInterface.h" #include "pnSceneObject/plCoordinateInterface.h"
#include "../plMessage/plInputEventMsg.h" #include "plMessage/plInputEventMsg.h"
#include "../plMessage/plAnimCmdMsg.h" #include "plMessage/plAnimCmdMsg.h"
#include "../pnMessage/plTimeMsg.h" #include "pnMessage/plTimeMsg.h"
#include "../pnKeyedObject/plKey.h" #include "pnKeyedObject/plKey.h"
#include "../pnKeyedObject/plFixedKey.h" #include "pnKeyedObject/plFixedKey.h"
#include "../plInputCore/plInputDevice.h" #include "plInputCore/plInputDevice.h"
#include "../plInputCore/plInputManager.h" #include "plInputCore/plInputManager.h"
#include "hsResMgr.h" #include "hsResMgr.h"
#include "../pnMessage/plCameraMsg.h" #include "pnMessage/plCameraMsg.h"
#include "../plPhysical/plSimDefs.h" #include "plPhysical/plSimDefs.h"
#include "plPhysical.h" #include "plPhysical.h"
#include "../pnSceneObject/plSimulationInterface.h" #include "pnSceneObject/plSimulationInterface.h"
#include "../plAvatar/plAvatarMgr.h" #include "plAvatar/plAvatarMgr.h"
#include "../plAvatar/plArmatureMod.h" #include "plAvatar/plArmatureMod.h"
#include "../plAvatar/plPhysicalControllerCore.h" #include "plAvatar/plPhysicalControllerCore.h"
// new stuff // new stuff

2
Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.h

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

10
Sources/Plasma/FeatureLib/pfCamera/plInterestingModifier.cpp

@ -43,13 +43,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h" #include "hsTypes.h"
#include "hsGeometry3.h" #include "hsGeometry3.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "../pnSceneObject/plDrawInterface.h" #include "pnSceneObject/plDrawInterface.h"
#include "../plMessage/plInterestingPing.h" #include "plMessage/plInterestingPing.h"
#include "hsBounds.h" #include "hsBounds.h"
#include "plInterestingModifier.h" #include "plInterestingModifier.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "../pnMessage/plTimeMsg.h" #include "pnMessage/plTimeMsg.h"
#include "../pnKeyedObject/plKey.h" #include "pnKeyedObject/plKey.h"
hsScalar plInterestingModifier::fInterestRadius = 100.0f; hsScalar plInterestingModifier::fInterestRadius = 100.0f;

4
Sources/Plasma/FeatureLib/pfCamera/plInterestingModifier.h

@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plInterestingModifier_inc #ifndef plInterestingModifier_inc
#define plInterestingModifier_inc #define plInterestingModifier_inc
#include "../pnModifier/plSingleModifier.h" #include "pnModifier/plSingleModifier.h"
#include "../pnMessage/plMessage.h" #include "pnMessage/plMessage.h"
#include "hsResMgr.h" #include "hsResMgr.h"
#include "hsGeometry3.h" #include "hsGeometry3.h"
#include "hsStream.h" #include "hsStream.h"

64
Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp

@ -46,41 +46,41 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plPipeline.h" #include "plPipeline.h"
#include "pfCameraProxy.h" #include "pfCameraProxy.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "../pnKeyedObject/plKey.h" #include "pnKeyedObject/plKey.h"
#include "../pnKeyedObject/plFixedKey.h" #include "pnKeyedObject/plFixedKey.h"
#include "hsMatrix44.h" #include "hsMatrix44.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "hsResMgr.h" #include "hsResMgr.h"
#include "hsTimer.h" #include "hsTimer.h"
#include "../plAudio/plAudioSystem.h" #include "plAudio/plAudioSystem.h"
#include "../plInputCore/plInputDevice.h" #include "plInputCore/plInputDevice.h"
#include "../plInputCore/plInputManager.h" #include "plInputCore/plInputManager.h"
#include "../pnInputCore/plKeyDef.h" #include "pnInputCore/plKeyDef.h"
#include "../plScene/plSceneNode.h" #include "plScene/plSceneNode.h"
#include "../plMessage/plAvatarMsg.h" #include "plMessage/plAvatarMsg.h"
#include "../pnMessage/plWarpMsg.h" #include "pnMessage/plWarpMsg.h"
#include "../pnMessage/plCameraMsg.h" #include "pnMessage/plCameraMsg.h"
#include "../pnMessage/plEnableMsg.h" #include "pnMessage/plEnableMsg.h"
#include "../pnMessage/plTimeMsg.h" #include "pnMessage/plTimeMsg.h"
#include "../pnMessage/plObjRefMsg.h" #include "pnMessage/plObjRefMsg.h"
#include "../pnMessage/plCmdIfaceModMsg.h" #include "pnMessage/plCmdIfaceModMsg.h"
#include "../pnMessage/plPlayerPageMsg.h" #include "pnMessage/plPlayerPageMsg.h"
#include "../plMessage/plInputEventMsg.h" #include "plMessage/plInputEventMsg.h"
#include "../pnSceneObject/plCoordinateInterface.h" #include "pnSceneObject/plCoordinateInterface.h"
#include "../plDrawable/plDrawableGenerator.h" #include "plDrawable/plDrawableGenerator.h"
#include "../plScene/plSceneNode.h" #include "plScene/plSceneNode.h"
#include "../plInputCore/plDebugInputInterface.h" #include "plInputCore/plDebugInputInterface.h"
#include "../plInputCore/plAvatarInputInterface.h" #include "plInputCore/plAvatarInputInterface.h"
#include "../plMessage/plInputIfaceMgrMsg.h" #include "plMessage/plInputIfaceMgrMsg.h"
#include "../plStatusLog/plStatusLog.h" #include "plStatusLog/plStatusLog.h"
#include "../plPipeline/plPlates.h" #include "plPipeline/plPlates.h"
#include "../plGImage/plMipmap.h" #include "plGImage/plMipmap.h"
#include "../plSurface/plLayer.h" #include "plSurface/plLayer.h"
#include "../plSurface/hsGMaterial.h" #include "plSurface/hsGMaterial.h"
#include "../pnNetCommon/plNetApp.h" #include "pnNetCommon/plNetApp.h"
#include "../plNetClient/plNetClientMgr.h" #include "plNetClient/plNetClientMgr.h"
#include "../plAvatar/plAvBrainHuman.h" #include "plAvatar/plAvBrainHuman.h"
#include "../plAvatar/plAvatarMgr.h" #include "plAvatar/plAvatarMgr.h"
#include "hsGeometry3.h" #include "hsGeometry3.h"
#include "hsConfig.h" #include "hsConfig.h"

2
Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plVirtualCam1_inc #ifndef plVirtualCam1_inc
#define plVirtualCam1_inc #define plVirtualCam1_inc
#include "../pnKeyedObject/hsKeyedObject.h" #include "pnKeyedObject/hsKeyedObject.h"
#include "hsMatrix44.h" #include "hsMatrix44.h"
#include "hsBitVector.h" #include "hsBitVector.h"

25
Sources/Plasma/FeatureLib/pfCharacter/CMakeLists.txt

@ -0,0 +1,25 @@
include_directories(../../CoreLib)
include_directories(../../FeatureLib)
include_directories(../../NucleusLib)
include_directories(../../NucleusLib/inc)
include_directories(../../PubUtilLib)
include_directories(${OPENSSL_INCLUDE_DIR})
set(pfCharacter_SOURCES
pfMarkerInfo.cpp
pfMarkerMgr.cpp
plPlayerModifier.cpp
)
set(pfCharacter_HEADERS
pfCharacterCreatable.h
pfMarkerInfo.h
pfMarkerMgr.h
plPlayerModifier.h
)
add_library(pfCharacter STATIC ${pfCharacter_SOURCES} ${pfCharacter_HEADERS})
source_group("Source Files" FILES ${pfCharacter_SOURCES})
source_group("Header Files" FILES ${pfCharacter_HEADERS})

24
Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.cpp

@ -42,21 +42,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfMarkerInfo.h" #include "pfMarkerInfo.h"
#include "pfMarkerMgr.h" #include "pfMarkerMgr.h"
#include "../plModifier/plGameMarkerModifier.h" #include "plModifier/plGameMarkerModifier.h"
#include "../plMessage/plLoadCloneMsg.h" #include "plMessage/plLoadCloneMsg.h"
#include "../pnMessage/plWarpMsg.h" #include "pnMessage/plWarpMsg.h"
#include "../pnSceneObject/plCoordinateInterface.h" #include "pnSceneObject/plCoordinateInterface.h"
#include "../plMessage/plAnimCmdMsg.h" #include "plMessage/plAnimCmdMsg.h"
#include "../pnMessage/plEnableMsg.h" #include "pnMessage/plEnableMsg.h"
#include "../pnMessage/plSoundMsg.h" #include "pnMessage/plSoundMsg.h"
#include "../pnSceneObject/plAudioInterface.h" #include "pnSceneObject/plAudioInterface.h"
// For Init // For Init
#include "../pnMessage/plClientMsg.h" #include "pnMessage/plClientMsg.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "../plResMgr/plResManager.h" #include "plResMgr/plResManager.h"
#include "../plResMgr/plKeyFinder.h" #include "plResMgr/plKeyFinder.h"
plUoid pfMarkerInfo::fMarkerUoid; plUoid pfMarkerInfo::fMarkerUoid;

4
Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.h

@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef pfMarkerInfo_h_inc #ifndef pfMarkerInfo_h_inc
#define pfMarkerInfo_h_inc #define pfMarkerInfo_h_inc
#include "../pnKeyedObject/plKey.h" #include "pnKeyedObject/plKey.h"
#include "../pnKeyedObject/plUoid.h" #include "pnKeyedObject/plUoid.h"
#include "hsGeometry3.h" #include "hsGeometry3.h"
class plMessage; class plMessage;

14
Sources/Plasma/FeatureLib/pfCharacter/pfMarkerMgr.cpp

@ -40,17 +40,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include "pfMarkerMgr.h" #include "pfMarkerMgr.h"
#include "../pfMessage/pfMarkerMsg.h" #include "pfMessage/pfMarkerMsg.h"
#include "pfMarkerInfo.h" #include "pfMarkerInfo.h"
#include "../plModifier/plCloneSpawnModifier.h" #include "plModifier/plCloneSpawnModifier.h"
#include "../plStatusLog/plStatusLog.h" #include "plStatusLog/plStatusLog.h"
#include "../plMessage/plLoadCloneMsg.h" #include "plMessage/plLoadCloneMsg.h"
#include "../pnMessage/plTimeMsg.h" #include "pnMessage/plTimeMsg.h"
#include "../pnMessage/plNotifyMsg.h" #include "pnMessage/plNotifyMsg.h"
#include "../plNetClient/plNetClientMgr.h" #include "plNetClient/plNetClientMgr.h"
#include "plgDispatch.h" #include "plgDispatch.h"
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

2
Sources/Plasma/FeatureLib/pfCharacter/pfMarkerMgr.h

@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef pfMarkerMgr_h_inc #ifndef pfMarkerMgr_h_inc
#define pfMarkerMgr_h_inc #define pfMarkerMgr_h_inc
#include "../pnKeyedObject/hsKeyedObject.h" #include "pnKeyedObject/hsKeyedObject.h"
#include <map> #include <map>
class plStatusLog; class plStatusLog;

40
Sources/Plasma/FeatureLib/pfConditional/CMakeLists.txt

@ -0,0 +1,40 @@
include_directories(../../CoreLib)
include_directories(../../NucleusLib)
include_directories(../../NucleusLib/inc)
include_directories(../../PubUtilLib)
set(pfConditional_SOURCES
plActivatorConditionalObject.cpp
plANDConditionalObject.cpp
plAnimationEventConditionalObject.cpp
plControlEventConditionalObject.cpp
plFacingConditionalObject.cpp
plKeyPressConditionalObject.cpp
plLocalPlayerInBoxConditionalObject.cpp
plLocalPlayerIntersectPlaneConditionalObject.cpp
plObjectInBoxConditionalObject.cpp
plObjectIntersectPlaneConditionalObject.cpp
plORConditionalObject.cpp
plPickedConditionalObject.cpp
)
set(pfConditional_HEADERS
plActivatorConditionalObject.h
plANDConditionalObject.h
plAnimationEventConditionalObject.h
plConditionalObjectCreatable.h
plControlEventConditionalObject.h
plFacingConditionalObject.h
plKeyPressConditionalObject.h
plLocalPlayerInBoxConditionalObject.h
plLocalPlayerIntersectPlaneConditionalObject.h
plObjectInBoxConditionalObject.h
plObjectIntersectPlaneConditionalObject.h
plORConditionalObject.h
plPickedConditionalObject.h
)
add_library(pfConditional ${pfConditional_SOURCES} ${pfConditional_HEADERS})
source_group("Source Files" FILES ${pfConditional_SOURCES})
source_group("Header Files" FILES ${pfConditional_HEADERS})

8
Sources/Plasma/FeatureLib/pfConditional/plANDConditionalObject.cpp

@ -41,11 +41,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include "hsTypes.h" #include "hsTypes.h"
#include "plANDConditionalObject.h" #include "plANDConditionalObject.h"
#include "../plPhysical/plDetectorModifier.h" #include "plPhysical/plDetectorModifier.h"
#include "hsResMgr.h" #include "hsResMgr.h"
#include "../../NucleusLib/pnModifier/plConditionalObject.h" #include "pnModifier/plConditionalObject.h"
#include "../../NucleusLib/pnModifier/plLogicModBase.h" #include "pnModifier/plLogicModBase.h"
#include "../plMessage/plCondRefMsg.h" #include "plMessage/plCondRefMsg.h"
plANDConditionalObject::plANDConditionalObject() plANDConditionalObject::plANDConditionalObject()
{ {

2
Sources/Plasma/FeatureLib/pfConditional/plANDConditionalObject.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plANDConditionalObject_inc #ifndef plANDConditionalObject_inc
#define plANDConditionalObject_inc #define plANDConditionalObject_inc
#include "../../NucleusLib/pnModifier/plConditionalObject.h" #include "pnModifier/plConditionalObject.h"
#include "hsTemplates.h" #include "hsTemplates.h"
class plANDConditionalObject : public plConditionalObject class plANDConditionalObject : public plConditionalObject

8
Sources/Plasma/FeatureLib/pfConditional/plActivatorConditionalObject.cpp

@ -41,10 +41,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include "hsTypes.h" #include "hsTypes.h"
#include "plActivatorConditionalObject.h" #include "plActivatorConditionalObject.h"
#include "../plPhysical/plDetectorModifier.h" #include "plPhysical/plDetectorModifier.h"
#include "../../NucleusLib/pnModifier/plLogicModBase.h" #include "pnModifier/plLogicModBase.h"
#include "../plMessage/plActivatorMsg.h" #include "plMessage/plActivatorMsg.h"
#include "../pnMessage/plNotifyMsg.h" #include "pnMessage/plNotifyMsg.h"
plActivatorConditionalObject::plActivatorConditionalObject() plActivatorConditionalObject::plActivatorConditionalObject()

2
Sources/Plasma/FeatureLib/pfConditional/plActivatorConditionalObject.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plActivatorConditionalObject_inc #ifndef plActivatorConditionalObject_inc
#define plActivatorConditionalObject_inc #define plActivatorConditionalObject_inc
#include "../../NucleusLib/pnModifier/plConditionalObject.h" #include "pnModifier/plConditionalObject.h"
#include "hsTemplates.h" #include "hsTemplates.h"
class plKey; class plKey;

8
Sources/Plasma/FeatureLib/pfConditional/plAnimationEventConditionalObject.cpp

@ -41,12 +41,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include "hsTypes.h" #include "hsTypes.h"
#include "plAnimationEventConditionalObject.h" #include "plAnimationEventConditionalObject.h"
#include "../pnInputCore/plKeyDef.h" #include "pnInputCore/plKeyDef.h"
#include "../plModifier/plSimpleModifier.h" #include "plModifier/plSimpleModifier.h"
#include "../../NucleusLib/pnModifier/plLogicModBase.h" #include "pnModifier/plLogicModBase.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "hsResMgr.h" #include "hsResMgr.h"
#include "../plMessage/plAnimCmdMsg.h" #include "plMessage/plAnimCmdMsg.h"
plAnimationEventConditionalObject::plAnimationEventConditionalObject(plKey pTargetModifier) : plAnimationEventConditionalObject::plAnimationEventConditionalObject(plKey pTargetModifier) :
fTarget(pTargetModifier), fTarget(pTargetModifier),

6
Sources/Plasma/FeatureLib/pfConditional/plAnimationEventConditionalObject.h

@ -43,9 +43,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plAnimationEventConditionalObject_inc #ifndef plAnimationEventConditionalObject_inc
#define plAnimationEventConditionalObject_inc #define plAnimationEventConditionalObject_inc
#include "../pnModifier/plConditionalObject.h" #include "pnModifier/plConditionalObject.h"
#include "../pnInputCore/plKeyDef.h" #include "pnInputCore/plKeyDef.h"
#include "../pnMessage/plEventCallbackMsg.h" // AnimationEvent's defined here #include "pnMessage/plEventCallbackMsg.h" // AnimationEvent's defined here
class plAnimationEventConditionalObject : public plConditionalObject class plAnimationEventConditionalObject : public plConditionalObject

2
Sources/Plasma/FeatureLib/pfConditional/plConditionalObjectCreatable.h

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

6
Sources/Plasma/FeatureLib/pfConditional/plControlEventConditionalObject.cpp

@ -41,9 +41,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include "hsTypes.h" #include "hsTypes.h"
#include "plControlEventConditionalObject.h" #include "plControlEventConditionalObject.h"
#include "../plPhysical/plDetectorModifier.h" #include "plPhysical/plDetectorModifier.h"
#include "../../NucleusLib/pnModifier/plLogicModBase.h" #include "pnModifier/plLogicModBase.h"
#include "../plMessage/plInputEventMsg.h" #include "plMessage/plInputEventMsg.h"
plControlEventConditionalObject::plControlEventConditionalObject() plControlEventConditionalObject::plControlEventConditionalObject()
{ {

4
Sources/Plasma/FeatureLib/pfConditional/plControlEventConditionalObject.h

@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plControlEventConditionalObject_inc #ifndef plControlEventConditionalObject_inc
#define plControlEventConditionalObject_inc #define plControlEventConditionalObject_inc
#include "../../NucleusLib/pnModifier/plConditionalObject.h" #include "pnModifier/plConditionalObject.h"
#include "../../NucleusLib/pnInputCore/plControlEventCodes.h" #include "pnInputCore/plControlEventCodes.h"
class plControlEventConditionalObject : public plConditionalObject class plControlEventConditionalObject : public plConditionalObject

16
Sources/Plasma/FeatureLib/pfConditional/plFacingConditionalObject.cpp

@ -42,14 +42,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h" #include "hsTypes.h"
#include "plFacingConditionalObject.h" #include "plFacingConditionalObject.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "../../NucleusLib/pnModifier/plLogicModBase.h" #include "pnModifier/plLogicModBase.h"
#include "../plMessage/plActivatorMsg.h" #include "plMessage/plActivatorMsg.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "../pnSceneObject/plCoordinateInterface.h" #include "pnSceneObject/plCoordinateInterface.h"
#include "../pnKeyedObject/plKey.h" #include "pnKeyedObject/plKey.h"
#include "../pnMessage/plNotifyMsg.h" #include "pnMessage/plNotifyMsg.h"
#include "../pnMessage/plFakeOutMsg.h" #include "pnMessage/plFakeOutMsg.h"
#include "../pnNetCommon/plNetApp.h" #include "pnNetCommon/plNetApp.h"
plFacingConditionalObject::plFacingConditionalObject() : plFacingConditionalObject::plFacingConditionalObject() :
fTolerance(-1.0f), fTolerance(-1.0f),

2
Sources/Plasma/FeatureLib/pfConditional/plFacingConditionalObject.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plFacingConditionalObject_inc #ifndef plFacingConditionalObject_inc
#define plFacingConditionalObject_inc #define plFacingConditionalObject_inc
#include "../../NucleusLib/pnModifier/plConditionalObject.h" #include "pnModifier/plConditionalObject.h"
class plSceneObject; class plSceneObject;

6
Sources/Plasma/FeatureLib/pfConditional/plKeyPressConditionalObject.cpp

@ -41,9 +41,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include "hsTypes.h" #include "hsTypes.h"
#include "plKeyPressConditionalObject.h" #include "plKeyPressConditionalObject.h"
#include "../plPhysical/plDetectorModifier.h" #include "plPhysical/plDetectorModifier.h"
#include "../../NucleusLib/pnModifier/plLogicModBase.h" #include "pnModifier/plLogicModBase.h"
#include "../plMessage/plInputEventMsg.h" #include "plMessage/plInputEventMsg.h"
plKeyPressConditionalObject::plKeyPressConditionalObject() plKeyPressConditionalObject::plKeyPressConditionalObject()
{ {

4
Sources/Plasma/FeatureLib/pfConditional/plKeyPressConditionalObject.h

@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plKeyPressConditionalObject_inc #ifndef plKeyPressConditionalObject_inc
#define plKeyPressConditionalObject_inc #define plKeyPressConditionalObject_inc
#include "../../NucleusLib/pnModifier/plConditionalObject.h" #include "pnModifier/plConditionalObject.h"
#include "../../NucleusLib/pnInputCore/plKeyDef.h" #include "pnInputCore/plKeyDef.h"
class plKeyPressConditionalObject : public plConditionalObject class plKeyPressConditionalObject : public plConditionalObject

4
Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerInBoxConditionalObject.cpp

@ -41,8 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include "hsTypes.h" #include "hsTypes.h"
#include "plLocalPlayerInBoxConditionalObject.h" #include "plLocalPlayerInBoxConditionalObject.h"
#include "../../PubUtilLib/plPhysical/plDetectorModifier.h" #include "plPhysical/plDetectorModifier.h"
#include "../../NucleusLib/pnModifier/plLogicModBase.h" #include "pnModifier/plLogicModBase.h"
plLocalPlayerInBoxConditionalObject::plLocalPlayerInBoxConditionalObject() plLocalPlayerInBoxConditionalObject::plLocalPlayerInBoxConditionalObject()
{ {

2
Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerInBoxConditionalObject.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plLocalPlayerInBoxConditionalObject_inc #ifndef plLocalPlayerInBoxConditionalObject_inc
#define plLocalPlayerInBoxConditionalObject_inc #define plLocalPlayerInBoxConditionalObject_inc
#include "../../NucleusLib/pnModifier/plConditionalObject.h" #include "pnModifier/plConditionalObject.h"
class plKey; class plKey;

4
Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerIntersectPlaneConditionalObject.cpp

@ -41,8 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include "hsTypes.h" #include "hsTypes.h"
#include "plLocalPlayerIntersectPlaneConditionalObject.h" #include "plLocalPlayerIntersectPlaneConditionalObject.h"
#include "../../PubUtilLib/plPhysical/plDetectorModifier.h" #include "plPhysical/plDetectorModifier.h"
#include "../../NucleusLib/pnModifier/plLogicModBase.h" #include "pnModifier/plLogicModBase.h"
plLocalPlayerIntersectPlaneConditionalObject::plLocalPlayerIntersectPlaneConditionalObject() plLocalPlayerIntersectPlaneConditionalObject::plLocalPlayerIntersectPlaneConditionalObject()
{ {

2
Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerIntersectPlaneConditionalObject.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plLocalPlayerIntersectPlaneConditionalObject_inc #ifndef plLocalPlayerIntersectPlaneConditionalObject_inc
#define plLocalPlayerIntersectPlaneConditionalObject_inc #define plLocalPlayerIntersectPlaneConditionalObject_inc
#include "../../NucleusLib/pnModifier/plConditionalObject.h" #include "pnModifier/plConditionalObject.h"
class plKey; class plKey;

6
Sources/Plasma/FeatureLib/pfConditional/plORConditionalObject.cpp

@ -41,11 +41,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include "hsTypes.h" #include "hsTypes.h"
#include "plORConditionalObject.h" #include "plORConditionalObject.h"
#include "../plPhysical/plDetectorModifier.h" #include "plPhysical/plDetectorModifier.h"
#include "hsResMgr.h" #include "hsResMgr.h"
#include "../../NucleusLib/pnModifier/plLogicModBase.h" #include "pnModifier/plLogicModBase.h"
#include "../plMessage/plCondRefMsg.h" #include "plMessage/plCondRefMsg.h"
plORConditionalObject::plORConditionalObject() plORConditionalObject::plORConditionalObject()

2
Sources/Plasma/FeatureLib/pfConditional/plORConditionalObject.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plORConditionalObject_inc #ifndef plORConditionalObject_inc
#define plORConditionalObject_inc #define plORConditionalObject_inc
#include "../../NucleusLib/pnModifier/plConditionalObject.h" #include "pnModifier/plConditionalObject.h"
#include "hsTemplates.h" #include "hsTemplates.h"
class plORConditionalObject : public plConditionalObject class plORConditionalObject : public plConditionalObject

20
Sources/Plasma/FeatureLib/pfConditional/plObjectInBoxConditionalObject.cpp

@ -41,14 +41,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include "hsTypes.h" #include "hsTypes.h"
#include "plObjectInBoxConditionalObject.h" #include "plObjectInBoxConditionalObject.h"
#include "../../PubUtilLib/plPhysical/plDetectorModifier.h" #include "plPhysical/plDetectorModifier.h"
#include "../../NucleusLib/pnModifier/plLogicModBase.h" #include "pnModifier/plLogicModBase.h"
#include "../../PubUtilLib/plMessage/plActivatorMsg.h" #include "plMessage/plActivatorMsg.h"
#include "../pnMessage/plNotifyMsg.h" #include "pnMessage/plNotifyMsg.h"
#include "../pnMessage/plFakeOutMsg.h" #include "pnMessage/plFakeOutMsg.h"
#include "../pnNetCommon/plNetApp.h" #include "pnNetCommon/plNetApp.h"
#include "../plAvatar/plArmatureMod.h" #include "plAvatar/plArmatureMod.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
bool plVolumeSensorConditionalObject::makeBriceHappyVar = true; bool plVolumeSensorConditionalObject::makeBriceHappyVar = true;
@ -293,8 +293,8 @@ void plVolumeSensorConditionalObject::Write(hsStream* stream, hsResMgr* mgr)
stream->WriteSwap32(fType); stream->WriteSwap32(fType);
stream->WriteBool(fFirst); stream->WriteBool(fFirst);
} }
#include "../pnMessage/plPlayerPageMsg.h" #include "pnMessage/plPlayerPageMsg.h"
#include "../../NucleusLib/inc/plgDispatch.h" #include "plgDispatch.h"
hsBool plVolumeSensorConditionalObjectNoArbitration::MsgReceive(plMessage* msg) hsBool plVolumeSensorConditionalObjectNoArbitration::MsgReceive(plMessage* msg)
{ {
plActivatorMsg* pActivateMsg = plActivatorMsg::ConvertNoRef(msg); plActivatorMsg* pActivateMsg = plActivatorMsg::ConvertNoRef(msg);

2
Sources/Plasma/FeatureLib/pfConditional/plObjectInBoxConditionalObject.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plObjectInBoxConditionalObject_inc #ifndef plObjectInBoxConditionalObject_inc
#define plObjectInBoxConditionalObject_inc #define plObjectInBoxConditionalObject_inc
#include "../../NucleusLib/pnModifier/plConditionalObject.h" #include "pnModifier/plConditionalObject.h"
#include "hsTemplates.h" #include "hsTemplates.h"
class plKey; class plKey;

4
Sources/Plasma/FeatureLib/pfConditional/plObjectIntersectPlaneConditionalObject.cpp

@ -41,8 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include "hsTypes.h" #include "hsTypes.h"
#include "plObjectIntersectPlaneConditionalObject.h" #include "plObjectIntersectPlaneConditionalObject.h"
#include "../../PubUtilLib/plPhysical/plDetectorModifier.h" #include "plPhysical/plDetectorModifier.h"
#include "../../NucleusLib/pnModifier/plLogicModBase.h" #include "pnModifier/plLogicModBase.h"
plObjectIntersectPlaneConditionalObject::plObjectIntersectPlaneConditionalObject() plObjectIntersectPlaneConditionalObject::plObjectIntersectPlaneConditionalObject()
{ {

2
Sources/Plasma/FeatureLib/pfConditional/plObjectIntersectPlaneConditionalObject.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plObjectIntersectPlaneConditionalObject_inc #ifndef plObjectIntersectPlaneConditionalObject_inc
#define plObjectIntersectPlaneConditionalObject_inc #define plObjectIntersectPlaneConditionalObject_inc
#include "../../NucleusLib/pnModifier/plConditionalObject.h" #include "pnModifier/plConditionalObject.h"
class plKey; class plKey;

6
Sources/Plasma/FeatureLib/pfConditional/plPickedConditionalObject.cpp

@ -41,10 +41,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include "hsTypes.h" #include "hsTypes.h"
#include "plPickedConditionalObject.h" #include "plPickedConditionalObject.h"
#include "../../PubUtilLib/plPhysical/plDetectorModifier.h" #include "plPhysical/plDetectorModifier.h"
#include "../../NucleusLib/pnModifier/plLogicModBase.h" #include "pnModifier/plLogicModBase.h"
#include "../plMessage/plActivatorMsg.h" #include "plMessage/plActivatorMsg.h"
plPickedConditionalObject::plPickedConditionalObject() plPickedConditionalObject::plPickedConditionalObject()
{ {

2
Sources/Plasma/FeatureLib/pfConditional/plPickedConditionalObject.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plPickedConditionalObject_inc #ifndef plPickedConditionalObject_inc
#define plPickedConditionalObject_inc #define plPickedConditionalObject_inc
#include "../../NucleusLib/pnModifier/plConditionalObject.h" #include "pnModifier/plConditionalObject.h"
class plKey; class plKey;

38
Sources/Plasma/FeatureLib/pfConsole/CMakeLists.txt

@ -0,0 +1,38 @@
include_directories(../../CoreLib)
include_directories(../../FeatureLib)
include_directories(../../NucleusLib)
include_directories(../../NucleusLib/inc)
include_directories(../../PubUtilLib)
include_directories(${OPENSSL_INCLUDE_DIR})
include_directories(${OPENAL_INCLUDE_DIR})
include_directories(${PYTHON_INCLUDE_DIR})
set(pfConsole_SOURCES
pfAvatarConsoleCommands.cpp
pfCCRConsoleCommands.cpp
pfConsole.cpp
pfConsoleCmd.cpp
pfConsoleCommands.cpp
pfConsoleCommandsNet.cpp
pfConsoleContext.cpp
pfConsoleDirSrc.cpp
pfConsoleEngine.cpp
pfDispatchLog.cpp
pfGameConsoleCommands.cpp
)
set(pfConsole_HEADERS
pfConsole.h
pfConsoleCmd.h
pfConsoleContext.h
pfConsoleCreatable.h
pfConsoleDirSrc.h
pfConsoleEngine.h
pfDispatchLog.h
)
add_library(pfConsole STATIC ${pfConsole_SOURCES} ${pfConsole_HEADERS})
source_group("Source Files" FILES ${pfConsole_SOURCES})
source_group("Header Files" FILES ${pfConsole_HEADERS})

72
Sources/Plasma/FeatureLib/pfConsole/pfAvatarConsoleCommands.cpp

@ -54,41 +54,41 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfConsole.h" #include "pfConsole.h"
#include "hsResMgr.h" #include "hsResMgr.h"
#include "../pfMessage/plArmatureEffectMsg.h" #include "pfMessage/plArmatureEffectMsg.h"
#include "../plMessage/plOneShotMsg.h" #include "plMessage/plOneShotMsg.h"
#include "../plMessage/plAvatarMsg.h" #include "plMessage/plAvatarMsg.h"
#include "../plMessage/plInputEventMsg.h" #include "plMessage/plInputEventMsg.h"
#include "../plMessage/plSimStateMsg.h" #include "plMessage/plSimStateMsg.h"
#include "../plMessage/plCCRMsg.h" #include "plMessage/plCCRMsg.h"
#include "../plMessage/plLinkToAgeMsg.h" #include "plMessage/plLinkToAgeMsg.h"
#include "../pnMessage/plNotifyMsg.h" #include "pnMessage/plNotifyMsg.h"
#include "../plModifier/plSpawnModifier.h" #include "plModifier/plSpawnModifier.h"
#include "../plResMgr/plKeyFinder.h" #include "plResMgr/plKeyFinder.h"
#include "../plAvatar/plArmatureMod.h" #include "plAvatar/plArmatureMod.h"
#include "../plAvatar/plAvBrainCritter.h" #include "plAvatar/plAvBrainCritter.h"
#include "../plAvatar/plAvBrainHuman.h" #include "plAvatar/plAvBrainHuman.h"
#include "../plAvatar/plAvBrainSwim.h" #include "plAvatar/plAvBrainSwim.h"
#include "../plAvatar/plAvBrainGeneric.h" #include "plAvatar/plAvBrainGeneric.h"
#include "../plAvatar/plAvatarMgr.h" #include "plAvatar/plAvatarMgr.h"
#include "../plAvatar/plSeekPointMod.h" #include "plAvatar/plSeekPointMod.h"
#include "../plAvatar/plOneShotMod.h" #include "plAvatar/plOneShotMod.h"
#include "../plAvatar/plAGAnim.h" #include "plAvatar/plAGAnim.h"
#include "../plAvatar/plAvBrainUser.h" #include "plAvatar/plAvBrainUser.h"
#include "../plAvatar/plAvBrainHuman.h" #include "plAvatar/plAvBrainHuman.h"
#include "../plAvatar/plNPCSpawnMod.h" #include "plAvatar/plNPCSpawnMod.h"
#include "../plAvatar/plAGAnimInstance.h" #include "plAvatar/plAGAnimInstance.h"
#include "../plAvatar/plArmatureEffects.h" #include "plAvatar/plArmatureEffects.h"
#include "../plAvatar/plAvTaskSeek.h" #include "plAvatar/plAvTaskSeek.h"
//#include "../plHavok1/plSimulationMgr.h" //#include "../plHavok1/plSimulationMgr.h"
#include "../pnNetCommon/plNetApp.h" #include "pnNetCommon/plNetApp.h"
#include "../plNetClient/plNetClientMgr.h" #include "plNetClient/plNetClientMgr.h"
#include "../plDrawable/plInstanceDrawInterface.h" #include "plDrawable/plInstanceDrawInterface.h"
#include "../plDrawable/plDrawableSpans.h" #include "plDrawable/plDrawableSpans.h"
#define PF_SANITY_CHECK( cond, msg ) { if( !( cond ) ) { PrintString( msg ); return; } } #define PF_SANITY_CHECK( cond, msg ) { if( !( cond ) ) { PrintString( msg ); return; } }
@ -135,7 +135,7 @@ PF_CONSOLE_SUBGROUP( Avatar, LOD )
#endif // LIMIT_CONSOLE_COMMANDS #endif // LIMIT_CONSOLE_COMMANDS
#include "../plAvatar/plAnimStage.h" #include "plAvatar/plAnimStage.h"
plAvBrainHuman * GetMainAvatarBrain() plAvBrainHuman * GetMainAvatarBrain()
{ {
@ -456,7 +456,7 @@ PF_CONSOLE_CMD( Avatar, PopBrain, "", "Remove the topmost brain from the avatar.
} }
} }
#include "../plScene/plRelevanceMgr.h" #include "plScene/plRelevanceMgr.h"
PF_CONSOLE_CMD( Avatar, PF_CONSOLE_CMD( Avatar,
MarkRelevanceRegion, MarkRelevanceRegion,
@ -762,7 +762,7 @@ PF_CONSOLE_CMD( Avatar_LOD, GetLODDistance, "", "Get Distance for switching Ava
#include "../plAvatar/plAvBrainClimb.h" #include "plAvatar/plAvBrainClimb.h"
PF_CONSOLE_CMD( Avatar_Climb, Start, "string direction", "Specify initial mount direction: up, down, left, right") PF_CONSOLE_CMD( Avatar_Climb, Start, "string direction", "Specify initial mount direction: up, down, left, right")
{ {

26
Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp

@ -47,26 +47,26 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfConsole.h" #include "pfConsole.h"
#include "pfConsoleEngine.h" #include "pfConsoleEngine.h"
#include "../plPipeline/plDebugText.h" #include "plPipeline/plDebugText.h"
#include "../plInputCore/plInputDevice.h" #include "plInputCore/plInputDevice.h"
#include "../plInputCore/plInputInterface.h" #include "plInputCore/plInputInterface.h"
#include "../plInputCore/plInputInterfaceMgr.h" #include "plInputCore/plInputInterfaceMgr.h"
#include "../pnInputCore/plKeyMap.h" #include "pnInputCore/plKeyMap.h"
#include "../pnInputCore/plKeyDef.h" #include "pnInputCore/plKeyDef.h"
#include "../plMessage/plInputEventMsg.h" #include "plMessage/plInputEventMsg.h"
#include "../plMessage/plConsoleMsg.h" #include "plMessage/plConsoleMsg.h"
#include "../plMessage/plInputIfaceMgrMsg.h" #include "plMessage/plInputIfaceMgrMsg.h"
#include "../pnKeyedObject/plFixedKey.h" #include "pnKeyedObject/plFixedKey.h"
#include "hsTimer.h" #include "hsTimer.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "plPipeline.h" #include "plPipeline.h"
#include "hsConfig.h" #include "hsConfig.h"
#include "../pfPython/cyPythonInterface.h" #include "pfPython/cyPythonInterface.h"
#include "../plNetClient/plNetClientMgr.h" #include "plNetClient/plNetClientMgr.h"
#ifndef PLASMA_EXTERNAL_RELEASE #ifndef PLASMA_EXTERNAL_RELEASE
#include "../pfGameMgr/pfGameMgr.h" #include "pfGameMgr/pfGameMgr.h"
#endif // PLASMA_EXTERNAL_RELEASE #endif // PLASMA_EXTERNAL_RELEASE

2
Sources/Plasma/FeatureLib/pfConsole/pfConsole.h

@ -56,7 +56,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define _pfConsole_h #define _pfConsole_h
#include "hsTypes.h" #include "hsTypes.h"
#include "../pnKeyedObject/hsKeyedObject.h" #include "pnKeyedObject/hsKeyedObject.h"
class plPipeline; class plPipeline;

244
Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp

@ -53,123 +53,123 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfConsoleCmd.h" #include "pfConsoleCmd.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "../plAgeLoader/plAgeLoader.h" #include "plAgeLoader/plAgeLoader.h"
#include "../plNetClient/plNetClientMgr.h" #include "plNetClient/plNetClientMgr.h"
#include "../plPipeline/plDebugText.h" #include "plPipeline/plDebugText.h"
#include "../plPipeline/plPipeDebugFlags.h" #include "plPipeline/plPipeDebugFlags.h"
#include "../plMessage/plMovieMsg.h" #include "plMessage/plMovieMsg.h"
#include "../plDrawable/plDrawableSpans.h" #include "plDrawable/plDrawableSpans.h"
#include "plPipeline.h" #include "plPipeline.h"
#include "../pfCamera/plCameraModifier.h" #include "pfCamera/plCameraModifier.h"
#include "../pfCamera/plVirtualCamNeu.h" #include "pfCamera/plVirtualCamNeu.h"
#include "../pfCamera/plCameraBrain.h" #include "pfCamera/plCameraBrain.h"
#include "../plResMgr/plResManager.h" #include "plResMgr/plResManager.h"
#include "../pnKeyedObject/plFixedKey.h" #include "pnKeyedObject/plFixedKey.h"
#include "../pnKeyedObject/plKey.h" #include "pnKeyedObject/plKey.h"
#include "../pnKeyedObject/plKeyImp.h" #include "pnKeyedObject/plKeyImp.h"
#include "../pnModifier/plLogicModBase.h" #include "pnModifier/plLogicModBase.h"
#include "../plModifier/plSDLModifier.h" #include "plModifier/plSDLModifier.h"
#include "../plSDL/plSDL.h" #include "plSDL/plSDL.h"
#include "../pfCharacter/plPlayerModifier.h" #include "pfCharacter/plPlayerModifier.h"
#include "../plSurface/plLayerDepth.h" #include "plSurface/plLayerDepth.h"
#include "../plSurface/plLayerOr.h" #include "plSurface/plLayerOr.h"
#include "../plSurface/plLayerOr.h" #include "plSurface/plLayerOr.h"
#include "../plAudio/plAudioSystem.h" #include "plAudio/plAudioSystem.h"
#include "../plAudio/plVoiceChat.h" #include "plAudio/plVoiceChat.h"
#include "../plAudio/plWinMicLevel.h" #include "plAudio/plWinMicLevel.h"
#include "../plPipeline/plFogEnvironment.h" #include "plPipeline/plFogEnvironment.h"
#include "../plPipeline/plPlates.h" #include "plPipeline/plPlates.h"
#include "../plPipeline/plDynamicEnvMap.h" #include "plPipeline/plDynamicEnvMap.h"
#include "../../NucleusLib/inc/hsTimer.h" #include "hsTimer.h"
#include "../pnMessage/plClientMsg.h" #include "pnMessage/plClientMsg.h"
#include "../pnMessage/plEnableMsg.h" #include "pnMessage/plEnableMsg.h"
#include "../pnMessage/plAudioSysMsg.h" #include "pnMessage/plAudioSysMsg.h"
#include "../plMessage/plListenerMsg.h" #include "plMessage/plListenerMsg.h"
#include "../pfAudio/plListener.h" #include "pfAudio/plListener.h"
#include "../plMessage/plAvatarMsg.h" #include "plMessage/plAvatarMsg.h"
#include "../plMessage/plOneShotMsg.h" #include "plMessage/plOneShotMsg.h"
#include "../plVault/plVault.h" #include "plVault/plVault.h"
#include "../../Apps/plClient/plClient.h" #include "../../Apps/plClient/plClient.h"
#include "pfConsole.h" #include "pfConsole.h"
#include "pfConsoleContext.h" #include "pfConsoleContext.h"
#include "../plResMgr/plKeyFinder.h" #include "plResMgr/plKeyFinder.h"
#include "../plModifier/plSimpleModifier.h" #include "plModifier/plSimpleModifier.h"
#include "../plAvatar/plAvatarMgr.h" #include "plAvatar/plAvatarMgr.h"
#include "../plAvatar/plAvatarTasks.h" #include "plAvatar/plAvatarTasks.h"
#include "../plAvatar/plAvBrainGeneric.h" #include "plAvatar/plAvBrainGeneric.h"
//#include "../plHavok1/plSimulationMgr.h" //#include "../plHavok1/plSimulationMgr.h"
#include "../plMessage/plConsoleMsg.h" #include "plMessage/plConsoleMsg.h"
#include "../plMessage/plAnimCmdMsg.h" #include "plMessage/plAnimCmdMsg.h"
#include "../pnMessage/plCameraMsg.h" #include "pnMessage/plCameraMsg.h"
#include "../pnMessage/plSoundMsg.h" #include "pnMessage/plSoundMsg.h"
#include "../pnMessage/plEventCallbackMsg.h" #include "pnMessage/plEventCallbackMsg.h"
#include "../pnMessage/plNotifyMsg.h" #include "pnMessage/plNotifyMsg.h"
#include "../pfAnimation/plAnimDebugList.h" #include "pfAnimation/plAnimDebugList.h"
#include "../pnMessage/plNodeChangeMsg.h" #include "pnMessage/plNodeChangeMsg.h"
#include "../pnMessage/plProxyDrawMsg.h" #include "pnMessage/plProxyDrawMsg.h"
#include "../pnMessage/plObjRefMsg.h" #include "pnMessage/plObjRefMsg.h"
#include "../pnMessage/plAttachMsg.h" #include "pnMessage/plAttachMsg.h"
#include "../plMessage/plSimInfluenceMsg.h" #include "plMessage/plSimInfluenceMsg.h"
#include "../plMessage/plSimStateMsg.h" #include "plMessage/plSimStateMsg.h"
#include "../plMessage/plLinkToAgeMsg.h" #include "plMessage/plLinkToAgeMsg.h"
#include "../pfMessage/pfKIMsg.h" #include "pfMessage/pfKIMsg.h"
#include "../plInputCore/plInputInterfaceMgr.h" #include "plInputCore/plInputInterfaceMgr.h"
#include "../plInputCore/plInputManager.h" #include "plInputCore/plInputManager.h"
#include "../plInputCore/plInputDevice.h" #include "plInputCore/plInputDevice.h"
#include "../plInputCore/plAvatarInputInterface.h" #include "plInputCore/plAvatarInputInterface.h"
#include "../plMessage/plInputEventMsg.h" #include "plMessage/plInputEventMsg.h"
#include "../pnInputCore/plKeyMap.h" #include "pnInputCore/plKeyMap.h"
#include "../plParticleSystem/plParticleSystem.h" #include "plParticleSystem/plParticleSystem.h"
#include "../plParticleSystem/plConvexVolume.h" #include "plParticleSystem/plConvexVolume.h"
#include "../plParticleSystem/plParticleEffect.h" #include "plParticleSystem/plParticleEffect.h"
#include "../plParticleSystem/plParticleGenerator.h" #include "plParticleSystem/plParticleGenerator.h"
#include "../plSurface/hsGMaterial.h" #include "plSurface/hsGMaterial.h"
#include "../pnSceneObject/plDrawInterface.h" #include "pnSceneObject/plDrawInterface.h"
#include "../pnSceneObject/plCoordinateInterface.h" #include "pnSceneObject/plCoordinateInterface.h"
#include "../plScene/plSceneNode.h" #include "plScene/plSceneNode.h"
#include "../plScene/plPageTreeMgr.h" #include "plScene/plPageTreeMgr.h"
#include "../plScene/plPostEffectMod.h" #include "plScene/plPostEffectMod.h"
#include "../pnMessage/plNodeRefMsg.h" #include "pnMessage/plNodeRefMsg.h"
//#include "../pnMessage/plWarpMsg.h" //#include "../pnMessage/plWarpMsg.h"
#include "hsResMgr.h" #include "hsResMgr.h"
#include "../plParticleSystem/plParticleSystem.h" #include "plParticleSystem/plParticleSystem.h"
#include "../plMessage/plParticleUpdateMsg.h" #include "plMessage/plParticleUpdateMsg.h"
#include "../plDrawable/plDynaBulletMgr.h" #include "plDrawable/plDynaBulletMgr.h"
#include "../plGImage/plMipmap.h" #include "plGImage/plMipmap.h"
#include "../plGImage/plTGAWriter.h" #include "plGImage/plTGAWriter.h"
#include "../plGLight/plShadowCaster.h" #include "plGLight/plShadowCaster.h"
#include "../plGLight/plShadowMaster.h" #include "plGLight/plShadowMaster.h"
// begin for agedefn test // begin for agedefn test
#include "hsStream.h" #include "hsStream.h"
#include "../plAgeDescription/plAgeDescription.h" #include "plAgeDescription/plAgeDescription.h"
#include "../plUnifiedTime/plUnifiedTime.h" #include "plUnifiedTime/plUnifiedTime.h"
//end for agedefn test //end for agedefn test
#include "../../PubUtilLib/plFile/hsFiles.h" #include "plFile/hsFiles.h"
#include "../../NucleusLib/pnSceneObject/plAudioInterface.h" #include "pnSceneObject/plAudioInterface.h"
#include "../plStatusLog/plStatusLog.h" #include "plStatusLog/plStatusLog.h"
#include "../pnTimer/pnBuildDates.h" #include "pnTimer/pnBuildDates.h"
#include "hsStlUtils.h" #include "hsStlUtils.h"
#include "hsTemplates.h" #include "hsTemplates.h"
#include "../Corelib/hsUtils.h" #include "hsUtils.h"
#include "../pfPython/cyPythonInterface.h" #include "pfPython/cyPythonInterface.h"
#include "../pfPython/plPythonSDLModifier.h" #include "pfPython/plPythonSDLModifier.h"
#include "../plResMgr/plResManagerHelper.h" #include "plResMgr/plResManagerHelper.h"
#include "../plResMgr/plResMgrSettings.h" #include "plResMgr/plResMgrSettings.h"
#include "../plResMgr/plLocalization.h" #include "plResMgr/plLocalization.h"
#define PF_SANITY_CHECK( cond, msg ) { if( !( cond ) ) { PrintString( msg ); return; } } #define PF_SANITY_CHECK( cond, msg ) { if( !( cond ) ) { PrintString( msg ); return; } }
@ -452,7 +452,7 @@ PF_CONSOLE_BASE_CMD( SampleCmd3, "int, ...", "Sample command #3" )
#ifndef LIMIT_CONSOLE_COMMANDS #ifndef LIMIT_CONSOLE_COMMANDS
#include "../plMessage/plTransitionMsg.h" #include "plMessage/plTransitionMsg.h"
PF_CONSOLE_BASE_CMD( FadeIn, "float len, bool hold", "Sample command #1" ) PF_CONSOLE_BASE_CMD( FadeIn, "float len, bool hold", "Sample command #1" )
{ {
@ -511,7 +511,7 @@ PF_CONSOLE_BASE_CMD( DumpLogs, "string folderName", "Dumps all current logs to t
PF_CONSOLE_GROUP( Stats ) PF_CONSOLE_GROUP( Stats )
#include "../plStatGather/plProfileManagerFull.h" #include "plStatGather/plProfileManagerFull.h"
PF_CONSOLE_CMD( Stats, Show, // Group name, Function name PF_CONSOLE_CMD( Stats, Show, // Group name, Function name
"...", // Params "...", // Params
@ -641,7 +641,7 @@ PF_CONSOLE_CMD(Stats, RemoveDetailVar, "string stat", "Removes the specified var
plProfileManagerFull::Instance().RemoveDetailVar(params[0]); plProfileManagerFull::Instance().RemoveDetailVar(params[0]);
} }
#include "../plStatGather/plAutoProfile.h" #include "plStatGather/plAutoProfile.h"
PF_CONSOLE_CMD(Stats, AutoProfile, "...", "Performs an automated profile in all the ages. Optional: Specify an age name to do just that age") PF_CONSOLE_CMD(Stats, AutoProfile, "...", "Performs an automated profile in all the ages. Optional: Specify an age name to do just that age")
{ {
@ -1638,7 +1638,7 @@ PF_CONSOLE_CMD( Graphics_Renderer, TakeScreenshot, "...", "Takes a shot of the c
} }
} }
#include "../pfSurface/plGrabCubeMap.h" #include "pfSurface/plGrabCubeMap.h"
PF_CONSOLE_CMD( Graphics_Renderer, GrabCubeMap, PF_CONSOLE_CMD( Graphics_Renderer, GrabCubeMap,
"string sceneObject, string prefix", "string sceneObject, string prefix",
@ -1672,7 +1672,7 @@ PF_CONSOLE_CMD( Graphics_Renderer, GrabCubeCam,
grabCube.GrabCube(pfConsole::GetPipeline(), pos, pref, clearColor); grabCube.GrabCube(pfConsole::GetPipeline(), pos, pref, clearColor);
} }
#include "../plJPEG/plJPEG.h" #include "plJPEG/plJPEG.h"
PF_CONSOLE_CMD( Graphics_Renderer, TakeJPEGScreenshot, "...", "Takes a shot of the current frame and saves it to the given file" ) PF_CONSOLE_CMD( Graphics_Renderer, TakeJPEGScreenshot, "...", "Takes a shot of the current frame and saves it to the given file" )
{ {
@ -1722,7 +1722,7 @@ PF_CONSOLE_CMD( Graphics_Renderer, TakeJPEGScreenshot, "...", "Takes a shot of t
} }
} }
#include "../plGImage/plAVIWriter.h" #include "plGImage/plAVIWriter.h"
PF_CONSOLE_CMD( Graphics_Renderer, AVIWrite, "...", "Saves each frame to an AVI file" ) PF_CONSOLE_CMD( Graphics_Renderer, AVIWrite, "...", "Saves each frame to an AVI file" )
{ {
@ -2504,7 +2504,7 @@ PF_CONSOLE_CMD( App, // groupName
PrintString( str ); PrintString( str );
} }
#include "../plInputCore/plSceneInputInterface.h" #include "plInputCore/plSceneInputInterface.h"
PF_CONSOLE_CMD( App, // groupName PF_CONSOLE_CMD( App, // groupName
ShowLOS, // fxnName ShowLOS, // fxnName
@ -3315,7 +3315,7 @@ PF_CONSOLE_CMD(Logic, ListResponders, "", "Prints the names of the loaded respon
} }
} }
#include "../plModifier/plResponderModifier.h" #include "plModifier/plResponderModifier.h"
PF_CONSOLE_CMD(Logic, ResponderAnimCue, "", "Toggle box being drawn on screen when a responder starts an anim") PF_CONSOLE_CMD(Logic, ResponderAnimCue, "", "Toggle box being drawn on screen when a responder starts an anim")
{ {
@ -3330,7 +3330,7 @@ PF_CONSOLE_CMD(Logic, ResponderNoLog, "string prefix", "Don't log responders tha
plResponderModifier::NoLogString(params[0]); plResponderModifier::NoLogString(params[0]);
} }
#include "../plModifier/plDetectorLog.h" #include "plModifier/plDetectorLog.h"
PF_CONSOLE_CMD(Logic, WriteDetectorLog, "", "Write detector log to logfile") PF_CONSOLE_CMD(Logic, WriteDetectorLog, "", "Write detector log to logfile")
{ {
DetectorDoLogfile(); DetectorDoLogfile();
@ -4288,7 +4288,7 @@ PF_CONSOLE_CMD( Quality,
PrintString(str); PrintString(str);
} }
#include "../plSurface/plShaderTable.h" #include "plSurface/plShaderTable.h"
PF_CONSOLE_CMD( Quality, PF_CONSOLE_CMD( Quality,
Cap, Cap,
@ -4315,10 +4315,10 @@ PF_CONSOLE_CMD( Quality,
#ifndef LIMIT_CONSOLE_COMMANDS #ifndef LIMIT_CONSOLE_COMMANDS
#include "../plDrawable/plSharedMesh.h" #include "plDrawable/plSharedMesh.h"
#include "../plDrawable/plAccessGeometry.h" #include "plDrawable/plAccessGeometry.h"
#include "../plDrawable/plMorphSequence.h" #include "plDrawable/plMorphSequence.h"
#include "../plAvatar/plAvatarClothing.h" #include "plAvatar/plAvatarClothing.h"
PF_CONSOLE_GROUP( Access ) PF_CONSOLE_GROUP( Access )
@ -4620,7 +4620,7 @@ PF_CONSOLE_CMD( Access,
PrintString(str); PrintString(str);
} }
#include "../pfSurface/plFadeOpacityMod.h" #include "pfSurface/plFadeOpacityMod.h"
PF_CONSOLE_CMD( Access, PF_CONSOLE_CMD( Access,
Fade, Fade,
@ -4664,7 +4664,7 @@ PF_CONSOLE_CMD( Access,
} }
#include "../plDrawable/plVisLOSMgr.h" #include "plDrawable/plVisLOSMgr.h"
static plSceneObject* losObj = nil; static plSceneObject* losObj = nil;
@ -4751,7 +4751,7 @@ PF_CONSOLE_CMD( Access,
} }
#include "../plMessage/plBulletMsg.h" #include "plMessage/plBulletMsg.h"
plSceneObject* gunObj = nil; plSceneObject* gunObj = nil;
hsScalar gunRadius = 1.f; hsScalar gunRadius = 1.f;
@ -4871,8 +4871,8 @@ PF_CONSOLE_CMD( Access,
#ifndef LIMIT_CONSOLE_COMMANDS #ifndef LIMIT_CONSOLE_COMMANDS
#include "../plDrawable/plWaveSet7.h" #include "plDrawable/plWaveSet7.h"
#include "../plDrawable/plFixedWaterState7.h" #include "plDrawable/plFixedWaterState7.h"
PF_CONSOLE_GROUP( Wave ) PF_CONSOLE_GROUP( Wave )
PF_CONSOLE_SUBGROUP( Wave, Set) // Creates a sub-group under a given group PF_CONSOLE_SUBGROUP( Wave, Set) // Creates a sub-group under a given group
@ -5716,7 +5716,7 @@ PF_CONSOLE_CMD( SceneObject, Detach, // Group name, Function name
#ifndef LIMIT_CONSOLE_COMMANDS #ifndef LIMIT_CONSOLE_COMMANDS
#include "../plPhysX/plPXPhysicalControllerCore.h" #include "plPhysX/plPXPhysicalControllerCore.h"
PF_CONSOLE_GROUP( Physics ) PF_CONSOLE_GROUP( Physics )
@ -5952,7 +5952,7 @@ PF_CONSOLE_CMD( Physics, ClearLog, "", "Clear the physics log.")
plSimulationMgr::ClearLog(); plSimulationMgr::ClearLog();
} }
*/ */
#include "../plPhysical/plPhysicalSDLModifier.h" #include "plPhysical/plPhysicalSDLModifier.h"
PF_CONSOLE_CMD(Physics, LogSDL, "int level", "Turn logging of physics SDL state on or off. 0=off 1=send/receive only 2=any attempt") PF_CONSOLE_CMD(Physics, LogSDL, "int level", "Turn logging of physics SDL state on or off. 0=off 1=send/receive only 2=any attempt")
{ {
@ -5960,7 +5960,7 @@ PF_CONSOLE_CMD(Physics, LogSDL, "int level", "Turn logging of physics SDL state
plPhysicalSDLModifier::SetLogLevel(level); plPhysicalSDLModifier::SetLogLevel(level);
} }
#include "../plPhysX/plSimulationMgr.h" #include "plPhysX/plSimulationMgr.h"
PF_CONSOLE_CMD(Physics, ExtraProfile, "", "Toggle extra simulation profiling") PF_CONSOLE_CMD(Physics, ExtraProfile, "", "Toggle extra simulation profiling")
{ {
char str[256]; char str[256];
@ -6729,10 +6729,10 @@ PF_CONSOLE_CMD( Animation,
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
#ifndef LIMIT_CONSOLE_COMMANDS #ifndef LIMIT_CONSOLE_COMMANDS
#include "../plAvatar/plArmatureMod.h" #include "plAvatar/plArmatureMod.h"
#include "../plAvatar/plAvatarClothing.h" #include "plAvatar/plAvatarClothing.h"
#include "../plAvatar/plClothingLayout.h" #include "plAvatar/plClothingLayout.h"
#include "../pfMessage/plClothingMsg.h" #include "pfMessage/plClothingMsg.h"
PF_CONSOLE_GROUP( Clothing ) // Defines a main command group PF_CONSOLE_GROUP( Clothing ) // Defines a main command group
@ -7001,7 +7001,7 @@ PF_CONSOLE_CMD( KI, // Group name
PF_CONSOLE_GROUP( Python ) // Defines a main command group PF_CONSOLE_GROUP( Python ) // Defines a main command group
#include "../pfPython/cyMisc.h" #include "pfPython/cyMisc.h"
PF_CONSOLE_CMD( Python, // Group name PF_CONSOLE_CMD( Python, // Group name
SetLoggingLevel, // Function name SetLoggingLevel, // Function name
@ -7023,7 +7023,7 @@ PF_CONSOLE_CMD( Python,
#endif #endif
#include "../pfMessage/pfBackdoorMsg.h" #include "pfMessage/pfBackdoorMsg.h"
PF_CONSOLE_CMD( Python, PF_CONSOLE_CMD( Python,
Backdoor, Backdoor,
"string target, ...", // Params "string target, ...", // Params

60
Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp

@ -53,52 +53,52 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfConsoleCmd.h" #include "pfConsoleCmd.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "../plAgeLoader/plAgeLoader.h" #include "plAgeLoader/plAgeLoader.h"
#include "../plNetClient/plNetObjectDebugger.h" #include "plNetClient/plNetObjectDebugger.h"
#include "../plNetClient/plNetClientMgr.h" #include "plNetClient/plNetClientMgr.h"
#include "../plNetClient/plNetLinkingMgr.h" #include "plNetClient/plNetLinkingMgr.h"
#include "../plAgeLoader/plResPatcher.h" #include "plAgeLoader/plResPatcher.h"
#include "../../NucleusLib/inc/hsResMgr.h" #include "hsResMgr.h"
#include "../pnKeyedObject/plFixedKey.h" #include "pnKeyedObject/plFixedKey.h"
#include "../pnKeyedObject/plKey.h" #include "pnKeyedObject/plKey.h"
#include "../pnKeyedObject/plKeyImp.h" #include "pnKeyedObject/plKeyImp.h"
#include "../pnModifier/plLogicModBase.h" #include "pnModifier/plLogicModBase.h"
#include "../pfCharacter/plPlayerModifier.h" #include "pfCharacter/plPlayerModifier.h"
#include "../../NucleusLib/inc/hsTimer.h" #include "hsTimer.h"
#include "../pnMessage/plClientMsg.h" #include "pnMessage/plClientMsg.h"
#include "../pnMessage/plEnableMsg.h" #include "pnMessage/plEnableMsg.h"
#include "../pnMessage/plAudioSysMsg.h" #include "pnMessage/plAudioSysMsg.h"
#include "../plNetMessage/plNetMessage.h" #include "plNetMessage/plNetMessage.h"
#include "../plMessage/plAvatarMsg.h" #include "plMessage/plAvatarMsg.h"
#include "../plMessage/plOneShotMsg.h" #include "plMessage/plOneShotMsg.h"
#include "../plMessage/plConsoleMsg.h" #include "plMessage/plConsoleMsg.h"
#include "../../Apps/plClient/plClient.h" #include "../../Apps/plClient/plClient.h"
#include "pfConsole.h" #include "pfConsole.h"
#include "../plResMgr/plKeyFinder.h" #include "plResMgr/plKeyFinder.h"
#include "hsResMgr.h" #include "hsResMgr.h"
// begin for agedefn test // begin for agedefn test
#include "hsStream.h" #include "hsStream.h"
#include "../plAgeDescription/plAgeDescription.h" #include "plAgeDescription/plAgeDescription.h"
#include "../plUnifiedTime/plUnifiedTime.h" #include "plUnifiedTime/plUnifiedTime.h"
//end for agedefn test //end for agedefn test
#include "../../PubUtilLib/plFile/hsFiles.h" #include "plFile/hsFiles.h"
#include "../plStatusLog/plStatusLog.h" #include "plStatusLog/plStatusLog.h"
#include "hsStlUtils.h" #include "hsStlUtils.h"
#include "hsTemplates.h" #include "hsTemplates.h"
#include "../plVault/plVault.h" #include "plVault/plVault.h"
#include "../plNetCommon/plSpawnPointInfo.h" #include "plNetCommon/plSpawnPointInfo.h"
#include "../plSDL/plSDL.h" #include "plSDL/plSDL.h"
#include "../plNetGameLib/plNetGameLib.h" #include "plNetGameLib/plNetGameLib.h"
#include "../pfGameMgr/pfGameMgr.h" #include "pfGameMgr/pfGameMgr.h"
#define PF_SANITY_CHECK( cond, msg ) { if( !( cond ) ) { PrintString( msg ); return; } } #define PF_SANITY_CHECK( cond, msg ) { if( !( cond ) ) { PrintString( msg ); return; } }
@ -640,7 +640,7 @@ PF_CONSOLE_CMD( Net_DebugObject, // groupName
plNetObjectDebugger::GetInstance()->ClearAllDebugObjects(); plNetObjectDebugger::GetInstance()->ClearAllDebugObjects();
} }
#include "../pfPython/plPythonSDLModifier.h" #include "pfPython/plPythonSDLModifier.h"
PF_CONSOLE_CMD( Net_DebugObject, // groupName PF_CONSOLE_CMD( Net_DebugObject, // groupName
DumpAgeSDLHook, // fxnName DumpAgeSDLHook, // fxnName
"bool dirtyOnly", // paramList "bool dirtyOnly", // paramList

2
Sources/Plasma/FeatureLib/pfConsole/pfConsoleEngine.cpp

@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfConsoleCmd.h" #include "pfConsoleCmd.h"
#include "pfConsoleContext.h" #include "pfConsoleContext.h"
#include "../plFile/plEncryptedStream.h" #include "plFile/plEncryptedStream.h"
const Int32 pfConsoleEngine::fMaxNumParams = 16; const Int32 pfConsoleEngine::fMaxNumParams = 16;

16
Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.cpp

@ -41,9 +41,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include "hsTimer.h" #include "hsTimer.h"
#include "pfDispatchLog.h" #include "pfDispatchLog.h"
#include "../plStatusLog/plStatusLog.h" #include "plStatusLog/plStatusLog.h"
#include "../pnMessage/plMessage.h" #include "pnMessage/plMessage.h"
#include "../pnKeyedObject/plKey.h" #include "pnKeyedObject/plKey.h"
#include "hsWindows.h" #include "hsWindows.h"
bool DumpSpecificMsgInfo(plMessage* msg, std::string& info); bool DumpSpecificMsgInfo(plMessage* msg, std::string& info);
@ -187,11 +187,11 @@ void plDispatchLog::RemoveFilterExactType(UInt16 type)
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
#include "../pnMessage/plClientMsg.h" #include "pnMessage/plClientMsg.h"
#include "../pfMessage/pfKIMsg.h" #include "pfMessage/pfKIMsg.h"
#include "../pnKeyedObject/hsKeyedObject.h" #include "pnKeyedObject/hsKeyedObject.h"
#include "../plResMgr/plKeyFinder.h" #include "plResMgr/plKeyFinder.h"
#include "../plResMgr/plPageInfo.h" #include "plResMgr/plPageInfo.h"
static bool DumpSpecificMsgInfo(plMessage* msg, std::string& info) static bool DumpSpecificMsgInfo(plMessage* msg, std::string& info)
{ {

2
Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.h

@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef pfDispatchLog_inc #ifndef pfDispatchLog_inc
#define pfDispatchLog_inc #define pfDispatchLog_inc
#include "../pnDispatch/plDispatchLogBase.h" #include "pnDispatch/plDispatchLogBase.h"
#include "hsBitVector.h" #include "hsBitVector.h"
class plStatusLog; class plStatusLog;

30
Sources/Plasma/FeatureLib/pfConsole/pfGameConsoleCommands.cpp

@ -74,17 +74,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plPipeline.h" #include "plPipeline.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "../plGImage/plMipmap.h" #include "plGImage/plMipmap.h"
#include "../plGImage/plTGAWriter.h" #include "plGImage/plTGAWriter.h"
#include "../pfMessage/pfGameGUIMsg.h" #include "pfMessage/pfGameGUIMsg.h"
#include "../../NucleusLib/inc/hsResMgr.h" #include "hsResMgr.h"
#include "../pfGameGUIMgr/pfGUICtrlGenerator.h" #include "pfGameGUIMgr/pfGUICtrlGenerator.h"
#include "../plAvatar/plAvatarMgr.h" #include "plAvatar/plAvatarMgr.h"
#include "../plAvatar/plAnimStage.h" #include "plAvatar/plAnimStage.h"
#include "../plAvatar/plAvBrainGeneric.h" #include "plAvatar/plAvBrainGeneric.h"
#include "../plAvatar/plAvBrainHuman.h" #include "plAvatar/plAvBrainHuman.h"
#include "../plMessage/plAvatarMsg.h" #include "plMessage/plAvatarMsg.h"
#include "../pnKeyedObject/plFixedKey.h" #include "pnKeyedObject/plFixedKey.h"
#define PF_SANITY_CHECK( cond, msg ) { if( !( cond ) ) { PrintString( msg ); return; } } #define PF_SANITY_CHECK( cond, msg ) { if( !( cond ) ) { PrintString( msg ); return; } }
@ -234,7 +234,7 @@ PF_CONSOLE_CMD( Game, SwitchDialog, "string olddlgName, string newdlgName", "Hid
PF_CONSOLE_SUBGROUP( Game, GUI ) PF_CONSOLE_SUBGROUP( Game, GUI )
#include "../pfGameGUIMgr/pfGUICtrlGenerator.h" #include "pfGameGUIMgr/pfGUICtrlGenerator.h"
static hsColorRGBA sDynCtrlColor = hsColorRGBA().Set( 1, 1, 1, 1 ), sDynCtrlTextColor = hsColorRGBA().Set( 0, 0, 0, 1 ); static hsColorRGBA sDynCtrlColor = hsColorRGBA().Set( 1, 1, 1, 1 ), sDynCtrlTextColor = hsColorRGBA().Set( 0, 0, 0, 1 );
@ -275,7 +275,7 @@ PF_CONSOLE_CMD( Game_GUI, CreateDialog, "string name", "" )
//#include "../pfKI/pfKI.h" //#include "../pfKI/pfKI.h"
#include "../pfMessage/pfKIMsg.h" #include "pfMessage/pfKIMsg.h"
PF_CONSOLE_CMD( Game, EnterChatMode, "", "Enters in-game chat mode" ) PF_CONSOLE_CMD( Game, EnterChatMode, "", "Enters in-game chat mode" )
{ {
@ -393,7 +393,7 @@ PF_CONSOLE_CMD( Game, SetChatFadeDelay, "float delayInSecs", "Sets the time in s
plgDispatch::MsgSend( msg ); plgDispatch::MsgSend( msg );
} }
#include "../plAvatar/plArmatureMod.h" #include "plAvatar/plArmatureMod.h"
PF_CONSOLE_CMD( Game, LimitAvatarLOD, "int newLOD", "Zero is (always) highest detail; 2 is (currently) lowest." ) PF_CONSOLE_CMD( Game, LimitAvatarLOD, "int newLOD", "Zero is (always) highest detail; 2 is (currently) lowest." )
{ {
@ -458,7 +458,7 @@ PF_CONSOLE_CMD( Game, SetLocalClientAsAdmin, "bool enable", "Makes chat messages
} }
#endif #endif
#include "../pfConditional/plObjectInBoxConditionalObject.h" #include "pfConditional/plObjectInBoxConditionalObject.h"
PF_CONSOLE_CMD( Game, BreakVolumeSensors, "bool break", "reverts to old broken volume sensor logic" ) PF_CONSOLE_CMD( Game, BreakVolumeSensors, "bool break", "reverts to old broken volume sensor logic" )
{ {

19
Sources/Plasma/FeatureLib/pfCsrSrv/CMakeLists.txt

@ -0,0 +1,19 @@
include_directories(../../CoreLib)
include_directories(../../FeatureLib)
include_directories(../../NucleusLib)
include_directories(../../NucleusLib/inc)
include_directories(../../PubUtilLib)
set(pfCsrSrv_SOURCES
pfCsrSrv.cpp
)
set(pfCsrSrv_HEADERS
Pch.h
pfCsrSrv.h
)
add_library(pfCsrSrv STATIC ${pfCsrSrv_SOURCES} ${pfCsrSrv_HEADERS})
source_group("Source Files" FILES ${pfCsrSrv_SOURCES})
source_group("Header Files" FILES ${pfCsrSrv_HEADERS})

68
Sources/Plasma/FeatureLib/pfGameGUIMgr/CMakeLists.txt

@ -0,0 +1,68 @@
include_directories(../../CoreLib)
include_directories(../../FeatureLib)
include_directories(../../NucleusLib)
include_directories(../../NucleusLib/inc)
include_directories(../../PubUtilLib)
set(pfGameGUIMgr_SOURCES
pfGameGUIMgr.cpp
pfGUIButtonMod.cpp
pfGUICheckBoxCtrl.cpp
pfGUIClickMapCtrl.cpp
pfGUIControlHandlers.cpp
pfGUIControlMod.cpp
pfGUICtrlGenerator.cpp
pfGUIDialogMod.cpp
pfGUIDialogNotifyProc.cpp
pfGUIDragBarCtrl.cpp
pfGUIDraggableMod.cpp
pfGUIDynDisplayCtrl.cpp
pfGUIEditBoxMod.cpp
pfGUIKnobCtrl.cpp
pfGUIListBoxMod.cpp
pfGUIListElement.cpp
pfGUIMenuItem.cpp
pfGUIMultiLineEditCtrl.cpp
pfGUIPopUpMenu.cpp
pfGUIProgressCtrl.cpp
pfGUIRadioGroupCtrl.cpp
pfGUITagDefs.cpp
pfGUITextBoxMod.cpp
pfGUIUpDownPairMod.cpp
pfGUIValueCtrl.cpp
)
set(pfGameGUIMgr_HEADERS
pfGameGUIMgr.h
pfGameGUIMgrCreatable.h
pfGUIButtonMod.h
pfGUICheckBoxCtrl.h
pfGUIClickMapCtrl.h
pfGUIControlHandlers.h
pfGUIControlMod.h
pfGUICtrlGenerator.h
pfGUIDialogHandlers.h
pfGUIDialogMod.h
pfGUIDialogNotifyProc.cpp
pfGUIDragBarCtrl.h
pfGUIDraggableMod.h
pfGUIDynDisplayCtrl.h
pfGUIEditBoxMod.h
pfGUIKnobCtrl.h
pfGUIListBoxMod.h
pfGUIListElement.h
pfGUIMenuItem.h
pfGUIMultiLineEditCtrl.h
pfGUIPopUpMenu.h
pfGUIProgressCtrl.h
pfGUIRadioGroupCtrl.h
pfGUITagDefs.h
pfGUITextBoxMod.h
pfGUIUpDownPairMod.h
pfGUIValueCtrl.h
)
add_library(pfGameGUIMgr STATIC ${pfGameGUIMgr_SOURCES} ${pfGameGUIMgr_HEADERS})
source_group("Source Files" FILES ${pfGameGUIMgr_SOURCES})
source_group("Header Files" FILES ${pfGameGUIMgr_HEADERS})

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

Loading…
Cancel
Save