Browse Source

Finish the port of FeatureLib to CMake

(cherry picked from commit 4134a68f2c)
rarified/huru-merge-work/cmake-building
Branan Purvine-Riley 14 years ago committed by rarified
parent
commit
afa3f2c67a
  1. 6
      CMakeLists.txt
  2. 6
      Sources/Plasma/Apps/plClient/plClient.h
  3. 27
      Sources/Plasma/FeatureLib/CMakeLists.txt
  4. 18
      Sources/Plasma/FeatureLib/pfCCR/CMakeLists.txt
  5. 29
      Sources/Plasma/FeatureLib/pfCamera/CMakeLists.txt
  6. 2
      Sources/Plasma/FeatureLib/pfCamera/pfCameraCreatable.h
  7. 6
      Sources/Plasma/FeatureLib/pfCamera/pfCameraProxy.cpp
  8. 2
      Sources/Plasma/FeatureLib/pfCamera/pfCameraProxy.h
  9. 46
      Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.cpp
  10. 2
      Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.h
  11. 32
      Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.cpp
  12. 2
      Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.h
  13. 10
      Sources/Plasma/FeatureLib/pfCamera/plInterestingModifier.cpp
  14. 4
      Sources/Plasma/FeatureLib/pfCamera/plInterestingModifier.h
  15. 64
      Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp
  16. 2
      Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.h
  17. 25
      Sources/Plasma/FeatureLib/pfCharacter/CMakeLists.txt
  18. 24
      Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.cpp
  19. 4
      Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.h
  20. 14
      Sources/Plasma/FeatureLib/pfCharacter/pfMarkerMgr.cpp
  21. 2
      Sources/Plasma/FeatureLib/pfCharacter/pfMarkerMgr.h
  22. 40
      Sources/Plasma/FeatureLib/pfConditional/CMakeLists.txt
  23. 8
      Sources/Plasma/FeatureLib/pfConditional/plANDConditionalObject.cpp
  24. 2
      Sources/Plasma/FeatureLib/pfConditional/plANDConditionalObject.h
  25. 8
      Sources/Plasma/FeatureLib/pfConditional/plActivatorConditionalObject.cpp
  26. 2
      Sources/Plasma/FeatureLib/pfConditional/plActivatorConditionalObject.h
  27. 8
      Sources/Plasma/FeatureLib/pfConditional/plAnimationEventConditionalObject.cpp
  28. 6
      Sources/Plasma/FeatureLib/pfConditional/plAnimationEventConditionalObject.h
  29. 2
      Sources/Plasma/FeatureLib/pfConditional/plConditionalObjectCreatable.h
  30. 6
      Sources/Plasma/FeatureLib/pfConditional/plControlEventConditionalObject.cpp
  31. 4
      Sources/Plasma/FeatureLib/pfConditional/plControlEventConditionalObject.h
  32. 16
      Sources/Plasma/FeatureLib/pfConditional/plFacingConditionalObject.cpp
  33. 2
      Sources/Plasma/FeatureLib/pfConditional/plFacingConditionalObject.h
  34. 6
      Sources/Plasma/FeatureLib/pfConditional/plKeyPressConditionalObject.cpp
  35. 4
      Sources/Plasma/FeatureLib/pfConditional/plKeyPressConditionalObject.h
  36. 4
      Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerInBoxConditionalObject.cpp
  37. 2
      Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerInBoxConditionalObject.h
  38. 4
      Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerIntersectPlaneConditionalObject.cpp
  39. 2
      Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerIntersectPlaneConditionalObject.h
  40. 6
      Sources/Plasma/FeatureLib/pfConditional/plORConditionalObject.cpp
  41. 2
      Sources/Plasma/FeatureLib/pfConditional/plORConditionalObject.h
  42. 20
      Sources/Plasma/FeatureLib/pfConditional/plObjectInBoxConditionalObject.cpp
  43. 2
      Sources/Plasma/FeatureLib/pfConditional/plObjectInBoxConditionalObject.h
  44. 4
      Sources/Plasma/FeatureLib/pfConditional/plObjectIntersectPlaneConditionalObject.cpp
  45. 2
      Sources/Plasma/FeatureLib/pfConditional/plObjectIntersectPlaneConditionalObject.h
  46. 6
      Sources/Plasma/FeatureLib/pfConditional/plPickedConditionalObject.cpp
  47. 2
      Sources/Plasma/FeatureLib/pfConditional/plPickedConditionalObject.h
  48. 38
      Sources/Plasma/FeatureLib/pfConsole/CMakeLists.txt
  49. 72
      Sources/Plasma/FeatureLib/pfConsole/pfAvatarConsoleCommands.cpp
  50. 26
      Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp
  51. 2
      Sources/Plasma/FeatureLib/pfConsole/pfConsole.h
  52. 244
      Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp
  53. 60
      Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp
  54. 2
      Sources/Plasma/FeatureLib/pfConsole/pfConsoleEngine.cpp
  55. 16
      Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.cpp
  56. 2
      Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.h
  57. 30
      Sources/Plasma/FeatureLib/pfConsole/pfGameConsoleCommands.cpp
  58. 19
      Sources/Plasma/FeatureLib/pfCsrSrv/CMakeLists.txt
  59. 67
      Sources/Plasma/FeatureLib/pfGameGUIMgr/CMakeLists.txt
  60. 10
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIButtonMod.cpp
  61. 10
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUICheckBoxCtrl.cpp
  62. 6
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIClickMapCtrl.cpp
  63. 2
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlHandlers.cpp
  64. 30
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlMod.cpp
  65. 4
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlMod.h
  66. 36
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUICtrlGenerator.cpp
  67. 22
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogMod.cpp
  68. 2
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogMod.h
  69. 2
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogNotifyProc.cpp
  70. 2
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogNotifyProc.h
  71. 10
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDragBarCtrl.cpp
  72. 10
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDraggableMod.cpp
  73. 10
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDynDisplayCtrl.cpp
  74. 14
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIEditBoxMod.cpp
  75. 4
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIEditBoxMod.h
  76. 22
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIKnobCtrl.cpp
  77. 12
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIListBoxMod.cpp
  78. 6
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIListElement.cpp
  79. 6
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMenuItem.cpp
  80. 10
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMultiLineEditCtrl.cpp
  81. 2
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMultiLineEditCtrl.h
  82. 34
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIPopUpMenu.cpp
  83. 26
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIProgressCtrl.cpp
  84. 4
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIRadioGroupCtrl.cpp
  85. 14
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUITextBoxMod.cpp
  86. 8
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIUpDownPairMod.cpp
  87. 26
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgr.cpp
  88. 4
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgr.h
  89. 2
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgrCreatable.h
  90. 35
      Sources/Plasma/FeatureLib/pfGameMgr/CMakeLists.txt
  91. 22
      Sources/Plasma/FeatureLib/pfGameMgr/Pch.h
  92. 16
      Sources/Plasma/FeatureLib/pfGameMgr/pfGameMgr.h
  93. 17
      Sources/Plasma/FeatureLib/pfGameScoreMgr/CMakeLists.txt
  94. 6
      Sources/Plasma/FeatureLib/pfGameScoreMgr/pfGameScoreMgr.cpp
  95. 4
      Sources/Plasma/FeatureLib/pfGameScoreMgr/pfGameScoreMgr.h
  96. 21
      Sources/Plasma/FeatureLib/pfJournalBook/CMakeLists.txt
  97. 66
      Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp
  98. 4
      Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.h
  99. 25
      Sources/Plasma/FeatureLib/pfLocalizationMgr/CMakeLists.txt
  100. 15
      Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizationDataMgr.cpp
  101. Some files were not shown because too many files have changed in this diff Show More

