From afa3f2c67a96eec761ee5b1f2dc765c8624dd60c Mon Sep 17 00:00:00 2001 From: Branan Purvine-Riley Date: Fri, 8 Apr 2011 00:42:40 -0700 Subject: [PATCH] Finish the port of FeatureLib to CMake (cherry picked from commit 4134a68f2cdea6aa23cb132ae1ff6581817875e0) --- CMakeLists.txt | 6 +- Sources/Plasma/Apps/plClient/plClient.h | 6 +- Sources/Plasma/FeatureLib/CMakeLists.txt | 27 +- .../Plasma/FeatureLib/pfCCR/CMakeLists.txt | 18 + .../Plasma/FeatureLib/pfCamera/CMakeLists.txt | 29 ++ .../FeatureLib/pfCamera/pfCameraCreatable.h | 2 +- .../FeatureLib/pfCamera/pfCameraProxy.cpp | 6 +- .../FeatureLib/pfCamera/pfCameraProxy.h | 2 +- .../FeatureLib/pfCamera/plCameraBrain.cpp | 46 +-- .../FeatureLib/pfCamera/plCameraBrain.h | 2 +- .../FeatureLib/pfCamera/plCameraModifier.cpp | 32 +- .../FeatureLib/pfCamera/plCameraModifier.h | 2 +- .../pfCamera/plInterestingModifier.cpp | 10 +- .../pfCamera/plInterestingModifier.h | 4 +- .../FeatureLib/pfCamera/plVirtualCamNeu.cpp | 64 ++-- .../FeatureLib/pfCamera/plVirtualCamNeu.h | 2 +- .../FeatureLib/pfCharacter/CMakeLists.txt | 25 ++ .../FeatureLib/pfCharacter/pfMarkerInfo.cpp | 24 +- .../FeatureLib/pfCharacter/pfMarkerInfo.h | 4 +- .../FeatureLib/pfCharacter/pfMarkerMgr.cpp | 14 +- .../FeatureLib/pfCharacter/pfMarkerMgr.h | 2 +- .../FeatureLib/pfConditional/CMakeLists.txt | 40 ++ .../pfConditional/plANDConditionalObject.cpp | 8 +- .../pfConditional/plANDConditionalObject.h | 2 +- .../plActivatorConditionalObject.cpp | 8 +- .../plActivatorConditionalObject.h | 2 +- .../plAnimationEventConditionalObject.cpp | 8 +- .../plAnimationEventConditionalObject.h | 6 +- .../plConditionalObjectCreatable.h | 2 +- .../plControlEventConditionalObject.cpp | 6 +- .../plControlEventConditionalObject.h | 4 +- .../plFacingConditionalObject.cpp | 16 +- .../pfConditional/plFacingConditionalObject.h | 2 +- .../plKeyPressConditionalObject.cpp | 6 +- .../plKeyPressConditionalObject.h | 4 +- .../plLocalPlayerInBoxConditionalObject.cpp | 4 +- .../plLocalPlayerInBoxConditionalObject.h | 2 +- ...lPlayerIntersectPlaneConditionalObject.cpp | 4 +- ...calPlayerIntersectPlaneConditionalObject.h | 2 +- .../pfConditional/plORConditionalObject.cpp | 6 +- .../pfConditional/plORConditionalObject.h | 2 +- .../plObjectInBoxConditionalObject.cpp | 20 +- .../plObjectInBoxConditionalObject.h | 2 +- ...lObjectIntersectPlaneConditionalObject.cpp | 4 +- .../plObjectIntersectPlaneConditionalObject.h | 2 +- .../plPickedConditionalObject.cpp | 6 +- .../pfConditional/plPickedConditionalObject.h | 2 +- .../FeatureLib/pfConsole/CMakeLists.txt | 38 ++ .../pfConsole/pfAvatarConsoleCommands.cpp | 72 ++-- .../Plasma/FeatureLib/pfConsole/pfConsole.cpp | 26 +- .../Plasma/FeatureLib/pfConsole/pfConsole.h | 2 +- .../pfConsole/pfConsoleCommands.cpp | 244 ++++++------ .../pfConsole/pfConsoleCommandsNet.cpp | 60 +-- .../FeatureLib/pfConsole/pfConsoleEngine.cpp | 2 +- .../FeatureLib/pfConsole/pfDispatchLog.cpp | 16 +- .../FeatureLib/pfConsole/pfDispatchLog.h | 2 +- .../pfConsole/pfGameConsoleCommands.cpp | 30 +- .../Plasma/FeatureLib/pfCsrSrv/CMakeLists.txt | 19 + .../FeatureLib/pfGameGUIMgr/CMakeLists.txt | 67 ++++ .../pfGameGUIMgr/pfGUIButtonMod.cpp | 10 +- .../pfGameGUIMgr/pfGUICheckBoxCtrl.cpp | 10 +- .../pfGameGUIMgr/pfGUIClickMapCtrl.cpp | 6 +- .../pfGameGUIMgr/pfGUIControlHandlers.cpp | 2 +- .../pfGameGUIMgr/pfGUIControlMod.cpp | 30 +- .../FeatureLib/pfGameGUIMgr/pfGUIControlMod.h | 4 +- .../pfGameGUIMgr/pfGUICtrlGenerator.cpp | 36 +- .../pfGameGUIMgr/pfGUIDialogMod.cpp | 22 +- .../FeatureLib/pfGameGUIMgr/pfGUIDialogMod.h | 2 +- .../pfGameGUIMgr/pfGUIDialogNotifyProc.cpp | 2 +- .../pfGameGUIMgr/pfGUIDialogNotifyProc.h | 2 +- .../pfGameGUIMgr/pfGUIDragBarCtrl.cpp | 10 +- .../pfGameGUIMgr/pfGUIDraggableMod.cpp | 10 +- .../pfGameGUIMgr/pfGUIDynDisplayCtrl.cpp | 10 +- .../pfGameGUIMgr/pfGUIEditBoxMod.cpp | 14 +- .../FeatureLib/pfGameGUIMgr/pfGUIEditBoxMod.h | 4 +- .../FeatureLib/pfGameGUIMgr/pfGUIKnobCtrl.cpp | 22 +- .../pfGameGUIMgr/pfGUIListBoxMod.cpp | 12 +- .../pfGameGUIMgr/pfGUIListElement.cpp | 6 +- .../FeatureLib/pfGameGUIMgr/pfGUIMenuItem.cpp | 6 +- .../pfGameGUIMgr/pfGUIMultiLineEditCtrl.cpp | 10 +- .../pfGameGUIMgr/pfGUIMultiLineEditCtrl.h | 2 +- .../pfGameGUIMgr/pfGUIPopUpMenu.cpp | 34 +- .../pfGameGUIMgr/pfGUIProgressCtrl.cpp | 26 +- .../pfGameGUIMgr/pfGUIRadioGroupCtrl.cpp | 4 +- .../pfGameGUIMgr/pfGUITextBoxMod.cpp | 14 +- .../pfGameGUIMgr/pfGUIUpDownPairMod.cpp | 8 +- .../FeatureLib/pfGameGUIMgr/pfGameGUIMgr.cpp | 26 +- .../FeatureLib/pfGameGUIMgr/pfGameGUIMgr.h | 4 +- .../pfGameGUIMgr/pfGameGUIMgrCreatable.h | 2 +- .../FeatureLib/pfGameMgr/CMakeLists.txt | 35 ++ Sources/Plasma/FeatureLib/pfGameMgr/Pch.h | 22 +- .../Plasma/FeatureLib/pfGameMgr/pfGameMgr.h | 16 +- .../FeatureLib/pfGameScoreMgr/CMakeLists.txt | 17 + .../pfGameScoreMgr/pfGameScoreMgr.cpp | 6 +- .../pfGameScoreMgr/pfGameScoreMgr.h | 4 +- .../FeatureLib/pfJournalBook/CMakeLists.txt | 21 ++ .../pfJournalBook/pfJournalBook.cpp | 66 ++-- .../FeatureLib/pfJournalBook/pfJournalBook.h | 4 +- .../pfLocalizationMgr/CMakeLists.txt | 25 ++ .../pfLocalizationDataMgr.cpp | 15 +- .../FeatureLib/pfLoginDialog/CMakeLists.txt | 23 ++ .../pfLoginDialog/plLoginDialog.cpp | 12 +- .../FeatureLib/pfLoginDialog/plLoginDialog.h | 6 +- .../FeatureLib/pfMessage/CMakeLists.txt | 28 ++ .../FeatureLib/pfMessage/pfBackdoorMsg.h | 2 +- .../FeatureLib/pfMessage/pfGUINotifyMsg.h | 4 +- .../FeatureLib/pfMessage/pfGameGUIMsg.h | 2 +- .../Plasma/FeatureLib/pfMessage/pfKIMsg.cpp | 2 +- Sources/Plasma/FeatureLib/pfMessage/pfKIMsg.h | 2 +- .../Plasma/FeatureLib/pfMessage/pfMarkerMsg.h | 2 +- .../FeatureLib/pfMessage/pfMessageCreatable.h | 2 +- .../FeatureLib/pfMessage/pfMovieEventMsg.h | 2 +- .../pfMessage/plArmatureEffectMsg.cpp | 2 +- .../pfMessage/plArmatureEffectMsg.h | 2 +- .../FeatureLib/pfMessage/plClothingMsg.h | 4 +- .../Plasma/FeatureLib/pfPython/CMakeLists.txt | 357 ++++++++++++++++++ .../Games/BlueSpiral/pyBlueSpiralGame.h | 2 +- .../Games/BlueSpiral/pyBlueSpiralMsg.h | 2 +- .../Games/ClimbingWall/pyClimbingWallGame.h | 2 +- .../Games/ClimbingWall/pyClimbingWallMsg.h | 2 +- .../pfPython/Games/Heek/pyHeekGame.h | 2 +- .../pfPython/Games/Heek/pyHeekMsg.h | 2 +- .../pfPython/Games/Marker/pyMarkerGame.h | 2 +- .../pfPython/Games/Marker/pyMarkerMsg.h | 2 +- .../pfPython/Games/TicTacToe/pyTTTGame.h | 2 +- .../pfPython/Games/TicTacToe/pyTTTMsg.h | 2 +- .../pfPython/Games/VarSync/pyVarSyncGame.h | 2 +- .../pfPython/Games/VarSync/pyVarSyncMsg.h | 2 +- .../FeatureLib/pfPython/Games/pyGameCli.h | 2 +- .../FeatureLib/pfPython/Games/pyGameCliMsg.h | 2 +- .../FeatureLib/pfPython/Games/pyGameMgrMsg.h | 2 +- .../pfPython/cyAccountManagement.cpp | 2 +- .../pfPython/cyAccountManagementGlue.cpp | 2 +- .../FeatureLib/pfPython/cyAnimation.cpp | 4 +- .../Plasma/FeatureLib/pfPython/cyAvatar.cpp | 50 +-- Sources/Plasma/FeatureLib/pfPython/cyAvatar.h | 2 +- .../FeatureLib/pfPython/cyAvatarGlue.cpp | 2 +- .../Plasma/FeatureLib/pfPython/cyCamera.cpp | 14 +- Sources/Plasma/FeatureLib/pfPython/cyCamera.h | 2 +- Sources/Plasma/FeatureLib/pfPython/cyDraw.cpp | 2 +- Sources/Plasma/FeatureLib/pfPython/cyDraw.h | 2 +- .../FeatureLib/pfPython/cyInputInterface.cpp | 4 +- Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp | 116 +++--- Sources/Plasma/FeatureLib/pfPython/cyMisc.h | 2 +- .../FeatureLib/pfPython/cyMiscGlue2.cpp | 6 +- .../FeatureLib/pfPython/cyMiscGlue4.cpp | 4 +- .../FeatureLib/pfPython/cyParticleSys.cpp | 4 +- .../FeatureLib/pfPython/cyParticleSys.h | 2 +- .../Plasma/FeatureLib/pfPython/cyPhysics.cpp | 18 +- .../Plasma/FeatureLib/pfPython/cyPhysics.h | 2 +- .../FeatureLib/pfPython/cyPythonInterface.cpp | 4 +- .../FeatureLib/pfPython/plPythonFileMod.cpp | 88 ++--- .../FeatureLib/pfPython/plPythonFileMod.h | 2 +- .../FeatureLib/pfPython/plPythonPack.cpp | 6 +- .../FeatureLib/pfPython/plPythonParameter.h | 2 +- .../pfPython/plPythonSDLModifier.cpp | 12 +- .../FeatureLib/pfPython/plPythonSDLModifier.h | 2 +- .../FeatureLib/pfPython/pyAgeInfoStruct.h | 2 +- .../FeatureLib/pfPython/pyAgeLinkStruct.h | 2 +- .../Plasma/FeatureLib/pfPython/pyAgeVault.cpp | 14 +- .../FeatureLib/pfPython/pyAudioControl.cpp | 8 +- .../Plasma/FeatureLib/pfPython/pyCluster.cpp | 2 +- .../FeatureLib/pfPython/pyCritterBrain.cpp | 2 +- .../pfPython/pyCritterBrainGlue.cpp | 2 +- .../FeatureLib/pfPython/pyDniCoordinates.cpp | 4 +- .../pfPython/pyDniCoordinatesGlue.cpp | 2 +- .../FeatureLib/pfPython/pyDniInfoSource.cpp | 8 +- .../FeatureLib/pfPython/pyDrawControl.cpp | 12 +- .../FeatureLib/pfPython/pyDynamicText.cpp | 4 +- .../FeatureLib/pfPython/pyDynamicTextGlue.cpp | 2 +- .../FeatureLib/pfPython/pyGUIControl.cpp | 4 +- .../pfPython/pyGUIControlButton.cpp | 2 +- .../pfPython/pyGUIControlButtonGlue.cpp | 2 +- .../pfPython/pyGUIControlCheckBox.cpp | 4 +- .../pfPython/pyGUIControlClickMap.cpp | 4 +- .../pfPython/pyGUIControlDragBar.cpp | 2 +- .../pfPython/pyGUIControlDraggable.cpp | 4 +- .../pfPython/pyGUIControlDynamicText.cpp | 4 +- .../pfPython/pyGUIControlEditBox.cpp | 2 +- .../pfPython/pyGUIControlListBox.cpp | 8 +- .../pfPython/pyGUIControlMultiLineEdit.cpp | 2 +- .../pyGUIControlMultiLineEditGlue.cpp | 2 +- .../pfPython/pyGUIControlRadioGroup.cpp | 2 +- .../pfPython/pyGUIControlTextBox.cpp | 4 +- .../FeatureLib/pfPython/pyGUIControlTextBox.h | 2 +- .../FeatureLib/pfPython/pyGUIControlValue.cpp | 8 +- .../FeatureLib/pfPython/pyGUIDialog.cpp | 10 +- .../FeatureLib/pfPython/pyGUIPopUpMenu.cpp | 6 +- .../FeatureLib/pfPython/pyGUIPopUpMenu.h | 2 +- .../Plasma/FeatureLib/pfPython/pyGUISkin.cpp | 5 +- .../FeatureLib/pfPython/pyGameScore.cpp | 2 +- .../FeatureLib/pfPython/pyGameScoreGlue.cpp | 2 +- .../FeatureLib/pfPython/pyGrassShader.cpp | 2 +- .../Plasma/FeatureLib/pfPython/pyImage.cpp | 6 +- Sources/Plasma/FeatureLib/pfPython/pyImage.h | 2 +- .../FeatureLib/pfPython/pyJournalBook.cpp | 4 +- .../FeatureLib/pfPython/pyJournalBookGlue.cpp | 2 +- Sources/Plasma/FeatureLib/pfPython/pyKey.cpp | 6 +- Sources/Plasma/FeatureLib/pfPython/pyKey.h | 2 +- .../Plasma/FeatureLib/pfPython/pyKeyMap.cpp | 4 +- Sources/Plasma/FeatureLib/pfPython/pyKeyMap.h | 2 +- .../FeatureLib/pfPython/pyMarkerMgr.cpp | 2 +- .../FeatureLib/pfPython/pyMarkerMgrGlue.cpp | 2 +- .../FeatureLib/pfPython/pyMoviePlayer.cpp | 4 +- .../FeatureLib/pfPython/pyMoviePlayerGlue.cpp | 2 +- .../FeatureLib/pfPython/pyNetLinkingMgr.cpp | 6 +- .../pfPython/pyNetLinkingMgrGlue.cpp | 2 +- .../pfPython/pyNetServerSessionInfo.h | 4 +- .../Plasma/FeatureLib/pfPython/pyNotify.cpp | 2 +- Sources/Plasma/FeatureLib/pfPython/pyNotify.h | 2 +- Sources/Plasma/FeatureLib/pfPython/pySDL.cpp | 2 +- .../Plasma/FeatureLib/pfPython/pySDLGlue.cpp | 2 +- .../FeatureLib/pfPython/pySceneObject.cpp | 30 +- .../Plasma/FeatureLib/pfPython/pyScoreMgr.cpp | 6 +- .../FeatureLib/pfPython/pyScoreMgrGlue.cpp | 2 +- .../FeatureLib/pfPython/pySpawnPointInfo.h | 2 +- .../FeatureLib/pfPython/pyStatusLog.cpp | 2 +- .../FeatureLib/pfPython/pyStatusLogGlue.cpp | 2 +- .../Plasma/FeatureLib/pfPython/pyStream.cpp | 2 +- .../pfPython/pySwimCurrentInterface.cpp | 2 +- .../Plasma/FeatureLib/pfPython/pyVault.cpp | 16 +- .../pfPython/pyVaultAgeInfoListNode.cpp | 2 +- .../pfPython/pyVaultAgeInfoListNodeGlue.cpp | 2 +- .../pfPython/pyVaultAgeInfoNode.cpp | 2 +- .../pfPython/pyVaultAgeInfoNodeGlue.cpp | 2 +- .../pfPython/pyVaultAgeLinkNode.cpp | 4 +- .../FeatureLib/pfPython/pyVaultAgeLinkNode.h | 2 +- .../pfPython/pyVaultAgeLinkNodeGlue.cpp | 2 +- .../pfPython/pyVaultChronicleNode.cpp | 2 +- .../pfPython/pyVaultChronicleNodeGlue.cpp | 3 +- .../FeatureLib/pfPython/pyVaultFolderNode.cpp | 2 +- .../pfPython/pyVaultFolderNodeGlue.cpp | 2 +- .../FeatureLib/pfPython/pyVaultGlue.cpp | 4 +- .../FeatureLib/pfPython/pyVaultImageNode.cpp | 8 +- .../FeatureLib/pfPython/pyVaultImageNode.h | 2 +- .../pfPython/pyVaultImageNodeGlue.cpp | 2 +- .../pfPython/pyVaultMarkerGameNode.cpp | 2 +- .../pfPython/pyVaultMarkerGameNode.h | 2 +- .../pfPython/pyVaultMarkerGameNodeGlue.cpp | 2 +- .../FeatureLib/pfPython/pyVaultNode.cpp | 8 +- .../FeatureLib/pfPython/pyVaultNodeGlue.cpp | 2 +- .../FeatureLib/pfPython/pyVaultNodeRef.cpp | 2 +- .../pfPython/pyVaultNodeRefGlue.cpp | 2 +- .../pfPython/pyVaultPlayerInfoListNode.cpp | 2 +- .../pyVaultPlayerInfoListNodeGlue.cpp | 2 +- .../pfPython/pyVaultPlayerInfoNode.cpp | 2 +- .../pfPython/pyVaultPlayerInfoNodeGlue.cpp | 2 +- .../FeatureLib/pfPython/pyVaultPlayerNode.cpp | 20 +- .../FeatureLib/pfPython/pyVaultPlayerNode.h | 4 +- .../pfPython/pyVaultPlayerNodeGlue.cpp | 2 +- .../FeatureLib/pfPython/pyVaultSDLNode.cpp | 4 +- .../pfPython/pyVaultSDLNodeGlue.cpp | 2 +- .../FeatureLib/pfPython/pyVaultSystemNode.cpp | 2 +- .../pfPython/pyVaultSystemNodeGlue.cpp | 2 +- .../pfPython/pyVaultTextNoteNode.cpp | 2 +- .../pfPython/pyVaultTextNoteNodeGlue.cpp | 2 +- .../Plasma/FeatureLib/pfPython/pyWaveSet.cpp | 2 +- .../pfSecurePreloader/CMakeLists.txt | 22 ++ .../pfSecurePreloader/pfSecurePreloader.cpp | 24 +- .../pfSecurePreloader/pfSecurePreloader.h | 4 +- .../pfSecurePreloaderCreatable.h | 2 +- .../FeatureLib/pfStackTrace/CMakeLists.txt | 27 ++ .../FeatureLib/pfSurface/CMakeLists.txt | 34 ++ .../FeatureLib/pfSurface/pfSurfaceCreatable.h | 2 +- .../FeatureLib/pfSurface/plDistOpacityMod.cpp | 14 +- .../FeatureLib/pfSurface/plDistOpacityMod.h | 2 +- .../FeatureLib/pfSurface/plFadeOpacityLay.h | 2 +- .../FeatureLib/pfSurface/plFadeOpacityMod.cpp | 20 +- .../FeatureLib/pfSurface/plFadeOpacityMod.h | 2 +- .../FeatureLib/pfSurface/plGrabCubeMap.cpp | 10 +- .../FeatureLib/pfSurface/plGrabCubeMap.h | 2 +- .../FeatureLib/pfSurface/plLayerAVI.cpp | 2 +- .../FeatureLib/pfSurface/plLayerMovie.cpp | 6 +- .../FeatureLib/pfSurface/plLayerMovie.h | 4 +- 274 files changed, 1950 insertions(+), 1105 deletions(-) create mode 100644 Sources/Plasma/FeatureLib/pfCCR/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfCamera/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfCharacter/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfConditional/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfConsole/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfCsrSrv/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfGameGUIMgr/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfGameMgr/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfGameScoreMgr/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfJournalBook/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfLocalizationMgr/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfLoginDialog/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfMessage/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfSecurePreloader/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfStackTrace/CMakeLists.txt create mode 100644 Sources/Plasma/FeatureLib/pfSurface/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index f763e040..1adcbda7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,11 +4,15 @@ cmake_minimum_required(VERSION 2.8) # Find all 3rd-party libraries that are required find_package(OpenSSL REQUIRED) find_package(OpenAL REQUIRED) +find_package(PythonLibs REQUIRED) +find_package(ZLIB REQUIRED) +find_package(EXPAT REQUIRED) find_package(ZLIB REQUIRED) option(EXTERNAL_RELEASE "Is this release intended for the general public?" OFF) -#TODO: Don't hard code this +# TODO: are there any other build types which are useful for us? +>>>>>>> Finish the port of FeatureLib to CMake add_definitions(-DBUILD_TYPE=BUILD_TYPE_LIVE) if(EXTERNAL_RELEASE) diff --git a/Sources/Plasma/Apps/plClient/plClient.h b/Sources/Plasma/Apps/plClient/plClient.h index 1038a8f5..24cbaf02 100644 --- a/Sources/Plasma/Apps/plClient/plClient.h +++ b/Sources/Plasma/Apps/plClient/plClient.h @@ -52,9 +52,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTemplates.h" #include "hsUtils.h" #include "hsStlUtils.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnKeyedObject/plUoid.h" -#include "../plScene/plRenderRequest.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/plUoid.h" +#include "plScene/plRenderRequest.h" class plSceneNode; class plPipeline; diff --git a/Sources/Plasma/FeatureLib/CMakeLists.txt b/Sources/Plasma/FeatureLib/CMakeLists.txt index a60bb33a..12841ad1 100644 --- a/Sources/Plasma/FeatureLib/CMakeLists.txt +++ b/Sources/Plasma/FeatureLib/CMakeLists.txt @@ -1,2 +1,25 @@ -add_subdirectory(pfAnimation) -add_subdirectory(pfAudio) +add_definitions(-D_LIB) + +add_subdirectory(pfAnimation) +add_subdirectory(pfAudio) +add_subdirectory(pfCCR) +add_subdirectory(pfCamera) +add_subdirectory(pfCharacter) +add_subdirectory(pfConditional) +add_subdirectory(pfConsole) +add_subdirectory(pfCsrSrv) +add_subdirectory(pfGameGUIMgr) +add_subdirectory(pfGameMgr) +add_subdirectory(pfGameScoreMgr) +add_subdirectory(pfJournalBook) +# pfKI is apparently just a historical oddity at this point +# add_subdirectory(pfKI) +add_subdirectory(pfLocalizationMgr) +# This is missing required parts in other plasma libraries. +# Also not referenced by any sln file +# add_subdirectory(pfLoginDialog) +add_subdirectory(pfMessage) +add_subdirectory(pfPython) +add_subdirectory(pfSecurePreloader) +add_subdirectory(pfStackTrace) +add_subdirectory(pfSurface) diff --git a/Sources/Plasma/FeatureLib/pfCCR/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfCCR/CMakeLists.txt new file mode 100644 index 00000000..6fc5e1c9 --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfCCR/CMakeLists.txt @@ -0,0 +1,18 @@ +include_directories(../../CoreLib) +include_directories(../../NucleusLib/inc) + +set(pfCCR_SOURCES + plCCRMgr.cpp + plCCRVault.cpp +) + +set(pfCCR_HEADERS + plCCRCreatable.h + plCCRMgr.h + plCCRVault.h +) + +add_library(pfCCR STATIC ${pfCCR_SOURCES} ${pfCCR_HEADERS}) + +source_group("Source Files" FILES ${pfCCR_SOURCES}) +source_group("Header Files" FILES ${pfCCR_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfCamera/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfCamera/CMakeLists.txt new file mode 100644 index 00000000..f759c748 --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfCamera/CMakeLists.txt @@ -0,0 +1,29 @@ +include_directories(../../CoreLib) +include_directories(../../FeatureLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) +include_directories(../../PubUtilLib) + +include_directories(${OPENSSL_INCLUDE_DIR}) + +set(pfCamera_SOURCES + pfCameraProxy.cpp + plCameraBrain.cpp + plCameraModifier.cpp + plInterestingModifier.cpp + plVirtualCamNeu.cpp +) + +set(pfCamera_HEADERS + pfCameraCreatable.h + pfCameraProxy.h + plCameraBrain.h + plCameraModifier.h + plInterestingModifier.h + plVirtualCamNeu.h +) + +add_library(pfCamera STATIC ${pfCamera_SOURCES} ${pfCamera_HEADERS}) + +source_group("Source Files" FILES ${pfCamera_SOURCES}) +source_group("Header Files" FILES ${pfCamera_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfCamera/pfCameraCreatable.h b/Sources/Plasma/FeatureLib/pfCamera/pfCameraCreatable.h index cb71e899..a1f3c98f 100644 --- a/Sources/Plasma/FeatureLib/pfCamera/pfCameraCreatable.h +++ b/Sources/Plasma/FeatureLib/pfCamera/pfCameraCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pfCameraCreatable_inc #define pfCameraCreatable_inc -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" #include "plCameraBrain.h" diff --git a/Sources/Plasma/FeatureLib/pfCamera/pfCameraProxy.cpp b/Sources/Plasma/FeatureLib/pfCamera/pfCameraProxy.cpp index 4c29862e..7644d13c 100644 --- a/Sources/Plasma/FeatureLib/pfCamera/pfCameraProxy.cpp +++ b/Sources/Plasma/FeatureLib/pfCamera/pfCameraProxy.cpp @@ -43,9 +43,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "pfCameraProxy.h" #include "plVirtualCamNeu.h" -#include "../plDrawable/plDrawableGenerator.h" -#include "../pnMessage/plProxyDrawMsg.h" -#include "../plScene/plSceneNode.h" +#include "plDrawable/plDrawableGenerator.h" +#include "pnMessage/plProxyDrawMsg.h" +#include "plScene/plSceneNode.h" plCameraProxy::plCameraProxy() : plProxyGen(hsColorRGBA().Set(0.2f,0.2f,0.8f,1.f), hsColorRGBA().Set(1.f,0.5f,0.5f,1.f), 0.2f), diff --git a/Sources/Plasma/FeatureLib/pfCamera/pfCameraProxy.h b/Sources/Plasma/FeatureLib/pfCamera/pfCameraProxy.h index ea6e42a5..2e13c49d 100644 --- a/Sources/Plasma/FeatureLib/pfCamera/pfCameraProxy.h +++ b/Sources/Plasma/FeatureLib/pfCamera/pfCameraProxy.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plCameraProxy_inc #define plCameraProxy_inc -#include "../plDrawable/plProxyGen.h" +#include "plDrawable/plProxyGen.h" class plVirtualCam1; class plSceneNode; diff --git a/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.cpp b/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.cpp index 0d6a0298..901ceadb 100644 --- a/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.cpp +++ b/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.cpp @@ -48,29 +48,29 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plCameraModifier.h" #include "plVirtualCamNeu.h" #include "plgDispatch.h" -#include "../plInterp/plController.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnSceneObject/plSimulationInterface.h" -#include "../pnSceneObject/plDrawInterface.h" -#include "../plScene/plSceneNode.h" -#include "../pnMessage/plCameraMsg.h" -#include "../pnMessage/plPlayerPageMsg.h" -#include "../pnMessage/plEnableMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../plMessage/plInputEventMsg.h" -#include "../plMessage/plLOSRequestMsg.h" -#include "../plMessage/plLOSHitMsg.h" -#include "../plMessage/plAvatarMsg.h" -#include "../pnKeyedObject/plKey.h" -#include "../plInputCore/plInputDevice.h" -#include "../plInputCore/plInputManager.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pfAnimation/plLineFollowMod.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plAvatar/plArmatureMod.h" -#include "../plAvatar/plAvBrainHuman.h" -#include "../plNetClient/plNetClientMgr.h" +#include "plInterp/plController.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plSimulationInterface.h" +#include "pnSceneObject/plDrawInterface.h" +#include "plScene/plSceneNode.h" +#include "pnMessage/plCameraMsg.h" +#include "pnMessage/plPlayerPageMsg.h" +#include "pnMessage/plEnableMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "plMessage/plInputEventMsg.h" +#include "plMessage/plLOSRequestMsg.h" +#include "plMessage/plLOSHitMsg.h" +#include "plMessage/plAvatarMsg.h" +#include "pnKeyedObject/plKey.h" +#include "plInputCore/plInputDevice.h" +#include "plInputCore/plInputManager.h" +#include "pnNetCommon/plNetApp.h" +#include "pfAnimation/plLineFollowMod.h" +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plArmatureMod.h" +#include "plAvatar/plAvBrainHuman.h" +#include "plNetClient/plNetClientMgr.h" hsBool plCameraBrain1_FirstPerson::fDontFade = false; hsScalar plCameraBrain1::fFallAccel = 20.0f; diff --git a/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.h b/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.h index 518e7c32..628fcca9 100644 --- a/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.h +++ b/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plCameraBrain_inc #define plCameraBrain_inc -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include "hsMatrix44.h" #include "hsBitVector.h" #include "hsTemplates.h" diff --git a/Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.cpp b/Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.cpp index e5b72cbe..459a9300 100644 --- a/Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.cpp +++ b/Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.cpp @@ -46,24 +46,24 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plVirtualCamNeu.h" #include "hsTimer.h" #include "plgDispatch.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../plMessage/plInputEventMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../plInputCore/plInputDevice.h" -#include "../plInputCore/plInputManager.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "plMessage/plInputEventMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plFixedKey.h" +#include "plInputCore/plInputDevice.h" +#include "plInputCore/plInputManager.h" #include "hsResMgr.h" -#include "../pnMessage/plCameraMsg.h" -#include "../plPhysical/plSimDefs.h" +#include "pnMessage/plCameraMsg.h" +#include "plPhysical/plSimDefs.h" #include "plPhysical.h" -#include "../pnSceneObject/plSimulationInterface.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plAvatar/plArmatureMod.h" -#include "../plAvatar/plPhysicalControllerCore.h" +#include "pnSceneObject/plSimulationInterface.h" +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plArmatureMod.h" +#include "plAvatar/plPhysicalControllerCore.h" // new stuff @@ -491,4 +491,4 @@ void plCameraModifier1::SetTransform(hsPoint3 at) l2w.Make(&fFrom, &at, &up); l2w.GetInverse(&w2l); IGetTargetCoordinateInterface(0)->SetTransform( l2w, w2l ); -} \ No newline at end of file +} diff --git a/Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.h b/Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.h index 828c72dc..18780fcd 100644 --- a/Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.h +++ b/Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plCameraModifier_inc #define plCameraModifier_inc -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" #include "hsBitVector.h" #include "hsGeometry3.h" #include "hsTemplates.h" diff --git a/Sources/Plasma/FeatureLib/pfCamera/plInterestingModifier.cpp b/Sources/Plasma/FeatureLib/pfCamera/plInterestingModifier.cpp index 7d98e01b..45d51d20 100644 --- a/Sources/Plasma/FeatureLib/pfCamera/plInterestingModifier.cpp +++ b/Sources/Plasma/FeatureLib/pfCamera/plInterestingModifier.cpp @@ -43,13 +43,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsGeometry3.h" #include "plgDispatch.h" -#include "../pnSceneObject/plDrawInterface.h" -#include "../plMessage/plInterestingPing.h" +#include "pnSceneObject/plDrawInterface.h" +#include "plMessage/plInterestingPing.h" #include "hsBounds.h" #include "plInterestingModifier.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnKeyedObject/plKey.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnMessage/plTimeMsg.h" +#include "pnKeyedObject/plKey.h" hsScalar plInterestingModifier::fInterestRadius = 100.0f; diff --git a/Sources/Plasma/FeatureLib/pfCamera/plInterestingModifier.h b/Sources/Plasma/FeatureLib/pfCamera/plInterestingModifier.h index 445d7eef..0c2fa130 100644 --- a/Sources/Plasma/FeatureLib/pfCamera/plInterestingModifier.h +++ b/Sources/Plasma/FeatureLib/pfCamera/plInterestingModifier.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plInterestingModifier_inc #define plInterestingModifier_inc -#include "../pnModifier/plSingleModifier.h" -#include "../pnMessage/plMessage.h" +#include "pnModifier/plSingleModifier.h" +#include "pnMessage/plMessage.h" #include "hsResMgr.h" #include "hsGeometry3.h" #include "hsStream.h" diff --git a/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp b/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp index 9a379052..929f3ac7 100644 --- a/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp +++ b/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp @@ -46,41 +46,41 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPipeline.h" #include "pfCameraProxy.h" #include "plgDispatch.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plFixedKey.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plFixedKey.h" #include "hsMatrix44.h" -#include "../pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plSceneObject.h" #include "hsResMgr.h" #include "hsTimer.h" -#include "../plAudio/plAudioSystem.h" -#include "../plInputCore/plInputDevice.h" -#include "../plInputCore/plInputManager.h" -#include "../pnInputCore/plKeyDef.h" -#include "../plScene/plSceneNode.h" -#include "../plMessage/plAvatarMsg.h" -#include "../pnMessage/plWarpMsg.h" -#include "../pnMessage/plCameraMsg.h" -#include "../pnMessage/plEnableMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../pnMessage/plCmdIfaceModMsg.h" -#include "../pnMessage/plPlayerPageMsg.h" -#include "../plMessage/plInputEventMsg.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../plDrawable/plDrawableGenerator.h" -#include "../plScene/plSceneNode.h" -#include "../plInputCore/plDebugInputInterface.h" -#include "../plInputCore/plAvatarInputInterface.h" -#include "../plMessage/plInputIfaceMgrMsg.h" -#include "../plStatusLog/plStatusLog.h" -#include "../plPipeline/plPlates.h" -#include "../plGImage/plMipmap.h" -#include "../plSurface/plLayer.h" -#include "../plSurface/hsGMaterial.h" -#include "../pnNetCommon/plNetApp.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plAvatar/plAvBrainHuman.h" -#include "../plAvatar/plAvatarMgr.h" +#include "plAudio/plAudioSystem.h" +#include "plInputCore/plInputDevice.h" +#include "plInputCore/plInputManager.h" +#include "pnInputCore/plKeyDef.h" +#include "plScene/plSceneNode.h" +#include "plMessage/plAvatarMsg.h" +#include "pnMessage/plWarpMsg.h" +#include "pnMessage/plCameraMsg.h" +#include "pnMessage/plEnableMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "pnMessage/plObjRefMsg.h" +#include "pnMessage/plCmdIfaceModMsg.h" +#include "pnMessage/plPlayerPageMsg.h" +#include "plMessage/plInputEventMsg.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "plDrawable/plDrawableGenerator.h" +#include "plScene/plSceneNode.h" +#include "plInputCore/plDebugInputInterface.h" +#include "plInputCore/plAvatarInputInterface.h" +#include "plMessage/plInputIfaceMgrMsg.h" +#include "plStatusLog/plStatusLog.h" +#include "plPipeline/plPlates.h" +#include "plGImage/plMipmap.h" +#include "plSurface/plLayer.h" +#include "plSurface/hsGMaterial.h" +#include "pnNetCommon/plNetApp.h" +#include "plNetClient/plNetClientMgr.h" +#include "plAvatar/plAvBrainHuman.h" +#include "plAvatar/plAvatarMgr.h" #include "hsGeometry3.h" #include "hsConfig.h" diff --git a/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.h b/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.h index 61c4a94a..8ad1d906 100644 --- a/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.h +++ b/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plVirtualCam1_inc #define plVirtualCam1_inc -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include "hsMatrix44.h" #include "hsBitVector.h" diff --git a/Sources/Plasma/FeatureLib/pfCharacter/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfCharacter/CMakeLists.txt new file mode 100644 index 00000000..a7141dfb --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfCharacter/CMakeLists.txt @@ -0,0 +1,25 @@ +include_directories(../../CoreLib) +include_directories(../../FeatureLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) +include_directories(../../PubUtilLib) + +include_directories(${OPENSSL_INCLUDE_DIR}) + +set(pfCharacter_SOURCES + pfMarkerInfo.cpp + pfMarkerMgr.cpp + plPlayerModifier.cpp +) + +set(pfCharacter_HEADERS + pfCharacterCreatable.h + pfMarkerInfo.h + pfMarkerMgr.h + plPlayerModifier.h +) + +add_library(pfCharacter STATIC ${pfCharacter_SOURCES} ${pfCharacter_HEADERS}) + +source_group("Source Files" FILES ${pfCharacter_SOURCES}) +source_group("Header Files" FILES ${pfCharacter_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.cpp b/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.cpp index 533ba406..1b5daa39 100644 --- a/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.cpp +++ b/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.cpp @@ -42,21 +42,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfMarkerInfo.h" #include "pfMarkerMgr.h" -#include "../plModifier/plGameMarkerModifier.h" +#include "plModifier/plGameMarkerModifier.h" -#include "../plMessage/plLoadCloneMsg.h" -#include "../pnMessage/plWarpMsg.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../pnMessage/plEnableMsg.h" -#include "../pnMessage/plSoundMsg.h" -#include "../pnSceneObject/plAudioInterface.h" +#include "plMessage/plLoadCloneMsg.h" +#include "pnMessage/plWarpMsg.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "plMessage/plAnimCmdMsg.h" +#include "pnMessage/plEnableMsg.h" +#include "pnMessage/plSoundMsg.h" +#include "pnSceneObject/plAudioInterface.h" // For Init -#include "../pnMessage/plClientMsg.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../plResMgr/plResManager.h" -#include "../plResMgr/plKeyFinder.h" +#include "pnMessage/plClientMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "plResMgr/plResManager.h" +#include "plResMgr/plKeyFinder.h" plUoid pfMarkerInfo::fMarkerUoid; diff --git a/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.h b/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.h index 05590189..97522411 100644 --- a/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.h +++ b/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.h @@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pfMarkerInfo_h_inc #define pfMarkerInfo_h_inc -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plUoid.h" #include "hsGeometry3.h" class plMessage; diff --git a/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerMgr.cpp b/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerMgr.cpp index 9d183ade..2f13a9e9 100644 --- a/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerMgr.cpp +++ b/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerMgr.cpp @@ -40,17 +40,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pfMarkerMgr.h" -#include "../pfMessage/pfMarkerMsg.h" +#include "pfMessage/pfMarkerMsg.h" #include "pfMarkerInfo.h" -#include "../plModifier/plCloneSpawnModifier.h" -#include "../plStatusLog/plStatusLog.h" +#include "plModifier/plCloneSpawnModifier.h" +#include "plStatusLog/plStatusLog.h" -#include "../plMessage/plLoadCloneMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnMessage/plNotifyMsg.h" +#include "plMessage/plLoadCloneMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "pnMessage/plNotifyMsg.h" -#include "../plNetClient/plNetClientMgr.h" +#include "plNetClient/plNetClientMgr.h" #include "plgDispatch.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerMgr.h b/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerMgr.h index 7a8a01c8..291b78e0 100644 --- a/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerMgr.h +++ b/Sources/Plasma/FeatureLib/pfCharacter/pfMarkerMgr.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pfMarkerMgr_h_inc #define pfMarkerMgr_h_inc -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include class plStatusLog; diff --git a/Sources/Plasma/FeatureLib/pfConditional/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfConditional/CMakeLists.txt new file mode 100644 index 00000000..86b562ab --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfConditional/CMakeLists.txt @@ -0,0 +1,40 @@ +include_directories(../../CoreLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) +include_directories(../../PubUtilLib) + +set(pfConditional_SOURCES + plActivatorConditionalObject.cpp + plANDConditionalObject.cpp + plAnimationEventConditionalObject.cpp + plControlEventConditionalObject.cpp + plFacingConditionalObject.cpp + plKeyPressConditionalObject.cpp + plLocalPlayerInBoxConditionalObject.cpp + plLocalPlayerIntersectPlaneConditionalObject.cpp + plObjectInBoxConditionalObject.cpp + plObjectIntersectPlaneConditionalObject.cpp + plORConditionalObject.cpp + plPickedConditionalObject.cpp +) + +set(pfConditional_HEADERS + plActivatorConditionalObject.h + plANDConditionalObject.h + plAnimationEventConditionalObject.h + plConditionalObjectCreatable.h + plControlEventConditionalObject.h + plFacingConditionalObject.h + plKeyPressConditionalObject.h + plLocalPlayerInBoxConditionalObject.h + plLocalPlayerIntersectPlaneConditionalObject.h + plObjectInBoxConditionalObject.h + plObjectIntersectPlaneConditionalObject.h + plORConditionalObject.h + plPickedConditionalObject.h +) + +add_library(pfConditional ${pfConditional_SOURCES} ${pfConditional_HEADERS}) + +source_group("Source Files" FILES ${pfConditional_SOURCES}) +source_group("Header Files" FILES ${pfConditional_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfConditional/plANDConditionalObject.cpp b/Sources/Plasma/FeatureLib/pfConditional/plANDConditionalObject.cpp index e640abe9..c583304d 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plANDConditionalObject.cpp +++ b/Sources/Plasma/FeatureLib/pfConditional/plANDConditionalObject.cpp @@ -41,11 +41,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "plANDConditionalObject.h" -#include "../plPhysical/plDetectorModifier.h" +#include "plPhysical/plDetectorModifier.h" #include "hsResMgr.h" -#include "../../NucleusLib/pnModifier/plConditionalObject.h" -#include "../../NucleusLib/pnModifier/plLogicModBase.h" -#include "../plMessage/plCondRefMsg.h" +#include "pnModifier/plConditionalObject.h" +#include "pnModifier/plLogicModBase.h" +#include "plMessage/plCondRefMsg.h" plANDConditionalObject::plANDConditionalObject() { diff --git a/Sources/Plasma/FeatureLib/pfConditional/plANDConditionalObject.h b/Sources/Plasma/FeatureLib/pfConditional/plANDConditionalObject.h index a74dcc44..706d2ebf 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plANDConditionalObject.h +++ b/Sources/Plasma/FeatureLib/pfConditional/plANDConditionalObject.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plANDConditionalObject_inc #define plANDConditionalObject_inc -#include "../../NucleusLib/pnModifier/plConditionalObject.h" +#include "pnModifier/plConditionalObject.h" #include "hsTemplates.h" class plANDConditionalObject : public plConditionalObject diff --git a/Sources/Plasma/FeatureLib/pfConditional/plActivatorConditionalObject.cpp b/Sources/Plasma/FeatureLib/pfConditional/plActivatorConditionalObject.cpp index a7d34e1d..f8450290 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plActivatorConditionalObject.cpp +++ b/Sources/Plasma/FeatureLib/pfConditional/plActivatorConditionalObject.cpp @@ -41,10 +41,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "plActivatorConditionalObject.h" -#include "../plPhysical/plDetectorModifier.h" -#include "../../NucleusLib/pnModifier/plLogicModBase.h" -#include "../plMessage/plActivatorMsg.h" -#include "../pnMessage/plNotifyMsg.h" +#include "plPhysical/plDetectorModifier.h" +#include "pnModifier/plLogicModBase.h" +#include "plMessage/plActivatorMsg.h" +#include "pnMessage/plNotifyMsg.h" plActivatorConditionalObject::plActivatorConditionalObject() diff --git a/Sources/Plasma/FeatureLib/pfConditional/plActivatorConditionalObject.h b/Sources/Plasma/FeatureLib/pfConditional/plActivatorConditionalObject.h index 9bff4a29..092e3198 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plActivatorConditionalObject.h +++ b/Sources/Plasma/FeatureLib/pfConditional/plActivatorConditionalObject.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plActivatorConditionalObject_inc #define plActivatorConditionalObject_inc -#include "../../NucleusLib/pnModifier/plConditionalObject.h" +#include "pnModifier/plConditionalObject.h" #include "hsTemplates.h" class plKey; diff --git a/Sources/Plasma/FeatureLib/pfConditional/plAnimationEventConditionalObject.cpp b/Sources/Plasma/FeatureLib/pfConditional/plAnimationEventConditionalObject.cpp index f40fac7f..1b5ff2ec 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plAnimationEventConditionalObject.cpp +++ b/Sources/Plasma/FeatureLib/pfConditional/plAnimationEventConditionalObject.cpp @@ -41,12 +41,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "plAnimationEventConditionalObject.h" -#include "../pnInputCore/plKeyDef.h" -#include "../plModifier/plSimpleModifier.h" -#include "../../NucleusLib/pnModifier/plLogicModBase.h" +#include "pnInputCore/plKeyDef.h" +#include "plModifier/plSimpleModifier.h" +#include "pnModifier/plLogicModBase.h" #include "plgDispatch.h" #include "hsResMgr.h" -#include "../plMessage/plAnimCmdMsg.h" +#include "plMessage/plAnimCmdMsg.h" plAnimationEventConditionalObject::plAnimationEventConditionalObject(plKey pTargetModifier) : fTarget(pTargetModifier), diff --git a/Sources/Plasma/FeatureLib/pfConditional/plAnimationEventConditionalObject.h b/Sources/Plasma/FeatureLib/pfConditional/plAnimationEventConditionalObject.h index b4520405..58710e71 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plAnimationEventConditionalObject.h +++ b/Sources/Plasma/FeatureLib/pfConditional/plAnimationEventConditionalObject.h @@ -43,9 +43,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAnimationEventConditionalObject_inc #define plAnimationEventConditionalObject_inc -#include "../pnModifier/plConditionalObject.h" -#include "../pnInputCore/plKeyDef.h" -#include "../pnMessage/plEventCallbackMsg.h" // AnimationEvent's defined here +#include "pnModifier/plConditionalObject.h" +#include "pnInputCore/plKeyDef.h" +#include "pnMessage/plEventCallbackMsg.h" // AnimationEvent's defined here class plAnimationEventConditionalObject : public plConditionalObject diff --git a/Sources/Plasma/FeatureLib/pfConditional/plConditionalObjectCreatable.h b/Sources/Plasma/FeatureLib/pfConditional/plConditionalObjectCreatable.h index 2cbd366e..3d0e0c56 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plConditionalObjectCreatable.h +++ b/Sources/Plasma/FeatureLib/pfConditional/plConditionalObjectCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plConditionalObjectCreatable_inc #define plConditionalObjectCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plANDConditionalObject.h" diff --git a/Sources/Plasma/FeatureLib/pfConditional/plControlEventConditionalObject.cpp b/Sources/Plasma/FeatureLib/pfConditional/plControlEventConditionalObject.cpp index 693b25eb..382e21ac 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plControlEventConditionalObject.cpp +++ b/Sources/Plasma/FeatureLib/pfConditional/plControlEventConditionalObject.cpp @@ -41,9 +41,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "plControlEventConditionalObject.h" -#include "../plPhysical/plDetectorModifier.h" -#include "../../NucleusLib/pnModifier/plLogicModBase.h" -#include "../plMessage/plInputEventMsg.h" +#include "plPhysical/plDetectorModifier.h" +#include "pnModifier/plLogicModBase.h" +#include "plMessage/plInputEventMsg.h" plControlEventConditionalObject::plControlEventConditionalObject() { diff --git a/Sources/Plasma/FeatureLib/pfConditional/plControlEventConditionalObject.h b/Sources/Plasma/FeatureLib/pfConditional/plControlEventConditionalObject.h index daa0ba61..06345bba 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plControlEventConditionalObject.h +++ b/Sources/Plasma/FeatureLib/pfConditional/plControlEventConditionalObject.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plControlEventConditionalObject_inc #define plControlEventConditionalObject_inc -#include "../../NucleusLib/pnModifier/plConditionalObject.h" -#include "../../NucleusLib/pnInputCore/plControlEventCodes.h" +#include "pnModifier/plConditionalObject.h" +#include "pnInputCore/plControlEventCodes.h" class plControlEventConditionalObject : public plConditionalObject diff --git a/Sources/Plasma/FeatureLib/pfConditional/plFacingConditionalObject.cpp b/Sources/Plasma/FeatureLib/pfConditional/plFacingConditionalObject.cpp index fd8bb3dd..1f33822b 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plFacingConditionalObject.cpp +++ b/Sources/Plasma/FeatureLib/pfConditional/plFacingConditionalObject.cpp @@ -42,14 +42,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plFacingConditionalObject.h" #include "plgDispatch.h" -#include "../../NucleusLib/pnModifier/plLogicModBase.h" -#include "../plMessage/plActivatorMsg.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../pnMessage/plFakeOutMsg.h" -#include "../pnNetCommon/plNetApp.h" +#include "pnModifier/plLogicModBase.h" +#include "plMessage/plActivatorMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnKeyedObject/plKey.h" +#include "pnMessage/plNotifyMsg.h" +#include "pnMessage/plFakeOutMsg.h" +#include "pnNetCommon/plNetApp.h" plFacingConditionalObject::plFacingConditionalObject() : fTolerance(-1.0f), diff --git a/Sources/Plasma/FeatureLib/pfConditional/plFacingConditionalObject.h b/Sources/Plasma/FeatureLib/pfConditional/plFacingConditionalObject.h index 3b108518..32661253 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plFacingConditionalObject.h +++ b/Sources/Plasma/FeatureLib/pfConditional/plFacingConditionalObject.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plFacingConditionalObject_inc #define plFacingConditionalObject_inc -#include "../../NucleusLib/pnModifier/plConditionalObject.h" +#include "pnModifier/plConditionalObject.h" class plSceneObject; diff --git a/Sources/Plasma/FeatureLib/pfConditional/plKeyPressConditionalObject.cpp b/Sources/Plasma/FeatureLib/pfConditional/plKeyPressConditionalObject.cpp index b7c52210..579c06df 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plKeyPressConditionalObject.cpp +++ b/Sources/Plasma/FeatureLib/pfConditional/plKeyPressConditionalObject.cpp @@ -41,9 +41,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "plKeyPressConditionalObject.h" -#include "../plPhysical/plDetectorModifier.h" -#include "../../NucleusLib/pnModifier/plLogicModBase.h" -#include "../plMessage/plInputEventMsg.h" +#include "plPhysical/plDetectorModifier.h" +#include "pnModifier/plLogicModBase.h" +#include "plMessage/plInputEventMsg.h" plKeyPressConditionalObject::plKeyPressConditionalObject() { diff --git a/Sources/Plasma/FeatureLib/pfConditional/plKeyPressConditionalObject.h b/Sources/Plasma/FeatureLib/pfConditional/plKeyPressConditionalObject.h index ede030a0..6e700c66 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plKeyPressConditionalObject.h +++ b/Sources/Plasma/FeatureLib/pfConditional/plKeyPressConditionalObject.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plKeyPressConditionalObject_inc #define plKeyPressConditionalObject_inc -#include "../../NucleusLib/pnModifier/plConditionalObject.h" -#include "../../NucleusLib/pnInputCore/plKeyDef.h" +#include "pnModifier/plConditionalObject.h" +#include "pnInputCore/plKeyDef.h" class plKeyPressConditionalObject : public plConditionalObject diff --git a/Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerInBoxConditionalObject.cpp b/Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerInBoxConditionalObject.cpp index 18d28eae..3038026e 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerInBoxConditionalObject.cpp +++ b/Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerInBoxConditionalObject.cpp @@ -41,8 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "plLocalPlayerInBoxConditionalObject.h" -#include "../../PubUtilLib/plPhysical/plDetectorModifier.h" -#include "../../NucleusLib/pnModifier/plLogicModBase.h" +#include "plPhysical/plDetectorModifier.h" +#include "pnModifier/plLogicModBase.h" plLocalPlayerInBoxConditionalObject::plLocalPlayerInBoxConditionalObject() { diff --git a/Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerInBoxConditionalObject.h b/Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerInBoxConditionalObject.h index 98c42b0a..2e45543e 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerInBoxConditionalObject.h +++ b/Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerInBoxConditionalObject.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLocalPlayerInBoxConditionalObject_inc #define plLocalPlayerInBoxConditionalObject_inc -#include "../../NucleusLib/pnModifier/plConditionalObject.h" +#include "pnModifier/plConditionalObject.h" class plKey; diff --git a/Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerIntersectPlaneConditionalObject.cpp b/Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerIntersectPlaneConditionalObject.cpp index de394430..fe190424 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerIntersectPlaneConditionalObject.cpp +++ b/Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerIntersectPlaneConditionalObject.cpp @@ -41,8 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "plLocalPlayerIntersectPlaneConditionalObject.h" -#include "../../PubUtilLib/plPhysical/plDetectorModifier.h" -#include "../../NucleusLib/pnModifier/plLogicModBase.h" +#include "plPhysical/plDetectorModifier.h" +#include "pnModifier/plLogicModBase.h" plLocalPlayerIntersectPlaneConditionalObject::plLocalPlayerIntersectPlaneConditionalObject() { diff --git a/Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerIntersectPlaneConditionalObject.h b/Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerIntersectPlaneConditionalObject.h index c9e14147..2502e57b 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerIntersectPlaneConditionalObject.h +++ b/Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerIntersectPlaneConditionalObject.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLocalPlayerIntersectPlaneConditionalObject_inc #define plLocalPlayerIntersectPlaneConditionalObject_inc -#include "../../NucleusLib/pnModifier/plConditionalObject.h" +#include "pnModifier/plConditionalObject.h" class plKey; diff --git a/Sources/Plasma/FeatureLib/pfConditional/plORConditionalObject.cpp b/Sources/Plasma/FeatureLib/pfConditional/plORConditionalObject.cpp index f09d3b44..824960fc 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plORConditionalObject.cpp +++ b/Sources/Plasma/FeatureLib/pfConditional/plORConditionalObject.cpp @@ -41,11 +41,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "plORConditionalObject.h" -#include "../plPhysical/plDetectorModifier.h" +#include "plPhysical/plDetectorModifier.h" #include "hsResMgr.h" -#include "../../NucleusLib/pnModifier/plLogicModBase.h" +#include "pnModifier/plLogicModBase.h" -#include "../plMessage/plCondRefMsg.h" +#include "plMessage/plCondRefMsg.h" plORConditionalObject::plORConditionalObject() diff --git a/Sources/Plasma/FeatureLib/pfConditional/plORConditionalObject.h b/Sources/Plasma/FeatureLib/pfConditional/plORConditionalObject.h index 1c24c5c5..79071bf9 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plORConditionalObject.h +++ b/Sources/Plasma/FeatureLib/pfConditional/plORConditionalObject.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plORConditionalObject_inc #define plORConditionalObject_inc -#include "../../NucleusLib/pnModifier/plConditionalObject.h" +#include "pnModifier/plConditionalObject.h" #include "hsTemplates.h" class plORConditionalObject : public plConditionalObject diff --git a/Sources/Plasma/FeatureLib/pfConditional/plObjectInBoxConditionalObject.cpp b/Sources/Plasma/FeatureLib/pfConditional/plObjectInBoxConditionalObject.cpp index ad359e5c..18d825cd 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plObjectInBoxConditionalObject.cpp +++ b/Sources/Plasma/FeatureLib/pfConditional/plObjectInBoxConditionalObject.cpp @@ -41,14 +41,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "plObjectInBoxConditionalObject.h" -#include "../../PubUtilLib/plPhysical/plDetectorModifier.h" -#include "../../NucleusLib/pnModifier/plLogicModBase.h" -#include "../../PubUtilLib/plMessage/plActivatorMsg.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../pnMessage/plFakeOutMsg.h" -#include "../pnNetCommon/plNetApp.h" -#include "../plAvatar/plArmatureMod.h" -#include "../pnSceneObject/plSceneObject.h" +#include "plPhysical/plDetectorModifier.h" +#include "pnModifier/plLogicModBase.h" +#include "plMessage/plActivatorMsg.h" +#include "pnMessage/plNotifyMsg.h" +#include "pnMessage/plFakeOutMsg.h" +#include "pnNetCommon/plNetApp.h" +#include "plAvatar/plArmatureMod.h" +#include "pnSceneObject/plSceneObject.h" bool plVolumeSensorConditionalObject::makeBriceHappyVar = true; @@ -293,8 +293,8 @@ void plVolumeSensorConditionalObject::Write(hsStream* stream, hsResMgr* mgr) stream->WriteSwap32(fType); stream->WriteBool(fFirst); } -#include "../pnMessage/plPlayerPageMsg.h" -#include "../../NucleusLib/inc/plgDispatch.h" +#include "pnMessage/plPlayerPageMsg.h" +#include "plgDispatch.h" hsBool plVolumeSensorConditionalObjectNoArbitration::MsgReceive(plMessage* msg) { plActivatorMsg* pActivateMsg = plActivatorMsg::ConvertNoRef(msg); diff --git a/Sources/Plasma/FeatureLib/pfConditional/plObjectInBoxConditionalObject.h b/Sources/Plasma/FeatureLib/pfConditional/plObjectInBoxConditionalObject.h index 9eab8eb4..b1a7c433 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plObjectInBoxConditionalObject.h +++ b/Sources/Plasma/FeatureLib/pfConditional/plObjectInBoxConditionalObject.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plObjectInBoxConditionalObject_inc #define plObjectInBoxConditionalObject_inc -#include "../../NucleusLib/pnModifier/plConditionalObject.h" +#include "pnModifier/plConditionalObject.h" #include "hsTemplates.h" class plKey; diff --git a/Sources/Plasma/FeatureLib/pfConditional/plObjectIntersectPlaneConditionalObject.cpp b/Sources/Plasma/FeatureLib/pfConditional/plObjectIntersectPlaneConditionalObject.cpp index b05b1719..7f60e3f4 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plObjectIntersectPlaneConditionalObject.cpp +++ b/Sources/Plasma/FeatureLib/pfConditional/plObjectIntersectPlaneConditionalObject.cpp @@ -41,8 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "plObjectIntersectPlaneConditionalObject.h" -#include "../../PubUtilLib/plPhysical/plDetectorModifier.h" -#include "../../NucleusLib/pnModifier/plLogicModBase.h" +#include "plPhysical/plDetectorModifier.h" +#include "pnModifier/plLogicModBase.h" plObjectIntersectPlaneConditionalObject::plObjectIntersectPlaneConditionalObject() { diff --git a/Sources/Plasma/FeatureLib/pfConditional/plObjectIntersectPlaneConditionalObject.h b/Sources/Plasma/FeatureLib/pfConditional/plObjectIntersectPlaneConditionalObject.h index 4896cf05..4499ef5c 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plObjectIntersectPlaneConditionalObject.h +++ b/Sources/Plasma/FeatureLib/pfConditional/plObjectIntersectPlaneConditionalObject.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plObjectIntersectPlaneConditionalObject_inc #define plObjectIntersectPlaneConditionalObject_inc -#include "../../NucleusLib/pnModifier/plConditionalObject.h" +#include "pnModifier/plConditionalObject.h" class plKey; diff --git a/Sources/Plasma/FeatureLib/pfConditional/plPickedConditionalObject.cpp b/Sources/Plasma/FeatureLib/pfConditional/plPickedConditionalObject.cpp index ec93098b..567e61ee 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plPickedConditionalObject.cpp +++ b/Sources/Plasma/FeatureLib/pfConditional/plPickedConditionalObject.cpp @@ -41,10 +41,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "plPickedConditionalObject.h" -#include "../../PubUtilLib/plPhysical/plDetectorModifier.h" -#include "../../NucleusLib/pnModifier/plLogicModBase.h" +#include "plPhysical/plDetectorModifier.h" +#include "pnModifier/plLogicModBase.h" -#include "../plMessage/plActivatorMsg.h" +#include "plMessage/plActivatorMsg.h" plPickedConditionalObject::plPickedConditionalObject() { diff --git a/Sources/Plasma/FeatureLib/pfConditional/plPickedConditionalObject.h b/Sources/Plasma/FeatureLib/pfConditional/plPickedConditionalObject.h index 8349d326..5dcd8d6e 100644 --- a/Sources/Plasma/FeatureLib/pfConditional/plPickedConditionalObject.h +++ b/Sources/Plasma/FeatureLib/pfConditional/plPickedConditionalObject.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPickedConditionalObject_inc #define plPickedConditionalObject_inc -#include "../../NucleusLib/pnModifier/plConditionalObject.h" +#include "pnModifier/plConditionalObject.h" class plKey; diff --git a/Sources/Plasma/FeatureLib/pfConsole/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfConsole/CMakeLists.txt new file mode 100644 index 00000000..01d7d616 --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfConsole/CMakeLists.txt @@ -0,0 +1,38 @@ +include_directories(../../CoreLib) +include_directories(../../FeatureLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) +include_directories(../../PubUtilLib) + +include_directories(${OPENSSL_INCLUDE_DIR}) +include_directories(${OPENAL_INCLUDE_DIR}) +include_directories(${PYTHON_INCLUDE_DIR}) + +set(pfConsole_SOURCES + pfAvatarConsoleCommands.cpp + pfCCRConsoleCommands.cpp + pfConsole.cpp + pfConsoleCmd.cpp + pfConsoleCommands.cpp + pfConsoleCommandsNet.cpp + pfConsoleContext.cpp + pfConsoleDirSrc.cpp + pfConsoleEngine.cpp + pfDispatchLog.cpp + pfGameConsoleCommands.cpp +) + +set(pfConsole_HEADERS + pfConsole.h + pfConsoleCmd.h + pfConsoleContext.h + pfConsoleCreatable.h + pfConsoleDirSrc.h + pfConsoleEngine.h + pfDispatchLog.h +) + +add_library(pfConsole STATIC ${pfConsole_SOURCES} ${pfConsole_HEADERS}) + +source_group("Source Files" FILES ${pfConsole_SOURCES}) +source_group("Header Files" FILES ${pfConsole_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfAvatarConsoleCommands.cpp b/Sources/Plasma/FeatureLib/pfConsole/pfAvatarConsoleCommands.cpp index f11a521f..36f55367 100644 --- a/Sources/Plasma/FeatureLib/pfConsole/pfAvatarConsoleCommands.cpp +++ b/Sources/Plasma/FeatureLib/pfConsole/pfAvatarConsoleCommands.cpp @@ -54,41 +54,41 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfConsole.h" #include "hsResMgr.h" -#include "../pfMessage/plArmatureEffectMsg.h" - -#include "../plMessage/plOneShotMsg.h" -#include "../plMessage/plAvatarMsg.h" -#include "../plMessage/plInputEventMsg.h" -#include "../plMessage/plSimStateMsg.h" -#include "../plMessage/plCCRMsg.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../pnMessage/plNotifyMsg.h" - -#include "../plModifier/plSpawnModifier.h" - -#include "../plResMgr/plKeyFinder.h" - -#include "../plAvatar/plArmatureMod.h" -#include "../plAvatar/plAvBrainCritter.h" -#include "../plAvatar/plAvBrainHuman.h" -#include "../plAvatar/plAvBrainSwim.h" -#include "../plAvatar/plAvBrainGeneric.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plAvatar/plSeekPointMod.h" -#include "../plAvatar/plOneShotMod.h" -#include "../plAvatar/plAGAnim.h" -#include "../plAvatar/plAvBrainUser.h" -#include "../plAvatar/plAvBrainHuman.h" -#include "../plAvatar/plNPCSpawnMod.h" -#include "../plAvatar/plAGAnimInstance.h" -#include "../plAvatar/plArmatureEffects.h" -#include "../plAvatar/plAvTaskSeek.h" +#include "pfMessage/plArmatureEffectMsg.h" + +#include "plMessage/plOneShotMsg.h" +#include "plMessage/plAvatarMsg.h" +#include "plMessage/plInputEventMsg.h" +#include "plMessage/plSimStateMsg.h" +#include "plMessage/plCCRMsg.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "pnMessage/plNotifyMsg.h" + +#include "plModifier/plSpawnModifier.h" + +#include "plResMgr/plKeyFinder.h" + +#include "plAvatar/plArmatureMod.h" +#include "plAvatar/plAvBrainCritter.h" +#include "plAvatar/plAvBrainHuman.h" +#include "plAvatar/plAvBrainSwim.h" +#include "plAvatar/plAvBrainGeneric.h" +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plSeekPointMod.h" +#include "plAvatar/plOneShotMod.h" +#include "plAvatar/plAGAnim.h" +#include "plAvatar/plAvBrainUser.h" +#include "plAvatar/plAvBrainHuman.h" +#include "plAvatar/plNPCSpawnMod.h" +#include "plAvatar/plAGAnimInstance.h" +#include "plAvatar/plArmatureEffects.h" +#include "plAvatar/plAvTaskSeek.h" //#include "../plHavok1/plSimulationMgr.h" -#include "../pnNetCommon/plNetApp.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plDrawable/plInstanceDrawInterface.h" -#include "../plDrawable/plDrawableSpans.h" +#include "pnNetCommon/plNetApp.h" +#include "plNetClient/plNetClientMgr.h" +#include "plDrawable/plInstanceDrawInterface.h" +#include "plDrawable/plDrawableSpans.h" #define PF_SANITY_CHECK( cond, msg ) { if( !( cond ) ) { PrintString( msg ); return; } } @@ -135,7 +135,7 @@ PF_CONSOLE_SUBGROUP( Avatar, LOD ) #endif // LIMIT_CONSOLE_COMMANDS -#include "../plAvatar/plAnimStage.h" +#include "plAvatar/plAnimStage.h" plAvBrainHuman * GetMainAvatarBrain() { @@ -456,7 +456,7 @@ PF_CONSOLE_CMD( Avatar, PopBrain, "", "Remove the topmost brain from the avatar. } } -#include "../plScene/plRelevanceMgr.h" +#include "plScene/plRelevanceMgr.h" PF_CONSOLE_CMD( Avatar, MarkRelevanceRegion, @@ -762,7 +762,7 @@ PF_CONSOLE_CMD( Avatar_LOD, GetLODDistance, "", "Get Distance for switching Ava -#include "../plAvatar/plAvBrainClimb.h" +#include "plAvatar/plAvBrainClimb.h" PF_CONSOLE_CMD( Avatar_Climb, Start, "string direction", "Specify initial mount direction: up, down, left, right") { diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp b/Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp index b4e03c91..314f45fc 100644 --- a/Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp +++ b/Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp @@ -47,26 +47,26 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfConsole.h" #include "pfConsoleEngine.h" -#include "../plPipeline/plDebugText.h" -#include "../plInputCore/plInputDevice.h" -#include "../plInputCore/plInputInterface.h" -#include "../plInputCore/plInputInterfaceMgr.h" -#include "../pnInputCore/plKeyMap.h" -#include "../pnInputCore/plKeyDef.h" -#include "../plMessage/plInputEventMsg.h" -#include "../plMessage/plConsoleMsg.h" -#include "../plMessage/plInputIfaceMgrMsg.h" -#include "../pnKeyedObject/plFixedKey.h" +#include "plPipeline/plDebugText.h" +#include "plInputCore/plInputDevice.h" +#include "plInputCore/plInputInterface.h" +#include "plInputCore/plInputInterfaceMgr.h" +#include "pnInputCore/plKeyMap.h" +#include "pnInputCore/plKeyDef.h" +#include "plMessage/plInputEventMsg.h" +#include "plMessage/plConsoleMsg.h" +#include "plMessage/plInputIfaceMgrMsg.h" +#include "pnKeyedObject/plFixedKey.h" #include "hsTimer.h" #include "plgDispatch.h" #include "plPipeline.h" #include "hsConfig.h" -#include "../pfPython/cyPythonInterface.h" -#include "../plNetClient/plNetClientMgr.h" +#include "pfPython/cyPythonInterface.h" +#include "plNetClient/plNetClientMgr.h" #ifndef PLASMA_EXTERNAL_RELEASE -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #endif // PLASMA_EXTERNAL_RELEASE diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfConsole.h b/Sources/Plasma/FeatureLib/pfConsole/pfConsole.h index 709b12b2..b8374a49 100644 --- a/Sources/Plasma/FeatureLib/pfConsole/pfConsole.h +++ b/Sources/Plasma/FeatureLib/pfConsole/pfConsole.h @@ -56,7 +56,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define _pfConsole_h #include "hsTypes.h" -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" class plPipeline; diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp b/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp index b6c7fb28..0219419e 100644 --- a/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp +++ b/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp @@ -53,123 +53,123 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfConsoleCmd.h" #include "plgDispatch.h" -#include "../plAgeLoader/plAgeLoader.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plPipeline/plDebugText.h" -#include "../plPipeline/plPipeDebugFlags.h" -#include "../plMessage/plMovieMsg.h" -#include "../plDrawable/plDrawableSpans.h" +#include "plAgeLoader/plAgeLoader.h" +#include "plNetClient/plNetClientMgr.h" +#include "plPipeline/plDebugText.h" +#include "plPipeline/plPipeDebugFlags.h" +#include "plMessage/plMovieMsg.h" +#include "plDrawable/plDrawableSpans.h" #include "plPipeline.h" -#include "../pfCamera/plCameraModifier.h" -#include "../pfCamera/plVirtualCamNeu.h" -#include "../pfCamera/plCameraBrain.h" -#include "../plResMgr/plResManager.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plKeyImp.h" -#include "../pnModifier/plLogicModBase.h" -#include "../plModifier/plSDLModifier.h" -#include "../plSDL/plSDL.h" -#include "../pfCharacter/plPlayerModifier.h" -#include "../plSurface/plLayerDepth.h" -#include "../plSurface/plLayerOr.h" -#include "../plSurface/plLayerOr.h" -#include "../plAudio/plAudioSystem.h" -#include "../plAudio/plVoiceChat.h" -#include "../plAudio/plWinMicLevel.h" -#include "../plPipeline/plFogEnvironment.h" -#include "../plPipeline/plPlates.h" -#include "../plPipeline/plDynamicEnvMap.h" -#include "../../NucleusLib/inc/hsTimer.h" -#include "../pnMessage/plClientMsg.h" -#include "../pnMessage/plEnableMsg.h" -#include "../pnMessage/plAudioSysMsg.h" -#include "../plMessage/plListenerMsg.h" -#include "../pfAudio/plListener.h" -#include "../plMessage/plAvatarMsg.h" -#include "../plMessage/plOneShotMsg.h" -#include "../plVault/plVault.h" +#include "pfCamera/plCameraModifier.h" +#include "pfCamera/plVirtualCamNeu.h" +#include "pfCamera/plCameraBrain.h" +#include "plResMgr/plResManager.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKeyImp.h" +#include "pnModifier/plLogicModBase.h" +#include "plModifier/plSDLModifier.h" +#include "plSDL/plSDL.h" +#include "pfCharacter/plPlayerModifier.h" +#include "plSurface/plLayerDepth.h" +#include "plSurface/plLayerOr.h" +#include "plSurface/plLayerOr.h" +#include "plAudio/plAudioSystem.h" +#include "plAudio/plVoiceChat.h" +#include "plAudio/plWinMicLevel.h" +#include "plPipeline/plFogEnvironment.h" +#include "plPipeline/plPlates.h" +#include "plPipeline/plDynamicEnvMap.h" +#include "hsTimer.h" +#include "pnMessage/plClientMsg.h" +#include "pnMessage/plEnableMsg.h" +#include "pnMessage/plAudioSysMsg.h" +#include "plMessage/plListenerMsg.h" +#include "pfAudio/plListener.h" +#include "plMessage/plAvatarMsg.h" +#include "plMessage/plOneShotMsg.h" +#include "plVault/plVault.h" #include "../../Apps/plClient/plClient.h" #include "pfConsole.h" #include "pfConsoleContext.h" -#include "../plResMgr/plKeyFinder.h" -#include "../plModifier/plSimpleModifier.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plAvatar/plAvatarTasks.h" -#include "../plAvatar/plAvBrainGeneric.h" +#include "plResMgr/plKeyFinder.h" +#include "plModifier/plSimpleModifier.h" +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plAvatarTasks.h" +#include "plAvatar/plAvBrainGeneric.h" //#include "../plHavok1/plSimulationMgr.h" -#include "../plMessage/plConsoleMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../pnMessage/plCameraMsg.h" -#include "../pnMessage/plSoundMsg.h" -#include "../pnMessage/plEventCallbackMsg.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../pfAnimation/plAnimDebugList.h" - -#include "../pnMessage/plNodeChangeMsg.h" -#include "../pnMessage/plProxyDrawMsg.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../pnMessage/plAttachMsg.h" -#include "../plMessage/plSimInfluenceMsg.h" -#include "../plMessage/plSimStateMsg.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../pfMessage/pfKIMsg.h" - -#include "../plInputCore/plInputInterfaceMgr.h" -#include "../plInputCore/plInputManager.h" -#include "../plInputCore/plInputDevice.h" -#include "../plInputCore/plAvatarInputInterface.h" -#include "../plMessage/plInputEventMsg.h" -#include "../pnInputCore/plKeyMap.h" - -#include "../plParticleSystem/plParticleSystem.h" -#include "../plParticleSystem/plConvexVolume.h" -#include "../plParticleSystem/plParticleEffect.h" -#include "../plParticleSystem/plParticleGenerator.h" -#include "../plSurface/hsGMaterial.h" -#include "../pnSceneObject/plDrawInterface.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../plScene/plSceneNode.h" -#include "../plScene/plPageTreeMgr.h" -#include "../plScene/plPostEffectMod.h" -#include "../pnMessage/plNodeRefMsg.h" +#include "plMessage/plConsoleMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "pnMessage/plCameraMsg.h" +#include "pnMessage/plSoundMsg.h" +#include "pnMessage/plEventCallbackMsg.h" +#include "pnMessage/plNotifyMsg.h" +#include "pfAnimation/plAnimDebugList.h" + +#include "pnMessage/plNodeChangeMsg.h" +#include "pnMessage/plProxyDrawMsg.h" +#include "pnMessage/plObjRefMsg.h" +#include "pnMessage/plAttachMsg.h" +#include "plMessage/plSimInfluenceMsg.h" +#include "plMessage/plSimStateMsg.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "pfMessage/pfKIMsg.h" + +#include "plInputCore/plInputInterfaceMgr.h" +#include "plInputCore/plInputManager.h" +#include "plInputCore/plInputDevice.h" +#include "plInputCore/plAvatarInputInterface.h" +#include "plMessage/plInputEventMsg.h" +#include "pnInputCore/plKeyMap.h" + +#include "plParticleSystem/plParticleSystem.h" +#include "plParticleSystem/plConvexVolume.h" +#include "plParticleSystem/plParticleEffect.h" +#include "plParticleSystem/plParticleGenerator.h" +#include "plSurface/hsGMaterial.h" +#include "pnSceneObject/plDrawInterface.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "plScene/plSceneNode.h" +#include "plScene/plPageTreeMgr.h" +#include "plScene/plPostEffectMod.h" +#include "pnMessage/plNodeRefMsg.h" //#include "../pnMessage/plWarpMsg.h" #include "hsResMgr.h" -#include "../plParticleSystem/plParticleSystem.h" -#include "../plMessage/plParticleUpdateMsg.h" +#include "plParticleSystem/plParticleSystem.h" +#include "plMessage/plParticleUpdateMsg.h" -#include "../plDrawable/plDynaBulletMgr.h" +#include "plDrawable/plDynaBulletMgr.h" -#include "../plGImage/plMipmap.h" -#include "../plGImage/plTGAWriter.h" +#include "plGImage/plMipmap.h" +#include "plGImage/plTGAWriter.h" -#include "../plGLight/plShadowCaster.h" -#include "../plGLight/plShadowMaster.h" +#include "plGLight/plShadowCaster.h" +#include "plGLight/plShadowMaster.h" // begin for agedefn test #include "hsStream.h" -#include "../plAgeDescription/plAgeDescription.h" -#include "../plUnifiedTime/plUnifiedTime.h" +#include "plAgeDescription/plAgeDescription.h" +#include "plUnifiedTime/plUnifiedTime.h" //end for agedefn test -#include "../../PubUtilLib/plFile/hsFiles.h" -#include "../../NucleusLib/pnSceneObject/plAudioInterface.h" +#include "plFile/hsFiles.h" +#include "pnSceneObject/plAudioInterface.h" -#include "../plStatusLog/plStatusLog.h" -#include "../pnTimer/pnBuildDates.h" +#include "plStatusLog/plStatusLog.h" +#include "pnTimer/pnBuildDates.h" #include "hsStlUtils.h" #include "hsTemplates.h" -#include "../Corelib/hsUtils.h" +#include "hsUtils.h" -#include "../pfPython/cyPythonInterface.h" -#include "../pfPython/plPythonSDLModifier.h" +#include "pfPython/cyPythonInterface.h" +#include "pfPython/plPythonSDLModifier.h" -#include "../plResMgr/plResManagerHelper.h" -#include "../plResMgr/plResMgrSettings.h" -#include "../plResMgr/plLocalization.h" +#include "plResMgr/plResManagerHelper.h" +#include "plResMgr/plResMgrSettings.h" +#include "plResMgr/plLocalization.h" #define PF_SANITY_CHECK( cond, msg ) { if( !( cond ) ) { PrintString( msg ); return; } } @@ -452,7 +452,7 @@ PF_CONSOLE_BASE_CMD( SampleCmd3, "int, ...", "Sample command #3" ) #ifndef LIMIT_CONSOLE_COMMANDS -#include "../plMessage/plTransitionMsg.h" +#include "plMessage/plTransitionMsg.h" PF_CONSOLE_BASE_CMD( FadeIn, "float len, bool hold", "Sample command #1" ) { @@ -511,7 +511,7 @@ PF_CONSOLE_BASE_CMD( DumpLogs, "string folderName", "Dumps all current logs to t PF_CONSOLE_GROUP( Stats ) -#include "../plStatGather/plProfileManagerFull.h" +#include "plStatGather/plProfileManagerFull.h" PF_CONSOLE_CMD( Stats, Show, // Group name, Function name "...", // Params @@ -641,7 +641,7 @@ PF_CONSOLE_CMD(Stats, RemoveDetailVar, "string stat", "Removes the specified var plProfileManagerFull::Instance().RemoveDetailVar(params[0]); } -#include "../plStatGather/plAutoProfile.h" +#include "plStatGather/plAutoProfile.h" PF_CONSOLE_CMD(Stats, AutoProfile, "...", "Performs an automated profile in all the ages. Optional: Specify an age name to do just that age") { @@ -1638,7 +1638,7 @@ PF_CONSOLE_CMD( Graphics_Renderer, TakeScreenshot, "...", "Takes a shot of the c } } -#include "../pfSurface/plGrabCubeMap.h" +#include "pfSurface/plGrabCubeMap.h" PF_CONSOLE_CMD( Graphics_Renderer, GrabCubeMap, "string sceneObject, string prefix", @@ -1672,7 +1672,7 @@ PF_CONSOLE_CMD( Graphics_Renderer, GrabCubeCam, grabCube.GrabCube(pfConsole::GetPipeline(), pos, pref, clearColor); } -#include "../plJPEG/plJPEG.h" +#include "plJPEG/plJPEG.h" PF_CONSOLE_CMD( Graphics_Renderer, TakeJPEGScreenshot, "...", "Takes a shot of the current frame and saves it to the given file" ) { @@ -1722,7 +1722,7 @@ PF_CONSOLE_CMD( Graphics_Renderer, TakeJPEGScreenshot, "...", "Takes a shot of t } } -#include "../plGImage/plAVIWriter.h" +#include "plGImage/plAVIWriter.h" PF_CONSOLE_CMD( Graphics_Renderer, AVIWrite, "...", "Saves each frame to an AVI file" ) { @@ -2504,7 +2504,7 @@ PF_CONSOLE_CMD( App, // groupName PrintString( str ); } -#include "../plInputCore/plSceneInputInterface.h" +#include "plInputCore/plSceneInputInterface.h" PF_CONSOLE_CMD( App, // groupName ShowLOS, // fxnName @@ -3315,7 +3315,7 @@ PF_CONSOLE_CMD(Logic, ListResponders, "", "Prints the names of the loaded respon } } -#include "../plModifier/plResponderModifier.h" +#include "plModifier/plResponderModifier.h" PF_CONSOLE_CMD(Logic, ResponderAnimCue, "", "Toggle box being drawn on screen when a responder starts an anim") { @@ -3330,7 +3330,7 @@ PF_CONSOLE_CMD(Logic, ResponderNoLog, "string prefix", "Don't log responders tha plResponderModifier::NoLogString(params[0]); } -#include "../plModifier/plDetectorLog.h" +#include "plModifier/plDetectorLog.h" PF_CONSOLE_CMD(Logic, WriteDetectorLog, "", "Write detector log to logfile") { DetectorDoLogfile(); @@ -4288,7 +4288,7 @@ PF_CONSOLE_CMD( Quality, PrintString(str); } -#include "../plSurface/plShaderTable.h" +#include "plSurface/plShaderTable.h" PF_CONSOLE_CMD( Quality, Cap, @@ -4315,10 +4315,10 @@ PF_CONSOLE_CMD( Quality, #ifndef LIMIT_CONSOLE_COMMANDS -#include "../plDrawable/plSharedMesh.h" -#include "../plDrawable/plAccessGeometry.h" -#include "../plDrawable/plMorphSequence.h" -#include "../plAvatar/plAvatarClothing.h" +#include "plDrawable/plSharedMesh.h" +#include "plDrawable/plAccessGeometry.h" +#include "plDrawable/plMorphSequence.h" +#include "plAvatar/plAvatarClothing.h" PF_CONSOLE_GROUP( Access ) @@ -4620,7 +4620,7 @@ PF_CONSOLE_CMD( Access, PrintString(str); } -#include "../pfSurface/plFadeOpacityMod.h" +#include "pfSurface/plFadeOpacityMod.h" PF_CONSOLE_CMD( Access, Fade, @@ -4664,7 +4664,7 @@ PF_CONSOLE_CMD( Access, } -#include "../plDrawable/plVisLOSMgr.h" +#include "plDrawable/plVisLOSMgr.h" static plSceneObject* losObj = nil; @@ -4751,7 +4751,7 @@ PF_CONSOLE_CMD( Access, } -#include "../plMessage/plBulletMsg.h" +#include "plMessage/plBulletMsg.h" plSceneObject* gunObj = nil; hsScalar gunRadius = 1.f; @@ -4871,8 +4871,8 @@ PF_CONSOLE_CMD( Access, #ifndef LIMIT_CONSOLE_COMMANDS -#include "../plDrawable/plWaveSet7.h" -#include "../plDrawable/plFixedWaterState7.h" +#include "plDrawable/plWaveSet7.h" +#include "plDrawable/plFixedWaterState7.h" PF_CONSOLE_GROUP( Wave ) PF_CONSOLE_SUBGROUP( Wave, Set) // Creates a sub-group under a given group @@ -5716,7 +5716,7 @@ PF_CONSOLE_CMD( SceneObject, Detach, // Group name, Function name #ifndef LIMIT_CONSOLE_COMMANDS -#include "../plPhysX/plPXPhysicalControllerCore.h" +#include "plPhysX/plPXPhysicalControllerCore.h" PF_CONSOLE_GROUP( Physics ) @@ -5952,7 +5952,7 @@ PF_CONSOLE_CMD( Physics, ClearLog, "", "Clear the physics log.") plSimulationMgr::ClearLog(); } */ -#include "../plPhysical/plPhysicalSDLModifier.h" +#include "plPhysical/plPhysicalSDLModifier.h" PF_CONSOLE_CMD(Physics, LogSDL, "int level", "Turn logging of physics SDL state on or off. 0=off 1=send/receive only 2=any attempt") { @@ -5960,7 +5960,7 @@ PF_CONSOLE_CMD(Physics, LogSDL, "int level", "Turn logging of physics SDL state plPhysicalSDLModifier::SetLogLevel(level); } -#include "../plPhysX/plSimulationMgr.h" +#include "plPhysX/plSimulationMgr.h" PF_CONSOLE_CMD(Physics, ExtraProfile, "", "Toggle extra simulation profiling") { char str[256]; @@ -6729,10 +6729,10 @@ PF_CONSOLE_CMD( Animation, //////////////////////////////////////////////////////////////////////// #ifndef LIMIT_CONSOLE_COMMANDS -#include "../plAvatar/plArmatureMod.h" -#include "../plAvatar/plAvatarClothing.h" -#include "../plAvatar/plClothingLayout.h" -#include "../pfMessage/plClothingMsg.h" +#include "plAvatar/plArmatureMod.h" +#include "plAvatar/plAvatarClothing.h" +#include "plAvatar/plClothingLayout.h" +#include "pfMessage/plClothingMsg.h" PF_CONSOLE_GROUP( Clothing ) // Defines a main command group @@ -7001,7 +7001,7 @@ PF_CONSOLE_CMD( KI, // Group name PF_CONSOLE_GROUP( Python ) // Defines a main command group -#include "../pfPython/cyMisc.h" +#include "pfPython/cyMisc.h" PF_CONSOLE_CMD( Python, // Group name SetLoggingLevel, // Function name @@ -7023,7 +7023,7 @@ PF_CONSOLE_CMD( Python, #endif -#include "../pfMessage/pfBackdoorMsg.h" +#include "pfMessage/pfBackdoorMsg.h" PF_CONSOLE_CMD( Python, Backdoor, "string target, ...", // Params diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp b/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp index 581a4a13..281850d7 100644 --- a/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp +++ b/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp @@ -53,52 +53,52 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfConsoleCmd.h" #include "plgDispatch.h" -#include "../plAgeLoader/plAgeLoader.h" -#include "../plNetClient/plNetObjectDebugger.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plNetClient/plNetLinkingMgr.h" -#include "../plAgeLoader/plResPatcher.h" -#include "../../NucleusLib/inc/hsResMgr.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plKeyImp.h" -#include "../pnModifier/plLogicModBase.h" -#include "../pfCharacter/plPlayerModifier.h" -#include "../../NucleusLib/inc/hsTimer.h" -#include "../pnMessage/plClientMsg.h" -#include "../pnMessage/plEnableMsg.h" -#include "../pnMessage/plAudioSysMsg.h" -#include "../plNetMessage/plNetMessage.h" -#include "../plMessage/plAvatarMsg.h" -#include "../plMessage/plOneShotMsg.h" -#include "../plMessage/plConsoleMsg.h" +#include "plAgeLoader/plAgeLoader.h" +#include "plNetClient/plNetObjectDebugger.h" +#include "plNetClient/plNetClientMgr.h" +#include "plNetClient/plNetLinkingMgr.h" +#include "plAgeLoader/plResPatcher.h" +#include "hsResMgr.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKeyImp.h" +#include "pnModifier/plLogicModBase.h" +#include "pfCharacter/plPlayerModifier.h" +#include "hsTimer.h" +#include "pnMessage/plClientMsg.h" +#include "pnMessage/plEnableMsg.h" +#include "pnMessage/plAudioSysMsg.h" +#include "plNetMessage/plNetMessage.h" +#include "plMessage/plAvatarMsg.h" +#include "plMessage/plOneShotMsg.h" +#include "plMessage/plConsoleMsg.h" #include "../../Apps/plClient/plClient.h" #include "pfConsole.h" -#include "../plResMgr/plKeyFinder.h" +#include "plResMgr/plKeyFinder.h" #include "hsResMgr.h" // begin for agedefn test #include "hsStream.h" -#include "../plAgeDescription/plAgeDescription.h" -#include "../plUnifiedTime/plUnifiedTime.h" +#include "plAgeDescription/plAgeDescription.h" +#include "plUnifiedTime/plUnifiedTime.h" //end for agedefn test -#include "../../PubUtilLib/plFile/hsFiles.h" +#include "plFile/hsFiles.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" #include "hsStlUtils.h" #include "hsTemplates.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" -#include "../plNetCommon/plSpawnPointInfo.h" +#include "plNetCommon/plSpawnPointInfo.h" -#include "../plSDL/plSDL.h" +#include "plSDL/plSDL.h" -#include "../plNetGameLib/plNetGameLib.h" +#include "plNetGameLib/plNetGameLib.h" -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #define PF_SANITY_CHECK( cond, msg ) { if( !( cond ) ) { PrintString( msg ); return; } } @@ -640,7 +640,7 @@ PF_CONSOLE_CMD( Net_DebugObject, // groupName plNetObjectDebugger::GetInstance()->ClearAllDebugObjects(); } -#include "../pfPython/plPythonSDLModifier.h" +#include "pfPython/plPythonSDLModifier.h" PF_CONSOLE_CMD( Net_DebugObject, // groupName DumpAgeSDLHook, // fxnName "bool dirtyOnly", // paramList diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfConsoleEngine.cpp b/Sources/Plasma/FeatureLib/pfConsole/pfConsoleEngine.cpp index a02ac118..f0681332 100644 --- a/Sources/Plasma/FeatureLib/pfConsole/pfConsoleEngine.cpp +++ b/Sources/Plasma/FeatureLib/pfConsole/pfConsoleEngine.cpp @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfConsoleCmd.h" #include "pfConsoleContext.h" -#include "../plFile/plEncryptedStream.h" +#include "plFile/plEncryptedStream.h" const Int32 pfConsoleEngine::fMaxNumParams = 16; diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.cpp b/Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.cpp index e1676082..8f520182 100644 --- a/Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.cpp +++ b/Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.cpp @@ -41,9 +41,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTimer.h" #include "pfDispatchLog.h" -#include "../plStatusLog/plStatusLog.h" -#include "../pnMessage/plMessage.h" -#include "../pnKeyedObject/plKey.h" +#include "plStatusLog/plStatusLog.h" +#include "pnMessage/plMessage.h" +#include "pnKeyedObject/plKey.h" #include "hsWindows.h" bool DumpSpecificMsgInfo(plMessage* msg, std::string& info); @@ -187,11 +187,11 @@ void plDispatchLog::RemoveFilterExactType(UInt16 type) ////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////// -#include "../pnMessage/plClientMsg.h" -#include "../pfMessage/pfKIMsg.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../plResMgr/plKeyFinder.h" -#include "../plResMgr/plPageInfo.h" +#include "pnMessage/plClientMsg.h" +#include "pfMessage/pfKIMsg.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "plResMgr/plKeyFinder.h" +#include "plResMgr/plPageInfo.h" static bool DumpSpecificMsgInfo(plMessage* msg, std::string& info) { diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.h b/Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.h index bdd50444..e3d3ec23 100644 --- a/Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.h +++ b/Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pfDispatchLog_inc #define pfDispatchLog_inc -#include "../pnDispatch/plDispatchLogBase.h" +#include "pnDispatch/plDispatchLogBase.h" #include "hsBitVector.h" class plStatusLog; diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfGameConsoleCommands.cpp b/Sources/Plasma/FeatureLib/pfConsole/pfGameConsoleCommands.cpp index 4147e9cb..c1f5c180 100644 --- a/Sources/Plasma/FeatureLib/pfConsole/pfGameConsoleCommands.cpp +++ b/Sources/Plasma/FeatureLib/pfConsole/pfGameConsoleCommands.cpp @@ -74,17 +74,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPipeline.h" #include "plgDispatch.h" -#include "../plGImage/plMipmap.h" -#include "../plGImage/plTGAWriter.h" -#include "../pfMessage/pfGameGUIMsg.h" -#include "../../NucleusLib/inc/hsResMgr.h" -#include "../pfGameGUIMgr/pfGUICtrlGenerator.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plAvatar/plAnimStage.h" -#include "../plAvatar/plAvBrainGeneric.h" -#include "../plAvatar/plAvBrainHuman.h" -#include "../plMessage/plAvatarMsg.h" -#include "../pnKeyedObject/plFixedKey.h" +#include "plGImage/plMipmap.h" +#include "plGImage/plTGAWriter.h" +#include "pfMessage/pfGameGUIMsg.h" +#include "hsResMgr.h" +#include "pfGameGUIMgr/pfGUICtrlGenerator.h" +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plAnimStage.h" +#include "plAvatar/plAvBrainGeneric.h" +#include "plAvatar/plAvBrainHuman.h" +#include "plMessage/plAvatarMsg.h" +#include "pnKeyedObject/plFixedKey.h" #define PF_SANITY_CHECK( cond, msg ) { if( !( cond ) ) { PrintString( msg ); return; } } @@ -234,7 +234,7 @@ PF_CONSOLE_CMD( Game, SwitchDialog, "string olddlgName, string newdlgName", "Hid PF_CONSOLE_SUBGROUP( Game, GUI ) -#include "../pfGameGUIMgr/pfGUICtrlGenerator.h" +#include "pfGameGUIMgr/pfGUICtrlGenerator.h" static hsColorRGBA sDynCtrlColor = hsColorRGBA().Set( 1, 1, 1, 1 ), sDynCtrlTextColor = hsColorRGBA().Set( 0, 0, 0, 1 ); @@ -275,7 +275,7 @@ PF_CONSOLE_CMD( Game_GUI, CreateDialog, "string name", "" ) //#include "../pfKI/pfKI.h" -#include "../pfMessage/pfKIMsg.h" +#include "pfMessage/pfKIMsg.h" PF_CONSOLE_CMD( Game, EnterChatMode, "", "Enters in-game chat mode" ) { @@ -393,7 +393,7 @@ PF_CONSOLE_CMD( Game, SetChatFadeDelay, "float delayInSecs", "Sets the time in s plgDispatch::MsgSend( msg ); } -#include "../plAvatar/plArmatureMod.h" +#include "plAvatar/plArmatureMod.h" PF_CONSOLE_CMD( Game, LimitAvatarLOD, "int newLOD", "Zero is (always) highest detail; 2 is (currently) lowest." ) { @@ -458,7 +458,7 @@ PF_CONSOLE_CMD( Game, SetLocalClientAsAdmin, "bool enable", "Makes chat messages } #endif -#include "../pfConditional/plObjectInBoxConditionalObject.h" +#include "pfConditional/plObjectInBoxConditionalObject.h" PF_CONSOLE_CMD( Game, BreakVolumeSensors, "bool break", "reverts to old broken volume sensor logic" ) { diff --git a/Sources/Plasma/FeatureLib/pfCsrSrv/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfCsrSrv/CMakeLists.txt new file mode 100644 index 00000000..bcd18325 --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfCsrSrv/CMakeLists.txt @@ -0,0 +1,19 @@ +include_directories(../../CoreLib) +include_directories(../../FeatureLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) +include_directories(../../PubUtilLib) + +set(pfCsrSrv_SOURCES + pfCsrSrv.cpp +) + +set(pfCsrSrv_HEADERS + Pch.h + pfCsrSrv.h +) + +add_library(pfCsrSrv STATIC ${pfCsrSrv_SOURCES} ${pfCsrSrv_HEADERS}) + +source_group("Source Files" FILES ${pfCsrSrv_SOURCES}) +source_group("Header Files" FILES ${pfCsrSrv_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfGameGUIMgr/CMakeLists.txt new file mode 100644 index 00000000..b66a9876 --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/CMakeLists.txt @@ -0,0 +1,67 @@ +include_directories(../../CoreLib) +include_directories(../../FeatureLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) +include_directories(../../PubUtilLib) + +set(pfGameGUIMgr_SOURCES + pfGameGUIMgr.cpp + pfGUIButtonMod.cpp + pfGUICheckBoxCtrl.cpp + pfGUIClickMapCtrl.cpp + pfGUIControlHandlers.cpp + pfGUIControlMod.cpp + pfGUICtrlGenerator.cpp + pfGUIDialogMod.cpp + pfGUIDialogNotifyProc.cpp + pfGUIDragBarCtrl.cpp + pfGUIDynDisplayCtrl.cpp + pfGUIEditBoxMod.cpp + pfGUIKnobCtrl.cpp + pfGUIListBoxMod.cpp + pfGUIListElement.cpp + pfGUIMenuItem.cpp + pfGUIMultiLineEditCtrl.cpp + pfGUIPopUpMenu.cpp + pfGUIProgressCtrl.cpp + pfGUIRadioGroupCtrl.cpp + pfGUITagDefs.cpp + pfGUITextBoxMod.cpp + pfGUIUpDownPairMod.cpp + pfGUIValueCtrl.cpp +) + +set(pfGameGUIMgr_HEADERS + pfGameGUIMgr.h + pfGameGUIMgrCreatable.h + pfGUIButtonMod.h + pfGUICheckBoxCtrl.h + pfGUIClickMapCtrl.h + pfGUIControlHandlers.h + pfGUIControlMod.h + pfGUICtrlGenerator.h + pfGUIDialogHandlers.h + pfGUIDialogMod.h + pfGUIDialogNotifyProc.cpp + pfGUIDragBarCtrl.h + pfGUIDraggableMod.h + pfGUIDynDisplayCtrl.h + pfGUIEditBoxMod.h + pfGUIKnobCtrl.h + pfGUIListBoxMod.h + pfGUIListElement.h + pfGUIMenuItem.h + pfGUIMultiLineEditCtrl.h + pfGUIPopUpMenu.h + pfGUIProgressCtrl.h + pfGUIRadioGroupCtrl.h + pfGUITagDefs.h + pfGUITextBoxMod.h + pfGUIUpDownPairMod.h + pfGUIValueCtrl.h +) + +add_library(pfGameGUIMgr STATIC ${pfGameGUIMgr_SOURCES} ${pfGameGUIMgr_HEADERS}) + +source_group("Source Files" FILES ${pfGameGUIMgr_SOURCES}) +source_group("Header Files" FILES ${pfGameGUIMgr_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIButtonMod.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIButtonMod.cpp index ecea7913..f780f2ee 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIButtonMod.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIButtonMod.cpp @@ -52,11 +52,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUIControlHandlers.h" #include "pfGUIDialogMod.h" -#include "../plInputCore/plInputInterface.h" -#include "../pnMessage/plRefMsg.h" -#include "../pfMessage/pfGameGUIMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plAvatar/plAGModifier.h" +#include "plInputCore/plInputInterface.h" +#include "pnMessage/plRefMsg.h" +#include "pfMessage/pfGameGUIMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plAvatar/plAGModifier.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUICheckBoxCtrl.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUICheckBoxCtrl.cpp index ca743081..f3dea959 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUICheckBoxCtrl.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUICheckBoxCtrl.cpp @@ -52,11 +52,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUICheckBoxCtrl.h" #include "pfGameGUIMgr.h" -#include "../plInputCore/plInputInterface.h" - #include "../pnMessage/plRefMsg.h" -#include "../pfMessage/pfGameGUIMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plAvatar/plAGModifier.h" +#include "plInputCore/plInputInterface.h" +#include "pnMessage/plRefMsg.h" +#include "pfMessage/pfGameGUIMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plAvatar/plAGModifier.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIClickMapCtrl.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIClickMapCtrl.cpp index f3bbf7f0..38ec8f65 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIClickMapCtrl.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIClickMapCtrl.cpp @@ -50,9 +50,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGameGUIMgr.h" #include "pfGUIDialogMod.h" -#include "../plInputCore/plInputInterface.h" -#include "../pnMessage/plRefMsg.h" -#include "../pfMessage/pfGameGUIMsg.h" +#include "plInputCore/plInputInterface.h" +#include "pnMessage/plRefMsg.h" +#include "pfMessage/pfGameGUIMsg.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlHandlers.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlHandlers.cpp index ecfa648b..23be469f 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlHandlers.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlHandlers.cpp @@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUIControlMod.h" #include "pfGUIDialogMod.h" -#include "../plMessage/plConsoleMsg.h" +#include "plMessage/plConsoleMsg.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlMod.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlMod.cpp index 2c4b61e3..a4773ae0 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlMod.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlMod.cpp @@ -53,23 +53,23 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUIDialogHandlers.h" #include "pfGUIListElement.h" // Includes dropTargetProc -#include "../pnMessage/plRefMsg.h" -#include "../pnMessage/plEnableMsg.h" -#include "../pfMessage/pfGameGUIMsg.h" -#include "../plMessage/plDeviceRecreateMsg.h" -#include "../pnSceneObject/plDrawInterface.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnSceneObject/plAudioInterface.h" - -#include "../plGImage/plDynamicTextMap.h" -#include "../plSurface/plLayer.h" -#include "../plMessage/plRenderMsg.h" -#include "../pnMessage/plSoundMsg.h" +#include "pnMessage/plRefMsg.h" +#include "pnMessage/plEnableMsg.h" +#include "pfMessage/pfGameGUIMsg.h" +#include "plMessage/plDeviceRecreateMsg.h" +#include "pnSceneObject/plDrawInterface.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plAudioInterface.h" + +#include "plGImage/plDynamicTextMap.h" +#include "plSurface/plLayer.h" +#include "plMessage/plRenderMsg.h" +#include "pnMessage/plSoundMsg.h" #include "plPipeline.h" -#include "../plDrawable/plAccessGeometry.h" -#include "../plDrawable/plAccessSpan.h" -#include "../plDrawable/plAccessVtxSpan.h" +#include "plDrawable/plAccessGeometry.h" +#include "plDrawable/plAccessSpan.h" +#include "plDrawable/plAccessVtxSpan.h" #include "pfGUIPopUpMenu.h" // For skin, can we move that please? Thank you diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlMod.h b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlMod.h index b31ab33e..93b637a9 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlMod.h +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlMod.h @@ -49,9 +49,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define _pfGUIControlMod_h -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" #include "hsBounds.h" -#include "../plMessage/plInputEventMsg.h" +#include "plMessage/plInputEventMsg.h" #include "pfGameGUIMgr.h" #include "hsColorRGBA.h" #include "hsRefCnt.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUICtrlGenerator.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUICtrlGenerator.cpp index fb988d9c..ea86b62c 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUICtrlGenerator.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUICtrlGenerator.cpp @@ -55,24 +55,24 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUIControlHandlers.h" #include "pfGUIMenuItem.h" -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plLayer.h" -#include "../plGImage/plMipmap.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../plDrawable/plDrawableSpans.h" -#include "../plDrawable/plDrawableGenerator.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plDrawInterface.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnMessage/plIntRefMsg.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../pnMessage/plNodeRefMsg.h" -#include "../plPipeline/plTextGenerator.h" -#include "../plScene/plPostEffectMod.h" -#include "../plScene/plSceneNode.h" -#include "../pnMessage/plClientMsg.h" -#include "../plMessage/plLayRefMsg.h" -#include "../pnMessage/plAttachMsg.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plLayer.h" +#include "plGImage/plMipmap.h" +#include "pnKeyedObject/plFixedKey.h" +#include "plDrawable/plDrawableSpans.h" +#include "plDrawable/plDrawableGenerator.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plDrawInterface.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnMessage/plIntRefMsg.h" +#include "pnMessage/plObjRefMsg.h" +#include "pnMessage/plNodeRefMsg.h" +#include "plPipeline/plTextGenerator.h" +#include "plScene/plPostEffectMod.h" +#include "plScene/plSceneNode.h" +#include "pnMessage/plClientMsg.h" +#include "plMessage/plLayRefMsg.h" +#include "pnMessage/plAttachMsg.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogMod.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogMod.cpp index ec7286f6..01848c2d 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogMod.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogMod.cpp @@ -52,18 +52,18 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUIDialogHandlers.h" #include "pfGUIDialogNotifyProc.h" #include "pfGUIListElement.h" -#include "../plScene/plPostEffectMod.h" +#include "plScene/plPostEffectMod.h" -#include "../pnMessage/plRefMsg.h" -#include "../pfMessage/pfGameGUIMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plScene/plSceneNode.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnSceneObject/plCoordinateInterface.h" +#include "pnMessage/plRefMsg.h" +#include "pfMessage/pfGameGUIMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plScene/plSceneNode.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnSceneObject/plCoordinateInterface.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" #include "plgDispatch.h" #include "hsResMgr.h" @@ -402,7 +402,7 @@ void pfGUIDialogMod::UpdateInterestingThings( hsScalar mouseX, hsScalar mouseY, //// HandleMouseEvent //////////////////////////////////////////////////////// #ifdef HS_DEBUGGING // Debugging bounds rects -#include "../plPipeline/plDebugText.h" +#include "plPipeline/plDebugText.h" #endif hsBool pfGUIDialogMod::HandleMouseEvent( pfGameGUIMgr::EventType event, hsScalar mouseX, hsScalar mouseY, diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogMod.h b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogMod.h index 4f00e2f7..1b4049db 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogMod.h +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogMod.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define _pfGUIDialogMod_h -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" #include "pfGameGUIMgr.h" #include "hsMatrix44.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogNotifyProc.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogNotifyProc.cpp index 544ad293..a5453ea7 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogNotifyProc.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogNotifyProc.cpp @@ -61,7 +61,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUIListBoxMod.h" #include "pfGUIEditBoxMod.h" -#include "../pfMessage/pfGUINotifyMsg.h" +#include "pfMessage/pfGUINotifyMsg.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogNotifyProc.h b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogNotifyProc.h index f04e2fcd..8bbaeee6 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogNotifyProc.h +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogNotifyProc.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define _pfGUIDialogNotifyProc_h #include "pfGUIDialogHandlers.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" class plGUIControlMod; diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDragBarCtrl.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDragBarCtrl.cpp index ca70c714..146caa35 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDragBarCtrl.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDragBarCtrl.cpp @@ -54,11 +54,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGameGUIMgr.h" #include "pfGUIDialogMod.h" -#include "../plInputCore/plInputInterface.h" -#include "../pnMessage/plRefMsg.h" -#include "../pfMessage/pfGameGUIMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plAvatar/plAGModifier.h" +#include "plInputCore/plInputInterface.h" +#include "pnMessage/plRefMsg.h" +#include "pfMessage/pfGameGUIMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plAvatar/plAGModifier.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDraggableMod.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDraggableMod.cpp index 9f2aecae..7a8e59a4 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDraggableMod.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDraggableMod.cpp @@ -49,11 +49,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUIDraggableMod.h" #include "pfGameGUIMgr.h" -#include "../pnMessage/plRefMsg.h" -#include "../pfMessage/pfGameGUIMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plAvatar/plAGModifier.h" -#include "../plInputCore/plInputInterface.h" +#include "pnMessage/plRefMsg.h" +#include "pfMessage/pfGameGUIMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plAvatar/plAGModifier.h" +#include "plInputCore/plInputInterface.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDynDisplayCtrl.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDynDisplayCtrl.cpp index eeb66986..833052bc 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDynDisplayCtrl.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDynDisplayCtrl.cpp @@ -49,11 +49,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUIDynDisplayCtrl.h" #include "pfGameGUIMgr.h" -#include "../pnMessage/plRefMsg.h" -#include "../plGImage/plDynamicTextMap.h" -#include "../plSurface/plLayerInterface.h" -#include "../plSurface/hsGMaterial.h" -#include "../plPipeline/plTextGenerator.h" +#include "pnMessage/plRefMsg.h" +#include "plGImage/plDynamicTextMap.h" +#include "plSurface/plLayerInterface.h" +#include "plSurface/hsGMaterial.h" +#include "plPipeline/plTextGenerator.h" #include "plPipeline.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIEditBoxMod.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIEditBoxMod.cpp index ba5412fa..e524a08a 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIEditBoxMod.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIEditBoxMod.cpp @@ -53,15 +53,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUIEditBoxMod.h" #include "pfGameGUIMgr.h" -#include "../pnMessage/plRefMsg.h" -#include "../pfMessage/pfGameGUIMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plAvatar/plAGModifier.h" -#include "../plGImage/plDynamicTextMap.h" +#include "pnMessage/plRefMsg.h" +#include "pfMessage/pfGameGUIMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plAvatar/plAGModifier.h" +#include "plGImage/plDynamicTextMap.h" #include "plgDispatch.h" #include "hsResMgr.h" -#include "../pnInputCore/plKeyMap.h" -#include "../plClipboard/plClipboard.h" +#include "pnInputCore/plKeyMap.h" +#include "plClipboard/plClipboard.h" #include diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIEditBoxMod.h b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIEditBoxMod.h index 7216968e..9e0aeb4c 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIEditBoxMod.h +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIEditBoxMod.h @@ -50,9 +50,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStlUtils.h" #include "pfGUIControlMod.h" -#include "../pnInputCore/plKeyDef.h" +#include "pnInputCore/plKeyDef.h" -#include "../plInputCore/plInputDevice.h" +#include "plInputCore/plInputDevice.h" class plMessage; class hsGMaterial; diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIKnobCtrl.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIKnobCtrl.cpp index 16ec5bb9..4263c213 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIKnobCtrl.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIKnobCtrl.cpp @@ -50,17 +50,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGameGUIMgr.h" #include "pfGUIDialogMod.h" -#include "../plInputCore/plInputInterface.h" -#include "../pnMessage/plRefMsg.h" -#include "../pfMessage/pfGameGUIMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -// #include "../plAvatar/plAGModifier.h" -#include "../plAvatar/plAGMasterMod.h" -#include "../plAvatar/plAGAnimInstance.h" -#include "../plSurface/plLayerAnimation.h" - -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" +#include "plInputCore/plInputInterface.h" +#include "pnMessage/plRefMsg.h" +#include "pfMessage/pfGameGUIMsg.h" +#include "plMessage/plAnimCmdMsg.h" +// #include "plAvatar/plAGModifier.h" +#include "plAvatar/plAGMasterMod.h" +#include "plAvatar/plAGAnimInstance.h" +#include "plSurface/plLayerAnimation.h" + +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIListBoxMod.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIListBoxMod.cpp index 34359191..8c640fb9 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIListBoxMod.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIListBoxMod.cpp @@ -53,12 +53,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUIControlHandlers.h" #include "pfGUIDialogMod.h" -#include "../pnMessage/plRefMsg.h" -#include "../pfMessage/pfGameGUIMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plAvatar/plAGModifier.h" -#include "../plGImage/plDynamicTextMap.h" -#include "../plInputCore/plInputInterface.h" +#include "pnMessage/plRefMsg.h" +#include "pfMessage/pfGameGUIMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plAvatar/plAGModifier.h" +#include "plGImage/plDynamicTextMap.h" +#include "plInputCore/plInputInterface.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIListElement.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIListElement.cpp index 031fab5c..f9f5a2f3 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIListElement.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIListElement.cpp @@ -51,9 +51,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUIPopUpMenu.h" // For skins -#include "../plGImage/plDynamicTextMap.h" -#include "../plGImage/hsCodecManager.h" -#include "../plPipeline/plDebugText.h" // To quickly and hackily get the screen size in pixels +#include "plGImage/plDynamicTextMap.h" +#include "plGImage/hsCodecManager.h" +#include "plPipeline/plDebugText.h" // To quickly and hackily get the screen size in pixels #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMenuItem.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMenuItem.cpp index c428294c..38d859fa 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMenuItem.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMenuItem.cpp @@ -54,9 +54,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUIDialogMod.h" #include "pfGUIPopUpMenu.h" -#include "../plInputCore/plInputInterface.h" -#include "../pnMessage/plRefMsg.h" -#include "../plGImage/plDynamicTextMap.h" +#include "plInputCore/plInputInterface.h" +#include "pnMessage/plRefMsg.h" +#include "plGImage/plDynamicTextMap.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMultiLineEditCtrl.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMultiLineEditCtrl.cpp index 40e3fb56..933e8f05 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMultiLineEditCtrl.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMultiLineEditCtrl.cpp @@ -53,11 +53,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUIDialogMod.h" #include "pfGUIDialogHandlers.h" -#include "../pnMessage/plRefMsg.h" -#include "../pfMessage/pfGameGUIMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plAvatar/plAGModifier.h" -#include "../plGImage/plDynamicTextMap.h" +#include "pnMessage/plRefMsg.h" +#include "pfMessage/pfGameGUIMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plAvatar/plAGModifier.h" +#include "plGImage/plDynamicTextMap.h" #include "plgDispatch.h" #include "hsResMgr.h" #include "../plClipboard/plClipboard.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMultiLineEditCtrl.h b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMultiLineEditCtrl.h index 3a4c621c..7fb9fcba 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMultiLineEditCtrl.h +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMultiLineEditCtrl.h @@ -51,7 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUIControlMod.h" #include "hsTemplates.h" -#include "../plInputCore/plInputDevice.h" +#include "plInputCore/plInputDevice.h" class plMessage; class hsGMaterial; diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIPopUpMenu.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIPopUpMenu.cpp index 70fd5418..87fb23fe 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIPopUpMenu.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIPopUpMenu.cpp @@ -62,24 +62,24 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plgDispatch.h" #include "hsResMgr.h" -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plLayer.h" -#include "../plGImage/plDynamicTextMap.h" -#include "../plMessage/plLayRefMsg.h" - -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plDrawInterface.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnMessage/plIntRefMsg.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../pnMessage/plNodeRefMsg.h" - -#include "../plScene/plPostEffectMod.h" -#include "../plScene/plSceneNode.h" -#include "../pnMessage/plClientMsg.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plLayer.h" +#include "plGImage/plDynamicTextMap.h" +#include "plMessage/plLayRefMsg.h" + +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plDrawInterface.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnMessage/plIntRefMsg.h" +#include "pnMessage/plObjRefMsg.h" +#include "pnMessage/plNodeRefMsg.h" + +#include "plScene/plPostEffectMod.h" +#include "plScene/plSceneNode.h" +#include "pnMessage/plClientMsg.h" #include "plViewTransform.h" -#include "../plPipeline/plDebugText.h" +#include "plPipeline/plDebugText.h" class pfPopUpKeyGenerator @@ -731,7 +731,7 @@ hsGMaterial *pfGUIPopUpMenu::ICreateDynMaterial( void ) //// Build /////////////////////////////////////////////////////////////////// // Constructs a shiny new pop-up menu at runtime, complete with trimmings -#include "../plJPEG/plJPEG.h" +#include "plJPEG/plJPEG.h" pfGUIPopUpMenu *pfGUIPopUpMenu::Build( const char *name, pfGUIDialogMod *parent, hsScalar x, hsScalar y, const plLocation &destLoc ) { diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIProgressCtrl.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIProgressCtrl.cpp index 3514509d..a42ee3ca 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIProgressCtrl.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIProgressCtrl.cpp @@ -50,19 +50,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGameGUIMgr.h" #include "pfGUIDialogMod.h" -#include "../plInputCore/plInputInterface.h" -#include "../pnMessage/plRefMsg.h" -#include "../pfMessage/pfGameGUIMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plMessage/plTimerCallbackMsg.h" -// #include "../plAvatar/plAGModifier.h" -#include "../plAvatar/plAGMasterMod.h" -#include "../plAvatar/plAGAnimInstance.h" -#include "../plSurface/plLayerAnimation.h" - -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnTimer/plTimerCallbackManager.h" +#include "plInputCore/plInputInterface.h" +#include "pnMessage/plRefMsg.h" +#include "pfMessage/pfGameGUIMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plMessage/plTimerCallbackMsg.h" +// #include "plAvatar/plAGModifier.h" +#include "plAvatar/plAGMasterMod.h" +#include "plAvatar/plAGAnimInstance.h" +#include "plSurface/plLayerAnimation.h" + +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnTimer/plTimerCallbackManager.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIRadioGroupCtrl.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIRadioGroupCtrl.cpp index 5f4bdfca..b4a8376f 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIRadioGroupCtrl.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIRadioGroupCtrl.cpp @@ -51,8 +51,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUICheckBoxCtrl.h" #include "pfGUIControlHandlers.h" -#include "../pnMessage/plRefMsg.h" -#include "../pfMessage/pfGameGUIMsg.h" +#include "pnMessage/plRefMsg.h" +#include "pfMessage/pfGameGUIMsg.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUITextBoxMod.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUITextBoxMod.cpp index 972030e3..2f75a1c2 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUITextBoxMod.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUITextBoxMod.cpp @@ -50,16 +50,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUITextBoxMod.h" #include "pfGameGUIMgr.h" -#include "../pnMessage/plRefMsg.h" -#include "../pfMessage/pfGameGUIMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plAvatar/plAGModifier.h" -#include "../plGImage/plDynamicTextMap.h" +#include "pnMessage/plRefMsg.h" +#include "pfMessage/pfGameGUIMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plAvatar/plAGModifier.h" +#include "plGImage/plDynamicTextMap.h" #include "plgDispatch.h" #include "hsResMgr.h" -#include "../plResMgr/plLocalization.h" +#include "plResMgr/plLocalization.h" -#include "../pfLocalizationMgr/pfLocalizationMgr.h" +#include "pfLocalizationMgr/pfLocalizationMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIUpDownPairMod.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIUpDownPairMod.cpp index 98dcc5e1..3ac1b91b 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIUpDownPairMod.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIUpDownPairMod.cpp @@ -51,10 +51,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUIButtonMod.h" #include "pfGUIControlHandlers.h" -#include "../pnMessage/plRefMsg.h" -#include "../pfMessage/pfGameGUIMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plAvatar/plAGModifier.h" +#include "pnMessage/plRefMsg.h" +#include "pfMessage/pfGameGUIMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plAvatar/plAGModifier.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgr.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgr.cpp index a329c311..b46b1a75 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgr.cpp +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgr.cpp @@ -59,21 +59,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pfGUIControlMod.h" #include "pfGUIPopUpMenu.h" -#include "../pfMessage/pfGameGUIMsg.h" -#include "../plMessage/plInputEventMsg.h" -#include "../plMessage/plInputIfaceMgrMsg.h" -#include "../pnMessage/plClientMsg.h" -#include "../pnNetCommon/plSynchedObject.h" -#include "../plInputCore/plInputInterface.h" -#include "../plInputCore/plInputDevice.h" -#include "../plInputCore/plInputInterfaceMgr.h" -#include "../pnInputCore/plKeyMap.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnSceneObject/plSceneObject.h" // So we can get the target sceneNode of a dialog -#include "../plMessage/plConsoleMsg.h" +#include "pfMessage/pfGameGUIMsg.h" +#include "plMessage/plInputEventMsg.h" +#include "plMessage/plInputIfaceMgrMsg.h" +#include "pnMessage/plClientMsg.h" +#include "pnNetCommon/plSynchedObject.h" +#include "plInputCore/plInputInterface.h" +#include "plInputCore/plInputDevice.h" +#include "plInputCore/plInputInterfaceMgr.h" +#include "pnInputCore/plKeyMap.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnSceneObject/plSceneObject.h" // So we can get the target sceneNode of a dialog +#include "plMessage/plConsoleMsg.h" #include "plgDispatch.h" -#include "../plResMgr/plKeyFinder.h" +#include "plResMgr/plKeyFinder.h" #include "pfGUITagDefs.h" diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgr.h b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgr.h index ac371bbc..9c362844 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgr.h +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgr.h @@ -56,8 +56,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsTemplates.h" -#include "../pnInputCore/plKeyDef.h" -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnInputCore/plKeyDef.h" +#include "pnKeyedObject/hsKeyedObject.h" #include class plPipeline; diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgrCreatable.h b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgrCreatable.h index bdb42a61..eb6b0ac4 100644 --- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgrCreatable.h +++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgrCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _pfGameGUIMgrCreatable_inc #define _pfGameGUIMgrCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "pfGameGUIMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameMgr/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfGameMgr/CMakeLists.txt new file mode 100644 index 00000000..fcd34cfe --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfGameMgr/CMakeLists.txt @@ -0,0 +1,35 @@ +include_directories(../../CoreLib) +include_directories(../../FeatureLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) +include_directories(../../PubUtilLib) + +include_directories(${OPENSSL_INCLUDE_DIR}) + +set(pfGameMgr_SOURCES + pfGameMgr.cpp + BlueSpiral/pfGmBlueSpiral.cpp + ClimbingWall/pfGmClimbingWall.cpp + Heek/pfGmHeek.cpp + Marker/pfGmMarker.cpp + TicTacToe/pfGmTicTacToe.cpp + VarSync/pfGmVarSync.cpp +) + +set(pfGameMgr_HEADERS + Intern.h + Pch.h + pfGameMgr.h + pfGameMgrCreatables.h + BlueSpiral/pfGmBlueSpiral.h + ClimbingWall/pfGmClimbingWall.h + Heek/pfGmHeek.h + Marker/pfGmMarker.h + TicTacToe/pfGmTicTacToe.h + VarSync/pfGmVarSync.cpp +) + +add_library(pfGameMgr ${pfGameMgr_SOURCES} ${pfGameMgr_HEADERS}) + +source_group("Source Files" FILES ${pfGameMgr_SOURCES}) +source_group("Header Files" FILES ${pfGameMgr_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfGameMgr/Pch.h b/Sources/Plasma/FeatureLib/pfGameMgr/Pch.h index e0792540..d866121d 100644 --- a/Sources/Plasma/FeatureLib/pfGameMgr/Pch.h +++ b/Sources/Plasma/FeatureLib/pfGameMgr/Pch.h @@ -51,20 +51,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define PLASMA20_SOURCES_PLASMA_FEATURELIB_PFGAMEMGR_PCH_H -#include "../pnUtils/pnUtils.h" -#include "../pnNetBase/pnNetBase.h" -#include "../pnAsyncCore/pnAsyncCore.h" -#include "../pnNetCli/pnNetCli.h" -#include "../pnProduct/pnProduct.h" -#include "../pnGameMgr/pnGameMgr.h" -#include "../plNetGameLib/plNetGameLib.h" +#include "pnUtils/pnUtils.h" +#include "pnNetBase/pnNetBase.h" +#include "pnAsyncCore/pnAsyncCore.h" +#include "pnNetCli/pnNetCli.h" +#include "pnProduct/pnProduct.h" +#include "pnGameMgr/pnGameMgr.h" +#include "plNetGameLib/plNetGameLib.h" #pragma warning(push, 0) // These includes produce lots of warnings on W4 -#include "../pnMessage/plMessage.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../pfConsole/pfConsole.h" +#include "pnMessage/plMessage.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "plNetClient/plNetClientMgr.h" +#include "pfConsole/pfConsole.h" #pragma warning(pop) #include "pfGameMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfGameMgr/pfGameMgr.h b/Sources/Plasma/FeatureLib/pfGameMgr/pfGameMgr.h index 7539da9c..549ecaa0 100644 --- a/Sources/Plasma/FeatureLib/pfGameMgr/pfGameMgr.h +++ b/Sources/Plasma/FeatureLib/pfGameMgr/pfGameMgr.h @@ -49,17 +49,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define PLASMA20_SOURCES_PLASMA_FEATURELIB_PFGAMEMGR_PFGAMEMGR_H -#include "../pnUtils/pnUtils.h" -#include "../pnNetBase/pnNetBase.h" -#include "../pnAsyncCore/pnAsyncCore.h" -#include "../pnNetCli/pnNetCli.h" -#include "../pnProduct/pnProduct.h" -#include "../plNetGameLib/plNetGameLib.h" +#include "pnUtils/pnUtils.h" +#include "pnNetBase/pnNetBase.h" +#include "pnAsyncCore/pnAsyncCore.h" +#include "pnNetCli/pnNetCli.h" +#include "pnProduct/pnProduct.h" +#include "plNetGameLib/plNetGameLib.h" #pragma warning(push, 0) // These includes produce lots of warnings on W4 -#include "../pnMessage/plMessage.h" -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnMessage/plMessage.h" +#include "pnKeyedObject/hsKeyedObject.h" #pragma warning(pop) diff --git a/Sources/Plasma/FeatureLib/pfGameScoreMgr/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfGameScoreMgr/CMakeLists.txt new file mode 100644 index 00000000..3702746b --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfGameScoreMgr/CMakeLists.txt @@ -0,0 +1,17 @@ +include_directories(../../CoreLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) +include_directories(../../PubUtilLib) + +set(pfGameScoreMgr_SOURCES + pfGameScoreMgr.cpp +) + +set(pfGameScoreMgr_HEADERS + pfGameScoreMgr.h +) + +add_library(pfGameScoreMgr STATIC ${pfGameScoreMgr_SOURCES} ${pfGameScoreMgr_HEADERS}) + +source_group("Source Files" FILES ${pfGameScoreMgr_SOURCES}) +source_group("Header Files" FILES ${pfGameScoreMgr_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfGameScoreMgr/pfGameScoreMgr.cpp b/Sources/Plasma/FeatureLib/pfGameScoreMgr/pfGameScoreMgr.cpp index 9a6b9f21..f715a89d 100644 --- a/Sources/Plasma/FeatureLib/pfGameScoreMgr/pfGameScoreMgr.cpp +++ b/Sources/Plasma/FeatureLib/pfGameScoreMgr/pfGameScoreMgr.cpp @@ -41,9 +41,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pfGameScoreMgr.h" -#include "../pnUtils/pnUtils.h" -#include "../plNetGameLib/plNetGameLib.h" -#include "../pnNetProtocol/pnNetProtocol.h" +#include "pnUtils/pnUtils.h" +#include "plNetGameLib/plNetGameLib.h" +#include "pnNetProtocol/pnNetProtocol.h" //============================================================================ pfGameScore::pfGameScore() diff --git a/Sources/Plasma/FeatureLib/pfGameScoreMgr/pfGameScoreMgr.h b/Sources/Plasma/FeatureLib/pfGameScoreMgr/pfGameScoreMgr.h index b1216988..b3c8711b 100644 --- a/Sources/Plasma/FeatureLib/pfGameScoreMgr/pfGameScoreMgr.h +++ b/Sources/Plasma/FeatureLib/pfGameScoreMgr/pfGameScoreMgr.h @@ -49,8 +49,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define PLASMA20_SOURCES_PLASMA_FEATURELIB_PFGAMESCOREMGR_PFGAMESCOREMGR_H #include "hsTypes.h" -#include "../pnNetBase/pnNetBase.h" -#include "../pnUtils/pnUtils.h" +#include "pnNetBase/pnNetBase.h" +#include "pnUtils/pnUtils.h" struct NetGameRank; diff --git a/Sources/Plasma/FeatureLib/pfJournalBook/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfJournalBook/CMakeLists.txt new file mode 100644 index 00000000..7397a43c --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfJournalBook/CMakeLists.txt @@ -0,0 +1,21 @@ +include_directories(../../CoreLib) +include_directories(../../FeatureLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) +include_directories(../../PubUtilLib) + +include_directories(${OPENSSL_INCLUDE_DIR}) + +set(pfJournalBook_SOURCES + pfJournalBook.cpp +) + +set(pfJournalBook_HEADERS + pfJournalBook.h + pfJournalBookCreatable.h +) + +add_library(pfJournalBook STATIC ${pfJournalBook_SOURCES} ${pfJournalBook_HEADERS}) + +source_group("Source Files" FILES ${pfJournalBook_SOURCES}) +source_group("Header Files" FILES ${pfJournalBook_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp b/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp index 4b29c28c..7623466d 100644 --- a/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp +++ b/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp @@ -54,48 +54,48 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "pcSmallRect.h" #include "plgDispatch.h" -#include "../pfGameGUIMgr/pfGUIDialogMod.h" -#include "../pfGameGUIMgr/pfGUIControlMod.h" -#include "../pfGameGUIMgr/pfGUICheckBoxCtrl.h" -#include "../pfGameGUIMgr/pfGUIDialogHandlers.h" -#include "../pfGameGUIMgr/pfGUIDynDisplayCtrl.h" -#include "../pfGameGUIMgr/pfGUIClickMapCtrl.h" -#include "../pfGameGUIMgr/pfGUIButtonMod.h" -#include "../pfGameGUIMgr/pfGUIProgressCtrl.h" -#include "../pfGameGUIMgr/pfGUIMultiLineEditCtrl.h" - -#include "../pfMessage/pfGUINotifyMsg.h" -#include "../plGImage/plMipmap.h" -#include "../plGImage/plDynamicTextMap.h" -#include "../plPipeline/hsGDeviceRef.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnMessage/plRefMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../plMessage/plLayRefMsg.h" -#include "../plMessage/plMatRefMsg.h" -#include "../plSurface/plLayerInterface.h" -#include "../plSurface/plLayer.h" -#include "../plSurface/hsGMaterial.h" -#include "../plAgeLoader/plAgeLoader.h" +#include "pfGameGUIMgr/pfGUIDialogMod.h" +#include "pfGameGUIMgr/pfGUIControlMod.h" +#include "pfGameGUIMgr/pfGUICheckBoxCtrl.h" +#include "pfGameGUIMgr/pfGUIDialogHandlers.h" +#include "pfGameGUIMgr/pfGUIDynDisplayCtrl.h" +#include "pfGameGUIMgr/pfGUIClickMapCtrl.h" +#include "pfGameGUIMgr/pfGUIButtonMod.h" +#include "pfGameGUIMgr/pfGUIProgressCtrl.h" +#include "pfGameGUIMgr/pfGUIMultiLineEditCtrl.h" + +#include "pfMessage/pfGUINotifyMsg.h" +#include "plGImage/plMipmap.h" +#include "plGImage/plDynamicTextMap.h" +#include "plPipeline/hsGDeviceRef.h" +#include "plMessage/plAnimCmdMsg.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnMessage/plRefMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "plMessage/plLayRefMsg.h" +#include "plMessage/plMatRefMsg.h" +#include "plSurface/plLayerInterface.h" +#include "plSurface/plLayer.h" +#include "plSurface/hsGMaterial.h" +#include "plAgeLoader/plAgeLoader.h" #ifdef USE_BINK_SDK -#include "../pfSurface/plLayerBink.h" +#include "pfSurface/plLayerBink.h" #endif // So we can do image searches in our local age -#include "../plNetClient/plNetClientMgr.h" -#include "../plResMgr/plKeyFinder.h" +#include "plNetClient/plNetClientMgr.h" +#include "plResMgr/plKeyFinder.h" // For notify sends -#include "../pnMessage/plNotifyMsg.h" -#include "../pnTimer/plTimerCallbackManager.h" -#include "../plMessage/plTimerCallbackMsg.h" +#include "pnMessage/plNotifyMsg.h" +#include "pnTimer/plTimerCallbackManager.h" +#include "plMessage/plTimerCallbackMsg.h" // For custom cursors -#include "../plInputCore/plInputInterface.h" +#include "plInputCore/plInputInterface.h" // For measuring text -#include "../plGImage/plFont.h" +#include "plGImage/plFont.h" // For SFX #include "hsTimer.h" @@ -2507,7 +2507,7 @@ void pfJournalBook::IFreeSource( void ) // image name. #ifndef PLASMA_EXTERNAL_RELEASE -#include "../plJPEG/plJPEG.h" +#include "plJPEG/plJPEG.h" #endif plKey pfJournalBook::IGetMipmapKey( const wchar_t *name, const plLocation &loc ) diff --git a/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.h b/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.h index 096d5a58..9e76ce53 100644 --- a/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.h +++ b/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.h @@ -169,8 +169,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTemplates.h" #include "hsColorRGBA.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/plUoid.h" diff --git a/Sources/Plasma/FeatureLib/pfLocalizationMgr/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfLocalizationMgr/CMakeLists.txt new file mode 100644 index 00000000..c2915b80 --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfLocalizationMgr/CMakeLists.txt @@ -0,0 +1,25 @@ +include_directories(../../CoreLib) +include_directories(../../PubUtilLib) + +include_directories(${EXPAT_INCLUDE_DIR}) + +add_definitions(-DXML_UNICODE_WCHAR_T) +add_definitions(-DXML_STATIC) +add_definitions(-DWIN32) + +set(pfLocalizationMgr_SOURCES + pfLocalizationDataMgr.cpp + pfLocalizationMgr.cpp + pfLocalizedString.cpp +) + +set(pfLocalizationMgr_HEADERS + pfLocalizationDataMgr.h + pfLocalizationMgr.h + pfLocalizedString.h +) + +add_library(pfLocalizationMgr STATIC ${pfLocalizationMgr_SOURCES} ${pfLocalizationMgr_HEADERS}) + +source_group("Source Files" FILES ${pfLocalizationMgr_SOURCES}) +source_group("Header Files" FILES ${pfLocalizationMgr_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizationDataMgr.cpp b/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizationDataMgr.cpp index 5507db20..5065d07a 100644 --- a/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizationDataMgr.cpp +++ b/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizationDataMgr.cpp @@ -48,17 +48,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsUtils.h" -#include "../plResMgr/plLocalization.h" +#include "plResMgr/plLocalization.h" -#include "../plFile/hsFiles.h" -#include "../plFile/plEncryptedStream.h" -#include "../plStatusLog/plStatusLog.h" +#include "plFile/hsFiles.h" +#include "plFile/plEncryptedStream.h" +#include "plStatusLog/plStatusLog.h" #include "pfLocalizedString.h" #include "pfLocalizationMgr.h" #include "pfLocalizationDataMgr.h" -#include "expat.h" +#include #include @@ -66,11 +66,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #endif -// Add ..\..\..\..\..\StaticSDKs\XPlatform\expat-1.95.7\StaticLibs\Win32 to your -// lib include path if you include this file. -#pragma comment(lib, "libexpatwMT.lib") - - ////////////////////////////////////////////////////////////////////// // // LocalizationXMLFile - a basic class for storing all the diff --git a/Sources/Plasma/FeatureLib/pfLoginDialog/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfLoginDialog/CMakeLists.txt new file mode 100644 index 00000000..6c60c8c3 --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfLoginDialog/CMakeLists.txt @@ -0,0 +1,23 @@ +include_directories(../../CoreLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) +include_directories(../../PubUtilLib) + +set(pfLoginDialog_SOURCES + plLoginDialog.cpp +) + +set(pfLoginDialog_HEADERS + plLoginDialog.h + resource.h +) + +set(pfLoginDialog_RESOURCES + pfLoginDialog.rc +) + +add_library(pfLoginDialog STATIC ${pfLoginDialog_SOURCES} ${pfLoginDialog_HEADERS} ${pfLoginDialog_RESOURCES}) + +source_group("Source Files" FILES ${pfLoginDialog_SOURCES}) +source_group("Header Files" FILES ${pfLoginDialog_HEADERS}) +source_group("Resource Files" FILES ${pfLoginDialog_RESOURCES}) diff --git a/Sources/Plasma/FeatureLib/pfLoginDialog/plLoginDialog.cpp b/Sources/Plasma/FeatureLib/pfLoginDialog/plLoginDialog.cpp index 840b3014..3fa093c1 100644 --- a/Sources/Plasma/FeatureLib/pfLoginDialog/plLoginDialog.cpp +++ b/Sources/Plasma/FeatureLib/pfLoginDialog/plLoginDialog.cpp @@ -41,12 +41,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plLoginDialog.h" #include "resource.h" -#include "../plNetCommon/plNetCommonConstants.h" -#include "../plNetMessage/plNetMessage.h" -#include "../plHttpServer/plHttpResponse.h" -#include "../plSDL/plSDL.h" -#include "../plFile/hsFiles.h" -#include "../plNetMessage/plNetCommonMessage.h" +#include "plNetCommon/plNetCommonConstants.h" +#include "plNetMessage/plNetMessage.h" +// #include "plHttpServer/plHttpResponse.h" +#include "plSDL/plSDL.h" +#include "plFile/hsFiles.h" +#include "plNetMessage/plNetCommonMessage.h" // 'this' : used in base member initializer list #pragma warning(disable:4355) diff --git a/Sources/Plasma/FeatureLib/pfLoginDialog/plLoginDialog.h b/Sources/Plasma/FeatureLib/pfLoginDialog/plLoginDialog.h index 9244e440..5378e175 100644 --- a/Sources/Plasma/FeatureLib/pfLoginDialog/plLoginDialog.h +++ b/Sources/Plasma/FeatureLib/pfLoginDialog/plLoginDialog.h @@ -42,9 +42,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLoginDialog_h_inc #define plLoginDialog_h_inc -#include "../plWndCtrls/plWndCtrls.h" -#include "../plEncryption/plChallengeResponse.h" -#include "../pnNetCommon/plNetAddress.h" +#include "plWndCtrls/plWndCtrls.h" +// #include "plEncryption/plChallengeResponse.h" +#include "pnNetCommon/plNetAddress.h" class plMainDialog; class plNetMsgAuthenticateChallenge; diff --git a/Sources/Plasma/FeatureLib/pfMessage/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfMessage/CMakeLists.txt new file mode 100644 index 00000000..1c6a581b --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfMessage/CMakeLists.txt @@ -0,0 +1,28 @@ +include_directories(../../CoreLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) +include_directories(../../PubUtilLib) + +set(pfMessage_SOURCES + pfKIMsg.cpp + pfMarkerMsg.cpp + pfMovieEventMsg.cpp + plArmatureEffectMsg.cpp + plClothingMsg.cpp +) + +set(pfMessage_HEADERS + pfBackdoorMsg.h + pfGameGUIMsg.h + pfKIMsg.h + pfMarkerMsg.h + pfMessageCreatable.h + pfMovieEventMsg.h + plArmatureEffectMsg.h + plClothingMsg.h +) + +add_library(pfMessage STATIC ${pfMessage_SOURCES} ${pfMessage_HEADERS}) + +source_group("Source Files" FILES ${pfMessage_SOURCES}) +source_group("Header Files" FILES ${pfMessage_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfMessage/pfBackdoorMsg.h b/Sources/Plasma/FeatureLib/pfMessage/pfBackdoorMsg.h index c7a3690c..00036eef 100644 --- a/Sources/Plasma/FeatureLib/pfMessage/pfBackdoorMsg.h +++ b/Sources/Plasma/FeatureLib/pfMessage/pfBackdoorMsg.h @@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsStream.h" -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class pfBackdoorMsg : public plMessage { diff --git a/Sources/Plasma/FeatureLib/pfMessage/pfGUINotifyMsg.h b/Sources/Plasma/FeatureLib/pfMessage/pfGUINotifyMsg.h index 901207e2..59307d8f 100644 --- a/Sources/Plasma/FeatureLib/pfMessage/pfGUINotifyMsg.h +++ b/Sources/Plasma/FeatureLib/pfMessage/pfGUINotifyMsg.h @@ -42,9 +42,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _pfGUINotifyMsg_h_ #define _pfGUINotifyMsg_h_ -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsResMgr.h" -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" #include "hsUtils.h" diff --git a/Sources/Plasma/FeatureLib/pfMessage/pfGameGUIMsg.h b/Sources/Plasma/FeatureLib/pfMessage/pfGameGUIMsg.h index 06f92384..0a578441 100644 --- a/Sources/Plasma/FeatureLib/pfMessage/pfGameGUIMsg.h +++ b/Sources/Plasma/FeatureLib/pfMessage/pfGameGUIMsg.h @@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsStream.h" -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class pfGameGUIMsg : public plMessage { diff --git a/Sources/Plasma/FeatureLib/pfMessage/pfKIMsg.cpp b/Sources/Plasma/FeatureLib/pfMessage/pfKIMsg.cpp index 88603c4f..773e549c 100644 --- a/Sources/Plasma/FeatureLib/pfMessage/pfKIMsg.cpp +++ b/Sources/Plasma/FeatureLib/pfMessage/pfKIMsg.cpp @@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // ////////////////////////////////////////////////////////////////////////////// -#include "../pfMessage/pfKIMsg.h" +#include "pfKIMsg.h" const char* pfKIMsg::kChronicleKILevel = "PlayerKILevel"; diff --git a/Sources/Plasma/FeatureLib/pfMessage/pfKIMsg.h b/Sources/Plasma/FeatureLib/pfMessage/pfKIMsg.h index 6c5d104e..7252637e 100644 --- a/Sources/Plasma/FeatureLib/pfMessage/pfKIMsg.h +++ b/Sources/Plasma/FeatureLib/pfMessage/pfKIMsg.h @@ -51,7 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsStlUtils.h" #include "hsStream.h" -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" diff --git a/Sources/Plasma/FeatureLib/pfMessage/pfMarkerMsg.h b/Sources/Plasma/FeatureLib/pfMessage/pfMarkerMsg.h index f2ec742c..94dedc81 100644 --- a/Sources/Plasma/FeatureLib/pfMessage/pfMarkerMsg.h +++ b/Sources/Plasma/FeatureLib/pfMessage/pfMarkerMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pfMarkerMsg_h_inc #define pfMarkerMsg_h_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" struct hsPoint3; class pfMarkerMsg : public plMessage diff --git a/Sources/Plasma/FeatureLib/pfMessage/pfMessageCreatable.h b/Sources/Plasma/FeatureLib/pfMessage/pfMessageCreatable.h index f808c733..4f8aeb14 100644 --- a/Sources/Plasma/FeatureLib/pfMessage/pfMessageCreatable.h +++ b/Sources/Plasma/FeatureLib/pfMessage/pfMessageCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pfMessageCreatable_inc #define pfMessageCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #if 0 #include "plTriggerMsg.h" diff --git a/Sources/Plasma/FeatureLib/pfMessage/pfMovieEventMsg.h b/Sources/Plasma/FeatureLib/pfMessage/pfMovieEventMsg.h index c008befc..4c2dd185 100644 --- a/Sources/Plasma/FeatureLib/pfMessage/pfMovieEventMsg.h +++ b/Sources/Plasma/FeatureLib/pfMessage/pfMovieEventMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pfMovieEventMsg_h_inc #define pfMovieEventMsg_h_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class pfMovieEventMsg : public plMessage { diff --git a/Sources/Plasma/FeatureLib/pfMessage/plArmatureEffectMsg.cpp b/Sources/Plasma/FeatureLib/pfMessage/plArmatureEffectMsg.cpp index 6a66c9ce..3b251b7c 100644 --- a/Sources/Plasma/FeatureLib/pfMessage/plArmatureEffectMsg.cpp +++ b/Sources/Plasma/FeatureLib/pfMessage/plArmatureEffectMsg.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsStream.h" #include "plArmatureEffectMsg.h" -#include "../plAvatar/plArmatureEffects.h" +#include "plAvatar/plArmatureEffects.h" plArmatureEffectStateMsg::plArmatureEffectStateMsg() : fSurface(plArmatureEffectsMgr::kFootNoSurface), fAddSurface(false) {} diff --git a/Sources/Plasma/FeatureLib/pfMessage/plArmatureEffectMsg.h b/Sources/Plasma/FeatureLib/pfMessage/plArmatureEffectMsg.h index a0ae4c79..259f7a19 100644 --- a/Sources/Plasma/FeatureLib/pfMessage/plArmatureEffectMsg.h +++ b/Sources/Plasma/FeatureLib/pfMessage/plArmatureEffectMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plArmatureEffectMsg_inc #define plArmatureEffectMsg_inc -#include "../pnMessage/plEventCallbackMsg.h" +#include "pnMessage/plEventCallbackMsg.h" class plArmatureEffectMsg : public plEventCallbackMsg { diff --git a/Sources/Plasma/FeatureLib/pfMessage/plClothingMsg.h b/Sources/Plasma/FeatureLib/pfMessage/plClothingMsg.h index db79cd36..315068a2 100644 --- a/Sources/Plasma/FeatureLib/pfMessage/plClothingMsg.h +++ b/Sources/Plasma/FeatureLib/pfMessage/plClothingMsg.h @@ -42,9 +42,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plClothingMsg_inc #define plClothingMsg_inc -#include "../pnMessage/plRefMsg.h" +#include "pnMessage/plRefMsg.h" #include "hsStream.h" -#include "../CoreLib/hsColorRGBA.h" +#include "hsColorRGBA.h" class hsResMgr; diff --git a/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt new file mode 100644 index 00000000..02d1b6d9 --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt @@ -0,0 +1,357 @@ +include_directories(../../CoreLib) +include_directories(../../FeatureLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) +include_directories(../../PubUtilLib) +include_directories(../../) + +include_directories(${PYTHON_INCLUDE_DIR}) +include_directories(${OPENAL_INCLUDE_DIR}) +include_directories(${OPENSSL_INCLUDE_DIR}) + +if(WIN32) + add_definitions(-DWIN32) + add_definitions(-DMS_NO_COREDLL) +endif(WIN32) + +set(pfPython_SOURCES + cyAccountManagement.cpp + cyAnimation.cpp + cyAvatar.cpp + cyCamera.cpp + cyDraw.cpp + cyInputInterface.cpp + cyMisc.cpp + cyParticleSys.cpp + cyPhysics.cpp + cyPythonInterface.cpp + plPythonFileMod.cpp + plPythonPack.cpp + plPythonSDLModifier.cpp + pyAgeInfoStruct.cpp + pyAgeLinkStruct.cpp + pyAgeVault.cpp + pyAlarm.cpp + pyAudioControl.cpp + pyCCRMgr.cpp + pyCluster.cpp + pyColor.cpp + pyCritterBrain.cpp + pyDniCoordinates.cpp + pyDniInfoSource.cpp + pyDrawControl.cpp + pyDynamicText.cpp + pyEnum.cpp + pyGameScore.cpp + pyGeometry3.cpp + pyGrassShader.cpp + pyGUIControl.cpp + pyGUIControlButton.cpp + pyGUIControlCheckBox.cpp + pyGUIControlClickMap.cpp + pyGUIControlDragBar.cpp + pyGUIControlDraggable.cpp + pyGUIControlDynamicText.cpp + pyGUIControlEditBox.cpp + pyGUIControlListBox.cpp + pyGUIControlMultiLineEdit.cpp + pyGUIControlRadioGroup.cpp + pyGUIControlTextBox.cpp + pyGUIControlValue.cpp + pyGUIDialog.cpp + pyGUIPopUpMenu.cpp + pyGUISkin.cpp + pyImage.cpp + pyJournalBook.cpp + pyKey.cpp + pyKeyMap.cpp + pyMarkerMgr.cpp + pyMatrix44.cpp + pyMoviePlayer.cpp + pyNetLinkingMgr.cpp + pyNetServerSessionInfo.cpp + pyNotify.cpp + pyPlayer.cpp + pySceneObject.cpp + pyScoreMgr.cpp + pySDL.cpp + pySpawnPointInfo.cpp + pyStatusLog.cpp + pyStream.cpp + pySwimCurrentInterface.cpp + pyVault.cpp + pyVaultAgeInfoListNode.cpp + pyVaultAgeInfoNode.cpp + pyVaultAgeLinkNode.cpp + pyVaultChronicleNode.cpp + pyVaultFolderNode.cpp + pyVaultImageNode.cpp + pyVaultMarkerGameNode.cpp + pyVaultNode.cpp + pyVaultNodeRef.cpp + pyVaultPlayerInfoListNode.cpp + pyVaultPlayerInfoNode.cpp + pyVaultPlayerNode.cpp + pyVaultSDLNode.cpp + pyVaultSystemNode.cpp + pyVaultTextNoteNode.cpp + pyWaveSet.cpp +) + +set(pfPython_HEADERS + cyAccountManagement.h + cyAnimation.h + cyAvatar.h + cyCamera.h + cyDraw.h + cyInputInterface.h + cyMisc.h + cyParticleSys.h + cyPhysics.h + cyPythonInterface.h + pfPythonCreatable.h + plPythonFileMod.h + plPythonHelpers.h + plPythonPack.h + plPythonParameter.h + plPythonSDLModifier.h + pyAgeInfoStruct.h + pyAgeLinkStruct.h + pyAgeVault.h + pyAlarm.h + pyAudioControl.h + pyCCRMgr.h + pyCluster.h + pyColor.h + pyCritterBrain.h + pyDniCoordinates.h + pyDniInfoSource.h + pyDrawControl.h + pyDynamicText.h + pyEnum.h + pyGameScore.h + pyGeometry3.h + pyGrassShader.h + pyGUIControl.h + pyGUIControlButton.h + pyGUIControlCheckBox.h + pyGUIControlClickMap.h + pyGUIControlDragBar.h + pyGUIControlDraggable.h + pyGUIControlDynamicText.h + pyGUIControlEditBox.h + pyGUIControlListBox.h + pyGUIControlMultiLineEdit.h + pyGUIControlRadioGroup.h + pyGUIControlTextBox.h + pyGUIControlValue.h + pyGUIDialog.h + pyGUIPopUpMenu.h + pyGUISkin.h + pyImage.h + pyJournalBook.h + pyKey.h + pyKeyMap.h + pyMarkerMgr.h + pyMatrix44.h + pyMoviePlayer.h + pyNetLinkingMgr.h + pyNetServerSessionInfo.h + pyNotify.h + pyPlayer.h + pySceneObject.h + pyScoreMgr.h + pySDL.h + pySpawnPointInfo.h + pyStatusLog.h + pyStream.h + pySwimCurrentInterface.h + pyVault.h + pyVaultAgeInfoListNode.h + pyVaultAgeInfoNode.h + pyVaultAgeLinkNode.h + pyVaultChronicleNode.h + pyVaultFolderNode.h + pyVaultImageNode.h + pyVaultMarkerGameNode.h + pyVaultNode.h + pyVaultNodeRef.h + pyVaultPlayerInfoListNode.h + pyVaultPlayerInfoNode.h + pyVaultPlayerNode.h + pyVaultSDLNode.h + pyVaultSystemNode.h + pyVaultTextNoteNode.h + pyWaveSet.h +) + +set(pfPython_GLUE + cyAccountManagementGlue.cpp + cyAnimationGlue.cpp + cyAvatarGlue.cpp + cyCameraGlue.cpp + cyDrawGlue.cpp + cyInputInterfaceGlue.cpp + cyMiscGlue.cpp + cyMiscGlue2.cpp + cyMiscGlue3.cpp + cyMiscglue4.cpp + cyParticleSysGlue.cpp + cyPhysicsGlue.cpp + plPythonSDLModifierGlue.cpp + pyAgeInfoStructGlue.cpp + pyAgeLinkStructGlue.cpp + pyAgeVaultGlue.cpp + pyAudioControlGlue.cpp + pyCCRMgrGlue.cpp + pyCCRMgrGlue2.cpp + pyClusterGlue.cpp + pyColorGlue.cpp + pyCritterBrainGlue.cpp + pyDniCoordinatesGlue.cpp + pyDrawControlGlue.cpp + pyDynamicTextGlue.cpp + pyGameScoreGlue.cpp + pyGeometry3Glue.cpp + pyGlueHelpers.h + pyGrassShaderGlue.cpp + pyGUIControlButtonGlue.cpp + pyGUIControlCheckBoxGlue.cpp + pyGUIControlClickMapGlue.cpp + pyGUIControlDragBarGlue.cpp + pyGUIControlDraggableGlue.cpp + pyGUIControlDynamicTextGlue.cpp + pyGUIControlEditBoxGlue.cpp + pyGUIControlGlue.cpp + pyGUIControlListBoxGlue.cpp + pyGUIControlMultiLineEditGlue.cpp + pyGUIControlRadioGroupGlue.cpp + pyGUIControlTextBoxGlue.cpp + pyGUIControlValueGlue.cpp + pyGUIDialogGlue.cpp + pyGUIPopUpMenuGlue.cpp + pyGUISkinGlue.cpp + pyImageGlue.cpp + pyJournalBookGlue.cpp + pyKeyGlue.cpp + pyKeyMapGlue.cpp + pyMarkerMgrGlue.cpp + pyMatrix44Glue.cpp + pyMoviePlayerGlue.cpp + pyNetLinkingMgrGlue.cpp + pyNetServerSessionInfoGlue.cpp + pyNotifyGlue.cpp + pyPlayerGlue.cpp + pySceneObjectGlue.cpp + pyScoreMgrGlue.cpp + pySDLGlue.cpp + pySpawnPointInfoGlue.cpp + pyStatusLogGlue.cpp + pyStreamGlue.cpp + pySwimCurrentInterfaceGlue.cpp + pyVaultAgeInfoListNodeGlue.cpp + pyVaultAgeInfoNodeGlue.cpp + pyVaultAgeLinkNodeGlue.cpp + pyVaultChronicleNodeGlue.cpp + pyVaultFolderNodeGlue.cpp + pyVaultGlue.cpp + pyVaultImageNodeGlue.cpp + pyVaultMarkerGameNodeGlue.cpp + pyVaultNodeGlue.cpp + pyVaultNodeRefGlue.cpp + pyVaultPlayerInfoListNodeGlue.cpp + pyVaultPlayerInfoNodeGlue.cpp + pyVaultPlayerNodeGlue.cpp + pyVaultSDLNodeGlue.cpp + pyVaultSystemNodeGlue.cpp + pyVaultTextNoteNodeGlue.cpp + pyWaveSetGlue.cpp +) + +set(pfPython_GAME_GLUE + Games/pyGameCli.cpp + Games/pyGameCli.h + Games/pyGameCliGlue.cpp + Games/pyGameCliMsg.cpp + Games/pyGameCliMsg.h + Games/pyGameCliMsgGlue.cpp + Games/pyGameMgrMsg.cpp + Games/pyGameMgrMsg.h + Games/pyGameMgrMsg.cpp +) + +set(pfPython_TTT + Games/TicTacToe/pyTTTGame.cpp + Games/TicTacToe/pyTTTGame.h + Games/TicTacToe/pyTTTGameGlue.cpp + Games/TicTacToe/pyTTTMsg.cpp + Games/TicTacToe/pyTTTMsg.h + Games/TicTacToe/pyTTTMsgGlue.cpp +) + +set(pfPython_HEEK + Games/Heek/pyHeekGame.cpp + Games/Heek/pyHeekGame.h + Games/Heek/pyHeekGameGlue.cpp + Games/Heek/pyHeekMsg.cpp + Games/Heek/pyHeekMsg.h + Games/Heek/pyHeekGameGlue.cpp +) + +set(pfPython_MARKER + Games/Marker/pyMarkerGame.cpp + Games/Marker/pyMarkerGame.h + Games/Marker/pyMarkerGameGlue.cpp + Games/Marker/pyMarkerMsg.cpp + Games/Marker/pyMarkerMsg.h + Games/Marker/pyMarkerMsgGlue.cpp +) + +set(pfPython_BSPIRAL + Games/BlueSpiral/pyBlueSpiralGame.cpp + Games/BlueSpiral/pyBlueSpiralGame.h + Games/BlueSpiral/pyBlueSpiralGameGlue.cpp + Games/BlueSpiral/pyBlueSpiralMsg.cpp + Games/BlueSpiral/pyBlueSpiralMsg.h + Games/BlueSpiral/pyBlueSpiralMsgGlue.cpp +) + +set(pfPython_WALL + Games/ClimbingWall/pyClimbingWallGame.cpp + Games/ClimbingWall/pyClimbingWallGame.h + Games/ClimbingWall/pyClimbingWallGameGlue.cpp + Games/ClimbingWall/pyClimbingWallMsg.cpp + Games/ClimbingWall/pyClimbingWallMsg.h + Games/ClimbingWall/pyClimbingWallMsgGlue.cpp +) + +set(pfPython_VSYNC + Games/VarSync/pyVarSyncGame.cpp + Games/VarSync/pyVarSyncGame.h + Games/VarSync/pyVarSyncGameGlue.cpp + Games/VarSync/pyVarSyncMsg.cpp + Games/VarSync/pyVarSyncMsg.h + Games/VarSync/pyVarSyncMsgGlue.cpp +) + +set(pfPython_GAMES + ${pfPython_TTT} + ${pfPython_HEEK} + ${pfPython_MARKER} + ${pfPython_BSPIRAL} + ${pfPython_WALL} + ${pfPython_VSYNC} +) + +add_library(pfPython STATIC ${pfPython_SOURCES} ${pfPython_HEADERS} ${pfPython_GLUE} ${pfPython_GAME_GLUE} ${pfPython_GAMES}) + +source_group("Source Files" FILES ${pfPython_SOURCES}) +source_group("Header Files" FILES ${pfPython_HEADERS}) +source_group("Glue Files" FILES ${pfPython_GLUE}) +source_group("Game Glue" FILES ${pfPython_GAME_GLUE}) +source_group("Game Glue\\TicTacToe" FILES ${pfPython_TTT}) +source_group("Game Glue\\Heek" FILES ${pfPython_HEEK}) +source_group("Game Glue\\Marker" FILES ${pfPython_MARKER}) +source_group("Game Glue\\BlueSpiral" FILES ${pfPython_BSPIRAL}) +source_group("Game Glue\\ClimbingWall" FILES ${pfPython_WALL}) +source_group("Game Clue\\VarSync" FILES ${pfPython_VSYNC}) diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGame.h b/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGame.h index 28c11cb5..fbcd0632 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGame.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGame.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for the BlueSpiral game client // -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #include #include "../../pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsg.h index 9f307a7d..7aea1e97 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsg.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsg.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for BlueSpiral game messages // -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #include #include "../../pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGame.h b/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGame.h index 24fe1c7f..e7095d09 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGame.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGame.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for the climbing wall game client // -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #include #include "../../pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsg.h index 8006176b..03d059ee 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsg.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsg.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for ClimbingWall game messages // -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #include #include "../../pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGame.h b/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGame.h index 4c4f7ed1..b4d21c3a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGame.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGame.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for the Heek game client // -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #include #include "../../pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsg.h index 43ecd4e6..4d33a485 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsg.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsg.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for Heek game messages // -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #include #include "../../pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGame.h b/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGame.h index c29d32d5..aa912a0b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGame.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGame.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for the Marker game client // -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #include #include "../../pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsg.h index 58a6122e..28243df7 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsg.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsg.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for Marker game messages // -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #include #include "../../pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGame.h b/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGame.h index 1a34c3e3..42b6aa28 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGame.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGame.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for the TTT game client // -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #include #include "../../pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsg.h index 08f880ce..16e246f9 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsg.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsg.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for TTT game messages // -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #include #include "../../pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGame.h b/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGame.h index a766a030..5620a7b3 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGame.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGame.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for the VarSync game client // -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #include #include "../../pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsg.h index 635ae2c8..a20fd591 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsg.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsg.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for VarSync game messages // -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #include #include "../../pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.h b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.h index 7174d9bd..46471f80 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for the game client base class // -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #include #include "../pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsg.h index f3e37339..7605625b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsg.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsg.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for game client messages // -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #include #include "../pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.h index efddd3a3..536430f2 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.h @@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // #include "hsStlUtils.h" -#include "../pfGameMgr/pfGameMgr.h" +#include "pfGameMgr/pfGameMgr.h" #include #include "../pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.cpp b/Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.cpp index 039b34b3..fc316eb0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.cpp @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "cyAccountManagement.h" -#include "../plNetClientComm/plNetClientComm.h" +#include "plNetClientComm/plNetClientComm.h" bool cyAccountManagement::IsSubscriptionActive() { diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAccountManagementGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/cyAccountManagementGlue.cpp index f6e980cf..e9da4b25 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAccountManagementGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyAccountManagementGlue.cpp @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyGlueHelpers.h" #include "pyEnum.h" -#include "../plMessage/plAccountUpdateMsg.h" +#include "plMessage/plAccountUpdateMsg.h" PYTHON_GLOBAL_METHOD_DEFINITION_NOARGS(PtIsSubscriptionActive, "Returns true if the current player is a paying subscriber") { diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAnimation.cpp b/Sources/Plasma/FeatureLib/pfPython/cyAnimation.cpp index e76e8963..024a09bd 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAnimation.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyAnimation.cpp @@ -47,8 +47,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // #include "plgDispatch.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../pnMessage/plEventCallbackMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "pnMessage/plEventCallbackMsg.h" #include "cyAnimation.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAvatar.cpp b/Sources/Plasma/FeatureLib/pfPython/cyAvatar.cpp index cd5d123e..08821ecd 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAvatar.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyAvatar.cpp @@ -43,16 +43,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plgDispatch.h" -#include "../plAvatar/plAvatarMgr.h" - -#include "../plMessage/plAvatarMsg.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../plMessage/plOneShotCallbacks.h" -#include "../plMessage/plOneShotMsg.h" -#include "../plMessage/plMultistageMsg.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../plGImage/plMipmap.h" +#include "plAvatar/plAvatarMgr.h" + +#include "plMessage/plAvatarMsg.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "plMessage/plOneShotCallbacks.h" +#include "plMessage/plOneShotMsg.h" +#include "plMessage/plMultistageMsg.h" +#include "pnMessage/plNotifyMsg.h" +#include "pnKeyedObject/plFixedKey.h" +#include "plGImage/plMipmap.h" #include "pyKey.h" #include "pySceneObject.h" #include "pyColor.h" @@ -60,25 +60,25 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "cyPythonInterface.h" #include "cyMisc.h" -#include "../plAvatar/plOneShotMod.h" -#include "../plAvatar/plMultistageBehMod.h" -#include "../plAvatar/plAvatarClothing.h" -#include "../plAvatar/plClothingLayout.h" -#include "../plAvatar/plArmatureMod.h" -#include "../plAvatar/plAvBrainHuman.h" // needed to call the emote -#include "../plAvatar/plAGAnim.h" // to get the BodyUsage enum -#include "../plInputCore/plAvatarInputInterface.h" +#include "plAvatar/plOneShotMod.h" +#include "plAvatar/plMultistageBehMod.h" +#include "plAvatar/plAvatarClothing.h" +#include "plAvatar/plClothingLayout.h" +#include "plAvatar/plArmatureMod.h" +#include "plAvatar/plAvBrainHuman.h" // needed to call the emote +#include "plAvatar/plAGAnim.h" // to get the BodyUsage enum +#include "plInputCore/plAvatarInputInterface.h" #include "plPhysical.h" -#include "../plMessage/plSimStateMsg.h" +#include "plMessage/plSimStateMsg.h" -#include "../pnNetCommon/plNetApp.h" -#include "../plVault/plVault.h" +#include "pnNetCommon/plNetApp.h" +#include "plVault/plVault.h" -#include "../plDrawable/plSharedMesh.h" +#include "plDrawable/plSharedMesh.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../plDrawable/plMorphSequence.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "plDrawable/plMorphSequence.h" /////////////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAvatar.h b/Sources/Plasma/FeatureLib/pfPython/cyAvatar.h index e21a8929..3c1d3d7f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAvatar.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyAvatar.h @@ -51,7 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStlUtils.h" #include "hsTemplates.h" #include "hsBitVector.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include #include "pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAvatarGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/cyAvatarGlue.cpp index 8a538415..3ae9f3d8 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAvatarGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyAvatarGlue.cpp @@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyColor.h" #include "pySceneObject.h" -#include "../plAvatar/plAvBrainHuman.h" +#include "plAvatar/plAvBrainHuman.h" #include diff --git a/Sources/Plasma/FeatureLib/pfPython/cyCamera.cpp b/Sources/Plasma/FeatureLib/pfPython/cyCamera.cpp index 4539ff3c..9962e513 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyCamera.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyCamera.cpp @@ -41,17 +41,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "cyCamera.h" -#include "../pnMessage/plCameraMsg.h" -#include "../plMessage/plInputEventMsg.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnMessage/plCameraMsg.h" +#include "plMessage/plInputEventMsg.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnKeyedObject/plUoid.h" #include "hsResMgr.h" #include "pyKey.h" #include "plgDispatch.h" -#include "../pfCamera/plVirtualCamNeu.h" -#include "../pfCamera/plCameraModifier.h" -#include "../pfCamera/plCameraBrain.h" +#include "pfCamera/plVirtualCamNeu.h" +#include "pfCamera/plCameraModifier.h" +#include "pfCamera/plCameraBrain.h" cyCamera::cyCamera() { diff --git a/Sources/Plasma/FeatureLib/pfPython/cyCamera.h b/Sources/Plasma/FeatureLib/pfPython/cyCamera.h index 93b14e0c..2d3c887c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyCamera.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyCamera.h @@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // #include "hsTypes.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" class pyKey; #include diff --git a/Sources/Plasma/FeatureLib/pfPython/cyDraw.cpp b/Sources/Plasma/FeatureLib/pfPython/cyDraw.cpp index 5dc11593..ed398372 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyDraw.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyDraw.cpp @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plgDispatch.h" #include "hsBitVector.h" -#include "../pnMessage/plEnableMsg.h" +#include "pnMessage/plEnableMsg.h" cyDraw::cyDraw(plKey sender, plKey recvr) { diff --git a/Sources/Plasma/FeatureLib/pfPython/cyDraw.h b/Sources/Plasma/FeatureLib/pfPython/cyDraw.h index efc26e0f..5b5a5199 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyDraw.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyDraw.h @@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // #include "hsTemplates.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include #include "pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/cyInputInterface.cpp b/Sources/Plasma/FeatureLib/pfPython/cyInputInterface.cpp index d6b80675..7a5e91b3 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyInputInterface.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyInputInterface.cpp @@ -41,8 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "cyInputInterface.h" -#include "../plMessage/plInputIfaceMgrMsg.h" -#include "../plInputCore/plTelescopeInputInterface.h" +#include "plMessage/plInputIfaceMgrMsg.h" +#include "plInputCore/plTelescopeInputInterface.h" #include "plgDispatch.h" cyInputInterface::cyInputInterface() : diff --git a/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp b/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp index d2b350cd..31731f6d 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp @@ -43,32 +43,32 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plgDispatch.h" #include "hsResMgr.h" -#include "../plResMgr/plKeyFinder.h" - -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../plMessage/plConsoleMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plMessage/plExcludeRegionMsg.h" -#include "../plMessage/plInputEventMsg.h" -#include "../plMessage/plInputIfaceMgrMsg.h" -#include "../pnMessage/plCmdIfaceModMsg.h" -#include "../pnMessage/plAttachMsg.h" -#include "../plMessage/plTimerCallbackMsg.h" -#include "../plMessage/plNetVoiceListMsg.h" -#include "../pnMessage/plClientMsg.h" -#include "../pnMessage/plCameraMsg.h" -#include "../pnTimer/plTimerCallbackManager.h" -#include "../plVault/plVault.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plNetClient/plNetLinkingMgr.h" -#include "../plNetTransport/plNetTransport.h" -#include "../plNetTransport/plNetTransportMember.h" -#include "../plResMgr/plKeyFinder.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plAvatar/plMultistageBehMod.h" -#include "../plAvatar/plAvBrainCritter.h" +#include "plResMgr/plKeyFinder.h" + +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plFixedKey.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "plMessage/plConsoleMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plMessage/plExcludeRegionMsg.h" +#include "plMessage/plInputEventMsg.h" +#include "plMessage/plInputIfaceMgrMsg.h" +#include "pnMessage/plCmdIfaceModMsg.h" +#include "pnMessage/plAttachMsg.h" +#include "plMessage/plTimerCallbackMsg.h" +#include "plMessage/plNetVoiceListMsg.h" +#include "pnMessage/plClientMsg.h" +#include "pnMessage/plCameraMsg.h" +#include "pnTimer/plTimerCallbackManager.h" +#include "plVault/plVault.h" +#include "plNetClient/plNetClientMgr.h" +#include "plNetClient/plNetLinkingMgr.h" +#include "plNetTransport/plNetTransport.h" +#include "plNetTransport/plNetTransportMember.h" +#include "plResMgr/plKeyFinder.h" +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plMultistageBehMod.h" +#include "plAvatar/plAvBrainCritter.h" #include "pyCritterBrain.h" #include "cyPythonInterface.h" #include "pyKey.h" @@ -82,29 +82,29 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyAgeInfoStruct.h" #include "pyAgeLinkStruct.h" #include "pyAlarm.h" -#include "../pfMessage/pfKIMsg.h" -#include "../plNetMessage/plNetMessage.h" -#include "../pfCamera/plVirtualCamNeu.h" -#include "../plPipeline/plDynamicEnvMap.h" +#include "pfMessage/pfKIMsg.h" +#include "plNetMessage/plNetMessage.h" +#include "pfCamera/plVirtualCamNeu.h" +#include "plPipeline/plDynamicEnvMap.h" -#include "../pfGameGUIMgr/pfGameGUIMgr.h" -#include "../pfGameGUIMgr/pfGUIDialogMod.h" +#include "pfGameGUIMgr/pfGameGUIMgr.h" +#include "pfGameGUIMgr/pfGUIDialogMod.h" #include "pyGUIDialog.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" -#include "../plMessage/plCCRMsg.h" -#include "../plAgeLoader/plAgeLoader.h" +#include "plMessage/plCCRMsg.h" +#include "plAgeLoader/plAgeLoader.h" -#include "../plResMgr/plLocalization.h" -#include "../plGLight/plLightInfo.h" +#include "plResMgr/plLocalization.h" +#include "plGLight/plLightInfo.h" -#include "../plInputCore/plAvatarInputInterface.h" -#include "../plInputCore/plInputDevice.h" +#include "plInputCore/plAvatarInputInterface.h" +#include "plInputCore/plInputDevice.h" -#include "../plVault/plAgeInfoSource.h" +#include "plVault/plAgeInfoSource.h" -#include "../pfLocalizationMgr/pfLocalizationMgr.h" +#include "pfLocalizationMgr/pfLocalizationMgr.h" //// Static Class Stuff ////////////////////////////////////////////////////// plPipeline* cyMisc::fPipeline = nil; @@ -953,7 +953,7 @@ PyObject* cyMisc::GetLocalPlayer() #if 1 -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" // // TEMP SCREEN PRINT CODE FOR NON-DBG TEXT DISPLAY // @@ -971,7 +971,7 @@ void cyMisc::PrintToScreen(const char* msg) #endif #include "plPipeline.h" -#include "../plGImage/plMipmap.h" +#include "plGImage/plMipmap.h" ///////////////////////////////////////////////////////////////////////////// // @@ -1418,7 +1418,7 @@ void cyMisc::PageOutNode(const char* nodeName) } -#include "../plAvatar/plArmatureMod.h" +#include "plAvatar/plArmatureMod.h" ///////////////////////////////////////////////////////////////////////////// // // Function : LimitAvatarLOD @@ -1434,7 +1434,7 @@ void cyMisc::LimitAvatarLOD(int LODlimit) -#include "../plPipeline/plFogEnvironment.h" +#include "plPipeline/plFogEnvironment.h" ///////////////////////////////////////////////////////////////////////////// // @@ -1732,9 +1732,9 @@ bool cyMisc::UsingUnicode() // // // -#include "../plMessage/plParticleUpdateMsg.h" -#include "../plParticleSystem/plParticleSystem.h" -#include "../plParticleSystem/plParticleEffect.h" +#include "plMessage/plParticleUpdateMsg.h" +#include "plParticleSystem/plParticleSystem.h" +#include "plParticleSystem/plParticleEffect.h" void cyMisc::TransferParticlesToKey(pyKey& fromKey, pyKey& toKey, int numParticles) { plKey frKey = fromKey.getKey(); @@ -1924,7 +1924,7 @@ void cyMisc::SetLightColorValue(pyKey& light, std::string lightName, hsScalar r, } } -#include "../pnMessage/plEnableMsg.h" +#include "pnMessage/plEnableMsg.h" void cyMisc::SetLightAnimationOn(pyKey& light, std::string lightName, hsBool start) { // lightName is the name of the light object attached to the light that we want to talk to @@ -2017,7 +2017,7 @@ void cyMisc::RegisterForControlEventMessages(hsBool on, pyKey& k) // // PURPOSE : To request an LOS from a point on the screen // -#include "../plMessage/plLOSRequestMsg.h" +#include "plMessage/plLOSRequestMsg.h" bool cyMisc::RequestLOSScreen(pyKey &selfkey, Int32 ID, hsScalar xPos, hsScalar yPos, hsScalar distance, int what, int reportType) { plPipeline* pipe = selfkey.GetPipeline(); @@ -2074,7 +2074,7 @@ bool cyMisc::RequestLOSScreen(pyKey &selfkey, Int32 ID, hsScalar xPos, hsScalar // // PURPOSE : Check is there is something visible in the path from StartPoint to EndPoint // -#include "../plDrawable/plVisLOSMgr.h" +#include "plDrawable/plVisLOSMgr.h" PyObject* cyMisc::CheckVisLOS(pyPoint3 startPoint, pyPoint3 endPoint) { if (plVisLOSMgr::Instance()) @@ -2168,7 +2168,7 @@ bool cyMisc::IsEnterChatModeKeyBound() // // PURPOSE : Shoots from screen coordinates, a bullet and makes a mark on objects that know about bullet holes // -#include "../plMessage/plBulletMsg.h" +#include "plMessage/plBulletMsg.h" void cyMisc::ShootBulletFromScreen(pyKey &selfkey, hsScalar xPos, hsScalar yPos, hsScalar radius, hsScalar range) { plPipeline* pipe = selfkey.GetPipeline(); @@ -2404,7 +2404,7 @@ int cyMisc::GetKILevel() // // the following are for recording and rebuilding the camera stack -#include "../pfCamera/plCameraModifier.h" +#include "pfCamera/plCameraModifier.h" int cyMisc::GetNumCameras() { @@ -2493,7 +2493,7 @@ void cyMisc::RecenterCamera() pCam->Send(); } -#include "../plMessage/plTransitionMsg.h" +#include "plMessage/plTransitionMsg.h" void cyMisc::FadeIn(float lenTime, bool holdFlag, bool noSound) { @@ -2541,7 +2541,7 @@ void cyMisc::SetAlarm( float secs, PyObject * cb, UInt32 cbContext ) // // PURPOSE : captures the screen and saves it as a jpeg // -#include "../plJPEG/plJPEG.h" +#include "plJPEG/plJPEG.h" void cyMisc::SaveScreenShot(const char* fileName, int x, int y, int quality) { if ( cyMisc::GetPipeline() ) @@ -2564,7 +2564,7 @@ void cyMisc::SaveScreenShot(const char* fileName, int x, int y, int quality) // PURPOSE : This starts a screen capture in motion. It will be capture on the next // update and a plCaptureRenderMsg when its ready // -#include "../plPipeline/plCaptureRender.h" +#include "plPipeline/plCaptureRender.h" void cyMisc::StartScreenCapture(pyKey& selfkey) { cyMisc::StartScreenCaptureWH(selfkey, 800, 600); @@ -2576,7 +2576,7 @@ void cyMisc::StartScreenCaptureWH(pyKey& selfkey, UInt16 width, UInt16 height) } -#include "../plAvatar/plAvatarClothing.h" +#include "plAvatar/plAvatarClothing.h" void cyMisc::WearMaintainerSuit(pyKey& key, hsBool wear) { // run on all machines, but only affects us if we call it on our local guy (who props it to others himself) diff --git a/Sources/Plasma/FeatureLib/pfPython/cyMisc.h b/Sources/Plasma/FeatureLib/pfPython/cyMisc.h index de629c1c..2eee1260 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyMisc.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyMisc.h @@ -60,7 +60,7 @@ class pyPoint3; #include #include "hsTypes.h" #include "hsStlUtils.h" -#include "../pnUtils/pnUtils.h" +#include "pnUtils/pnUtils.h" class pyGUIDialog; class plPipeline; diff --git a/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue2.cpp b/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue2.cpp index 86ed7fb6..6173e051 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue2.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue2.cpp @@ -47,9 +47,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyEnum.h" // for enums -#include "..\plNetCommon\plNetCommon.h" -#include "..\plResMgr\plLocalization.h" -#include "..\plMessage\plLOSRequestMsg.h" +#include "plNetCommon\plNetCommon.h" +#include "plResMgr\plLocalization.h" +#include "plMessage\plLOSRequestMsg.h" #include diff --git a/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue4.cpp b/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue4.cpp index cb6081b2..770870fa 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue4.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue4.cpp @@ -45,8 +45,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pySceneObject.h" #include "pyAgeInfoStruct.h" #include "pyGeometry3.h" -#include "../NucleusLib/inc/plPipeline.h" -#include "../pnNetBase/pnNetBase.h" +#include "NucleusLib/inc/plPipeline.h" +#include "pnNetBase/pnNetBase.h" #include diff --git a/Sources/Plasma/FeatureLib/pfPython/cyParticleSys.cpp b/Sources/Plasma/FeatureLib/pfPython/cyParticleSys.cpp index 6c700ff9..0b58fd73 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyParticleSys.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyParticleSys.cpp @@ -42,10 +42,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "cyParticleSys.h" #include "hsStream.h" -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsResMgr.h" #include "plgDispatch.h" -#include "../plMessage/plParticleUpdateMsg.h" +#include "plMessage/plParticleUpdateMsg.h" cyParticleSys::cyParticleSys(plKey sender, plKey recvr) { diff --git a/Sources/Plasma/FeatureLib/pfPython/cyParticleSys.h b/Sources/Plasma/FeatureLib/pfPython/cyParticleSys.h index a45517b2..2469065d 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyParticleSys.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyParticleSys.h @@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // #include "hsTemplates.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" class pyKey; #include diff --git a/Sources/Plasma/FeatureLib/pfPython/cyPhysics.cpp b/Sources/Plasma/FeatureLib/pfPython/cyPhysics.cpp index cf4b760d..aed1982f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyPhysics.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyPhysics.cpp @@ -42,20 +42,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "cyPhysics.h" #include "plgDispatch.h" -#include "../pnMessage/plEnableMsg.h" -#include "../pnMessage/plWarpMsg.h" -#include "../plMessage/plSimInfluenceMsg.h" -#include "../plMessage/plSimStateMsg.h" -#include "../plMessage/plLinearVelocityMsg.h" -#include "../plMessage/plAngularVelocityMsg.h" +#include "pnMessage/plEnableMsg.h" +#include "pnMessage/plWarpMsg.h" +#include "plMessage/plSimInfluenceMsg.h" +#include "plMessage/plSimStateMsg.h" +#include "plMessage/plLinearVelocityMsg.h" +#include "plMessage/plAngularVelocityMsg.h" #include "pyGeometry3.h" #include "pyMatrix44.h" #include "pyKey.h" #include "hsQuat.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnKeyedObject/plKey.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnKeyedObject/plKey.h" cyPhysics::cyPhysics(plKey sender, plKey recvr) { diff --git a/Sources/Plasma/FeatureLib/pfPython/cyPhysics.h b/Sources/Plasma/FeatureLib/pfPython/cyPhysics.h index 9dfc3551..debb51e5 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyPhysics.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyPhysics.h @@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // #include "hsTemplates.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include #include "pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.cpp b/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.cpp index 4c3597b4..4dc50085 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.cpp @@ -94,8 +94,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPythonSDLModifier.h" // For printing to the log -#include "../plStatusLog/plStatusLog.h" -#include "../plNetGameLib/plNetGameLib.h" +#include "plStatusLog/plStatusLog.h" +#include "plNetGameLib/plNetGameLib.h" // vault #include "pyVaultNode.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.cpp b/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.cpp index a24ff9ed..54884ff1 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.cpp @@ -51,49 +51,49 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "plgDispatch.h" #include "hsResMgr.h" -#include "../plResMgr/plKeyFinder.h" -#include "../pnKeyedObject/plKeyImp.h" -#include "../pnKeyedObject/plUoid.h" - -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnMessage/plCmdIfaceModMsg.h" -#include "../plMessage/plInputEventMsg.h" -#include "../plModifier/plLogicModifier.h" -#include "../pfMessage/pfGUINotifyMsg.h" -#include "../plMessage/plRoomLoadNotifyMsg.h" -#include "../pfMessage/plClothingMsg.h" -#include "../pfMessage/pfKIMsg.h" -#include "../plMessage/plMemberUpdateMsg.h" -#include "../plMessage/plAgeLoadedMsg.h" -#include "../pnMessage/plRemoteAvatarInfoMsg.h" -#include "../pnMessage/plPlayerPageMsg.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plNetTransport/plNetTransportMember.h" -#include "../pnMessage/plSDLNotificationMsg.h" -#include "../plMessage/plNetOwnershipMsg.h" -#include "../plSDL/plSDL.h" -#include "../plVault/plVault.h" -#include "../plMessage/plCCRMsg.h" -#include "../plMessage/plVaultNotifyMsg.h" -#include "../plInputCore/plInputInterfaceMgr.h" -#include "../plInputCore/plInputDevice.h" -#include "../pfMessage/pfMarkerMsg.h" -#include "../pfMessage/pfBackdoorMsg.h" -#include "../plMessage/plAvatarMsg.h" -#include "../plMessage/plLOSHitMsg.h" -#include "../plMessage/plRenderMsg.h" -#include "../pfMessage/pfMovieEventMsg.h" -#include "../plMessage/plClimbEventMsg.h" -#include "../plMessage/plCaptureRenderMsg.h" -#include "../plGImage/plMipmap.h" -#include "../plMessage/plAccountUpdateMsg.h" -#include "../plAgeLoader/plAgeLoader.h" -#include "../pfGameMgr/pfGameMgr.h" -#include "../plMessage/plAIMsg.h" -#include "../plAvatar/plAvBrainCritter.h" +#include "plResMgr/plKeyFinder.h" +#include "pnKeyedObject/plKeyImp.h" +#include "pnKeyedObject/plUoid.h" + +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnKeyedObject/plKey.h" +#include "pnMessage/plTimeMsg.h" +#include "pnMessage/plCmdIfaceModMsg.h" +#include "plMessage/plInputEventMsg.h" +#include "plModifier/plLogicModifier.h" +#include "pfMessage/pfGUINotifyMsg.h" +#include "plMessage/plRoomLoadNotifyMsg.h" +#include "pfMessage/plClothingMsg.h" +#include "pfMessage/pfKIMsg.h" +#include "plMessage/plMemberUpdateMsg.h" +#include "plMessage/plAgeLoadedMsg.h" +#include "pnMessage/plRemoteAvatarInfoMsg.h" +#include "pnMessage/plPlayerPageMsg.h" +#include "plNetClient/plNetClientMgr.h" +#include "plNetTransport/plNetTransportMember.h" +#include "pnMessage/plSDLNotificationMsg.h" +#include "plMessage/plNetOwnershipMsg.h" +#include "plSDL/plSDL.h" +#include "plVault/plVault.h" +#include "plMessage/plCCRMsg.h" +#include "plMessage/plVaultNotifyMsg.h" +#include "plInputCore/plInputInterfaceMgr.h" +#include "plInputCore/plInputDevice.h" +#include "pfMessage/pfMarkerMsg.h" +#include "pfMessage/pfBackdoorMsg.h" +#include "plMessage/plAvatarMsg.h" +#include "plMessage/plLOSHitMsg.h" +#include "plMessage/plRenderMsg.h" +#include "pfMessage/pfMovieEventMsg.h" +#include "plMessage/plClimbEventMsg.h" +#include "plMessage/plCaptureRenderMsg.h" +#include "plGImage/plMipmap.h" +#include "plMessage/plAccountUpdateMsg.h" +#include "plAgeLoader/plAgeLoader.h" +#include "pfGameMgr/pfGameMgr.h" +#include "plMessage/plAIMsg.h" +#include "plAvatar/plAvBrainCritter.h" #include "plProfile.h" @@ -141,7 +141,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPythonSDLModifier.h" -#include "../plMessage/plTimerCallbackMsg.h" +#include "plMessage/plTimerCallbackMsg.h" plProfile_CreateTimer("Update", "Python", PythonUpdate); diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.h b/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.h index fc701a99..1b337b40 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.h +++ b/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.h @@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "../pnModifier/plMultiModifier.h" +#include "pnModifier/plMultiModifier.h" #include "hsGeometry3.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp b/Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp index 969a7d17..48287adc 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp @@ -43,9 +43,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStlUtils.h" #include "plPythonPack.h" #include "hsStream.h" -#include "../plFile/hsFiles.h" -#include "../plFile/plSecureStream.h" -#include "../plFile/plStreamSource.h" +#include "plFile/hsFiles.h" +#include "plFile/plSecureStream.h" +#include "plFile/plStreamSource.h" #include "hsStlSortUtils.h" #include "marshal.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonParameter.h b/Sources/Plasma/FeatureLib/pfPython/plPythonParameter.h index 577578ef..2896c307 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonParameter.h +++ b/Sources/Plasma/FeatureLib/pfPython/plPythonParameter.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPythonParameter_h_inc #define plPythonParameter_h_inc -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" // // This is the data for the parameters (or attributes) for the PythonFile components diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.cpp b/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.cpp index 6d008ce7..1f503cb0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.cpp @@ -47,13 +47,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" #include "cyMisc.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../plResMgr/plKeyFinder.h" -#include "../plAgeDescription/plAgeDescription.h" +#include "pnSceneObject/plSceneObject.h" +#include "plResMgr/plKeyFinder.h" +#include "plAgeDescription/plAgeDescription.h" -#include "../plSDL/plSDL.h" -#include "../pnNetCommon/plNetApp.h" -#include "../plNetClient/plNetClientMgr.h" +#include "plSDL/plSDL.h" +#include "pnNetCommon/plNetApp.h" +#include "plNetClient/plNetClientMgr.h" plStateDataRecord * GetAgeSDL() { diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.h b/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.h index 77ccb413..c0ff0755 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.h +++ b/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.h @@ -47,7 +47,7 @@ class plStateDataRecord; class plSimpleStateVariable; #include "hsStlUtils.h" -#include "../plModifier/plSDLModifier.h" +#include "plModifier/plSDLModifier.h" #include #include "pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.h b/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.h index 0ca95415..3ac2fb8c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsStlUtils.h" -#include "../plNetCommon/plNetServerSessionInfo.h" +#include "plNetCommon/plNetServerSessionInfo.h" #include #include "pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.h b/Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.h index cee3b1aa..38fb9ae5 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsStlUtils.h" -#include "../plNetCommon/plNetServerSessionInfo.h" +#include "plNetCommon/plNetServerSessionInfo.h" #include "pyAgeInfoStruct.h" #include diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAgeVault.cpp b/Sources/Plasma/FeatureLib/pfPython/pyAgeVault.cpp index 85e1d16e..8404a583 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAgeVault.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyAgeVault.cpp @@ -60,13 +60,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pySDL.h" -#include "../plVault/plVault.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plNetClient/plNetLinkingMgr.h" -#include "../plNetTransport/plNetTransport.h" -#include "../plNetTransport/plNetTransportMember.h" -#include "../plSDL/plSDL.h" -#include "../pnNetCommon/plNetApp.h" +#include "plVault/plVault.h" +#include "plNetClient/plNetClientMgr.h" +#include "plNetClient/plNetLinkingMgr.h" +#include "plNetTransport/plNetTransport.h" +#include "plNetTransport/plNetTransportMember.h" +#include "plSDL/plSDL.h" +#include "pnNetCommon/plNetApp.h" pyAgeVault::pyAgeVault() { } diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAudioControl.cpp b/Sources/Plasma/FeatureLib/pfPython/pyAudioControl.cpp index bddad507..aa197b57 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAudioControl.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyAudioControl.cpp @@ -47,11 +47,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyAudioControl.h" -#include "../plAudio/plAudioSystem.h" -#include "../plAudio/plVoiceChat.h" -#include "../plAudio/plWinMicLevel.h" +#include "plAudio/plAudioSystem.h" +#include "plAudio/plVoiceChat.h" +#include "plAudio/plWinMicLevel.h" -#include "../plAudio/plAudioCaps.h" +#include "plAudio/plAudioCaps.h" // Sets the master volume of a given audio channel void pyAudioControl::SetSoundFXVolume( hsScalar volume ) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyCluster.cpp b/Sources/Plasma/FeatureLib/pfPython/pyCluster.cpp index ccb9355d..02d093a5 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyCluster.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyCluster.cpp @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyCluster.h" -#include "../plDrawable/plClusterGroup.h" +#include "plDrawable/plClusterGroup.h" pyCluster::pyCluster(plKey key) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyCritterBrain.cpp b/Sources/Plasma/FeatureLib/pfPython/pyCritterBrain.cpp index 34e531a8..4334419e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyCritterBrain.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyCritterBrain.cpp @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyCritterBrain.h" #include "pyGeometry3.h" -#include "..\plAvatar\plAvBrainCritter.h" +#include "plAvatar/plAvBrainCritter.h" pyCritterBrain::pyCritterBrain(): fBrain(nil) {} diff --git a/Sources/Plasma/FeatureLib/pfPython/pyCritterBrainGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyCritterBrainGlue.cpp index 5ce5d57b..44ca9af2 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyCritterBrainGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyCritterBrainGlue.cpp @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyEnum.h" #include "pyGeometry3.h" -#include "..\plMessage\plAIMsg.h" +#include "plMessage/plAIMsg.h" #include diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinates.cpp b/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinates.cpp index 62db0d3d..eefe2a3e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinates.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinates.cpp @@ -40,9 +40,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyDniCoordinates.h" -#include "../plVault/plDniCoordinateInfo.h" +#include "plVault/plDniCoordinateInfo.h" #ifndef BUILDING_PYPLASMA -#include "../plAvatar/plAvatarMgr.h" +#include "plAvatar/plAvatarMgr.h" #include "pyVault.h" #endif diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinatesGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinatesGlue.cpp index e6c016e4..e3822a43 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinatesGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinatesGlue.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyDniCoordinates.h" #include "pyGeometry3.h" -#include "../plVault/plDniCoordinateInfo.h" +#include "plVault/plDniCoordinateInfo.h" #include diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.cpp b/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.cpp index 432afb99..d6f5848d 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.cpp @@ -39,10 +39,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "../pnUtils/pnUtils.h" -#include "../plUnifiedTime/plUnifiedTime.h" -#include "../plVault/plAgeInfoSource.h" -#include "../plVault/plVault.h" +#include "pnUtils/pnUtils.h" +#include "plUnifiedTime/plUnifiedTime.h" +#include "plVault/plAgeInfoSource.h" +#include "plVault/plVault.h" #include "pyDniInfoSource.h" #include "pyDniCoordinates.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDrawControl.cpp b/Sources/Plasma/FeatureLib/pfPython/pyDrawControl.cpp index db84a6c2..d534bc28 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDrawControl.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyDrawControl.cpp @@ -52,10 +52,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef BUILDING_PYPLASMA -#include "../plMessage/plInputEventMsg.h" -#include "../pnMessage/plClientMsg.h" -#include "../plInputCore/plInputDevice.h" -#include "../plAvatar/plArmatureMod.h" +#include "plMessage/plInputEventMsg.h" +#include "pnMessage/plClientMsg.h" +#include "plInputCore/plInputDevice.h" +#include "plAvatar/plArmatureMod.h" #endif void pyDrawControl::SetGamma2(hsScalar gamma) @@ -74,7 +74,7 @@ void pyDrawControl::SetGamma2(hsScalar gamma) } #ifndef BUILDING_PYPLASMA -#include "../plGLight/plShadowMaster.h" +#include "plGLight/plShadowMaster.h" #endif void pyDrawControl::SetShadowVisDistance(hsScalar distance) @@ -94,7 +94,7 @@ hsScalar pyDrawControl::GetShadowVisDistance() } #ifndef BUILDING_PYPLASMA -#include "../plGLight/plShadowCaster.h" +#include "plGLight/plShadowCaster.h" #endif void pyDrawControl::EnableShadows() diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDynamicText.cpp b/Sources/Plasma/FeatureLib/pfPython/pyDynamicText.cpp index fa75d9a5..4fc958cf 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDynamicText.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyDynamicText.cpp @@ -47,12 +47,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////////////// #include "plgDispatch.h" -#include "../plMessage/plDynamicTextMsg.h" +#include "plMessage/plDynamicTextMsg.h" #include "pyKey.h" #include "plPythonFileMod.h" #include "pyColor.h" #include "pyImage.h" -#include "../plGImage/plDynamicTextMap.h" +#include "plGImage/plDynamicTextMap.h" #include "pyDynamicText.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDynamicTextGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyDynamicTextGlue.cpp index 3cb19340..00b74394 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDynamicTextGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyDynamicTextGlue.cpp @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyEnum.h" #include "pyColor.h" #include "pyImage.h" -#include "../plGImage/plDynamicTextMap.h" +#include "plGImage/plDynamicTextMap.h" #include diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.cpp index 60af41a3..a692448e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.cpp @@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // /////////////////////////////////////////////// -#include "../pfGameGUIMgr/pfGUIControlMod.h" -#include "../pfGameGUIMgr/pfGUIDialogMod.h" +#include "pfGameGUIMgr/pfGUIControlMod.h" +#include "pfGameGUIMgr/pfGUIDialogMod.h" #include "pyKey.h" #include "pyGUIControl.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButton.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButton.cpp index c82c3458..6cc1239b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButton.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButton.cpp @@ -47,7 +47,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" #include "pyGUIControlButton.h" -#include "../pfGameGUIMgr/pfGUIButtonMod.h" +#include "pfGameGUIMgr/pfGUIButtonMod.h" pyGUIControlButton::pyGUIControlButton(pyKey& gckey) : pyGUIControl(gckey) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButtonGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButtonGlue.cpp index e5526c77..d9737f56 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButtonGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButtonGlue.cpp @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyGUIControlButton.h" #include "pyEnum.h" -#include "../pfGameGUIMgr/pfGUIButtonMod.h" +#include "pfGameGUIMgr/pfGUIButtonMod.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBox.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBox.cpp index 70d906e6..d093ae1e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBox.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBox.cpp @@ -46,8 +46,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" -#include "../pfGameGUIMgr/pfGUICheckBoxCtrl.h" -#include "../pfGameGUIMgr/pfGUIDialogMod.h" +#include "pfGameGUIMgr/pfGUICheckBoxCtrl.h" +#include "pfGameGUIMgr/pfGUIDialogMod.h" #include "pyGUIControlCheckBox.h" #include "pyGUIDialog.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.cpp index 1e7f568b..399176dc 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.cpp @@ -46,8 +46,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" -#include "../pfGameGUIMgr/pfGUIClickMapCtrl.h" -#include "../pfGameGUIMgr/pfGUIDialogMod.h" +#include "pfGameGUIMgr/pfGUIClickMapCtrl.h" +#include "pfGameGUIMgr/pfGUIDialogMod.h" #include "pyGUIControlClickMap.h" #include "pyGUIDialog.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBar.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBar.cpp index 61a4c1ca..321fe726 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBar.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBar.cpp @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" -#include "../pfGameGUIMgr/pfGUIDragBarCtrl.h" +#include "pfGameGUIMgr/pfGUIDragBarCtrl.h" #include "pyGUIControlDragBar.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggable.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggable.cpp index 8bd8aea4..d3c1e0e7 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggable.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggable.cpp @@ -46,8 +46,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" -#include "../pfGameGUIMgr/pfGUIDraggableMod.h" -#include "../pfGameGUIMgr/pfGUIDialogMod.h" +#include "pfGameGUIMgr/pfGUIDraggableMod.h" +#include "pfGameGUIMgr/pfGUIDialogMod.h" #include "pyGUIControlDraggable.h" #include "pyGUIDialog.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicText.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicText.cpp index 19946793..aacad44a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicText.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicText.cpp @@ -46,8 +46,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" -#include "../pfGameGUIMgr/pfGUIDynDisplayCtrl.h" -#include "../plGImage/plDynamicTextMap.h" +#include "pfGameGUIMgr/pfGUIDynDisplayCtrl.h" +#include "plGImage/plDynamicTextMap.h" #include "pyDynamicText.h" #include "pyGUIControlDynamicText.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBox.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBox.cpp index df1e5d10..d568dcb1 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBox.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBox.cpp @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" -#include "../pfGameGUIMgr/pfGUIEditBoxMod.h" +#include "pfGameGUIMgr/pfGUIEditBoxMod.h" #include "pyGUIControlEditBox.h" #include "pyColor.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.cpp index 39dc711a..55a3dba0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.cpp @@ -46,10 +46,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" -#include "../pfGameGUIMgr/pfGUIListBoxMod.h" -#include "../pfGameGUIMgr/pfGUIListElement.h" -#include "../pfGameGUIMgr/pfGUIDialogMod.h" -#include "../plGImage/plDynamicTextMap.h" +#include "pfGameGUIMgr/pfGUIListBoxMod.h" +#include "pfGameGUIMgr/pfGUIListElement.h" +#include "pfGameGUIMgr/pfGUIDialogMod.h" +#include "plGImage/plDynamicTextMap.h" #include "pyGUIControlListBox.h" #include "pyGUIDialog.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.cpp index 1a0c2fc1..a3643d20 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.cpp @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" -#include "../pfGameGUIMgr/pfGUIMultiLineEditCtrl.h" +#include "pfGameGUIMgr/pfGUIMultiLineEditCtrl.h" #include "pyGUIControlMultiLineEdit.h" #include "pyColor.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEditGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEditGlue.cpp index 50ca2abe..3a97699e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEditGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEditGlue.cpp @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyEnum.h" #include "pyColor.h" -#include "../pfGameGUIMgr/pfGUIMultiLineEditCtrl.h" +#include "pfGameGUIMgr/pfGUIMultiLineEditCtrl.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroup.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroup.cpp index de886d86..d9b08156 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroup.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroup.cpp @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" -#include "../pfGameGUIMgr/pfGUIRadioGroupCtrl.h" +#include "pfGameGUIMgr/pfGUIRadioGroupCtrl.h" #include "pyGUIControlRadioGroup.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.cpp index a96bbf16..a3eaf750 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.cpp @@ -46,8 +46,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" -#include "../pfGameGUIMgr/pfGUITextBoxMod.h" -#include "../pfGameGUIMgr/pfGUIListElement.h" +#include "pfGameGUIMgr/pfGUITextBoxMod.h" +#include "pfGameGUIMgr/pfGUIListElement.h" #include "pyGUIControlTextBox.h" #include "pyColor.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.h index f1aac266..0fd4641f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.h @@ -51,7 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" #include "pyGUIControl.h" -#include "../pfGameGUIMgr/pfGUIControlMod.h" +#include "pfGameGUIMgr/pfGUIControlMod.h" #include #include "pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlValue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlValue.cpp index 7863e8d5..a9fcb2ab 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlValue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlValue.cpp @@ -46,10 +46,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" -#include "../pfGameGUIMgr/pfGUIValueCtrl.h" -#include "../pfGameGUIMgr/pfGUIKnobCtrl.h" -#include "../pfGameGUIMgr/pfGUIUpDownPairMod.h" -#include "../pfGameGUIMgr/pfGUIProgressCtrl.h" +#include "pfGameGUIMgr/pfGUIValueCtrl.h" +#include "pfGameGUIMgr/pfGUIKnobCtrl.h" +#include "pfGameGUIMgr/pfGUIUpDownPairMod.h" +#include "pfGameGUIMgr/pfGUIProgressCtrl.h" #include "pyGUIControlValue.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIDialog.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIDialog.cpp index 52a99948..5d215a97 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIDialog.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIDialog.cpp @@ -48,8 +48,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyColor.h" #include "cyPythonInterface.h" -#include "../pfGameGUIMgr/pfGameGUIMgr.h" -#include "../pfGameGUIMgr/pfGUIDialogMod.h" +#include "pfGameGUIMgr/pfGameGUIMgr.h" +#include "pfGameGUIMgr/pfGUIDialogMod.h" #include "pyGUIDialog.h" @@ -67,10 +67,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyGUIControlClickMap.h" // specific value controls -#include "../pfGameGUIMgr/pfGUIKnobCtrl.h" -#include "../pfGameGUIMgr/pfGUIUpDownPairMod.h" +#include "pfGameGUIMgr/pfGUIKnobCtrl.h" +#include "pfGameGUIMgr/pfGUIUpDownPairMod.h" -#include "../plInputCore/plInputInterface.h" +#include "plInputCore/plInputInterface.h" pyGUIDialog::pyGUIDialog(pyKey& gckey) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.cpp index a6836c68..b7853f6a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.cpp @@ -48,8 +48,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyColor.h" #include "cyPythonInterface.h" -#include "../pfGameGUIMgr/pfGameGUIMgr.h" -#include "../pfGameGUIMgr/pfGUIPopUpMenu.h" +#include "pfGameGUIMgr/pfGameGUIMgr.h" +#include "pfGameGUIMgr/pfGUIPopUpMenu.h" #include "pyGUIPopUpMenu.h" @@ -64,7 +64,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyGUIControlDynamicText.h" #include "pyGUIControlMultiLineEdit.h" -#include "../pfGameGUIMgr/pfGUIControlHandlers.h" +#include "pfGameGUIMgr/pfGUIControlHandlers.h" #define kGetMenuPtr( ret ) if( fGCkey == nil ) return ret; \ pfGUIPopUpMenu *menu = pfGUIPopUpMenu::ConvertNoRef( fGCkey->ObjectIsLoaded() ); \ diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.h index 172c122d..38fc12fa 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "../pfGameGUIMgr/pfGUIPopUpMenu.h" +#include "pfGameGUIMgr/pfGUIPopUpMenu.h" #include "pyKey.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUISkin.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUISkin.cpp index 34e00edb..54863bef 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUISkin.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUISkin.cpp @@ -47,9 +47,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" #include "pyColor.h" #include "cyPythonInterface.h" - -#include "../pfGameGUIMgr/pfGameGUIMgr.h" -#include "../pfGameGUIMgr/pfGUIPopUpMenu.h" +#include "pfGameGUIMgr/pfGameGUIMgr.h" +#include "pfGameGUIMgr/pfGUIPopUpMenu.h" #include "pyGUISkin.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGameScore.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGameScore.cpp index 7d489377..6308c31c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGameScore.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGameScore.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyGameScore.h" -#include "../pfGameScoreMgr/pfGameScoreMgr.h" +#include "pfGameScoreMgr/pfGameScoreMgr.h" pyGameScore::pyGameScore() : fScore(nil) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGameScoreGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGameScoreGlue.cpp index c6a4146b..bdb7cda4 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGameScoreGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGameScoreGlue.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyGameScore.h" -#include "../pfGameScoreMgr/pfGameScoreMgr.h" +#include "pfGameScoreMgr/pfGameScoreMgr.h" // glue functions PYTHON_CLASS_DEFINITION(ptGameScore, pyGameScore); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGrassShader.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGrassShader.cpp index da1cb3cf..054fa10e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGrassShader.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGrassShader.cpp @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyGrassShader.h" -#include "../plSurface/plGrassShaderMod.h" +#include "plSurface/plGrassShaderMod.h" pyGrassShader::pyGrassShader() { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyImage.cpp b/Sources/Plasma/FeatureLib/pfPython/pyImage.cpp index 64183395..a9342aff 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyImage.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyImage.cpp @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "cyMisc.h" #ifndef BUILDING_PYPLASMA -#include "../plGImage/plMipmap.h" +#include "plGImage/plMipmap.h" #endif #ifndef BUILDING_PYPLASMA @@ -164,7 +164,7 @@ UInt32 pyImage::GetHeight() return 0; } -#include "../plJPEG/plJPEG.h" +#include "plJPEG/plJPEG.h" void pyImage::SaveAsJPEG(const wchar* fileName, UInt8 quality) { if (quality <= 0 || quality > 100) @@ -184,7 +184,7 @@ void pyImage::SaveAsPNG(const wchar* fileName) } #include "hsResMgr.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plUoid.h" PyObject* pyImage::LoadJPEGFromDisk(const wchar* filename, UInt16 width, UInt16 height) { plMipmap* theMipmap = plJPEG::Instance().ReadFromFile(filename); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyImage.h b/Sources/Plasma/FeatureLib/pfPython/pyImage.h index 8f284a91..6e9601d4 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyImage.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyImage.h @@ -56,7 +56,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef BUILDING_PYPLASMA #include "pyGeometry3.h" -#include "../plGImage/plMipmap.h" +#include "plGImage/plMipmap.h" #endif #include diff --git a/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.cpp b/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.cpp index 9dff2394..72fd650d 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.cpp @@ -46,13 +46,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com /////////////////////////////////////////////// #include "pyJournalBook.h" -#include "../pfJournalBook/pfJournalBook.h" +#include "pfJournalBook/pfJournalBook.h" #include "cyAnimation.h" #include "pyColor.h" #include "pyImage.h" #include "hsResMgr.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plUoid.h" UInt32 pyJournalBook::fNextKeyID = 0; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyJournalBookGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyJournalBookGlue.cpp index 5437204a..41bca814 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyJournalBookGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyJournalBookGlue.cpp @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" #include "pyImage.h" -#include "../pfJournalBook/pfJournalBook.h" +#include "pfJournalBook/pfJournalBook.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyKey.cpp b/Sources/Plasma/FeatureLib/pfPython/pyKey.cpp index 6c8b9d98..072a0fbd 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyKey.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyKey.cpp @@ -46,13 +46,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////// #include "pyKey.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include "plgDispatch.h" #include "plPythonFileMod.h" -#include "../pnMessage/plEnableMsg.h" +#include "pnMessage/plEnableMsg.h" #include "hsResMgr.h" #include "pySceneObject.h" -#include "../pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plSceneObject.h" pyKey::pyKey() { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyKey.h b/Sources/Plasma/FeatureLib/pfPython/pyKey.h index f6341cc6..d7a20684 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyKey.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyKey.h @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include #include "pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.cpp b/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.cpp index 48117f15..41335065 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.cpp @@ -48,8 +48,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKeyMap.h" -#include "../plInputCore/plInputInterfaceMgr.h" -#include "../pnInputCore/plKeyMap.h" +#include "plInputCore/plInputInterfaceMgr.h" +#include "pnInputCore/plKeyMap.h" // conversion functions const char* pyKeyMap::ConvertVKeyToChar( UInt32 vk, UInt32 flags ) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.h b/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.h index e0210b69..6d53b938 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////// #include "hsTypes.h" -#include "../pnInputCore/plKeyMap.h" +#include "pnInputCore/plKeyMap.h" #include #include "pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgr.cpp b/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgr.cpp index 46df0d76..324ce39c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgr.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgr.cpp @@ -47,7 +47,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyMarkerMgr.h" -#include "../pfCharacter/pfMarkerMgr.h" +#include "pfCharacter/pfMarkerMgr.h" void pyMarkerMgr::AddMarker(double x, double y, double z, UInt32 id, bool justCreated) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgrGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgrGlue.cpp index cc190ea3..aaa131bb 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgrGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgrGlue.cpp @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyMarkerMgr.h" -#include "../pfMessage/pfMarkerMsg.h" +#include "pfMessage/pfMarkerMsg.h" #include "pyEnum.h" #include diff --git a/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayer.cpp b/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayer.cpp index d56b6c06..dfd99cae 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayer.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayer.cpp @@ -47,8 +47,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyMoviePlayer.h" -#include "../plMessage/plMovieMsg.h" -#include "../pfMessage/pfMovieEventMsg.h" +#include "plMessage/plMovieMsg.h" +#include "pfMessage/pfMovieEventMsg.h" pyMoviePlayer::pyMoviePlayer(const char* movieName,pyKey& selfKey) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayerGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayerGlue.cpp index 9d60cf6d..fc469281 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayerGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayerGlue.cpp @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyKey.h" #include "pyColor.h" -#include "../pfMessage/pfMovieEventMsg.h" +#include "pfMessage/pfMovieEventMsg.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.cpp b/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.cpp index f746b9a5..d5c530cf 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.cpp @@ -47,9 +47,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStlUtils.h" #include "pyNetLinkingMgr.h" -#include "../plNetClient/plNetLinkingMgr.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plAvatar/plArmatureMod.h" +#include "plNetClient/plNetLinkingMgr.h" +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plArmatureMod.h" #include "pyAgeInfoStruct.h" #include "pyAgeLinkStruct.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgrGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgrGlue.cpp index 208105e8..ba580d3e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgrGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgrGlue.cpp @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyEnum.h" #include "pyAgeLinkStruct.h" -#include "../plNetCommon/plNetCommon.h" +#include "plNetCommon/plNetCommon.h" #include #ifndef BUILDING_PYPLASMA diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.h b/Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.h index de79b63d..573f73e1 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define pyNetServerSessionInfo_h_inc #include "hsTypes.h" -#include "../plNetCommon/plNetServerSessionInfo.h" -#include "../plUUID/plUUID.h" +#include "plNetCommon/plNetServerSessionInfo.h" +#include "plUUID/plUUID.h" #include #include "pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp b/Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp index f4764816..0536e4f2 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////// #include "plgDispatch.h" -#include "../pnMessage/plNotifyMsg.h" +#include "pnMessage/plNotifyMsg.h" #include "pyKey.h" #include "plPythonFileMod.h" #include "pyGeometry3.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNotify.h b/Sources/Plasma/FeatureLib/pfPython/pyNotify.h index 126afa01..1e3c799c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyNotify.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyNotify.h @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "../pnMessage/plNotifyMsg.h" +#include "pnMessage/plNotifyMsg.h" #include "pyKey.h" #include "pyGeometry3.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pySDL.cpp b/Sources/Plasma/FeatureLib/pfPython/pySDL.cpp index 325347c1..70523553 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySDL.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pySDL.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pySDL.h" -#include "../plSDL/plSDL.h" +#include "plSDL/plSDL.h" /////////////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/FeatureLib/pfPython/pySDLGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pySDLGlue.cpp index f4afd5b0..192e3c3a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySDLGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pySDLGlue.cpp @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pySDL.h" -#include "..\plSDL\plSDL.h" +#include "plSDL/plSDL.h" #include "pyEnum.h" #include "pyKey.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pySceneObject.cpp b/Sources/Plasma/FeatureLib/pfPython/pySceneObject.cpp index 1aa2d8f3..749b2263 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySceneObject.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pySceneObject.cpp @@ -42,18 +42,18 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" // TEMP, for STL warnings #include "pySceneObject.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include "cyAvatar.h" -#include "../plAvatar/plAvBrainHuman.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../plResMgr/plResManager.h" -#include "../pnMessage/plCameraMsg.h" -#include "../pfCamera/plCameraModifier.h" -#include "../plAvatar/plArmatureMod.h" +#include "plAvatar/plAvBrainHuman.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "plResMgr/plResManager.h" +#include "pnMessage/plCameraMsg.h" +#include "pfCamera/plCameraModifier.h" +#include "plAvatar/plArmatureMod.h" #include "plPhysical.h" -#include "../plModifier/plResponderModifier.h" -#include "../plModifier/plLogicModifier.h" -#include "../pfPython/plPythonFileMod.h" +#include "plModifier/plResponderModifier.h" +#include "plModifier/plLogicModifier.h" +#include "pfPython/plPythonFileMod.h" #include "pyMatrix44.h" #include "pyKey.h" @@ -545,7 +545,7 @@ hsBool pySceneObject::IsAvatar() return false; } -#include "../plAvatar/plPhysicalControllerCore.h" +#include "plAvatar/plPhysicalControllerCore.h" PyObject* pySceneObject::GetAvatarVelocity() { @@ -824,8 +824,8 @@ std::vector pySceneObject::GetPythonMods() -#include "../plMessage/plAnimCmdMsg.h" -#include "../pnMessage/plNotifyMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "pnMessage/plNotifyMsg.h" void pySceneObject::Animate() { @@ -938,8 +938,8 @@ void pySceneObject::FFResponder(int state) } } -#include "../pnSceneObject/plAudioInterface.h" -#include "../NucleusLib/inc/plAudible.h" +#include "pnSceneObject/plAudioInterface.h" +#include "NucleusLib/inc/plAudible.h" void pySceneObject::SetSoundFilename(int index, const char* filename, bool isCompressed) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyScoreMgr.cpp b/Sources/Plasma/FeatureLib/pfPython/pyScoreMgr.cpp index baae452f..598a6add 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyScoreMgr.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyScoreMgr.cpp @@ -41,9 +41,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyScoreMgr.h" -#include "../pfGameScoreMgr/pfGameScoreMgr.h" -#include "../plVault/plVault.h" -#include "../plNetCommon/plNetCommon.h" +#include "pfGameScoreMgr/pfGameScoreMgr.h" +#include "plVault/plVault.h" +#include "plNetCommon/plNetCommon.h" #include "pyGameScore.h" pyScoreMgr::pyScoreMgr() diff --git a/Sources/Plasma/FeatureLib/pfPython/pyScoreMgrGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyScoreMgrGlue.cpp index 33f21be4..2e51ea0a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyScoreMgrGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyScoreMgrGlue.cpp @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyScoreMgr.h" #include "pyEnum.h" -#include "../pfGameScoreMgr/pfGameScoreMgr.h" +#include "pfGameScoreMgr/pfGameScoreMgr.h" // glue functions PYTHON_CLASS_DEFINITION(ptScoreMgr, pyScoreMgr); diff --git a/Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfo.h b/Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfo.h index 7e82e76f..a4cc54da 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfo.h +++ b/Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfo.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsStlUtils.h" -#include "../plNetCommon/plSpawnPointInfo.h" +#include "plNetCommon/plSpawnPointInfo.h" #include #include "pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyStatusLog.cpp b/Sources/Plasma/FeatureLib/pfPython/pyStatusLog.cpp index 8764344e..cc91941a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyStatusLog.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyStatusLog.cpp @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyStatusLog.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" pyStatusLog::pyStatusLog( plStatusLog* log/*=nil */) : fLog( log ) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyStatusLogGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyStatusLogGlue.cpp index df55a689..b966da88 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyStatusLogGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyStatusLogGlue.cpp @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyStatusLog.h" #include "pyEnum.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyStream.cpp b/Sources/Plasma/FeatureLib/pfPython/pyStream.cpp index 786de7f0..634d82f8 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyStream.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyStream.cpp @@ -47,7 +47,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyStream.h" -#include "../plFile/plEncryptedStream.h" +#include "plFile/plEncryptedStream.h" pyStream::pyStream() : fStream( nil ) diff --git a/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterface.cpp b/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterface.cpp index a500bdda..75110ab1 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterface.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterface.cpp @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pySwimCurrentInterface.h" -#include "../plAvatar/plSwimRegion.h" +#include "plAvatar/plSwimRegion.h" pySwimCurrentInterface::pySwimCurrentInterface(plKey key) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVault.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVault.cpp index 46707a9e..af597e04 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVault.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVault.cpp @@ -64,17 +64,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyAgeLinkStruct.h" #include "pySDL.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include "cyPythonInterface.h" -#include "../plVault/plVault.h" -#include "../pnNetCommon/plNetApp.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plNetClient/plNetLinkingMgr.h" -#include "../plNetClientComm/plNetClientComm.h" -#include "../plMessage/plVaultNotifyMsg.h" +#include "plVault/plVault.h" +#include "pnNetCommon/plNetApp.h" +#include "plNetClient/plNetClientMgr.h" +#include "plNetClient/plNetLinkingMgr.h" +#include "plNetClientComm/plNetClientComm.h" +#include "plMessage/plVaultNotifyMsg.h" -#include "../plSDL/plSDL.h" +#include "plSDL/plSDL.h" //============================================================================ diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNode.cpp index a3288905..856bc7d9 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNode.cpp @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyVaultAgeInfoListNode.h" #include "pyVaultFolderNode.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" // should only be created from C++ side pyVaultAgeInfoListNode::pyVaultAgeInfoListNode(RelVaultNode* nfsNode) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNodeGlue.cpp index ad2396a6..970ce593 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNodeGlue.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyVaultAgeInfoListNode.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNode.cpp index a161d23e..092c9a25 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNode.cpp @@ -56,7 +56,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyNetLinkingMgr.h" #include "pyAgeInfoStruct.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" // should only be created from C++ side pyVaultAgeInfoNode::pyVaultAgeInfoNode(RelVaultNode* nfsNode) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNodeGlue.cpp index b320bea5..684a0902 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNodeGlue.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyVaultAgeInfoNode.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.cpp index efdafac7..6426e3b8 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.cpp @@ -51,9 +51,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyAgeLinkStruct.h" #include "pySpawnPointInfo.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" -#include "../plNetCommon/plSpawnPointInfo.h" +#include "plNetCommon/plSpawnPointInfo.h" // should only be created from C++ side pyVaultAgeLinkNode::pyVaultAgeLinkNode(RelVaultNode* nfsNode) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.h index f033cc30..1c38c678 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.h @@ -55,7 +55,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyGlueHelpers.h" #include "pyVaultNode.h" -#include "../plNetCommon/plNetServerSessionInfo.h" // for plAgeLinkStruct +#include "plNetCommon/plNetServerSessionInfo.h" // for plAgeLinkStruct class pyVaultAgeInfoNode; struct RelVaultNode; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNodeGlue.cpp index 9d5b49d1..251fb5b8 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNodeGlue.cpp @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyVaultAgeLinkNode.h" #include "pySpawnPointInfo.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNode.cpp index 2dbdff86..819cda02 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNode.cpp @@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyVault.h" #endif -#include "../plVault/plVault.h" +#include "plVault/plVault.h" // should only be created from C++ side pyVaultChronicleNode::pyVaultChronicleNode(RelVaultNode* nfsNode) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNodeGlue.cpp index 8fc48b1f..1c105b98 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNodeGlue.cpp @@ -40,8 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyVaultChronicleNode.h" - -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNode.cpp index a3a03a49..be81066a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNode.cpp @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyVaultFolderNode.h" #include "hsUtils.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" // should only be created from C++ side pyVaultFolderNode::pyVaultFolderNode( RelVaultNode* nfsNode ) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNodeGlue.cpp index c494196e..5b1d604f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNodeGlue.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyVaultFolderNode.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultGlue.cpp index f6108c1f..8e0bd00c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultGlue.cpp @@ -47,8 +47,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pySDL.h" #include "pyAgeLinkStruct.h" -#include "../plVault/plVault.h" -#include "../plMessage/plVaultNotifyMsg.h" +#include "plVault/plVault.h" +#include "plMessage/plVaultNotifyMsg.h" #include #ifndef BUILDING_PYPLASMA diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.cpp index 3c1e0f38..b90097ac 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.cpp @@ -54,10 +54,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "cyMisc.h" #include "hsResMgr.h" -#include "../plGImage/plMipmap.h" -#include "../plVault/plVault.h" -#include "../pnMessage/plRefMsg.h" -#include "../plNetClient/plNetClientMgr.h" +#include "plGImage/plMipmap.h" +#include "plVault/plVault.h" +#include "pnMessage/plRefMsg.h" +#include "plNetClient/plNetClientMgr.h" static unsigned s_keyseq; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.h index 87d9f4a2..8d7baf1f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.h @@ -55,7 +55,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyGlueHelpers.h" #include "pyVaultNode.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" struct RelVaultNode; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNodeGlue.cpp index ba78190f..b96e6915 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNodeGlue.cpp @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyVaultImageNode.h" #include "pyImage.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.cpp index 759a0f8c..8b04c778 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.cpp @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyVaultMarkerGameNode.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" // should only be created from C++ side pyVaultMarkerGameNode::pyVaultMarkerGameNode(RelVaultNode* nfsNode) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.h index 93ab3272..a74ce258 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.h @@ -54,7 +54,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyGlueHelpers.h" #include "pyVaultNode.h" -#include "../pnNetBase/pnNetBase.h" +#include "pnNetBase/pnNetBase.h" struct RelVaultNode; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNodeGlue.cpp index 4dc21426..6a134166 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNodeGlue.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyVaultMarkerGameNode.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.cpp index 6dfa886c..b08a4e04 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.cpp @@ -68,13 +68,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyVaultSystemNode.h" #endif -#include "../plGImage/plMipmap.h" +#include "plGImage/plMipmap.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #ifndef BUILDING_PYPLASMA -#include "../pnNetCommon/plNetApp.h" -#include "../plNetClientComm/plNetClientComm.h" +#include "pnNetCommon/plNetApp.h" +#include "plNetClientComm/plNetClientComm.h" #endif #include diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeGlue.cpp index 359346ff..9df2087f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeGlue.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyVaultNode.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRef.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRef.cpp index c47aed2c..e6a67295 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRef.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRef.cpp @@ -52,7 +52,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyVaultNode.h" #include "pyVaultPlayerInfoNode.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" ////////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRefGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRefGlue.cpp index 53e71475..604a97d0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRefGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRefGlue.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyVaultNodeRef.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNode.cpp index 914c62a0..051ed754 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNode.cpp @@ -53,7 +53,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyVaultPlayerInfoNode.h" #include "pyVaultNodeRef.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNodeGlue.cpp index 27fc381f..a9437989 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNodeGlue.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyVaultPlayerInfoListNode.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNode.cpp index 236b147a..9500469b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNode.cpp @@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyVault.h" #endif -#include "../plVault/plVault.h" +#include "plVault/plVault.h" // should only be created from C++ side pyVaultPlayerInfoNode::pyVaultPlayerInfoNode(RelVaultNode* nfsNode) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNodeGlue.cpp index d1d00925..9cf213e8 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNodeGlue.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyVaultPlayerInfoNode.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.cpp index b7873ee6..a32500f7 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.cpp @@ -50,16 +50,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyVault.h" #endif -#include "../pfPython/pyAgeInfoStruct.h" -#include "../pfPython/pyVaultAgeLinkNode.h" -#include "../pfPython/pyVaultPlayerInfoNode.h" -#include "../pfPython/pyVaultPlayerInfoListNode.h" -#include "../pfPython/pyVaultFolderNode.h" -#include "../pfPython/pyVaultChronicleNode.h" -#include "../pfPython/pyVaultSDLNode.h" -#include "../pfPython/pyAgeLinkStruct.h" - -#include "../plVault/plVault.h" +#include "pfPython/pyAgeInfoStruct.h" +#include "pfPython/pyVaultAgeLinkNode.h" +#include "pfPython/pyVaultPlayerInfoNode.h" +#include "pfPython/pyVaultPlayerInfoListNode.h" +#include "pfPython/pyVaultFolderNode.h" +#include "pfPython/pyVaultChronicleNode.h" +#include "pfPython/pyVaultSDLNode.h" +#include "pfPython/pyAgeLinkStruct.h" + +#include "plVault/plVault.h" //============================================================================ static PyObject * GetPlayerVaultFolder (unsigned folderType) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.h index ef18110d..90eb5a95 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.h @@ -54,8 +54,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include "pyGlueHelpers.h" -#include "../pfPython/pyVaultNode.h" -#include "../pfPython/pyVaultPlayerInfoNode.h" +#include "pfPython/pyVaultNode.h" +#include "pfPython/pyVaultPlayerInfoNode.h" class pyAgeInfoStruct; struct RelVaultNode; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNodeGlue.cpp index 85cbc79b..f1b5d3f5 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNodeGlue.cpp @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyVaultPlayerNode.h" #include "pyAgeInfoStruct.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNode.cpp index 3bfee6d3..359333fa 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNode.cpp @@ -48,9 +48,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyVaultSDLNode.h" #include "pySDL.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" -#include "../plSDL/plSDL.h" +#include "plSDL/plSDL.h" // should only be created from C++ side pyVaultSDLNode::pyVaultSDLNode(RelVaultNode* nfsNode) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNodeGlue.cpp index db7fd213..565359f0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNodeGlue.cpp @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyVaultSDLNode.h" #include "pySDL.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNode.cpp index 60abd737..dc191f16 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNode.cpp @@ -52,7 +52,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyVaultAgeLinkNode.h" #include "pyVaultFolderNode.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" // should only be created from C++ side pyVaultSystemNode::pyVaultSystemNode(RelVaultNode* nfsNode) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNodeGlue.cpp index 36022d62..30040f78 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNodeGlue.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyVaultSystemNode.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNode.cpp index f669ea23..e752f506 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNode.cpp @@ -52,7 +52,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyVaultAgeLinkNode.h" #include "pyVaultFolderNode.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" // should only be created from C++ side pyVaultTextNoteNode::pyVaultTextNoteNode(RelVaultNode* nfsNode) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNodeGlue.cpp index 449a424c..8c447122 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNodeGlue.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyVaultTextNoteNode.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyWaveSet.cpp b/Sources/Plasma/FeatureLib/pfPython/pyWaveSet.cpp index edf12b14..cdcdd2a4 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyWaveSet.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyWaveSet.cpp @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pyWaveSet.h" -#include "../plDrawable/plWaveSet7.h" +#include "plDrawable/plWaveSet7.h" pyWaveSet::pyWaveSet(plKey key) { diff --git a/Sources/Plasma/FeatureLib/pfSecurePreloader/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfSecurePreloader/CMakeLists.txt new file mode 100644 index 00000000..6d7125be --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfSecurePreloader/CMakeLists.txt @@ -0,0 +1,22 @@ +include_directories(../../CoreLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) +include_directories(../../PubUtilLib) + +if(WIN32) + add_definitions(-DWIN32) +endif(WIN32) + +set(pfSecurePreloader_SOURCES + pfSecurePreloader.cpp +) + +set(pfSecurePreloader_HEADERS + pfSecurePreloader.h + pfSecurePreloaderCreatable.h +) + +add_library(pfSecurePreloader STATIC ${pfSecurePreloader_SOURCES} ${pfSecurePreloader_HEADERS}) + +source_group("Source Files" FILES ${pfSecurePreloader_SOURCES}) +source_group("Header Files" FILES ${pfSecurePreloader_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfSecurePreloader/pfSecurePreloader.cpp b/Sources/Plasma/FeatureLib/pfSecurePreloader/pfSecurePreloader.cpp index 42613be1..1aa78318 100644 --- a/Sources/Plasma/FeatureLib/pfSecurePreloader/pfSecurePreloader.cpp +++ b/Sources/Plasma/FeatureLib/pfSecurePreloader/pfSecurePreloader.cpp @@ -42,20 +42,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsSTLStream.h" #include "hsResMgr.h" #include "plgDispatch.h" -#include "../pnUtils/pnUtils.h" -#include "../pnNetBase/pnNetBase.h" -#include "../pnAsyncCore/pnAsyncCore.h" -#include "../pnNetCli/pnNetCli.h" -#include "../plNetGameLib/plNetGameLib.h" -#include "../plFile/plFileUtils.h" -#include "../plFile/plStreamSource.h" -#include "../plNetCommon/plNetCommon.h" -#include "../plProgressMgr/plProgressMgr.h" -#include "../plMessage/plPreloaderMsg.h" -#include "../plMessage/plNetCommMsgs.h" +#include "pnUtils/pnUtils.h" +#include "pnNetBase/pnNetBase.h" +#include "pnAsyncCore/pnAsyncCore.h" +#include "pnNetCli/pnNetCli.h" +#include "plNetGameLib/plNetGameLib.h" +#include "plFile/plFileUtils.h" +#include "plFile/plStreamSource.h" +#include "plNetCommon/plNetCommon.h" +#include "plProgressMgr/plProgressMgr.h" +#include "plMessage/plPreloaderMsg.h" +#include "plMessage/plNetCommMsgs.h" #include "pfSecurePreloader.h" -#include "../plNetClientComm/plNetClientComm.h" +#include "plNetClientComm/plNetClientComm.h" extern hsBool gDataServerLocal; diff --git a/Sources/Plasma/FeatureLib/pfSecurePreloader/pfSecurePreloader.h b/Sources/Plasma/FeatureLib/pfSecurePreloader/pfSecurePreloader.h index 8cb6adb9..5760b633 100644 --- a/Sources/Plasma/FeatureLib/pfSecurePreloader/pfSecurePreloader.h +++ b/Sources/Plasma/FeatureLib/pfSecurePreloader/pfSecurePreloader.h @@ -46,8 +46,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStlUtils.h" #include "hsCritSect.h" #include "hsStream.h" -#include "../plFile/plSecureStream.h" -#include "../pnKeyedObject/hsKeyedObject.h" +#include "plFile/plSecureStream.h" +#include "pnKeyedObject/hsKeyedObject.h" class plOperationProgress; diff --git a/Sources/Plasma/FeatureLib/pfSecurePreloader/pfSecurePreloaderCreatable.h b/Sources/Plasma/FeatureLib/pfSecurePreloader/pfSecurePreloaderCreatable.h index 595e5aa0..7f6c3437 100644 --- a/Sources/Plasma/FeatureLib/pfSecurePreloader/pfSecurePreloaderCreatable.h +++ b/Sources/Plasma/FeatureLib/pfSecurePreloader/pfSecurePreloaderCreatable.h @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PLASMA20_SOURCES_PLASMA_FEATURELIB_PFSECUREPRELOADER_PFSECUREPRELOADERCREATABLE_H #define PLASMA20_SOURCES_PLASMA_FEATURELIB_PFSECUREPRELOADER_PFSECUREPRELOADERCREATABLE_H -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "pfSecurePreloader.h" REGISTER_NONCREATABLE(pfSecurePreloader); diff --git a/Sources/Plasma/FeatureLib/pfStackTrace/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfStackTrace/CMakeLists.txt new file mode 100644 index 00000000..449736b5 --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfStackTrace/CMakeLists.txt @@ -0,0 +1,27 @@ +include_directories(../../CoreLib) + +if(WIN32) + add_definitions(-DWIN32) +endif(WIN32) + +set(pfStackTrace_SOURCES + pfMapFile.cpp + pfMapFileEntry.cpp + pfPrintStackTrace.cpp + pfStackTrace.cpp + pfTextFile.cpp +) + +set(pfStackTrace_HEADERS + pfArray.h + pfMapFile.h + pfMapFileEntry.h + pfPrintStackTrace.h + pfStackTrace.h + pfTextFile.h +) + +add_library(pfStackTrace STATIC ${pfStackTrace_SOURCES} ${pfStackTrace_HEADERS}) + +source_group("Source Files" FILES ${pfStackTrace_SOURCES}) +source_group("Header Files" FILES ${pfStackTrace_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfSurface/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfSurface/CMakeLists.txt new file mode 100644 index 00000000..bc87de4c --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfSurface/CMakeLists.txt @@ -0,0 +1,34 @@ +include_directories(../../CoreLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) +include_directories(../../PubUtilLib) + +if(WIN32) + add_definitions(-DWIN32) +endif(WIN32) + +set(pfSurface_SOURCES + plDistOpacityMod.cpp + plFadeOpacityLay.cpp + plFadeOpacityMod.cpp + plGrabCubeMap.cpp + plLayerAVI.cpp + plLayerBink.cpp + plLayerMovie.cpp +) + +set(pfSurface_HEADERS + pfSurfaceCreatable.h + plDistOpacityMod.h + plFadeOpacityLay.h + plFadeOpacityMod.h + plGrabCubeMap.h + plLayerAVI.h + plLayerBink.h + plLayerMovie.h +) + +add_library(pfSurface STATIC ${pfSurface_SOURCES} ${pfSources_HEADERS}) + +source_group("Source Files" FILES ${pfSurface_SOURCES}) +source_group("Header Files" FILES ${pfSurface_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfSurface/pfSurfaceCreatable.h b/Sources/Plasma/FeatureLib/pfSurface/pfSurfaceCreatable.h index dc33e1c3..c416d2aa 100644 --- a/Sources/Plasma/FeatureLib/pfSurface/pfSurfaceCreatable.h +++ b/Sources/Plasma/FeatureLib/pfSurface/pfSurfaceCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pfSurfaceCreatable_inc #define pfSurfaceCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plLayerMovie.h" diff --git a/Sources/Plasma/FeatureLib/pfSurface/plDistOpacityMod.cpp b/Sources/Plasma/FeatureLib/pfSurface/plDistOpacityMod.cpp index beb8133c..45f4e48c 100644 --- a/Sources/Plasma/FeatureLib/pfSurface/plDistOpacityMod.cpp +++ b/Sources/Plasma/FeatureLib/pfSurface/plDistOpacityMod.cpp @@ -46,20 +46,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plDistOpacityMod.h" #include "plFadeOpacityLay.h" -#include "../plSurface/hsGMaterial.h" +#include "plSurface/hsGMaterial.h" -#include "../plDrawable/plAccessGeometry.h" -#include "../plDrawable/plAccessSpan.h" +#include "plDrawable/plAccessGeometry.h" +#include "plDrawable/plAccessSpan.h" -#include "../plMessage/plMatRefMsg.h" +#include "plMessage/plMatRefMsg.h" // If we're tracking the camera -#include "../plMessage/plRenderMsg.h" +#include "plMessage/plRenderMsg.h" #include "plPipeline.h" // If we're tracking the avater -#include "../plMessage/plAvatarMsg.h" -#include "../plAvatar/plArmatureMod.h" +#include "plMessage/plAvatarMsg.h" +#include "plAvatar/plArmatureMod.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfSurface/plDistOpacityMod.h b/Sources/Plasma/FeatureLib/pfSurface/plDistOpacityMod.h index ecd7d097..40885dff 100644 --- a/Sources/Plasma/FeatureLib/pfSurface/plDistOpacityMod.h +++ b/Sources/Plasma/FeatureLib/pfSurface/plDistOpacityMod.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plDistOpacityMod_inc #include "hsGeometry3.h" -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" #include "hsTemplates.h" class plPipeline; diff --git a/Sources/Plasma/FeatureLib/pfSurface/plFadeOpacityLay.h b/Sources/Plasma/FeatureLib/pfSurface/plFadeOpacityLay.h index f6182a39..5b023ec4 100644 --- a/Sources/Plasma/FeatureLib/pfSurface/plFadeOpacityLay.h +++ b/Sources/Plasma/FeatureLib/pfSurface/plFadeOpacityLay.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plFadeOpacityLay_inc #define plFadeOpacityLay_inc -#include "../plSurface/plLayerInterface.h" +#include "plSurface/plLayerInterface.h" class plFadeOpacityLay : public plLayerInterface diff --git a/Sources/Plasma/FeatureLib/pfSurface/plFadeOpacityMod.cpp b/Sources/Plasma/FeatureLib/pfSurface/plFadeOpacityMod.cpp index 2e7d12dd..16bbdd67 100644 --- a/Sources/Plasma/FeatureLib/pfSurface/plFadeOpacityMod.cpp +++ b/Sources/Plasma/FeatureLib/pfSurface/plFadeOpacityMod.cpp @@ -45,20 +45,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plFadeOpacityLay.h" -#include "../plMessage/plRenderMsg.h" -#include "../plMessage/plMatRefMsg.h" +#include "plMessage/plRenderMsg.h" +#include "plMessage/plMatRefMsg.h" -#include "../plSurface/hsGMaterial.h" +#include "plSurface/hsGMaterial.h" -#include "../plDrawable/plVisLOSMgr.h" -#include "../plDrawable/plAccessGeometry.h" -#include "../plDrawable/plAccessSpan.h" -#include "../plDrawable/plDrawableSpans.h" +#include "plDrawable/plVisLOSMgr.h" +#include "plDrawable/plAccessGeometry.h" +#include "plDrawable/plAccessSpan.h" +#include "plDrawable/plDrawableSpans.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plDrawInterface.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plDrawInterface.h" -#include "../plScene/plVisMgr.h" +#include "plScene/plVisMgr.h" #include "plgDispatch.h" #include "plPipeline.h" diff --git a/Sources/Plasma/FeatureLib/pfSurface/plFadeOpacityMod.h b/Sources/Plasma/FeatureLib/pfSurface/plFadeOpacityMod.h index fe83f56f..65d60437 100644 --- a/Sources/Plasma/FeatureLib/pfSurface/plFadeOpacityMod.h +++ b/Sources/Plasma/FeatureLib/pfSurface/plFadeOpacityMod.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plFadeOpacityMod_inc #include "hsGeometry3.h" -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" #include "hsTemplates.h" class plPipeline; diff --git a/Sources/Plasma/FeatureLib/pfSurface/plGrabCubeMap.cpp b/Sources/Plasma/FeatureLib/pfSurface/plGrabCubeMap.cpp index d9d0636f..82c3efe9 100644 --- a/Sources/Plasma/FeatureLib/pfSurface/plGrabCubeMap.cpp +++ b/Sources/Plasma/FeatureLib/pfSurface/plGrabCubeMap.cpp @@ -52,14 +52,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsColorRGBA.h" #include "hsBounds.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plDrawInterface.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plDrawInterface.h" -#include "../plGImage/plMipmap.h" +#include "plGImage/plMipmap.h" -#include "../plJPEG/plJPEG.h" +#include "plJPEG/plJPEG.h" -#include "../plMessage/plRenderRequestMsg.h" +#include "plMessage/plRenderRequestMsg.h" plGrabCubeRenderRequest::plGrabCubeRenderRequest() : fQuality(75) diff --git a/Sources/Plasma/FeatureLib/pfSurface/plGrabCubeMap.h b/Sources/Plasma/FeatureLib/pfSurface/plGrabCubeMap.h index 3d5fd01c..f00d142e 100644 --- a/Sources/Plasma/FeatureLib/pfSurface/plGrabCubeMap.h +++ b/Sources/Plasma/FeatureLib/pfSurface/plGrabCubeMap.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plGrabCubeMap_inc #define plGrabCubeMap_inc -#include "../plScene/plRenderRequest.h" +#include "plScene/plRenderRequest.h" class plSceneObject; class plPipeline; diff --git a/Sources/Plasma/FeatureLib/pfSurface/plLayerAVI.cpp b/Sources/Plasma/FeatureLib/pfSurface/plLayerAVI.cpp index 4c100bdb..0d38a6d8 100644 --- a/Sources/Plasma/FeatureLib/pfSurface/plLayerAVI.cpp +++ b/Sources/Plasma/FeatureLib/pfSurface/plLayerAVI.cpp @@ -54,7 +54,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plLayerAVI.h" -#include "../plGImage/plMipmap.h" +#include "plGImage/plMipmap.h" #if HS_BUILD_FOR_WIN32 class plAVIFileInfo diff --git a/Sources/Plasma/FeatureLib/pfSurface/plLayerMovie.cpp b/Sources/Plasma/FeatureLib/pfSurface/plLayerMovie.cpp index 218fa015..7156a18d 100644 --- a/Sources/Plasma/FeatureLib/pfSurface/plLayerMovie.cpp +++ b/Sources/Plasma/FeatureLib/pfSurface/plLayerMovie.cpp @@ -46,9 +46,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "hsUtils.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plGImage/plMipmap.h" -#include "../plPipeline/hsGDeviceRef.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plGImage/plMipmap.h" +#include "plPipeline/hsGDeviceRef.h" plLayerMovie::plLayerMovie() : fMovieName(nil), diff --git a/Sources/Plasma/FeatureLib/pfSurface/plLayerMovie.h b/Sources/Plasma/FeatureLib/pfSurface/plLayerMovie.h index 1c007003..f39df2e0 100644 --- a/Sources/Plasma/FeatureLib/pfSurface/plLayerMovie.h +++ b/Sources/Plasma/FeatureLib/pfSurface/plLayerMovie.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLayerMovie_inc #define plLayerMovie_inc -#include "../plSurface/plLayerAnimation.h" -#include "../plInterp/plAnimTimeConvert.h" +#include "plSurface/plLayerAnimation.h" +#include "plInterp/plAnimTimeConvert.h" class plMessage; class hsStream;