6
CMakeLists.txt

@ -4,11 +4,15 @@ cmake_minimum_required(VERSION 2.8)
# Find all 3rd-party libraries that are required # Find all 3rd-party libraries that are required
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)
find_package(OpenAL REQUIRED) find_package(OpenAL REQUIRED)
find_package(PythonLibs REQUIRED)
find_package(ZLIB REQUIRED)
find_package(EXPAT REQUIRED)
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
option(EXTERNAL_RELEASE "Is this release intended for the general public?" OFF) option(EXTERNAL_RELEASE "Is this release intended for the general public?" OFF)
#TODO: Don't hard code this # TODO: are there any other build types which are useful for us?
>>>>>>> Finish the port of FeatureLib to CMake
add_definitions(-DBUILD_TYPE=BUILD_TYPE_LIVE) add_definitions(-DBUILD_TYPE=BUILD_TYPE_LIVE)
if(EXTERNAL_RELEASE) if(EXTERNAL_RELEASE)

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;

27
Sources/Plasma/FeatureLib/CMakeLists.txt

@ -1,2 +1,25 @@
add_subdirectory(pfAnimation) add_definitions(-D_LIB)
add_subdirectory(pfAudio)
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)

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

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

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"

32
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
@ -491,4 +491,4 @@ void plCameraModifier1::SetTransform(hsPoint3 at)
l2w.Make(&fFrom, &at, &up); l2w.Make(&fFrom, &at, &up);
l2w.GetInverse(&w2l); l2w.GetInverse(&w2l);
IGetTargetCoordinateInterface(0)->SetTransform( l2w, w2l ); IGetTargetCoordinateInterface(0)->SetTransform( l2w, w2l );
} }

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

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

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

10
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIButtonMod.cpp

@ -52,11 +52,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGUIControlHandlers.h" #include "pfGUIControlHandlers.h"
#include "pfGUIDialogMod.h" #include "pfGUIDialogMod.h"
#include "../plInputCore/plInputInterface.h" #include "plInputCore/plInputInterface.h"
#include "../pnMessage/plRefMsg.h" #include "pnMessage/plRefMsg.h"
#include "../pfMessage/pfGameGUIMsg.h" #include "pfMessage/pfGameGUIMsg.h"
#include "../plMessage/plAnimCmdMsg.h" #include "plMessage/plAnimCmdMsg.h"
#include "../plAvatar/plAGModifier.h" #include "plAvatar/plAGModifier.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "hsResMgr.h" #include "hsResMgr.h"

10
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUICheckBoxCtrl.cpp

@ -52,11 +52,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGUICheckBoxCtrl.h" #include "pfGUICheckBoxCtrl.h"
#include "pfGameGUIMgr.h" #include "pfGameGUIMgr.h"
#include "../plInputCore/plInputInterface.h" #include "plInputCore/plInputInterface.h"
#include "../pnMessage/plRefMsg.h" #include "pnMessage/plRefMsg.h"
#include "../pfMessage/pfGameGUIMsg.h" #include "pfMessage/pfGameGUIMsg.h"
#include "../plMessage/plAnimCmdMsg.h" #include "plMessage/plAnimCmdMsg.h"
#include "../plAvatar/plAGModifier.h" #include "plAvatar/plAGModifier.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "hsResMgr.h" #include "hsResMgr.h"

6
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIClickMapCtrl.cpp

@ -50,9 +50,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGameGUIMgr.h" #include "pfGameGUIMgr.h"
#include "pfGUIDialogMod.h" #include "pfGUIDialogMod.h"
#include "../plInputCore/plInputInterface.h" #include "plInputCore/plInputInterface.h"
#include "../pnMessage/plRefMsg.h" #include "pnMessage/plRefMsg.h"
#include "../pfMessage/pfGameGUIMsg.h" #include "pfMessage/pfGameGUIMsg.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "hsResMgr.h" #include "hsResMgr.h"

2
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlHandlers.cpp

@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGUIControlMod.h" #include "pfGUIControlMod.h"
#include "pfGUIDialogMod.h" #include "pfGUIDialogMod.h"
#include "../plMessage/plConsoleMsg.h" #include "plMessage/plConsoleMsg.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "hsResMgr.h" #include "hsResMgr.h"

30
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlMod.cpp

@ -53,23 +53,23 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGUIDialogHandlers.h" #include "pfGUIDialogHandlers.h"
#include "pfGUIListElement.h" // Includes dropTargetProc #include "pfGUIListElement.h" // Includes dropTargetProc
#include "../pnMessage/plRefMsg.h" #include "pnMessage/plRefMsg.h"
#include "../pnMessage/plEnableMsg.h" #include "pnMessage/plEnableMsg.h"
#include "../pfMessage/pfGameGUIMsg.h" #include "pfMessage/pfGameGUIMsg.h"
#include "../plMessage/plDeviceRecreateMsg.h" #include "plMessage/plDeviceRecreateMsg.h"
#include "../pnSceneObject/plDrawInterface.h" #include "pnSceneObject/plDrawInterface.h"
#include "../pnSceneObject/plCoordinateInterface.h" #include "pnSceneObject/plCoordinateInterface.h"
#include "../pnSceneObject/plAudioInterface.h" #include "pnSceneObject/plAudioInterface.h"
#include "../plGImage/plDynamicTextMap.h" #include "plGImage/plDynamicTextMap.h"
#include "../plSurface/plLayer.h" #include "plSurface/plLayer.h"
#include "../plMessage/plRenderMsg.h" #include "plMessage/plRenderMsg.h"
#include "../pnMessage/plSoundMsg.h" #include "pnMessage/plSoundMsg.h"
#include "plPipeline.h" #include "plPipeline.h"
#include "../plDrawable/plAccessGeometry.h" #include "plDrawable/plAccessGeometry.h"
#include "../plDrawable/plAccessSpan.h" #include "plDrawable/plAccessSpan.h"
#include "../plDrawable/plAccessVtxSpan.h" #include "plDrawable/plAccessVtxSpan.h"
#include "pfGUIPopUpMenu.h" // For skin, can we move that please? Thank you #include "pfGUIPopUpMenu.h" // For skin, can we move that please? Thank you

4
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlMod.h

@ -49,9 +49,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define _pfGUIControlMod_h #define _pfGUIControlMod_h
#include "../pnModifier/plSingleModifier.h" #include "pnModifier/plSingleModifier.h"
#include "hsBounds.h" #include "hsBounds.h"
#include "../plMessage/plInputEventMsg.h" #include "plMessage/plInputEventMsg.h"
#include "pfGameGUIMgr.h" #include "pfGameGUIMgr.h"
#include "hsColorRGBA.h" #include "hsColorRGBA.h"
#include "hsRefCnt.h" #include "hsRefCnt.h"

36
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUICtrlGenerator.cpp

@ -55,24 +55,24 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGUIControlHandlers.h" #include "pfGUIControlHandlers.h"
#include "pfGUIMenuItem.h" #include "pfGUIMenuItem.h"
#include "../plSurface/hsGMaterial.h" #include "plSurface/hsGMaterial.h"
#include "../plSurface/plLayer.h" #include "plSurface/plLayer.h"
#include "../plGImage/plMipmap.h" #include "plGImage/plMipmap.h"
#include "../pnKeyedObject/plFixedKey.h" #include "pnKeyedObject/plFixedKey.h"
#include "../plDrawable/plDrawableSpans.h" #include "plDrawable/plDrawableSpans.h"
#include "../plDrawable/plDrawableGenerator.h" #include "plDrawable/plDrawableGenerator.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "../pnSceneObject/plDrawInterface.h" #include "pnSceneObject/plDrawInterface.h"
#include "../pnSceneObject/plCoordinateInterface.h" #include "pnSceneObject/plCoordinateInterface.h"
#include "../pnMessage/plIntRefMsg.h" #include "pnMessage/plIntRefMsg.h"
#include "../pnMessage/plObjRefMsg.h" #include "pnMessage/plObjRefMsg.h"
#include "../pnMessage/plNodeRefMsg.h" #include "pnMessage/plNodeRefMsg.h"
#include "../plPipeline/plTextGenerator.h" #include "plPipeline/plTextGenerator.h"
#include "../plScene/plPostEffectMod.h" #include "plScene/plPostEffectMod.h"
#include "../plScene/plSceneNode.h" #include "plScene/plSceneNode.h"
#include "../pnMessage/plClientMsg.h" #include "pnMessage/plClientMsg.h"
#include "../plMessage/plLayRefMsg.h" #include "plMessage/plLayRefMsg.h"
#include "../pnMessage/plAttachMsg.h" #include "pnMessage/plAttachMsg.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "hsResMgr.h" #include "hsResMgr.h"

22
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogMod.cpp

@ -52,18 +52,18 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGUIDialogHandlers.h" #include "pfGUIDialogHandlers.h"
#include "pfGUIDialogNotifyProc.h" #include "pfGUIDialogNotifyProc.h"
#include "pfGUIListElement.h" #include "pfGUIListElement.h"
#include "../plScene/plPostEffectMod.h" #include "plScene/plPostEffectMod.h"
#include "../pnMessage/plRefMsg.h" #include "pnMessage/plRefMsg.h"
#include "../pfMessage/pfGameGUIMsg.h" #include "pfMessage/pfGameGUIMsg.h"
#include "../plMessage/plAnimCmdMsg.h" #include "plMessage/plAnimCmdMsg.h"
#include "../plScene/plSceneNode.h" #include "plScene/plSceneNode.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "../pnKeyedObject/plKey.h" #include "pnKeyedObject/plKey.h"
#include "../pnKeyedObject/plFixedKey.h" #include "pnKeyedObject/plFixedKey.h"
#include "../pnSceneObject/plCoordinateInterface.h" #include "pnSceneObject/plCoordinateInterface.h"
#include "../plStatusLog/plStatusLog.h" #include "plStatusLog/plStatusLog.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "hsResMgr.h" #include "hsResMgr.h"
@ -402,7 +402,7 @@ void pfGUIDialogMod::UpdateInterestingThings( hsScalar mouseX, hsScalar mouseY,
//// HandleMouseEvent //////////////////////////////////////////////////////// //// HandleMouseEvent ////////////////////////////////////////////////////////
#ifdef HS_DEBUGGING // Debugging bounds rects #ifdef HS_DEBUGGING // Debugging bounds rects
#include "../plPipeline/plDebugText.h" #include "plPipeline/plDebugText.h"
#endif #endif
hsBool pfGUIDialogMod::HandleMouseEvent( pfGameGUIMgr::EventType event, hsScalar mouseX, hsScalar mouseY, hsBool pfGUIDialogMod::HandleMouseEvent( pfGameGUIMgr::EventType event, hsScalar mouseX, hsScalar mouseY,

2
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogMod.h

@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define _pfGUIDialogMod_h #define _pfGUIDialogMod_h
#include "../pnModifier/plSingleModifier.h" #include "pnModifier/plSingleModifier.h"
#include "pfGameGUIMgr.h" #include "pfGameGUIMgr.h"
#include "hsMatrix44.h" #include "hsMatrix44.h"

2
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogNotifyProc.cpp

@ -61,7 +61,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGUIListBoxMod.h" #include "pfGUIListBoxMod.h"
#include "pfGUIEditBoxMod.h" #include "pfGUIEditBoxMod.h"
#include "../pfMessage/pfGUINotifyMsg.h" #include "pfMessage/pfGUINotifyMsg.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "hsResMgr.h" #include "hsResMgr.h"

2
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogNotifyProc.h

@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define _pfGUIDialogNotifyProc_h #define _pfGUIDialogNotifyProc_h
#include "pfGUIDialogHandlers.h" #include "pfGUIDialogHandlers.h"
#include "../pnKeyedObject/plKey.h" #include "pnKeyedObject/plKey.h"
class plGUIControlMod; class plGUIControlMod;

10
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDragBarCtrl.cpp

@ -54,11 +54,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGameGUIMgr.h" #include "pfGameGUIMgr.h"
#include "pfGUIDialogMod.h" #include "pfGUIDialogMod.h"
#include "../plInputCore/plInputInterface.h" #include "plInputCore/plInputInterface.h"
#include "../pnMessage/plRefMsg.h" #include "pnMessage/plRefMsg.h"
#include "../pfMessage/pfGameGUIMsg.h" #include "pfMessage/pfGameGUIMsg.h"
#include "../plMessage/plAnimCmdMsg.h" #include "plMessage/plAnimCmdMsg.h"
#include "../plAvatar/plAGModifier.h" #include "plAvatar/plAGModifier.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "hsResMgr.h" #include "hsResMgr.h"

10
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDraggableMod.cpp

@ -49,11 +49,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGUIDraggableMod.h" #include "pfGUIDraggableMod.h"
#include "pfGameGUIMgr.h" #include "pfGameGUIMgr.h"
#include "../pnMessage/plRefMsg.h" #include "pnMessage/plRefMsg.h"
#include "../pfMessage/pfGameGUIMsg.h" #include "pfMessage/pfGameGUIMsg.h"
#include "../plMessage/plAnimCmdMsg.h" #include "plMessage/plAnimCmdMsg.h"
#include "../plAvatar/plAGModifier.h" #include "plAvatar/plAGModifier.h"
#include "../plInputCore/plInputInterface.h" #include "plInputCore/plInputInterface.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "hsResMgr.h" #include "hsResMgr.h"

10
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDynDisplayCtrl.cpp

@ -49,11 +49,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGUIDynDisplayCtrl.h" #include "pfGUIDynDisplayCtrl.h"
#include "pfGameGUIMgr.h" #include "pfGameGUIMgr.h"
#include "../pnMessage/plRefMsg.h" #include "pnMessage/plRefMsg.h"
#include "../plGImage/plDynamicTextMap.h" #include "plGImage/plDynamicTextMap.h"
#include "../plSurface/plLayerInterface.h" #include "plSurface/plLayerInterface.h"
#include "../plSurface/hsGMaterial.h" #include "plSurface/hsGMaterial.h"
#include "../plPipeline/plTextGenerator.h" #include "plPipeline/plTextGenerator.h"
#include "plPipeline.h" #include "plPipeline.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "hsResMgr.h" #include "hsResMgr.h"

14
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIEditBoxMod.cpp

@ -53,15 +53,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGUIEditBoxMod.h" #include "pfGUIEditBoxMod.h"
#include "pfGameGUIMgr.h" #include "pfGameGUIMgr.h"
#include "../pnMessage/plRefMsg.h" #include "pnMessage/plRefMsg.h"
#include "../pfMessage/pfGameGUIMsg.h" #include "pfMessage/pfGameGUIMsg.h"
#include "../plMessage/plAnimCmdMsg.h" #include "plMessage/plAnimCmdMsg.h"
#include "../plAvatar/plAGModifier.h" #include "plAvatar/plAGModifier.h"
#include "../plGImage/plDynamicTextMap.h" #include "plGImage/plDynamicTextMap.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "hsResMgr.h" #include "hsResMgr.h"
#include "../pnInputCore/plKeyMap.h" #include "pnInputCore/plKeyMap.h"
#include "../plClipboard/plClipboard.h" #include "plClipboard/plClipboard.h"
#include <locale> #include <locale>

4
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIEditBoxMod.h

@ -50,9 +50,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsStlUtils.h" #include "hsStlUtils.h"
#include "pfGUIControlMod.h" #include "pfGUIControlMod.h"
#include "../pnInputCore/plKeyDef.h" #include "pnInputCore/plKeyDef.h"
#include "../plInputCore/plInputDevice.h" #include "plInputCore/plInputDevice.h"
class plMessage; class plMessage;
class hsGMaterial; class hsGMaterial;

22
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIKnobCtrl.cpp

@ -50,17 +50,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGameGUIMgr.h" #include "pfGameGUIMgr.h"
#include "pfGUIDialogMod.h" #include "pfGUIDialogMod.h"
#include "../plInputCore/plInputInterface.h" #include "plInputCore/plInputInterface.h"
#include "../pnMessage/plRefMsg.h" #include "pnMessage/plRefMsg.h"
#include "../pfMessage/pfGameGUIMsg.h" #include "pfMessage/pfGameGUIMsg.h"
#include "../plMessage/plAnimCmdMsg.h" #include "plMessage/plAnimCmdMsg.h"
// #include "../plAvatar/plAGModifier.h" // #include "plAvatar/plAGModifier.h"
#include "../plAvatar/plAGMasterMod.h" #include "plAvatar/plAGMasterMod.h"
#include "../plAvatar/plAGAnimInstance.h" #include "plAvatar/plAGAnimInstance.h"
#include "../plSurface/plLayerAnimation.h" #include "plSurface/plLayerAnimation.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "../pnSceneObject/plCoordinateInterface.h" #include "pnSceneObject/plCoordinateInterface.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "hsResMgr.h" #include "hsResMgr.h"

12
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIListBoxMod.cpp

@ -53,12 +53,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGUIControlHandlers.h" #include "pfGUIControlHandlers.h"
#include "pfGUIDialogMod.h" #include "pfGUIDialogMod.h"
#include "../pnMessage/plRefMsg.h" #include "pnMessage/plRefMsg.h"
#include "../pfMessage/pfGameGUIMsg.h" #include "pfMessage/pfGameGUIMsg.h"
#include "../plMessage/plAnimCmdMsg.h" #include "plMessage/plAnimCmdMsg.h"
#include "../plAvatar/plAGModifier.h" #include "plAvatar/plAGModifier.h"
#include "../plGImage/plDynamicTextMap.h" #include "plGImage/plDynamicTextMap.h"
#include "../plInputCore/plInputInterface.h" #include "plInputCore/plInputInterface.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "hsResMgr.h" #include "hsResMgr.h"

6
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIListElement.cpp

@ -51,9 +51,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGUIPopUpMenu.h" // For skins #include "pfGUIPopUpMenu.h" // For skins
#include "../plGImage/plDynamicTextMap.h" #include "plGImage/plDynamicTextMap.h"
#include "../plGImage/hsCodecManager.h" #include "plGImage/hsCodecManager.h"
#include "../plPipeline/plDebugText.h" // To quickly and hackily get the screen size in pixels #include "plPipeline/plDebugText.h" // To quickly and hackily get the screen size in pixels
#include "hsResMgr.h" #include "hsResMgr.h"

6
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMenuItem.cpp

@ -54,9 +54,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGUIDialogMod.h" #include "pfGUIDialogMod.h"
#include "pfGUIPopUpMenu.h" #include "pfGUIPopUpMenu.h"
#include "../plInputCore/plInputInterface.h" #include "plInputCore/plInputInterface.h"
#include "../pnMessage/plRefMsg.h" #include "pnMessage/plRefMsg.h"
#include "../plGImage/plDynamicTextMap.h" #include "plGImage/plDynamicTextMap.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "hsResMgr.h" #include "hsResMgr.h"

10
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMultiLineEditCtrl.cpp

@ -53,11 +53,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGUIDialogMod.h" #include "pfGUIDialogMod.h"
#include "pfGUIDialogHandlers.h" #include "pfGUIDialogHandlers.h"
#include "../pnMessage/plRefMsg.h" #include "pnMessage/plRefMsg.h"
#include "../pfMessage/pfGameGUIMsg.h" #include "pfMessage/pfGameGUIMsg.h"
#include "../plMessage/plAnimCmdMsg.h" #include "plMessage/plAnimCmdMsg.h"
#include "../plAvatar/plAGModifier.h" #include "plAvatar/plAGModifier.h"
#include "../plGImage/plDynamicTextMap.h" #include "plGImage/plDynamicTextMap.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "hsResMgr.h" #include "hsResMgr.h"
#include "../plClipboard/plClipboard.h" #include "../plClipboard/plClipboard.h"

2
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMultiLineEditCtrl.h

@ -51,7 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGUIControlMod.h" #include "pfGUIControlMod.h"
#include "hsTemplates.h" #include "hsTemplates.h"
#include "../plInputCore/plInputDevice.h" #include "plInputCore/plInputDevice.h"
class plMessage; class plMessage;
class hsGMaterial; class hsGMaterial;

34
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIPopUpMenu.cpp

@ -62,24 +62,24 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plgDispatch.h" #include "plgDispatch.h"
#include "hsResMgr.h" #include "hsResMgr.h"
#include "../plSurface/hsGMaterial.h" #include "plSurface/hsGMaterial.h"
#include "../plSurface/plLayer.h" #include "plSurface/plLayer.h"
#include "../plGImage/plDynamicTextMap.h" #include "plGImage/plDynamicTextMap.h"
#include "../plMessage/plLayRefMsg.h" #include "plMessage/plLayRefMsg.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "../pnSceneObject/plDrawInterface.h" #include "pnSceneObject/plDrawInterface.h"
#include "../pnSceneObject/plCoordinateInterface.h" #include "pnSceneObject/plCoordinateInterface.h"
#include "../pnMessage/plIntRefMsg.h" #include "pnMessage/plIntRefMsg.h"
#include "../pnMessage/plObjRefMsg.h" #include "pnMessage/plObjRefMsg.h"
#include "../pnMessage/plNodeRefMsg.h" #include "pnMessage/plNodeRefMsg.h"
#include "../plScene/plPostEffectMod.h" #include "plScene/plPostEffectMod.h"
#include "../plScene/plSceneNode.h" #include "plScene/plSceneNode.h"
#include "../pnMessage/plClientMsg.h" #include "pnMessage/plClientMsg.h"
#include "plViewTransform.h" #include "plViewTransform.h"
#include "../plPipeline/plDebugText.h" #include "plPipeline/plDebugText.h"
class pfPopUpKeyGenerator class pfPopUpKeyGenerator
@ -731,7 +731,7 @@ hsGMaterial *pfGUIPopUpMenu::ICreateDynMaterial( void )
//// Build /////////////////////////////////////////////////////////////////// //// Build ///////////////////////////////////////////////////////////////////
// Constructs a shiny new pop-up menu at runtime, complete with trimmings // Constructs a shiny new pop-up menu at runtime, complete with trimmings
#include "../plJPEG/plJPEG.h" #include "plJPEG/plJPEG.h"
pfGUIPopUpMenu *pfGUIPopUpMenu::Build( const char *name, pfGUIDialogMod *parent, hsScalar x, hsScalar y, const plLocation &destLoc ) pfGUIPopUpMenu *pfGUIPopUpMenu::Build( const char *name, pfGUIDialogMod *parent, hsScalar x, hsScalar y, const plLocation &destLoc )
{ {

26
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIProgressCtrl.cpp

@ -50,19 +50,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGameGUIMgr.h" #include "pfGameGUIMgr.h"
#include "pfGUIDialogMod.h" #include "pfGUIDialogMod.h"
#include "../plInputCore/plInputInterface.h" #include "plInputCore/plInputInterface.h"
#include "../pnMessage/plRefMsg.h" #include "pnMessage/plRefMsg.h"
#include "../pfMessage/pfGameGUIMsg.h" #include "pfMessage/pfGameGUIMsg.h"
#include "../plMessage/plAnimCmdMsg.h" #include "plMessage/plAnimCmdMsg.h"
#include "../plMessage/plTimerCallbackMsg.h" #include "plMessage/plTimerCallbackMsg.h"
// #include "../plAvatar/plAGModifier.h" // #include "plAvatar/plAGModifier.h"
#include "../plAvatar/plAGMasterMod.h" #include "plAvatar/plAGMasterMod.h"
#include "../plAvatar/plAGAnimInstance.h" #include "plAvatar/plAGAnimInstance.h"
#include "../plSurface/plLayerAnimation.h" #include "plSurface/plLayerAnimation.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "../pnSceneObject/plCoordinateInterface.h" #include "pnSceneObject/plCoordinateInterface.h"
#include "../pnTimer/plTimerCallbackManager.h" #include "pnTimer/plTimerCallbackManager.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "hsResMgr.h" #include "hsResMgr.h"

4
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIRadioGroupCtrl.cpp

@ -51,8 +51,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGUICheckBoxCtrl.h" #include "pfGUICheckBoxCtrl.h"
#include "pfGUIControlHandlers.h" #include "pfGUIControlHandlers.h"
#include "../pnMessage/plRefMsg.h" #include "pnMessage/plRefMsg.h"
#include "../pfMessage/pfGameGUIMsg.h" #include "pfMessage/pfGameGUIMsg.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "hsResMgr.h" #include "hsResMgr.h"

14
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUITextBoxMod.cpp

@ -50,16 +50,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGUITextBoxMod.h" #include "pfGUITextBoxMod.h"
#include "pfGameGUIMgr.h" #include "pfGameGUIMgr.h"
#include "../pnMessage/plRefMsg.h" #include "pnMessage/plRefMsg.h"
#include "../pfMessage/pfGameGUIMsg.h" #include "pfMessage/pfGameGUIMsg.h"
#include "../plMessage/plAnimCmdMsg.h" #include "plMessage/plAnimCmdMsg.h"
#include "../plAvatar/plAGModifier.h" #include "plAvatar/plAGModifier.h"
#include "../plGImage/plDynamicTextMap.h" #include "plGImage/plDynamicTextMap.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "hsResMgr.h" #include "hsResMgr.h"
#include "../plResMgr/plLocalization.h" #include "plResMgr/plLocalization.h"
#include "../pfLocalizationMgr/pfLocalizationMgr.h" #include "pfLocalizationMgr/pfLocalizationMgr.h"

8
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIUpDownPairMod.cpp

@ -51,10 +51,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGUIButtonMod.h" #include "pfGUIButtonMod.h"
#include "pfGUIControlHandlers.h" #include "pfGUIControlHandlers.h"
#include "../pnMessage/plRefMsg.h" #include "pnMessage/plRefMsg.h"
#include "../pfMessage/pfGameGUIMsg.h" #include "pfMessage/pfGameGUIMsg.h"
#include "../plMessage/plAnimCmdMsg.h" #include "plMessage/plAnimCmdMsg.h"
#include "../plAvatar/plAGModifier.h" #include "plAvatar/plAGModifier.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "hsResMgr.h" #include "hsResMgr.h"

26
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgr.cpp

@ -59,21 +59,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGUIControlMod.h" #include "pfGUIControlMod.h"
#include "pfGUIPopUpMenu.h" #include "pfGUIPopUpMenu.h"
#include "../pfMessage/pfGameGUIMsg.h" #include "pfMessage/pfGameGUIMsg.h"
#include "../plMessage/plInputEventMsg.h" #include "plMessage/plInputEventMsg.h"
#include "../plMessage/plInputIfaceMgrMsg.h" #include "plMessage/plInputIfaceMgrMsg.h"
#include "../pnMessage/plClientMsg.h" #include "pnMessage/plClientMsg.h"
#include "../pnNetCommon/plSynchedObject.h" #include "pnNetCommon/plSynchedObject.h"
#include "../plInputCore/plInputInterface.h" #include "plInputCore/plInputInterface.h"
#include "../plInputCore/plInputDevice.h" #include "plInputCore/plInputDevice.h"
#include "../plInputCore/plInputInterfaceMgr.h" #include "plInputCore/plInputInterfaceMgr.h"
#include "../pnInputCore/plKeyMap.h" #include "pnInputCore/plKeyMap.h"
#include "../pnKeyedObject/plFixedKey.h" #include "pnKeyedObject/plFixedKey.h"
#include "../pnSceneObject/plSceneObject.h" // So we can get the target sceneNode of a dialog #include "pnSceneObject/plSceneObject.h" // So we can get the target sceneNode of a dialog
#include "../plMessage/plConsoleMsg.h" #include "plMessage/plConsoleMsg.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "../plResMgr/plKeyFinder.h" #include "plResMgr/plKeyFinder.h"
#include "pfGUITagDefs.h" #include "pfGUITagDefs.h"

4
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgr.h

@ -56,8 +56,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h" #include "hsTypes.h"
#include "hsTemplates.h" #include "hsTemplates.h"
#include "../pnInputCore/plKeyDef.h" #include "pnInputCore/plKeyDef.h"
#include "../pnKeyedObject/hsKeyedObject.h" #include "pnKeyedObject/hsKeyedObject.h"
#include <vector> #include <vector>
class plPipeline; class plPipeline;

2
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgrCreatable.h

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

35
Sources/Plasma/FeatureLib/pfGameMgr/CMakeLists.txt

@ -0,0 +1,35 @@
include_directories(../../CoreLib)
include_directories(../../FeatureLib)
include_directories(../../NucleusLib)
include_directories(../../NucleusLib/inc)
include_directories(../../PubUtilLib)
include_directories(${OPENSSL_INCLUDE_DIR})
set(pfGameMgr_SOURCES
pfGameMgr.cpp
BlueSpiral/pfGmBlueSpiral.cpp
ClimbingWall/pfGmClimbingWall.cpp
Heek/pfGmHeek.cpp
Marker/pfGmMarker.cpp
TicTacToe/pfGmTicTacToe.cpp
VarSync/pfGmVarSync.cpp
)
set(pfGameMgr_HEADERS
Intern.h
Pch.h
pfGameMgr.h
pfGameMgrCreatables.h
BlueSpiral/pfGmBlueSpiral.h
ClimbingWall/pfGmClimbingWall.h
Heek/pfGmHeek.h
Marker/pfGmMarker.h
TicTacToe/pfGmTicTacToe.h
VarSync/pfGmVarSync.cpp
)
add_library(pfGameMgr ${pfGameMgr_SOURCES} ${pfGameMgr_HEADERS})
source_group("Source Files" FILES ${pfGameMgr_SOURCES})
source_group("Header Files" FILES ${pfGameMgr_HEADERS})

22
Sources/Plasma/FeatureLib/pfGameMgr/Pch.h

@ -51,20 +51,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define PLASMA20_SOURCES_PLASMA_FEATURELIB_PFGAMEMGR_PCH_H #define PLASMA20_SOURCES_PLASMA_FEATURELIB_PFGAMEMGR_PCH_H
#include "../pnUtils/pnUtils.h" #include "pnUtils/pnUtils.h"
#include "../pnNetBase/pnNetBase.h" #include "pnNetBase/pnNetBase.h"
#include "../pnAsyncCore/pnAsyncCore.h" #include "pnAsyncCore/pnAsyncCore.h"
#include "../pnNetCli/pnNetCli.h" #include "pnNetCli/pnNetCli.h"
#include "../pnProduct/pnProduct.h" #include "pnProduct/pnProduct.h"
#include "../pnGameMgr/pnGameMgr.h" #include "pnGameMgr/pnGameMgr.h"
#include "../plNetGameLib/plNetGameLib.h" #include "plNetGameLib/plNetGameLib.h"
#pragma warning(push, 0) #pragma warning(push, 0)
// These includes produce lots of warnings on W4 // These includes produce lots of warnings on W4
#include "../pnMessage/plMessage.h" #include "pnMessage/plMessage.h"
#include "../pnKeyedObject/hsKeyedObject.h" #include "pnKeyedObject/hsKeyedObject.h"
#include "../plNetClient/plNetClientMgr.h" #include "plNetClient/plNetClientMgr.h"
#include "../pfConsole/pfConsole.h" #include "pfConsole/pfConsole.h"
#pragma warning(pop) #pragma warning(pop)
#include "pfGameMgr.h" #include "pfGameMgr.h"

16
Sources/Plasma/FeatureLib/pfGameMgr/pfGameMgr.h

@ -49,17 +49,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define PLASMA20_SOURCES_PLASMA_FEATURELIB_PFGAMEMGR_PFGAMEMGR_H #define PLASMA20_SOURCES_PLASMA_FEATURELIB_PFGAMEMGR_PFGAMEMGR_H
#include "../pnUtils/pnUtils.h" #include "pnUtils/pnUtils.h"
#include "../pnNetBase/pnNetBase.h" #include "pnNetBase/pnNetBase.h"
#include "../pnAsyncCore/pnAsyncCore.h" #include "pnAsyncCore/pnAsyncCore.h"
#include "../pnNetCli/pnNetCli.h" #include "pnNetCli/pnNetCli.h"
#include "../pnProduct/pnProduct.h" #include "pnProduct/pnProduct.h"
#include "../plNetGameLib/plNetGameLib.h" #include "plNetGameLib/plNetGameLib.h"
#pragma warning(push, 0) #pragma warning(push, 0)
// These includes produce lots of warnings on W4 // These includes produce lots of warnings on W4
#include "../pnMessage/plMessage.h" #include "pnMessage/plMessage.h"
#include "../pnKeyedObject/hsKeyedObject.h" #include "pnKeyedObject/hsKeyedObject.h"
#pragma warning(pop) #pragma warning(pop)

17
Sources/Plasma/FeatureLib/pfGameScoreMgr/CMakeLists.txt

@ -0,0 +1,17 @@
include_directories(../../CoreLib)
include_directories(../../NucleusLib)
include_directories(../../NucleusLib/inc)
include_directories(../../PubUtilLib)
set(pfGameScoreMgr_SOURCES
pfGameScoreMgr.cpp
)
set(pfGameScoreMgr_HEADERS
pfGameScoreMgr.h
)
add_library(pfGameScoreMgr STATIC ${pfGameScoreMgr_SOURCES} ${pfGameScoreMgr_HEADERS})
source_group("Source Files" FILES ${pfGameScoreMgr_SOURCES})
source_group("Header Files" FILES ${pfGameScoreMgr_HEADERS})

6
Sources/Plasma/FeatureLib/pfGameScoreMgr/pfGameScoreMgr.cpp

@ -41,9 +41,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include "pfGameScoreMgr.h" #include "pfGameScoreMgr.h"
#include "../pnUtils/pnUtils.h" #include "pnUtils/pnUtils.h"
#include "../plNetGameLib/plNetGameLib.h" #include "plNetGameLib/plNetGameLib.h"
#include "../pnNetProtocol/pnNetProtocol.h" #include "pnNetProtocol/pnNetProtocol.h"
//============================================================================ //============================================================================
pfGameScore::pfGameScore() pfGameScore::pfGameScore()

4
Sources/Plasma/FeatureLib/pfGameScoreMgr/pfGameScoreMgr.h

@ -49,8 +49,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define PLASMA20_SOURCES_PLASMA_FEATURELIB_PFGAMESCOREMGR_PFGAMESCOREMGR_H #define PLASMA20_SOURCES_PLASMA_FEATURELIB_PFGAMESCOREMGR_PFGAMESCOREMGR_H
#include "hsTypes.h" #include "hsTypes.h"
#include "../pnNetBase/pnNetBase.h" #include "pnNetBase/pnNetBase.h"
#include "../pnUtils/pnUtils.h" #include "pnUtils/pnUtils.h"
struct NetGameRank; struct NetGameRank;

21
Sources/Plasma/FeatureLib/pfJournalBook/CMakeLists.txt

@ -0,0 +1,21 @@
include_directories(../../CoreLib)
include_directories(../../FeatureLib)
include_directories(../../NucleusLib)
include_directories(../../NucleusLib/inc)
include_directories(../../PubUtilLib)
include_directories(${OPENSSL_INCLUDE_DIR})
set(pfJournalBook_SOURCES
pfJournalBook.cpp
)
set(pfJournalBook_HEADERS
pfJournalBook.h
pfJournalBookCreatable.h
)
add_library(pfJournalBook STATIC ${pfJournalBook_SOURCES} ${pfJournalBook_HEADERS})
source_group("Source Files" FILES ${pfJournalBook_SOURCES})
source_group("Header Files" FILES ${pfJournalBook_HEADERS})

66
Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp

@ -54,48 +54,48 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsResMgr.h" #include "hsResMgr.h"
#include "pcSmallRect.h" #include "pcSmallRect.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "../pfGameGUIMgr/pfGUIDialogMod.h" #include "pfGameGUIMgr/pfGUIDialogMod.h"
#include "../pfGameGUIMgr/pfGUIControlMod.h" #include "pfGameGUIMgr/pfGUIControlMod.h"
#include "../pfGameGUIMgr/pfGUICheckBoxCtrl.h" #include "pfGameGUIMgr/pfGUICheckBoxCtrl.h"
#include "../pfGameGUIMgr/pfGUIDialogHandlers.h" #include "pfGameGUIMgr/pfGUIDialogHandlers.h"
#include "../pfGameGUIMgr/pfGUIDynDisplayCtrl.h" #include "pfGameGUIMgr/pfGUIDynDisplayCtrl.h"
#include "../pfGameGUIMgr/pfGUIClickMapCtrl.h" #include "pfGameGUIMgr/pfGUIClickMapCtrl.h"
#include "../pfGameGUIMgr/pfGUIButtonMod.h" #include "pfGameGUIMgr/pfGUIButtonMod.h"
#include "../pfGameGUIMgr/pfGUIProgressCtrl.h" #include "pfGameGUIMgr/pfGUIProgressCtrl.h"
#include "../pfGameGUIMgr/pfGUIMultiLineEditCtrl.h" #include "pfGameGUIMgr/pfGUIMultiLineEditCtrl.h"
#include "../pfMessage/pfGUINotifyMsg.h" #include "pfMessage/pfGUINotifyMsg.h"
#include "../plGImage/plMipmap.h" #include "plGImage/plMipmap.h"
#include "../plGImage/plDynamicTextMap.h" #include "plGImage/plDynamicTextMap.h"
#include "../plPipeline/hsGDeviceRef.h" #include "plPipeline/hsGDeviceRef.h"
#include "../plMessage/plAnimCmdMsg.h" #include "plMessage/plAnimCmdMsg.h"
#include "../pnKeyedObject/plFixedKey.h" #include "pnKeyedObject/plFixedKey.h"
#include "../pnMessage/plRefMsg.h" #include "pnMessage/plRefMsg.h"
#include "../pnMessage/plTimeMsg.h" #include "pnMessage/plTimeMsg.h"
#include "../plMessage/plLayRefMsg.h" #include "plMessage/plLayRefMsg.h"
#include "../plMessage/plMatRefMsg.h" #include "plMessage/plMatRefMsg.h"
#include "../plSurface/plLayerInterface.h" #include "plSurface/plLayerInterface.h"
#include "../plSurface/plLayer.h" #include "plSurface/plLayer.h"
#include "../plSurface/hsGMaterial.h" #include "plSurface/hsGMaterial.h"
#include "../plAgeLoader/plAgeLoader.h" #include "plAgeLoader/plAgeLoader.h"
#ifdef USE_BINK_SDK #ifdef USE_BINK_SDK
#include "../pfSurface/plLayerBink.h" #include "pfSurface/plLayerBink.h"
#endif #endif
// So we can do image searches in our local age // So we can do image searches in our local age
#include "../plNetClient/plNetClientMgr.h" #include "plNetClient/plNetClientMgr.h"
#include "../plResMgr/plKeyFinder.h" #include "plResMgr/plKeyFinder.h"
// For notify sends // For notify sends
#include "../pnMessage/plNotifyMsg.h" #include "pnMessage/plNotifyMsg.h"
#include "../pnTimer/plTimerCallbackManager.h" #include "pnTimer/plTimerCallbackManager.h"
#include "../plMessage/plTimerCallbackMsg.h" #include "plMessage/plTimerCallbackMsg.h"
// For custom cursors // For custom cursors
#include "../plInputCore/plInputInterface.h" #include "plInputCore/plInputInterface.h"
// For measuring text // For measuring text
#include "../plGImage/plFont.h" #include "plGImage/plFont.h"
// For SFX // For SFX
#include "hsTimer.h" #include "hsTimer.h"
@ -2507,7 +2507,7 @@ void pfJournalBook::IFreeSource( void )
// image name. // image name.
#ifndef PLASMA_EXTERNAL_RELEASE #ifndef PLASMA_EXTERNAL_RELEASE
#include "../plJPEG/plJPEG.h" #include "plJPEG/plJPEG.h"
#endif #endif
plKey pfJournalBook::IGetMipmapKey( const wchar_t *name, const plLocation &loc ) plKey pfJournalBook::IGetMipmapKey( const wchar_t *name, const plLocation &loc )

4
Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.h

@ -169,8 +169,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTemplates.h" #include "hsTemplates.h"
#include "hsColorRGBA.h" #include "hsColorRGBA.h"
#include "../pnKeyedObject/hsKeyedObject.h" #include "pnKeyedObject/hsKeyedObject.h"
#include "../pnKeyedObject/plUoid.h" #include "pnKeyedObject/plUoid.h"

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

@ -0,0 +1,25 @@
include_directories(../../CoreLib)
include_directories(../../PubUtilLib)
include_directories(${EXPAT_INCLUDE_DIR})
add_definitions(-DXML_UNICODE_WCHAR_T)
add_definitions(-DXML_STATIC)
add_definitions(-DWIN32)
set(pfLocalizationMgr_SOURCES
pfLocalizationDataMgr.cpp
pfLocalizationMgr.cpp
pfLocalizedString.cpp
)
set(pfLocalizationMgr_HEADERS
pfLocalizationDataMgr.h
pfLocalizationMgr.h
pfLocalizedString.h
)
add_library(pfLocalizationMgr STATIC ${pfLocalizationMgr_SOURCES} ${pfLocalizationMgr_HEADERS})
source_group("Source Files" FILES ${pfLocalizationMgr_SOURCES})
source_group("Header Files" FILES ${pfLocalizationMgr_HEADERS})

15
Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizationDataMgr.cpp

@ -48,17 +48,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h" #include "hsTypes.h"
#include "hsUtils.h" #include "hsUtils.h"
#include "../plResMgr/plLocalization.h" #include "plResMgr/plLocalization.h"
#include "../plFile/hsFiles.h" #include "plFile/hsFiles.h"
#include "../plFile/plEncryptedStream.h" #include "plFile/plEncryptedStream.h"
#include "../plStatusLog/plStatusLog.h" #include "plStatusLog/plStatusLog.h"
#include "pfLocalizedString.h" #include "pfLocalizedString.h"
#include "pfLocalizationMgr.h" #include "pfLocalizationMgr.h"
#include "pfLocalizationDataMgr.h" #include "pfLocalizationDataMgr.h"
#include "expat.h" #include <expat.h>
#include <stack> #include <stack>
@ -66,11 +66,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include <bxwchar.h> #include <bxwchar.h>
#endif #endif
// Add ..\..\..\..\..\StaticSDKs\XPlatform\expat-1.95.7\StaticLibs\Win32 to your
// lib include path if you include this file.
#pragma comment(lib, "libexpatwMT.lib")
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// //
// LocalizationXMLFile - a basic class for storing all the // LocalizationXMLFile - a basic class for storing all the

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

Loading…
Cancel
Save