From afdcfc9fd32715d66da3221d6ea5945c84a034bb Mon Sep 17 00:00:00 2001 From: Zrax Date: Fri, 8 Apr 2011 18:09:44 -0700 Subject: [PATCH] Finished PubUtilLib cmakification --HG-- rename : MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plOGGCodec.cpp => MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plOGGCodec.cpp rename : MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plOGGCodec.h => MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plOGGCodec.h rename : MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWavFile.cpp => MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.cpp rename : MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWavFile.h => MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.h (cherry picked from commit 0477edc597375923fc2b6580172e9ce841564d03) --- CMakeLists.txt | 16 +- .../Plasma/FeatureLib/pfPython/CMakeLists.txt | 714 +++++++++--------- Sources/Plasma/PubUtilLib/CMakeLists.txt | 16 +- .../Plasma/PubUtilLib/plAudio/CMakeLists.txt | 50 ++ .../Plasma/PubUtilLib/plAudio/plAudioCaps.cpp | 6 +- .../PubUtilLib/plAudio/plAudioCreatable.h | 2 +- .../PubUtilLib/plAudio/plAudioSystem.cpp | 22 +- .../Plasma/PubUtilLib/plAudio/plAudioSystem.h | 2 +- .../PubUtilLib/plAudio/plDSoundBuffer.cpp | 8 +- .../PubUtilLib/plAudio/plEAXEffects.cpp | 4 +- .../PubUtilLib/plAudio/plEAXListenerMod.cpp | 4 +- .../PubUtilLib/plAudio/plEAXListenerMod.h | 2 +- Sources/Plasma/PubUtilLib/plAudio/plSound.cpp | 32 +- Sources/Plasma/PubUtilLib/plAudio/plSound.h | 8 +- .../PubUtilLib/plAudio/plSoundEvent.cpp | 4 +- .../Plasma/PubUtilLib/plAudio/plVoiceChat.cpp | 26 +- .../PubUtilLib/plAudio/plWAVClipBuffer.cpp | 2 +- .../plAudio/plWin32GroupedSound.cpp | 8 +- .../PubUtilLib/plAudio/plWin32Sound.cpp | 18 +- .../PubUtilLib/plAudio/plWin32StaticSound.cpp | 18 +- .../plAudio/plWin32StreamingSound.cpp | 12 +- .../plAudio/plWin32StreamingSound.h | 2 +- .../PubUtilLib/plAudioCore/CMakeLists.txt | 34 + .../plAudioCore/plAudioFileReader.cpp | 10 +- .../plAudioCore/plBufferedFileReader.h | 2 +- .../{plAudio => plAudioCore}/plOGGCodec.cpp | 2 +- .../{plAudio => plAudioCore}/plOGGCodec.h | 2 +- .../PubUtilLib/plAudioCore/plSoundBuffer.cpp | 12 +- .../PubUtilLib/plAudioCore/plSoundBuffer.h | 4 +- .../{plAudio => plAudioCore}/plWavFile.cpp | 0 .../{plAudio => plAudioCore}/plWavFile.h | 2 +- .../PubUtilLib/plInputCore/CMakeLists.txt | 37 + .../plInputCore/plAvatarInputInterface.cpp | 26 +- .../plInputCore/plAvatarInputInterface.h | 2 +- .../PubUtilLib/plInputCore/plDInputDevice.cpp | 2 +- .../plInputCore/plDebugInputInterface.cpp | 8 +- .../plInputCore/plDebugInputInterface.h | 2 +- .../PubUtilLib/plInputCore/plInputDevice.cpp | 12 +- .../PubUtilLib/plInputCore/plInputDevice.h | 4 +- .../plInputCore/plInputInterface.cpp | 4 +- .../PubUtilLib/plInputCore/plInputInterface.h | 4 +- .../plInputCore/plInputInterfaceMgr.cpp | 24 +- .../plInputCore/plInputInterfaceMgr.h | 4 +- .../PubUtilLib/plInputCore/plInputManager.cpp | 12 +- .../PubUtilLib/plInputCore/plInputManager.h | 4 +- .../plInputCore/plSceneInputInterface.cpp | 68 +- .../plInputCore/plSceneInputInterface.h | 4 +- .../plInputCore/plTelescopeInputInterface.cpp | 2 +- .../plInputCore/plTelescopeInputInterface.h | 2 +- .../PubUtilLib/plModifier/CMakeLists.txt | 59 ++ .../plModifier/plAnimEventModifier.cpp | 8 +- .../plModifier/plAnimEventModifier.h | 2 +- .../plAnimTimeConvertSDLModifier.cpp | 4 +- .../plModifier/plAnimTimeConvertSDLModifier.h | 2 +- .../plModifier/plAxisAnimModifier.cpp | 26 +- .../plModifier/plAxisAnimModifier.h | 2 +- .../plModifier/plCloneSpawnModifier.cpp | 14 +- .../plModifier/plCloneSpawnModifier.h | 2 +- .../plModifier/plDecalEnableMod.cpp | 8 +- .../PubUtilLib/plModifier/plDecalEnableMod.h | 4 +- .../PubUtilLib/plModifier/plDetectorLog.cpp | 2 +- .../plModifier/plExcludeRegionModifier.cpp | 26 +- .../plModifier/plExcludeRegionModifier.h | 4 +- .../plModifier/plGameMarkerModifier.cpp | 6 +- .../plModifier/plGameMarkerModifier.h | 2 +- .../PubUtilLib/plModifier/plImageLibMod.cpp | 4 +- .../PubUtilLib/plModifier/plImageLibMod.h | 4 +- .../plModifier/plInterfaceInfoModifier.cpp | 2 +- .../plModifier/plInterfaceInfoModifier.h | 4 +- .../plModifier/plLayerSDLModifier.cpp | 4 +- .../plModifier/plLayerSDLModifier.h | 2 +- .../PubUtilLib/plModifier/plLogicModifier.cpp | 34 +- .../PubUtilLib/plModifier/plLogicModifier.h | 2 +- .../plMaintainersMarkerModifier.cpp | 4 +- .../plModifier/plMaintainersMarkerModifier.h | 4 +- .../plModifier/plModifierCreatable.h | 2 +- .../plModifier/plResponderModifier.cpp | 50 +- .../plModifier/plResponderModifier.h | 4 +- .../plModifier/plResponderSDLModifier.cpp | 2 +- .../plModifier/plResponderSDLModifier.h | 2 +- .../PubUtilLib/plModifier/plSDLModifier.cpp | 18 +- .../plModifier/plSimpleModifier.cpp | 10 +- .../PubUtilLib/plModifier/plSimpleModifier.h | 2 +- .../plModifier/plSoundSDLModifier.cpp | 8 +- .../plModifier/plSoundSDLModifier.h | 2 +- .../PubUtilLib/plModifier/plSpawnModifier.cpp | 16 +- .../PubUtilLib/plModifier/plSpawnModifier.h | 4 +- .../PubUtilLib/plNetClient/CMakeLists.txt | 47 ++ .../plNetClient/plLinkEffectsMgr.cpp | 42 +- .../PubUtilLib/plNetClient/plLinkEffectsMgr.h | 2 +- .../plNetClient/plNetCliAgeJoiner.cpp | 34 +- .../plNetClient/plNetCliAgeJoiner.h | 4 +- .../plNetClient/plNetCliAgeLeaver.cpp | 24 +- .../plNetClient/plNetCliAgeLeaver.h | 4 +- .../plNetClient/plNetClientCommInterface.cpp | 4 +- .../plNetClient/plNetClientCreatable.h | 4 +- .../plNetClient/plNetClientGroup.cpp | 4 +- .../PubUtilLib/plNetClient/plNetClientGroup.h | 2 +- .../PubUtilLib/plNetClient/plNetClientMgr.cpp | 106 +-- .../PubUtilLib/plNetClient/plNetClientMgr.h | 12 +- .../plNetClient/plNetClientMgrLoad.cpp | 69 +- .../plNetClient/plNetClientMgrRecord.cpp | 6 +- .../plNetClient/plNetClientMgrSend.cpp | 46 +- .../plNetClient/plNetClientMgrShow.cpp | 12 +- .../plNetClient/plNetClientMgrVoice.cpp | 22 +- .../plNetClient/plNetClientMsgHandler.cpp | 62 +- .../plNetClient/plNetClientMsgHandler.h | 2 +- .../plNetClient/plNetClientMsgScreener.cpp | 10 +- .../plNetClient/plNetClientMsgScreener.h | 2 +- .../plNetClient/plNetLinkingMgr.cpp | 34 +- .../PubUtilLib/plNetClient/plNetLinkingMgr.h | 6 +- .../plNetClient/plNetObjectDebugger.cpp | 12 +- .../plNetClient/plNetObjectDebugger.h | 4 +- .../PubUtilLib/plNetClient/plNetVoiceList.cpp | 8 +- .../PubUtilLib/plNetCommon/CMakeLists.txt | 33 + .../PubUtilLib/plNetCommon/plClientGuid.cpp | 4 +- .../PubUtilLib/plNetCommon/plClientGuid.h | 4 +- .../PubUtilLib/plNetCommon/plNetCommon.cpp | 2 +- .../plNetCommon/plNetCommonCreatable.h | 2 +- .../plNetCommon/plNetCommonHelpers.cpp | 4 +- .../plNetCommon/plNetMsgScreener.cpp | 36 +- .../PubUtilLib/plNetCommon/plNetMsgScreener.h | 4 +- .../plNetCommon/plNetServerSessionInfo.cpp | 4 +- .../plNetCommon/plSpawnPointInfo.cpp | 2 +- .../Plasma/PubUtilLib/plPhysX/CMakeLists.txt | 30 + .../PubUtilLib/plPhysX/plLOSDispatch.cpp | 16 +- .../Plasma/PubUtilLib/plPhysX/plLOSDispatch.h | 2 +- .../Plasma/PubUtilLib/plPhysX/plPXConvert.h | 6 +- .../PubUtilLib/plPhysX/plPXPhysical.cpp | 36 +- .../Plasma/PubUtilLib/plPhysX/plPXPhysical.h | 2 +- .../Plasma/PubUtilLib/plPhysX/plPXStream.h | 4 +- .../PubUtilLib/plPhysX/plPhysXCreatable.h | 2 +- .../PubUtilLib/plPhysX/plSimulationMgr.cpp | 16 +- .../PubUtilLib/plPhysX/plSimulationMgr.h | 2 +- .../PubUtilLib/plPipeline/CMakeLists.txt | 87 +++ .../plPipeline/hsG3DDeviceSelector.cpp | 6 +- .../PubUtilLib/plPipeline/plCaptureRender.cpp | 12 +- .../PubUtilLib/plPipeline/plCaptureRender.h | 2 +- .../plCubicRenderTargetModifier.cpp | 12 +- .../plPipeline/plCubicRenderTargetModifier.h | 4 +- .../PubUtilLib/plPipeline/plCullTree.cpp | 2 +- .../Plasma/PubUtilLib/plPipeline/plCullTree.h | 2 +- .../PubUtilLib/plPipeline/plDTProgressMgr.h | 2 +- .../PubUtilLib/plPipeline/plDXDeviceRefs.cpp | 8 +- .../PubUtilLib/plPipeline/plDXPipeline.cpp | 72 +- .../PubUtilLib/plPipeline/plDXPipeline.h | 2 +- .../PubUtilLib/plPipeline/plDXPixelShader.cpp | 2 +- .../PubUtilLib/plPipeline/plDXShader.cpp | 2 +- .../plPipeline/plDXVertexShader.cpp | 2 +- .../PubUtilLib/plPipeline/plDynamicEnvMap.cpp | 28 +- .../PubUtilLib/plPipeline/plDynamicEnvMap.h | 2 +- .../PubUtilLib/plPipeline/plFogEnvironment.h | 2 +- .../PubUtilLib/plPipeline/plGBufferGroup.cpp | 4 +- .../plPipeline/plPipelineCreatable.h | 2 +- .../Plasma/PubUtilLib/plPipeline/plPlates.cpp | 14 +- .../PubUtilLib/plPipeline/plRenderTarget.cpp | 2 +- .../PubUtilLib/plPipeline/plRenderTarget.h | 2 +- .../plPipeline/plStatusLogDrawer.cpp | 2 +- .../PubUtilLib/plPipeline/plStatusLogDrawer.h | 2 +- .../PubUtilLib/plPipeline/plTextGenerator.cpp | 8 +- .../PubUtilLib/plPipeline/plTransitionMgr.cpp | 28 +- .../PubUtilLib/plPipeline/plTransitionMgr.h | 2 +- cmake/FindOgg.cmake | 30 + cmake/FindPhysX.cmake | 61 ++ cmake/FindSpeex.cmake | 30 + cmake/FindVorbis.cmake | 37 + 166 files changed, 1717 insertions(+), 1171 deletions(-) create mode 100644 Sources/Plasma/PubUtilLib/plAudio/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plAudioCore/CMakeLists.txt rename Sources/Plasma/PubUtilLib/{plAudio => plAudioCore}/plOGGCodec.cpp (99%) rename Sources/Plasma/PubUtilLib/{plAudio => plAudioCore}/plOGGCodec.h (98%) rename Sources/Plasma/PubUtilLib/{plAudio => plAudioCore}/plWavFile.cpp (100%) rename Sources/Plasma/PubUtilLib/{plAudio => plAudioCore}/plWavFile.h (98%) create mode 100644 Sources/Plasma/PubUtilLib/plInputCore/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plModifier/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plNetClient/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plNetCommon/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plPhysX/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt create mode 100644 cmake/FindOgg.cmake create mode 100644 cmake/FindPhysX.cmake create mode 100644 cmake/FindSpeex.cmake create mode 100644 cmake/FindVorbis.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 1adcbda7..cdd8d488 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,18 +1,24 @@ project(CyanWorldsEngine) cmake_minimum_required(VERSION 2.8) +set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") + # Find all 3rd-party libraries that are required find_package(OpenSSL REQUIRED) find_package(OpenAL REQUIRED) -find_package(PythonLibs REQUIRED) -find_package(ZLIB REQUIRED) -find_package(EXPAT REQUIRED) +find_package(PythonLibs REQUIRED) +find_package(EXPAT REQUIRED) find_package(ZLIB REQUIRED) +find_package(PHYSX REQUIRED) #TODO: Not required if we aren't building the client +find_package(Ogg REQUIRED) #TODO: Not required if we aren't building the client +find_package(Vorbis REQUIRED) #TODO: Not required if we aren't building the client +find_package(Speex REQUIRED) #TODO: Not required if we aren't building the client +#find_package(BINK REQUIRED) #TODO: Find Bink, but don't require it if plPipeline isn't built... +# Or better yet, just eliminate bink altogether option(EXTERNAL_RELEASE "Is this release intended for the general public?" OFF) -# TODO: are there any other build types which are useful for us? ->>>>>>> Finish the port of FeatureLib to CMake +#TODO: Don't hard code this add_definitions(-DBUILD_TYPE=BUILD_TYPE_LIVE) if(EXTERNAL_RELEASE) diff --git a/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt index 02d1b6d9..d5e41676 100644 --- a/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt +++ b/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt @@ -1,357 +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}) +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 Glue\\VarSync" FILES ${pfPython_VSYNC}) diff --git a/Sources/Plasma/PubUtilLib/CMakeLists.txt b/Sources/Plasma/PubUtilLib/CMakeLists.txt index e8da53cc..5fd9b82d 100644 --- a/Sources/Plasma/PubUtilLib/CMakeLists.txt +++ b/Sources/Plasma/PubUtilLib/CMakeLists.txt @@ -3,8 +3,8 @@ add_definitions(-D_LIB) add_subdirectory(plAgeDescription) add_subdirectory(plAgeLoader) add_subdirectory(plAudible) -#add_subdirectory(plAudio) # TODO: DirectX -#add_subdirectory(plAudioCore) # TODO: DirectX +add_subdirectory(plAudio) +add_subdirectory(plAudioCore) add_subdirectory(plAvatar) add_subdirectory(plCompression) add_subdirectory(plContainer) @@ -17,24 +17,24 @@ add_subdirectory(plFile) #add_subdirectory(plGImage) add_subdirectory(plGLight) #add_subdirectory(plGRenderProcs) # Not being used by any current slns -#add_subdirectory(plInputCore) # TODO: DirectX +add_subdirectory(plInputCore) add_subdirectory(plInterp) add_subdirectory(plIntersect) add_subdirectory(plJPEG) add_subdirectory(plMath) add_subdirectory(plMessage) -#add_subdirectory(plModifier) # TODO: PhysX -#add_subdirectory(plNetClient) # TODO: STLport +add_subdirectory(plModifier) +add_subdirectory(plNetClient) add_subdirectory(plNetClientComm) add_subdirectory(plNetClientRecorder) -#add_subdirectory(plNetCommon) # TODO: STLport +add_subdirectory(plNetCommon) add_subdirectory(plNetGameLib) add_subdirectory(plNetMessage) add_subdirectory(plNetTransport) add_subdirectory(plParticleSystem) add_subdirectory(plPhysical) -#add_subdirectory(plPhysX) # TODO: PhysX -#add_subdirectory(plPipeline) # TODO: Bink, DirectX +add_subdirectory(plPhysX) +add_subdirectory(plPipeline) add_subdirectory(plProgressMgr) add_subdirectory(plResMgr) add_subdirectory(plScene) diff --git a/Sources/Plasma/PubUtilLib/plAudio/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plAudio/CMakeLists.txt new file mode 100644 index 00000000..8619a451 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plAudio/CMakeLists.txt @@ -0,0 +1,50 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +#TODO: This should probably be an external dependancy +include_directories("../../../../SDKs/Win32/HawkVoice/src") + +include_directories(${OPENAL_INCLUDE_DIR}) +include_directories(${Speex_INCLUDE_DIR}) + +set(plAudio_SOURCES + plAudioCaps.cpp + plAudioSystem.cpp + plDSoundBuffer.cpp + plEAXEffects.cpp + plEAXListenerMod.cpp + plSound.cpp + plSoundEvent.cpp + plVoiceChat.cpp + plWAVClipBuffer.cpp + plWin32GroupedSound.cpp + plWin32Sound.cpp + plWin32StaticSound.cpp + plWin32StreamingSound.cpp + plWinMicLevel.cpp +) + +set(plAudio_HEADERS + plAudioCaps.h + plAudioCreatable.h + plAudioSystem.h + plDSoundBuffer.h + plEAXEffects.h + plEAXListenerMod.h + plSound.h + plSoundEvent.h + plVoiceChat.h + plWAVClipBuffer.h + plWin32GroupedSound.h + plWin32Sound.h + plWin32StaticSound.h + plWin32StreamingSound.h + plWinMicLevel.h +) + +add_library(plAudio STATIC ${plAudio_SOURCES} ${plAudio_HEADERS}) + +source_group("Source Files" FILES ${plAudio_SOURCES}) +source_group("Header Files" FILES ${plAudio_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plAudio/plAudioCaps.cpp b/Sources/Plasma/PubUtilLib/plAudio/plAudioCaps.cpp index dda658ec..d268d201 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plAudioCaps.cpp +++ b/Sources/Plasma/PubUtilLib/plAudio/plAudioCaps.cpp @@ -46,8 +46,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////////////// #include "HeadSpin.h" -#include "al.h" -#include "alc.h" +#include +#include #include "plEAXEffects.h" #include "plAudioCaps.h" @@ -57,7 +57,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #endif #include -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" #define MAX_NUM_SOURCES 128 #define kLogMe if( fLog != nil ) fLog->AddLineF( diff --git a/Sources/Plasma/PubUtilLib/plAudio/plAudioCreatable.h b/Sources/Plasma/PubUtilLib/plAudio/plAudioCreatable.h index 34a1d1b6..ad98d050 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plAudioCreatable.h +++ b/Sources/Plasma/PubUtilLib/plAudio/plAudioCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAudioCreatable_inc #define plAudioCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plAudioSystem.h" diff --git a/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.cpp b/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.cpp index c2da6da0..f561e4c4 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.cpp +++ b/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.cpp @@ -40,9 +40,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" -#include "al.h" -#include "alc.h" -#include "efx.h" +#include +#include +#include #include #ifdef EAX_SDK_AVAILABLE #include @@ -52,7 +52,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsGeometry3.h" #include "plgDispatch.h" #include "plProfile.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" #include "plSound.h" #include "plAudioCaps.h" @@ -62,14 +62,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plEAXListenerMod.h" #include "plVoiceChat.h" -#include "../pnMessage/plAudioSysMsg.h" -#include "../plMessage/plRenderMsg.h" -#include "../pnMessage/plRefMsg.h" -#include "../plMessage/plAgeLoadedMsg.h" -#include "../pnMessage/plTimeMsg.h" +#include "pnMessage/plAudioSysMsg.h" +#include "plMessage/plRenderMsg.h" +#include "pnMessage/plRefMsg.h" +#include "plMessage/plAgeLoadedMsg.h" +#include "pnMessage/plTimeMsg.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnKeyedObject/plKey.h" #define SAFE_RELEASE(p) if(p){ p->Release(); p = nil; } diff --git a/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.h b/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.h index a376e9c7..171c7589 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.h +++ b/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.h @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsWindowHndl.h" #include "hsTemplates.h" #include "hsGeometry3.h" -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #define DEFAULT_AUDIO_DEVICE_NAME "Generic Software" diff --git a/Sources/Plasma/PubUtilLib/plAudio/plDSoundBuffer.cpp b/Sources/Plasma/PubUtilLib/plAudio/plDSoundBuffer.cpp index 82f6d53d..48941037 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plDSoundBuffer.cpp +++ b/Sources/Plasma/PubUtilLib/plAudio/plDSoundBuffer.cpp @@ -50,17 +50,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsThread.h" #include "plDSoundBuffer.h" -#include "al.h" +#include #include "plgDispatch.h" #include "plAudioSystem.h" -#include "../plAudioCore/plAudioCore.h" -#include "../plAudioCore/plAudioFileReader.h" +#include "plAudioCore/plAudioCore.h" +#include "plAudioCore/plAudioFileReader.h" #include "plEAXEffects.h" #include "plProfile.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" #include diff --git a/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp b/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp index b5225e02..9deca6c3 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp +++ b/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp @@ -64,7 +64,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #endif #include "plEAXEffects.h" -#include "../plAudioCore/plAudioCore.h" +#include "plAudioCore/plAudioCore.h" #include "plDSoundBuffer.h" #include "hsTemplates.h" #include "plEAXListenerMod.h" @@ -78,7 +78,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include #endif -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" #define kDebugLog if( myLog != nil ) myLog->AddLineF( diff --git a/Sources/Plasma/PubUtilLib/plAudio/plEAXListenerMod.cpp b/Sources/Plasma/PubUtilLib/plAudio/plEAXListenerMod.cpp index dc081214..546a839f 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plEAXListenerMod.cpp +++ b/Sources/Plasma/PubUtilLib/plAudio/plEAXListenerMod.cpp @@ -50,11 +50,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #endif #include "hsTypes.h" #include "plEAXListenerMod.h" -#include "../plIntersect/plSoftVolume.h" +#include "plIntersect/plSoftVolume.h" #include "hsResMgr.h" #include "plgDispatch.h" #include "plAudioSystem.h" -#include "../pnMessage/plAudioSysMsg.h" +#include "pnMessage/plAudioSysMsg.h" #ifdef EAX_SDK_AVAILABLE #include diff --git a/Sources/Plasma/PubUtilLib/plAudio/plEAXListenerMod.h b/Sources/Plasma/PubUtilLib/plAudio/plEAXListenerMod.h index c08c93f4..1d33e171 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plEAXListenerMod.h +++ b/Sources/Plasma/PubUtilLib/plAudio/plEAXListenerMod.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define _plEAXListenerMod_h -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" class plMessage; class plSoftVolume; diff --git a/Sources/Plasma/PubUtilLib/plAudio/plSound.cpp b/Sources/Plasma/PubUtilLib/plAudio/plSound.cpp index c6fe0631..0447b0d8 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plSound.cpp +++ b/Sources/Plasma/PubUtilLib/plAudio/plSound.cpp @@ -52,22 +52,22 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plSound.h" #include "plWin32Sound.h" -#include "../plAudioCore/plSoundBuffer.h" -#include "../plDrawable/plDrawableGenerator.h" -#include "../pnMessage/plRefMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnMessage/plAudioSysMsg.h" -#include "../pnMessage/plSoundMsg.h" -#include "../plMessage/plListenerMsg.h" -#include "../plIntersect/plSoftVolume.h" -#include "../plStatusLog/plStatusLog.h" -#include "../plPipeline/plPlates.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnNetCommon/plSDLTypes.h" -#include "../plAvatar/plScalarChannel.h" -#include "../plAvatar/plAGModifier.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plAudioInterface.h" +#include "plAudioCore/plSoundBuffer.h" +#include "plDrawable/plDrawableGenerator.h" +#include "pnMessage/plRefMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "pnMessage/plAudioSysMsg.h" +#include "pnMessage/plSoundMsg.h" +#include "plMessage/plListenerMsg.h" +#include "plIntersect/plSoftVolume.h" +#include "plStatusLog/plStatusLog.h" +#include "plPipeline/plPlates.h" +#include "pnKeyedObject/plKey.h" +#include "pnNetCommon/plSDLTypes.h" +#include "plAvatar/plScalarChannel.h" +#include "plAvatar/plAGModifier.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plAudioInterface.h" plProfile_CreateCounterNoReset( "Loaded", "Sound", SoundNumLoaded ); plProfile_CreateCounterNoReset( "Waiting to Die", "Sound", WaitingToDie ); diff --git a/Sources/Plasma/PubUtilLib/plAudio/plSound.h b/Sources/Plasma/PubUtilLib/plAudio/plSound.h index 7a50d9d8..9a7618b6 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plSound.h +++ b/Sources/Plasma/PubUtilLib/plAudio/plSound.h @@ -57,10 +57,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTemplates.h" #include "hsGeometry3.h" #include "plEAXEffects.h" -#include "../pnNetCommon/plSynchedObject.h" -#include "../plAvatar/plAGChannel.h" -#include "../plAvatar/plAGApplicator.h" -#include "../plAudioCore/plSoundBuffer.h" +#include "pnNetCommon/plSynchedObject.h" +#include "plAvatar/plAGChannel.h" +#include "plAvatar/plAGApplicator.h" +#include "plAudioCore/plSoundBuffer.h" class hsResMgr; class hsStream; diff --git a/Sources/Plasma/PubUtilLib/plAudio/plSoundEvent.cpp b/Sources/Plasma/PubUtilLib/plAudio/plSoundEvent.cpp index 4adc285b..0ff8706c 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plSoundEvent.cpp +++ b/Sources/Plasma/PubUtilLib/plAudio/plSoundEvent.cpp @@ -53,8 +53,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plSoundEvent.h" #include "plgDispatch.h" -#include "../pnMessage/plEventCallbackMsg.h" -#include "../pnMessage/plSoundMsg.h" +#include "pnMessage/plEventCallbackMsg.h" +#include "pnMessage/plSoundMsg.h" #include "plSound.h" plSoundEvent::plSoundEvent( Types type, plSound *owner ) diff --git a/Sources/Plasma/PubUtilLib/plAudio/plVoiceChat.cpp b/Sources/Plasma/PubUtilLib/plAudio/plVoiceChat.cpp index 3edfdae9..0213b6be 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plVoiceChat.cpp +++ b/Sources/Plasma/PubUtilLib/plAudio/plVoiceChat.cpp @@ -43,28 +43,28 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsWindows.h" #include "hsTimer.h" #include "hsResMgr.h" -#include "al.h" -#include "alc.h" +#include +#include #include "plDSoundBuffer.h" -#include "speex.h" -#include "speex_bits.h" +#include +#include #include "hsGeometry3.h" #include "plVoiceChat.h" #include "plAudioSystem.h" #include "plgDispatch.h" -#include "../plAudible/plWinAudible.h" -#include "../plNetMessage/plNetMessage.h" -#include "../plPipeline/plPlates.h" +#include "plAudible/plWinAudible.h" +#include "plNetMessage/plNetMessage.h" +#include "plPipeline/plPlates.h" #include "hsConfig.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plAvatar/plArmatureMod.h" +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plArmatureMod.h" #include "hsQuat.h" -#include "../plAudioCore/plAudioCore.h" +#include "plAudioCore/plAudioCore.h" // DEBUG for printing to the console -#include "../plMessage/plConsoleMsg.h" -#include "../plPipeline/plDebugText.h" -#include "../plStatusLog/plStatusLog.h" +#include "plMessage/plConsoleMsg.h" +#include "plPipeline/plDebugText.h" +#include "plStatusLog/plStatusLog.h" #define MICROPHONE "ui_microphone.png" #define TALKING "ui_speaker.png" diff --git a/Sources/Plasma/PubUtilLib/plAudio/plWAVClipBuffer.cpp b/Sources/Plasma/PubUtilLib/plAudio/plWAVClipBuffer.cpp index d42cf945..dbd1b372 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plWAVClipBuffer.cpp +++ b/Sources/Plasma/PubUtilLib/plAudio/plWAVClipBuffer.cpp @@ -63,7 +63,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "hsUtils.h" -#include "plWavFile.h" +#include "plAudioCore/plWavFile.h" //// Constructor/Destructor ////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plAudio/plWin32GroupedSound.cpp b/Sources/Plasma/PubUtilLib/plAudio/plWin32GroupedSound.cpp index ce76b3de..f9c68d81 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plWin32GroupedSound.cpp +++ b/Sources/Plasma/PubUtilLib/plAudio/plWin32GroupedSound.cpp @@ -54,12 +54,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plDSoundBuffer.h" #include "plAudioSystem.h" -#include "../plAudioCore/plSoundBuffer.h" -#include "../plAudioCore/plSoundDeswizzler.h" +#include "plAudioCore/plSoundBuffer.h" +#include "plAudioCore/plSoundDeswizzler.h" #include "plgDispatch.h" -#include "../pnMessage/plSoundMsg.h" +#include "pnMessage/plSoundMsg.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" #include "plProfile.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/PubUtilLib/plAudio/plWin32Sound.cpp b/Sources/Plasma/PubUtilLib/plAudio/plWin32Sound.cpp index a81a31b4..066b6753 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plWin32Sound.cpp +++ b/Sources/Plasma/PubUtilLib/plAudio/plWin32Sound.cpp @@ -50,15 +50,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plWin32Sound.h" #include "plAudioSystem.h" #include "plDSoundBuffer.h" -#include "plWavFile.h" - -#include "../plAudible/plWinAudible.h" -#include "../plNetMessage/plNetMessage.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnMessage/plSoundMsg.h" -#include "../pnMessage/plEventCallbackMsg.h" -#include "../plPipeline/plPlates.h" -#include "../plStatusLog/plStatusLog.h" +#include "plAudioCore/plWavFile.h" + +#include "plAudible/plWinAudible.h" +#include "plNetMessage/plNetMessage.h" +#include "pnNetCommon/plNetApp.h" +#include "pnMessage/plSoundMsg.h" +#include "pnMessage/plEventCallbackMsg.h" +#include "plPipeline/plPlates.h" +#include "plStatusLog/plStatusLog.h" plProfile_CreateMemCounter("Sounds", "Memory", MemSounds); plProfile_Extern(SoundPlaying); diff --git a/Sources/Plasma/PubUtilLib/plAudio/plWin32StaticSound.cpp b/Sources/Plasma/PubUtilLib/plAudio/plWin32StaticSound.cpp index d2ea7832..4b522266 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plWin32StaticSound.cpp +++ b/Sources/Plasma/PubUtilLib/plAudio/plWin32StaticSound.cpp @@ -48,15 +48,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plWin32Sound.h" #include "plDSoundBuffer.h" #include "plAudioSystem.h" -#include "../plAudioCore/plSoundBuffer.h" -#include "../plAudioCore/plSoundDeswizzler.h" -#include "../pnMessage/plEventCallbackMsg.h" -#include "../pnMessage/plAudioSysMsg.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../plMessage/plAvatarMsg.h" - -#include "../plPipeline/plPlates.h" -#include "../plStatusLog/plStatusLog.h" +#include "plAudioCore/plSoundBuffer.h" +#include "plAudioCore/plSoundDeswizzler.h" +#include "pnMessage/plEventCallbackMsg.h" +#include "pnMessage/plAudioSysMsg.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "plMessage/plAvatarMsg.h" + +#include "plPipeline/plPlates.h" +#include "plStatusLog/plStatusLog.h" plProfile_Extern(MemSounds); plProfile_CreateAsynchTimer( "Static Shove Time", "Sound", StaticSndShoveTime ); diff --git a/Sources/Plasma/PubUtilLib/plAudio/plWin32StreamingSound.cpp b/Sources/Plasma/PubUtilLib/plAudio/plWin32StreamingSound.cpp index e402e771..22f78481 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plWin32StreamingSound.cpp +++ b/Sources/Plasma/PubUtilLib/plAudio/plWin32StreamingSound.cpp @@ -51,12 +51,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plDSoundBuffer.h" #include "plAudioSystem.h" -#include "../plAudioCore/plAudioFileReader.h" -#include "../plAudioCore/plSoundBuffer.h" -#include "../plAudioCore/plSoundDeswizzler.h" -#include "../pnMessage/plSoundMsg.h" -#include "../pnMessage/plEventCallbackMsg.h" -#include "../plStatusLog/plStatusLog.h" +#include "plAudioCore/plAudioFileReader.h" +#include "plAudioCore/plSoundBuffer.h" +#include "plAudioCore/plSoundDeswizzler.h" +#include "pnMessage/plSoundMsg.h" +#include "pnMessage/plEventCallbackMsg.h" +#include "plStatusLog/plStatusLog.h" #define STREAMING_UPDATE_MS 200 diff --git a/Sources/Plasma/PubUtilLib/plAudio/plWin32StreamingSound.h b/Sources/Plasma/PubUtilLib/plAudio/plWin32StreamingSound.h index b4de1572..15dd010e 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plWin32StreamingSound.h +++ b/Sources/Plasma/PubUtilLib/plAudio/plWin32StreamingSound.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plWin32StreamingSound_h #include "plWin32Sound.h" -#include "../pnUtils/pnUtils.h" +#include "pnUtils/pnUtils.h" class plDSoundBuffer; class DSoundCallbackHandle; diff --git a/Sources/Plasma/PubUtilLib/plAudioCore/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plAudioCore/CMakeLists.txt new file mode 100644 index 00000000..34d86088 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plAudioCore/CMakeLists.txt @@ -0,0 +1,34 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +include_directories(${Ogg_INCLUDE_DIR}) +include_directories(${Vorbis_INCLUDE_DIR}) + +set(plAudioCore_SOURCES + plAudioFileReader.cpp + plBufferedFileReader.cpp + plFastWavReader.cpp + plOGGCodec.cpp + plSoundBuffer.cpp + plSoundDeswizzler.cpp + plWavFile.cpp +) + +set(plAudioCore_HEADERS + plAudioCore.h + plAudioCoreCreatable.h + plAudioFileReader.h + plBufferedFileReader.h + plFastWavReader.h + plOGGCodec.h + plSoundBuffer.h + plSoundDeswizzler.h + plWavFile.h +) + +add_library(plAudioCore STATIC ${plAudioCore_SOURCES} ${plAudioCore_HEADERS}) + +source_group("Source Files" FILES ${plAudioCore_SOURCES}) +source_group("Header Files" FILES ${plAudioCore_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plAudioCore/plAudioFileReader.cpp b/Sources/Plasma/PubUtilLib/plAudioCore/plAudioFileReader.cpp index 37cc2969..67a347ea 100644 --- a/Sources/Plasma/PubUtilLib/plAudioCore/plAudioFileReader.cpp +++ b/Sources/Plasma/PubUtilLib/plAudioCore/plAudioFileReader.cpp @@ -55,13 +55,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAudioCore.h" //#include "hsTimer.h" #include "hsUtils.h" -#include "../plFile/hsFiles.h" -#include "../plFile/plFileUtils.h" -#include "../plUnifiedTime/plUnifiedTime.h" +#include "plFile/hsFiles.h" +#include "plFile/plFileUtils.h" +#include "plUnifiedTime/plUnifiedTime.h" #include "plBufferedFileReader.h" #include "plFastWavReader.h" -#include "../plAudio/plOGGCodec.h" -#include "../plAudio/plWavFile.h" +#include "plOGGCodec.h" +#include "plWavFile.h" #define kCacheDirName "streamingCache" diff --git a/Sources/Plasma/PubUtilLib/plAudioCore/plBufferedFileReader.h b/Sources/Plasma/PubUtilLib/plAudioCore/plBufferedFileReader.h index 7c764e88..af86c2e6 100644 --- a/Sources/Plasma/PubUtilLib/plAudioCore/plBufferedFileReader.h +++ b/Sources/Plasma/PubUtilLib/plAudioCore/plBufferedFileReader.h @@ -51,7 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plBufferedFileReader_h #define _plBufferedFileReader_h -#include "../plAudioCore/plAudioFileReader.h" +#include "plAudioCore/plAudioFileReader.h" //// Class Definition //////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plAudio/plOGGCodec.cpp b/Sources/Plasma/PubUtilLib/plAudioCore/plOGGCodec.cpp similarity index 99% rename from Sources/Plasma/PubUtilLib/plAudio/plOGGCodec.cpp rename to Sources/Plasma/PubUtilLib/plAudioCore/plOGGCodec.cpp index 1ac72f81..e132432d 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plOGGCodec.cpp +++ b/Sources/Plasma/PubUtilLib/plAudioCore/plOGGCodec.cpp @@ -61,7 +61,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plOGGCodec.h" #include "hsTimer.h" -#include "../pnNetCommon/plNetApp.h" +#include "pnNetCommon/plNetApp.h" plOGGCodec::DecodeFormat plOGGCodec::fDecodeFormat = plOGGCodec::k16bitSigned; UInt8 plOGGCodec::fDecodeFlags = 0; diff --git a/Sources/Plasma/PubUtilLib/plAudio/plOGGCodec.h b/Sources/Plasma/PubUtilLib/plAudioCore/plOGGCodec.h similarity index 98% rename from Sources/Plasma/PubUtilLib/plAudio/plOGGCodec.h rename to Sources/Plasma/PubUtilLib/plAudioCore/plOGGCodec.h index 5a593d29..781421ac 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plOGGCodec.h +++ b/Sources/Plasma/PubUtilLib/plAudioCore/plOGGCodec.h @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plOGGCodec_h #define _plOGGCodec_h -#include "../plAudioCore/plAudioFileReader.h" +#include "plAudioFileReader.h" //// Class Definition //////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plAudioCore/plSoundBuffer.cpp b/Sources/Plasma/PubUtilLib/plAudioCore/plSoundBuffer.cpp index f7068053..0e3dc4fb 100644 --- a/Sources/Plasma/PubUtilLib/plAudioCore/plSoundBuffer.cpp +++ b/Sources/Plasma/PubUtilLib/plAudioCore/plSoundBuffer.cpp @@ -48,12 +48,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plgDispatch.h" #include "hsResMgr.h" -#include "../pnMessage/plRefMsg.h" -#include "../plFile/plFileUtils.h" -#include "../plFile/hsFiles.h" -#include "../plUnifiedTime/plUnifiedTime.h" -#include "../pnUtils/pnUtils.h" -#include "../plStatusLog/plStatusLog.h" +#include "pnMessage/plRefMsg.h" +#include "plFile/plFileUtils.h" +#include "plFile/hsFiles.h" +#include "plUnifiedTime/plUnifiedTime.h" +#include "pnUtils/pnUtils.h" +#include "plStatusLog/plStatusLog.h" #include "hsTimer.h" static bool s_running; diff --git a/Sources/Plasma/PubUtilLib/plAudioCore/plSoundBuffer.h b/Sources/Plasma/PubUtilLib/plAudioCore/plSoundBuffer.h index 6bb72244..39a288e6 100644 --- a/Sources/Plasma/PubUtilLib/plAudioCore/plSoundBuffer.h +++ b/Sources/Plasma/PubUtilLib/plAudioCore/plSoundBuffer.h @@ -52,10 +52,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plSoundBuffer_h #define _plSoundBuffer_h -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include "plAudioCore.h" #include "plAudioFileReader.h" -#include "../pnUtils/pnUtils.h" +#include "pnUtils/pnUtils.h" //// Class Definition //////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plAudio/plWavFile.cpp b/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.cpp similarity index 100% rename from Sources/Plasma/PubUtilLib/plAudio/plWavFile.cpp rename to Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.cpp diff --git a/Sources/Plasma/PubUtilLib/plAudio/plWavFile.h b/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.h similarity index 98% rename from Sources/Plasma/PubUtilLib/plAudio/plWavFile.h rename to Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.h index e12f982b..684341cb 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plWavFile.h +++ b/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsWindows.h" #include "hsStlUtils.h" #include -#include "../plAudioCore/plAudioFileReader.h" +#include "plAudioFileReader.h" struct plSoundMarker diff --git a/Sources/Plasma/PubUtilLib/plInputCore/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plInputCore/CMakeLists.txt new file mode 100644 index 00000000..73e1522e --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plInputCore/CMakeLists.txt @@ -0,0 +1,37 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +include_directories(${OPENSSL_INCLUDE_DIR}) +include_directories(${OPENAL_INCLUDE_DIR}) + +set(plInputCore_SOURCES + plAvatarInputInterface.cpp + plDebugInputInterface.cpp + plDInputDevice.cpp + plInputDevice.cpp + plInputInterface.cpp + plInputInterfaceMgr.cpp + plInputManager.cpp + plSceneInputInterface.cpp + plTelescopeInputInterface.cpp +) + +set(plInputCore_HEADERS + plAvatarInputInterface.h + plDebugInputInterface.h + plDInputDevice.h + plInputCoreCreatable.h + plInputDevice.h + plInputInterface.h + plInputInterfaceMgr.h + plInputManager.h + plSceneInputInterface.h + plTelescopeInputInterface.h +) + +add_library(plInputCore STATIC ${plInputCore_SOURCES} ${plInputCore_HEADERS}) + +source_group("Source Files" FILES ${plInputCore_SOURCES}) +source_group("Header Files" FILES ${plInputCore_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.cpp b/Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.cpp index b5b61608..5fc4bd39 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.cpp +++ b/Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.cpp @@ -54,27 +54,27 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plAvatarInputInterface.h" -#include "../pnInputCore/plKeyMap.h" -#include "../plMessage/plInputEventMsg.h" +#include "pnInputCore/plKeyMap.h" +#include "plMessage/plInputEventMsg.h" #include "plInputInterfaceMgr.h" #include "plInputManager.h" #include "plInputDevice.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnMessage/plProxyDrawMsg.h" -#include "../pnMessage/plCmdIfaceModMsg.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnMessage/plProxyDrawMsg.h" +#include "pnMessage/plCmdIfaceModMsg.h" // DEHACK // used to run debug drawing stuff only; should never be checked in with this enabled #if 0 -#include "../FeatureLib/pfCamera/plVirtualCam.h" -#include "../plDrawable/plDrawableSpans.h" +#include "FeatureLib/pfCamera/plVirtualCam.h" +#include "plDrawable/plDrawableSpans.h" #endif -#include "../plAudio/plVoiceChat.h" +#include "plAudio/plVoiceChat.h" #include "plInputDevice.h" #include "plInputManager.h" #include "hsResMgr.h" @@ -82,10 +82,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsConfig.h" #include "hsMatrix44.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" -#include "../pnNetCommon/plNetApp.h" +#include "pnNetCommon/plNetApp.h" //// Constructor/Destructor ////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.h b/Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.h index cb8c8207..1ea7a877 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.h +++ b/Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plAvatarInputInterface_inc #include "plInputInterface.h" -#include "../pnInputCore/plInputMap.h" +#include "pnInputCore/plInputMap.h" #include "hsTemplates.h" diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plDInputDevice.cpp b/Sources/Plasma/PubUtilLib/plInputCore/plDInputDevice.cpp index 8ead27eb..503d64b4 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plDInputDevice.cpp +++ b/Sources/Plasma/PubUtilLib/plInputCore/plDInputDevice.cpp @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plDInputDevice.h" #include "plgDispatch.h" -#include "../plMessage/plInputEventMsg.h" +#include "plMessage/plInputEventMsg.h" #define DIRECTINPUT_VERSION 0x0800 #include // diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.cpp b/Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.cpp index 2d9e964a..8b5b4881 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.cpp +++ b/Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.cpp @@ -54,10 +54,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plInputManager.h" #include "plInputDevice.h" -#include "../plMessage/plInputIfaceMgrMsg.h" -#include "../plMessage/plInputEventMsg.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnInputCore/plKeyMap.h" +#include "plMessage/plInputIfaceMgrMsg.h" +#include "plMessage/plInputEventMsg.h" +#include "pnKeyedObject/plKey.h" +#include "pnInputCore/plKeyMap.h" #include "plgDispatch.h" #include "plPipeline.h" diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.h b/Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.h index e043cb8a..595e0350 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.h +++ b/Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define _plDebugInputInterface_h #include "plInputInterface.h" -#include "../pnInputCore/plInputMap.h" +#include "pnInputCore/plInputMap.h" //// Class Definition //////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp b/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp index b49a7ac4..32c266f2 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp +++ b/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp @@ -48,17 +48,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plInputDevice.h" #include "plInputManager.h" #include "plAvatarInputInterface.h" -#include "../plMessage/plInputEventMsg.h" -#include "../pnMessage/plTimeMsg.h" +#include "plMessage/plInputEventMsg.h" +#include "pnMessage/plTimeMsg.h" #include "hsUtils.h" #include "plgDispatch.h" -#include "../plPipeline/plPlates.h" -#include "../plPipeline/plDebugText.h" -#include "../plGImage/plMipmap.h" +#include "plPipeline/plPlates.h" +#include "plPipeline/plDebugText.h" +#include "plGImage/plMipmap.h" #include "hsWindows.h" -#include "../NucleusLib/inc/plPipeline.h" +#include "plPipeline.h" // The resolution that uses the base size of the cursor. // All other resolutions will scale the cursor size to keep the same physical size. diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h b/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h index bcb7297b..a89cbea2 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h +++ b/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h @@ -46,8 +46,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" #include "hsWindows.h" -//#include "../pnInputCore/plControlDefinition.h" -#include "../pnInputCore/plOSMsg.h" +//#include "pnInputCore/plControlDefinition.h" +#include "pnInputCore/plOSMsg.h" #include "hsBitVector.h" #include "hsTemplates.h" class plMessage; diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.cpp b/Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.cpp index 811ed35a..2b884296 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.cpp +++ b/Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.cpp @@ -55,8 +55,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plInputInterface.h" #include "plInputInterfaceMgr.h" -#include "../pnInputCore/plKeyMap.h" -#include "../plMessage/plInputEventMsg.h" +#include "pnInputCore/plKeyMap.h" +#include "plMessage/plInputEventMsg.h" #include "hsResMgr.h" #include "plgDispatch.h" diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.h b/Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.h index b63fd5de..b23a183c 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.h +++ b/Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.h @@ -67,8 +67,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsBitVector.h" // Needed for UNIX Build // only windows will let you predeclare an enum -#include "../../NucleusLib/pnInputCore/plKeyDef.h" -#include "../../NucleusLib/pnInputCore/plControlEventCodes.h" +#include "pnInputCore/plKeyDef.h" +#include "pnInputCore/plControlEventCodes.h" //// Class Definition //////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.cpp b/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.cpp index c1077d98..a68d66c3 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.cpp @@ -56,24 +56,24 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plInputInterface.h" #include "plInputDevice.h" // For mouse device stuff -#include "../pnInputCore/plKeyMap.h" -#include "../plMessage/plInputEventMsg.h" -#include "../plMessage/plInputIfaceMgrMsg.h" -#include "../pnMessage/plClientMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnMessage/plCmdIfaceModMsg.h" -#include "../pnMessage/plPlayerPageMsg.h" +#include "pnInputCore/plKeyMap.h" +#include "plMessage/plInputEventMsg.h" +#include "plMessage/plInputIfaceMgrMsg.h" +#include "pnMessage/plClientMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "pnMessage/plCmdIfaceModMsg.h" +#include "pnMessage/plPlayerPageMsg.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plFixedKey.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plFixedKey.h" -#include "../pnNetCommon/plNetApp.h" -#include "../plNetClient/plNetClientMgr.h" +#include "pnNetCommon/plNetApp.h" +#include "plNetClient/plNetClientMgr.h" #include "hsResMgr.h" #include "plgDispatch.h" #include "plProfile.h" -#include "../plResMgr/plLocalization.h" +#include "plResMgr/plLocalization.h" plProfile_CreateTimer("Input", "Update", Input); diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.h b/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.h index 9341ae88..8b763a92 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.h +++ b/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.h @@ -52,10 +52,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plInputInterfaceMgr_h #define _plInputInterfaceMgr_h -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" #include "hsTemplates.h" #include "hsGeometry3.h" -#include "../pnInputCore/plKeyMap.h" +#include "pnInputCore/plKeyMap.h" //// Class Definition //////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp b/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp index 009b2eb7..314a638d 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp +++ b/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp @@ -51,17 +51,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPipeline.h" #include "plInputDevice.h" #include "plDInputDevice.h" -#include "../plMessage/plInputEventMsg.h" +#include "plMessage/plInputEventMsg.h" #include "plInputInterfaceMgr.h" #include "hsStream.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plFixedKey.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plFixedKey.h" #include "hsResMgr.h" #include "hsTimer.h" #include "plgDispatch.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnMessage/plCmdIfaceModMsg.h" -#include "../pnMessage/plPlayerPageMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "pnMessage/plCmdIfaceModMsg.h" +#include "pnMessage/plPlayerPageMsg.h" hsBool plInputManager::fUseDInput = false; UInt8 plInputManager::bRecenterMouse = 0; diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.h b/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.h index 66f97bbb..cce79f12 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.h +++ b/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.h @@ -47,8 +47,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include "hsTypes.h" #include "hsTemplates.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnInputCore/plInputMap.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnInputCore/plInputMap.h" class plDInputMgr; class plInputDevice; diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plSceneInputInterface.cpp b/Sources/Plasma/PubUtilLib/plInputCore/plSceneInputInterface.cpp index 99f95b9e..aecce2be 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plSceneInputInterface.cpp +++ b/Sources/Plasma/PubUtilLib/plInputCore/plSceneInputInterface.cpp @@ -55,44 +55,44 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plInputManager.h" #include "plInputDevice.h" -#include "../plPhysical/plPickingDetector.h" -#include "../plMessage/plInputEventMsg.h" -#include "../plMessage/plLOSRequestMsg.h" -#include "../plMessage/plLOSHitMsg.h" -#include "../plMessage/plPickedMsg.h" -#include "../plMessage/plRenderMsg.h" -#include "../plMessage/plInputIfaceMgrMsg.h" -#include "../plMessage/plVaultNotifyMsg.h" -#include "../pnMessage/plFakeOutMsg.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../pnMessage/plRemoteAvatarInfoMsg.h" -#include "../pnMessage/plCursorChangeMsg.h" -#include "../pnMessage/plCameraMsg.h" -#include "../pnMessage/plPlayerPageMsg.h" -#include "../pnMessage/plCmdIfaceModMsg.h" -#include "../plAvatar/plArmatureMod.h" -#include "../plAvatar/plAvBrain.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plAvatar/plPhysicalControllerCore.h" -#include "../plModifier/plInterfaceInfoModifier.h" -#include "../pnModifier/plLogicModBase.h" -#include "../plVault/plVault.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plNetClient/plNetLinkingMgr.h" -#include "../plNetCommon/plNetServerSessionInfo.h" -#include "../plNetTransport/plNetTransport.h" -#include "../plNetTransport/plNetTransportMember.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnInputCore/plKeyMap.h" +#include "plPhysical/plPickingDetector.h" +#include "plMessage/plInputEventMsg.h" +#include "plMessage/plLOSRequestMsg.h" +#include "plMessage/plLOSHitMsg.h" +#include "plMessage/plPickedMsg.h" +#include "plMessage/plRenderMsg.h" +#include "plMessage/plInputIfaceMgrMsg.h" +#include "plMessage/plVaultNotifyMsg.h" +#include "pnMessage/plFakeOutMsg.h" +#include "pnMessage/plNotifyMsg.h" +#include "pnMessage/plRemoteAvatarInfoMsg.h" +#include "pnMessage/plCursorChangeMsg.h" +#include "pnMessage/plCameraMsg.h" +#include "pnMessage/plPlayerPageMsg.h" +#include "pnMessage/plCmdIfaceModMsg.h" +#include "plAvatar/plArmatureMod.h" +#include "plAvatar/plAvBrain.h" +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plPhysicalControllerCore.h" +#include "plModifier/plInterfaceInfoModifier.h" +#include "pnModifier/plLogicModBase.h" +#include "plVault/plVault.h" +#include "plNetClient/plNetClientMgr.h" +#include "plNetClient/plNetLinkingMgr.h" +#include "plNetCommon/plNetServerSessionInfo.h" +#include "plNetTransport/plNetTransport.h" +#include "plNetTransport/plNetTransportMember.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnInputCore/plKeyMap.h" #include "plPhysical.h" #include "plgDispatch.h" #include "plPipeline.h" -#include "../plModifier/plDetectorLog.h" +#include "plModifier/plDetectorLog.h" #define ID_FIND_CLICKABLE 2 @@ -1239,4 +1239,4 @@ UInt32 plSceneInputInterface::SetCurrentCursorID(UInt32 id) void plSceneInputInterface::RequestAvatarTurnToPointLOS() { IRequestLOSCheck( plMouseDevice::Instance()->GetCursorX(), plMouseDevice::Instance()->GetCursorY(), ID_FIND_WALKABLE_GROUND ); -} \ No newline at end of file +} diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plSceneInputInterface.h b/Sources/Plasma/PubUtilLib/plInputCore/plSceneInputInterface.h index a8397720..21b9f224 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plSceneInputInterface.h +++ b/Sources/Plasma/PubUtilLib/plInputCore/plSceneInputInterface.h @@ -50,8 +50,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plInputInterface.h" #include "hsGeometry3.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnUtils/pnUtils.h" +#include "pnKeyedObject/plKey.h" +#include "pnUtils/pnUtils.h" //// Class Definition //////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plTelescopeInputInterface.cpp b/Sources/Plasma/PubUtilLib/plInputCore/plTelescopeInputInterface.cpp index 797a4954..d9f06760 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plTelescopeInputInterface.cpp +++ b/Sources/Plasma/PubUtilLib/plInputCore/plTelescopeInputInterface.cpp @@ -54,7 +54,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plInputInterfaceMgr.h" #include "plInputManager.h" #include "plInputDevice.h" -#include "../pnInputCore/plKeyMap.h" +#include "pnInputCore/plKeyMap.h" #include "plgDispatch.h" diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plTelescopeInputInterface.h b/Sources/Plasma/PubUtilLib/plInputCore/plTelescopeInputInterface.h index 55d0d722..95614cd4 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plTelescopeInputInterface.h +++ b/Sources/Plasma/PubUtilLib/plInputCore/plTelescopeInputInterface.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define _plTelescopeInputInterface_h #include "plInputInterface.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" //// Class Definition //////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plModifier/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plModifier/CMakeLists.txt new file mode 100644 index 00000000..2830b277 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plModifier/CMakeLists.txt @@ -0,0 +1,59 @@ +include_directories("../../CoreLib") +include_directories("../../FeatureLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +include_directories(${PHYSX_INCLUDE_DIRS}) +include_directories(${OPENAL_INCLUDE_DIR}) +include_directories(${OPENSSL_INCLUDE_DIR}) + +set(plModifier_SOURCES + plAnimEventModifier.cpp + plAnimTimeConvertSDLModifier.cpp + plAxisAnimModifier.cpp + plCloneSpawnModifier.cpp + plDecalEnableMod.cpp + plDetectorLog.cpp + plExcludeRegionModifier.cpp + plGameMarkerModifier.cpp + plImageLibMod.cpp + plInterfaceInfoModifier.cpp + plLayerSDLModifier.cpp + plLogicModifier.cpp + plMaintainersMarkerModifier.cpp + plResponderModifier.cpp + plResponderSDLModifier.cpp + plSDLModifier.cpp + plSimpleModifier.cpp + plSoundSDLModifier.cpp + plSpawnModifier.cpp +) + +set(plModifier_HEADERS + plAnimEventModifier.h + plAnimTimeConvertSDLModifier.h + plAxisAnimModifier.h + plCloneSpawnModifier.h + plDecalEnableMod.h + plDetectorLog.h + plExcludeRegionModifier.h + plGameMarkerModifier.h + plImageLibMod.h + plInterfaceInfoModifier.h + plLayerSDLModifier.h + plLogicModifier.h + plMaintainersMarkerModifier.h + plModifierCreatable.h + plResponderModifier.h + plResponderSDLModifier.h + plSDLModifier.h + plSimpleModifier.h + plSoundSDLModifier.h + plSpawnModifier.h +) + +add_library(plModifier STATIC ${plModifier_SOURCES} ${plModifier_HEADERS}) + +source_group("Source Files" FILES ${plModifier_SOURCES}) +source_group("Header Files" FILES ${plModifier_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plModifier/plAnimEventModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plAnimEventModifier.cpp index 8b6a9c9f..bf2ab8d3 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plAnimEventModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plAnimEventModifier.cpp @@ -42,11 +42,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAnimEventModifier.h" #include "hsResMgr.h" -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" -#include "../pnMessage/plRefMsg.h" -#include "../pnMessage/plEnableMsg.h" -#include "../pnMessage/plEventCallbackMsg.h" +#include "pnMessage/plRefMsg.h" +#include "pnMessage/plEnableMsg.h" +#include "pnMessage/plEventCallbackMsg.h" plAnimEventModifier::plAnimEventModifier() : fCallback(nil), fDisabled(false) { diff --git a/Sources/Plasma/PubUtilLib/plModifier/plAnimEventModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plAnimEventModifier.h index 08d31ce2..84367365 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plAnimEventModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plAnimEventModifier.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAnimEventModifier_h_inc #define plAnimEventModifier_h_inc -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" #include "hsTemplates.h" // diff --git a/Sources/Plasma/PubUtilLib/plModifier/plAnimTimeConvertSDLModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plAnimTimeConvertSDLModifier.cpp index 4221e479..64c5be25 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plAnimTimeConvertSDLModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plAnimTimeConvertSDLModifier.cpp @@ -41,8 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTimer.h" #include "plAnimTimeConvertSDLModifier.h" -#include "../plSDL/plSDL.h" -#include "../plInterp/plAnimTimeConvert.h" +#include "plSDL/plSDL.h" +#include "plInterp/plAnimTimeConvert.h" // static vars char plAnimTimeConvertSDLModifier::AnimTimeConvertVarNames::kStrFlags[]="flags"; diff --git a/Sources/Plasma/PubUtilLib/plModifier/plAnimTimeConvertSDLModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plAnimTimeConvertSDLModifier.h index 6ae781e4..148e32aa 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plAnimTimeConvertSDLModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plAnimTimeConvertSDLModifier.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAnimTimeConvertSDLModifier_inc #define plAnimTimeConvertSDLModifier_inc -#include "../plModifier/plSDLModifier.h" +#include "plModifier/plSDLModifier.h" // // This modifier (abstract baseclass) handles sending and recving diff --git a/Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.cpp index 7c9777f0..161ef8ca 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.cpp @@ -44,19 +44,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsUtils.h" #include "plAxisAnimModifier.h" #include "hsResMgr.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnKeyedObject/plKey.h" -#include "../plNetMessage/plNetMsgHelpers.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnMessage/plCmdIfaceModMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plMessage/plInputEventMsg.h" -#include "../plMessage/plInputIfaceMgrMsg.h" -#include "../plInputCore/plInputDevice.h" -#include "../plInputCore/plInputManager.h" -#include "../plInputCore/plInputInterface.h" -#include "../pnNetCommon/plNetApp.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnKeyedObject/plKey.h" +#include "plNetMessage/plNetMsgHelpers.h" +#include "pnMessage/plNotifyMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "pnMessage/plCmdIfaceModMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plMessage/plInputEventMsg.h" +#include "plMessage/plInputIfaceMgrMsg.h" +#include "plInputCore/plInputDevice.h" +#include "plInputCore/plInputManager.h" +#include "plInputCore/plInputInterface.h" +#include "pnNetCommon/plNetApp.h" #include "plgDispatch.h" //// plAxisInputInterface //////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.h index 592b9561..42c39ee7 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plAxisAnimMod_inc #include "hsStlUtils.h" -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" class plKey; diff --git a/Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.cpp index 193b17c4..082fc336 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.cpp @@ -42,15 +42,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plCloneSpawnModifier.h" #include "hsResMgr.h" -#include "../plResMgr/plResManager.h" -#include "../plResMgr/plKeyFinder.h" -#include "../pnSceneObject/plSceneObject.h" +#include "plResMgr/plResManager.h" +#include "plResMgr/plKeyFinder.h" +#include "pnSceneObject/plSceneObject.h" -#include "../plScene/plSceneNode.h" -#include "../pnMessage/plClientMsg.h" +#include "plScene/plSceneNode.h" +#include "pnMessage/plClientMsg.h" #include "plgDispatch.h" -#include "../pnMessage/plWarpMsg.h" -#include "../pnMessage/plNodeRefMsg.h" +#include "pnMessage/plWarpMsg.h" +#include "pnMessage/plNodeRefMsg.h" plCloneSpawnModifier::plCloneSpawnModifier() : fTemplateName(nil), fExportTime(false) { diff --git a/Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.h index a1ca6f68..8c140bd1 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plCloneSpawnModifier_inc #define plCloneSpawnModifier_inc -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" class plCloneSpawnModifier : public plSingleModifier { diff --git a/Sources/Plasma/PubUtilLib/plModifier/plDecalEnableMod.cpp b/Sources/Plasma/PubUtilLib/plModifier/plDecalEnableMod.cpp index bfea2a93..fdc57dd0 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plDecalEnableMod.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plDecalEnableMod.cpp @@ -43,11 +43,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plDecalEnableMod.h" -#include "../plMessage/plDynaDecalEnableMsg.h" -#include "../plMessage/plCollideMsg.h" +#include "plMessage/plDynaDecalEnableMsg.h" +#include "plMessage/plCollideMsg.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../plAvatar/plArmatureMod.h" +#include "pnSceneObject/plSceneObject.h" +#include "plAvatar/plArmatureMod.h" #include "hsTimer.h" #include "hsStream.h" diff --git a/Sources/Plasma/PubUtilLib/plModifier/plDecalEnableMod.h b/Sources/Plasma/PubUtilLib/plModifier/plDecalEnableMod.h index d25a9dc1..b61463dc 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plDecalEnableMod.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plDecalEnableMod.h @@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plDecalEnableMod_inc #include "hsTemplates.h" -#include "../pnModifier/plSingleModifier.h" -#include "../pnKeyedObject/plKey.h" +#include "pnModifier/plSingleModifier.h" +#include "pnKeyedObject/plKey.h" class plDecalEnableMod : public plSingleModifier { diff --git a/Sources/Plasma/PubUtilLib/plModifier/plDetectorLog.cpp b/Sources/Plasma/PubUtilLib/plModifier/plDetectorLog.cpp index 0001f649..c47d9b12 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plDetectorLog.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plDetectorLog.cpp @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plDetectorLog.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" // Don't bother logging detectors in the external release, since it isn't written to disk #ifdef PLASMA_EXTERNAL_RELEASE diff --git a/Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.cpp index baa08ed7..4c537813 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.cpp @@ -40,29 +40,29 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plExcludeRegionModifier.h" -#include "../plMessage/plExcludeRegionMsg.h" +#include "plMessage/plExcludeRegionMsg.h" #include "hsTemplates.h" #include "hsResMgr.h" -#include "../pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plCoordinateInterface.h" #include "plDetectorLog.h" // For MsgReceive -#include "../plMessage/plCollideMsg.h" -#include "../pnSceneObject/plSceneObject.h" +#include "plMessage/plCollideMsg.h" +#include "pnSceneObject/plSceneObject.h" // For IClear and IRelease -#include "../pnMessage/plWarpMsg.h" -#include "../plMessage/plAvatarMsg.h" +#include "pnMessage/plWarpMsg.h" +#include "plMessage/plAvatarMsg.h" #include "plPhysical.h" -#include "../plPhysical/plSimDefs.h" +#include "plPhysical/plSimDefs.h" -#include "../plAvatar/plAvBrainGeneric.h" +#include "plAvatar/plAvBrainGeneric.h" -#include "../plSDL/plSDL.h" -#include "../pnMessage/plSDLModifierMsg.h" +#include "plSDL/plSDL.h" +#include "pnMessage/plSDLModifierMsg.h" //for hack -#include "../plPhysX/plPXPhysical.h" -#include "../plPhysX/plPXPhysicalControllerCore.h" -#include "NxCapsule.h" +#include "plPhysX/plPXPhysical.h" +#include "plPhysX/plPXPhysicalControllerCore.h" +#include static plPhysical* GetPhysical(plSceneObject* obj) { if (obj) diff --git a/Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.h index 0cc074e1..d0578d3f 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.h @@ -42,10 +42,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plExcludeRegionModifier_inc #define plExcludeRegionModifier_inc -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" #include "hsMatrix44.h" #include "hsTemplates.h" -#include "../plModifier/plSDLModifier.h" +#include "plModifier/plSDLModifier.h" // // Moves all of the avatars out of the area it's SceneObject occupies and makes it diff --git a/Sources/Plasma/PubUtilLib/plModifier/plGameMarkerModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plGameMarkerModifier.cpp index 892a5cf7..bfb684d3 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plGameMarkerModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plGameMarkerModifier.cpp @@ -40,10 +40,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plGameMarkerModifier.h" -#include "../plMessage/plCollideMsg.h" +#include "plMessage/plCollideMsg.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../pnSceneObject/plSceneObject.h" +#include "pnMessage/plNotifyMsg.h" +#include "pnSceneObject/plSceneObject.h" hsBool plGameMarkerModifier::MsgReceive(plMessage* msg) { diff --git a/Sources/Plasma/PubUtilLib/plModifier/plGameMarkerModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plGameMarkerModifier.h index 6e68d413..30f440e4 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plGameMarkerModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plGameMarkerModifier.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plGameMarkerModifier_h_inc #define plGameMarkerModifier_h_inc -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" class plGameMarkerModifier : public plSingleModifier { diff --git a/Sources/Plasma/PubUtilLib/plModifier/plImageLibMod.cpp b/Sources/Plasma/PubUtilLib/plModifier/plImageLibMod.cpp index d442c08b..b085a049 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plImageLibMod.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plImageLibMod.cpp @@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plImageLibMod.h" -#include "../plGImage/plBitmap.h" -#include "../pnMessage/plRefMsg.h" +#include "plGImage/plBitmap.h" +#include "pnMessage/plRefMsg.h" #include "hsTimer.h" #include "hsStream.h" diff --git a/Sources/Plasma/PubUtilLib/plModifier/plImageLibMod.h b/Sources/Plasma/PubUtilLib/plModifier/plImageLibMod.h index 9c85bd51..285957dc 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plImageLibMod.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plImageLibMod.h @@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plImageLibMod_inc #include "hsTemplates.h" -#include "../pnModifier/plSingleModifier.h" -#include "../pnKeyedObject/plKey.h" +#include "pnModifier/plSingleModifier.h" +#include "pnKeyedObject/plKey.h" class plBitmap; class plImageLibMod : public plSingleModifier diff --git a/Sources/Plasma/PubUtilLib/plModifier/plInterfaceInfoModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plInterfaceInfoModifier.cpp index 60d7239a..8e461110 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plInterfaceInfoModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plInterfaceInfoModifier.cpp @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plInterfaceInfoModifier.h" #include "hsResMgr.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" plInterfaceInfoModifier::plInterfaceInfoModifier() diff --git a/Sources/Plasma/PubUtilLib/plModifier/plInterfaceInfoModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plInterfaceInfoModifier.h index bde3c6cb..8760fbb9 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plInterfaceInfoModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plInterfaceInfoModifier.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plInterfaceInfoMod_inc #define plInterfaceInfoMod_inc -#include "../pnModifier/plSingleModifier.h" -#include "../pnKeyedObject/plKey.h" +#include "pnModifier/plSingleModifier.h" +#include "pnKeyedObject/plKey.h" #include "hsTemplates.h" class plInterfaceInfoModifier : public plSingleModifier diff --git a/Sources/Plasma/PubUtilLib/plModifier/plLayerSDLModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plLayerSDLModifier.cpp index b32993c1..261b747b 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plLayerSDLModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plLayerSDLModifier.cpp @@ -41,8 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsMatrix44.h" #include "plLayerSDLModifier.h" -#include "../plSDL/plSDL.h" -#include "../plSurface/plLayerAnimation.h" +#include "plSDL/plSDL.h" +#include "plSurface/plLayerAnimation.h" // static vars char plLayerSDLModifier::kStrAtc[]="atc"; diff --git a/Sources/Plasma/PubUtilLib/plModifier/plLayerSDLModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plLayerSDLModifier.h index 6326677c..b5824706 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plLayerSDLModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plLayerSDLModifier.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLayerSDLModifier_inc #define plLayerSDLModifier_inc -#include "../plModifier/plAnimTimeConvertSDLModifier.h" +#include "plModifier/plAnimTimeConvertSDLModifier.h" // // This modifier is responsible for sending and recving diff --git a/Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.cpp index ab6f15c0..6754b2bc 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.cpp @@ -42,23 +42,23 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plLogicModifier.h" #include "plgDispatch.h" -#include "../pnTimer/plTimerCallbackManager.h" -#include "../pnModifier/plConditionalObject.h" -#include "../plPhysical/plDetectorModifier.h" -#include "../plMessage/plCondRefMsg.h" -#include "../plMessage/plTimerCallbackMsg.h" -#include "../plMessage/plActivatorMsg.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnMessage/plFakeOutMsg.h" -#include "../pnMessage/plCursorChangeMsg.h" -#include "../pnMessage/plNotifyMsg.h" - -#include "../plModifier/plDetectorLog.h" -#include "../plInputCore/plSceneInputInterface.h" -#include "../../FeatureLib/pfConditional/plFacingConditionalObject.h" -#include "../../FeatureLib/pfConditional/plObjectInBoxConditionalObject.h" +#include "pnTimer/plTimerCallbackManager.h" +#include "pnModifier/plConditionalObject.h" +#include "plPhysical/plDetectorModifier.h" +#include "plMessage/plCondRefMsg.h" +#include "plMessage/plTimerCallbackMsg.h" +#include "plMessage/plActivatorMsg.h" +#include "pnNetCommon/plNetApp.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnKeyedObject/plKey.h" +#include "pnMessage/plFakeOutMsg.h" +#include "pnMessage/plCursorChangeMsg.h" +#include "pnMessage/plNotifyMsg.h" + +#include "plModifier/plDetectorLog.h" +#include "plInputCore/plSceneInputInterface.h" +#include "pfConditional/plFacingConditionalObject.h" +#include "pfConditional/plObjectInBoxConditionalObject.h" plLogicModifier::plLogicModifier() diff --git a/Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.h index 77f2b922..83f6fac6 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLogicModifier_inc #define plLogicModifier_inc -#include "../pnModifier/plLogicModBase.h" +#include "pnModifier/plLogicModBase.h" class plLogicModifier : public plLogicModBase { diff --git a/Sources/Plasma/PubUtilLib/plModifier/plMaintainersMarkerModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plMaintainersMarkerModifier.cpp index 11f28206..d1aa4e82 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plMaintainersMarkerModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plMaintainersMarkerModifier.cpp @@ -40,8 +40,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plMaintainersMarkerModifier.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../plAvatar/plAvatarMgr.h" +#include "pnSceneObject/plSceneObject.h" +#include "plAvatar/plAvatarMgr.h" void plMaintainersMarkerModifier::AddTarget(plSceneObject* so) { diff --git a/Sources/Plasma/PubUtilLib/plModifier/plMaintainersMarkerModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plMaintainersMarkerModifier.h index 519a2e40..1a2898ca 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plMaintainersMarkerModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plMaintainersMarkerModifier.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plMaintainersMarkerModifier_inc #define plMaintainersMarkerModifier_inc -#include "../pnModifier/plMultiModifier.h" -#include "../pnMessage/plMessage.h" +#include "pnModifier/plMultiModifier.h" +#include "pnMessage/plMessage.h" class plMaintainersMarkerModifier : public plMultiModifier diff --git a/Sources/Plasma/PubUtilLib/plModifier/plModifierCreatable.h b/Sources/Plasma/PubUtilLib/plModifier/plModifierCreatable.h index 648eb154..d8ade0ed 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plModifierCreatable.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plModifierCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plModifierCreatable_inc #define plModifierCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plSpawnModifier.h" diff --git a/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.cpp index f6ec11d5..914676bd 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.cpp @@ -47,33 +47,33 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plgDispatch.h" #include "hsResMgr.h" #include "plPhysical.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../pnNetCommon/plNetApp.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnMessage/plNotifyMsg.h" +#include "pnNetCommon/plNetApp.h" // for localOnly cmd check -#include "../plMessage/plLinkToAgeMsg.h" -#include "../pnMessage/plCameraMsg.h" -#include "../pnMessage/plSoundMsg.h" - -#include "../plMessage/plResponderMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../pnMessage/plSDLModifierMsg.h" -#include "../../FeatureLib/pfMessage/plArmatureEffectMsg.h" - -#include "../plStatusLog/plStatusLog.h" - -#include "../plMessage/plTimerCallbackMsg.h" -#include "../pnTimer/plTimerCallbackManager.h" - -#include "../plMessage/plSimStateMsg.h" -//#include "../plHavok1\plHKPhysical.h" -//#include "../plHavok1\plHKSubWorld.h" -#include "../plAvatar/plArmatureMod.h" -#include "../plAvatar/plAvatarMgr.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "pnMessage/plCameraMsg.h" +#include "pnMessage/plSoundMsg.h" + +#include "plMessage/plResponderMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "pnMessage/plSDLModifierMsg.h" +#include "pfMessage/plArmatureEffectMsg.h" + +#include "plStatusLog/plStatusLog.h" + +#include "plMessage/plTimerCallbackMsg.h" +#include "pnTimer/plTimerCallbackManager.h" + +#include "plMessage/plSimStateMsg.h" +//#include "plHavok1\plHKPhysical.h" +//#include "plHavok1\plHKSubWorld.h" +#include "plAvatar/plArmatureMod.h" +#include "plAvatar/plAvatarMgr.h" //#ifdef HS_DEBUGGING diff --git a/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.h index aa409207..db1f08a7 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plResponderModifier_inc #include "hsStlUtils.h" -#include "../pnModifier/plSingleModifier.h" -#include "../pnMessage/plMessage.h" +#include "pnModifier/plSingleModifier.h" +#include "pnMessage/plMessage.h" class plNotifyMsg; diff --git a/Sources/Plasma/PubUtilLib/plModifier/plResponderSDLModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plResponderSDLModifier.cpp index dc35545c..90095954 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plResponderSDLModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plResponderSDLModifier.cpp @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plResponderSDLModifier.h" -#include "../plSDL/plSDL.h" +#include "plSDL/plSDL.h" #include "plResponderModifier.h" // static vars diff --git a/Sources/Plasma/PubUtilLib/plModifier/plResponderSDLModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plResponderSDLModifier.h index 7685bae9..918ea12d 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plResponderSDLModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plResponderSDLModifier.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plResponderSDLModifier_inc #define plResponderSDLModifier_inc -#include "../plModifier/plSDLModifier.h" +#include "plModifier/plSDLModifier.h" // // This modifier is responsible for sending and recving responder state diff --git a/Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.cpp index 2ab14a10..124600a8 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.cpp @@ -41,15 +41,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plSDLModifier.h" -#include "../pnNetCommon/plSynchedObject.h" -#include "../pnDispatch/plDispatch.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnMessage/plSDLModifierMsg.h" - -#include "../plNetMessage/plNetMessage.h" -#include "../plSDL/plSDL.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plNetClient/plNetObjectDebugger.h" +#include "pnNetCommon/plSynchedObject.h" +#include "pnDispatch/plDispatch.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnMessage/plSDLModifierMsg.h" + +#include "plNetMessage/plNetMessage.h" +#include "plSDL/plSDL.h" +#include "plNetClient/plNetClientMgr.h" +#include "plNetClient/plNetObjectDebugger.h" plSDLModifier::plSDLModifier() : fStateCache(nil), fSentOrRecvdState(false) { diff --git a/Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.cpp index 8c316001..e59f4eb2 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.cpp @@ -45,12 +45,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plgDispatch.h" #include "hsStream.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnMessage/plRefMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnMessage/plTimeMsg.h" +#include "pnMessage/plRefMsg.h" #include "hsTimer.h" -// #include "../pfConditional/plAnimationEventConditionalObject.h" -#include "../plMessage/plAnimCmdMsg.h" +// #include "pfConditional/plAnimationEventConditionalObject.h" +#include "plMessage/plAnimCmdMsg.h" plSimpleModifier::plSimpleModifier() : diff --git a/Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.h index 5dca3d42..30fb6c5a 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.h @@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pnModifier/plModifier.h" #include "pnNetCommon/plSynchedValue.h" -#include "../plInterp/plAnimTimeConvert.h" +#include "plInterp/plAnimTimeConvert.h" class plSceneObject; class plRefMsg; diff --git a/Sources/Plasma/PubUtilLib/plModifier/plSoundSDLModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plSoundSDLModifier.cpp index 67e51973..b1db11bb 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plSoundSDLModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plSoundSDLModifier.cpp @@ -40,10 +40,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plSoundSDLModifier.h" -#include "../plSDL/plSDL.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plAudioInterface.h" -#include "../plAudio/plSound.h" +#include "plSDL/plSDL.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plAudioInterface.h" +#include "plAudio/plSound.h" // static vars char plSoundSDLModifier::kStrVolume[]="desiredVolume"; diff --git a/Sources/Plasma/PubUtilLib/plModifier/plSoundSDLModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plSoundSDLModifier.h index abdfd0c5..ad2b4dd8 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plSoundSDLModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plSoundSDLModifier.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plSoundSDLModifier_inc #define plSoundSDLModifier_inc -#include "../plModifier/plSDLModifier.h" +#include "plModifier/plSDLModifier.h" // // This modifier is responsible for sending and recving diff --git a/Sources/Plasma/PubUtilLib/plModifier/plSpawnModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plSpawnModifier.cpp index 1016b0a0..b21f44a3 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plSpawnModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plSpawnModifier.cpp @@ -43,17 +43,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com //#include "hsTypes.h" //#include "hsGeometry3.h" //#include "plgDispatch.h" -//#include "../pnSceneObject/plDrawInterface.h" -//#include "../pnSceneObject/plCoordinateInterface.h" +//#include "pnSceneObject/plDrawInterface.h" +//#include "pnSceneObject/plCoordinateInterface.h" //#include "hsBounds.h" #include "plSpawnModifier.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../plAvatar/plAvatarMgr.h" -//#include "../pnMessage/plTimeMsg.h" -//#include "../pnKeyedObject/plKey.h" +#include "pnSceneObject/plSceneObject.h" +#include "plAvatar/plAvatarMgr.h" +//#include "pnMessage/plTimeMsg.h" +//#include "pnKeyedObject/plKey.h" -//#include "../plMessage/plSpawnRequestMsg.h" -//#include "../plMessage/plSpawnModMsg.h" +//#include "plMessage/plSpawnRequestMsg.h" +//#include "plMessage/plSpawnModMsg.h" //hsBool plSpawnModifier::MsgReceive(plMessage* msg) //{ diff --git a/Sources/Plasma/PubUtilLib/plModifier/plSpawnModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plSpawnModifier.h index 56c11997..fdb88867 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plSpawnModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plSpawnModifier.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plSpawnModifier_inc #define plSpawnModifier_inc -#include "../pnModifier/plMultiModifier.h" -#include "../pnMessage/plMessage.h" +#include "pnModifier/plMultiModifier.h" +#include "pnMessage/plMessage.h" class plSpawnModifier : public plMultiModifier { diff --git a/Sources/Plasma/PubUtilLib/plNetClient/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plNetClient/CMakeLists.txt new file mode 100644 index 00000000..459e72bb --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plNetClient/CMakeLists.txt @@ -0,0 +1,47 @@ +include_directories("../../CoreLib") +include_directories("../../FeatureLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +include_directories(${OPENSSL_INCLUDE_DIR}) + +set(plNetClient_SOURCES + plLinkEffectsMgr.cpp + plNetCliAgeJoiner.cpp + plNetCliAgeLeaver.cpp + plNetClientCommInterface.cpp + plNetClientGroup.cpp + plNetClientMgr.cpp + plNetClientMgrLoad.cpp + plNetClientMgrRecord.cpp + plNetClientMgrSend.cpp + plNetClientMgrShow.cpp + plNetClientMgrVoice.cpp + plNetClientMsgHandler.cpp + plNetClientMsgScreener.cpp + plNetClientStats.cpp + plNetLinkingMgr.cpp + plNetObjectDebugger.cpp + plNetVoiceList.cpp +) + +set(plNetClient_HEADERS + plLinkEffectsMgr.h + plNetCliAgeJoiner.h + plNetCliAgeLeaver.h + plNetClientCreatable.h + plNetClientGroup.h + plNetClientMgr.h + plNetClientMsgHandler.h + plNetClientMsgScreener.h + plNetClientStats.h + plNetLinkingMgr.h + plNetObjectDebugger.h + plNetVoiceList.h +) + +add_library(plNetClient STATIC ${plNetClient_SOURCES} ${plNetClient_HEADERS}) + +source_group("Source Files" FILES ${plNetClient_SOURCES}) +source_group("Header Files" FILES ${plNetClient_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.cpp index 4bd84d45..31d908e7 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.cpp @@ -40,37 +40,37 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include "hsTemplates.h" #include "hsStream.h" #include "plLinkEffectsMgr.h" -#include "../pnMessage/plEventCallbackMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnMessage/plPlayerPageMsg.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../plMessage/plTransitionMsg.h" +#include "pnMessage/plEventCallbackMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "pnMessage/plPlayerPageMsg.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "plMessage/plTransitionMsg.h" #include "plgDispatch.h" #include "hsResMgr.h" #include "hsTimer.h" -#include "../pnNetCommon/plNetApp.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../plNetTransport/plNetTransportMember.h" -#include "../plVault/plVault.h" -#include "../plNetClient/plNetLinkingMgr.h" -#include "../plAgeLoader/plAgeLoader.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnMessage/plWarpMsg.h" -#include "../pnKeyedObject/plFixedKey.h" +#include "pnNetCommon/plNetApp.h" +#include "plNetClient/plNetClientMgr.h" +#include "pnSceneObject/plSceneObject.h" +#include "plNetTransport/plNetTransportMember.h" +#include "plVault/plVault.h" +#include "plNetClient/plNetLinkingMgr.h" +#include "plAgeLoader/plAgeLoader.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnMessage/plWarpMsg.h" +#include "pnKeyedObject/plFixedKey.h" // chronicle var #define kCleftSolved L"CleftSolved" -#include "../plAvatar/plArmatureMod.h" -#include "../plAvatar/plAvatarTasks.h" -#include "../plAvatar/plAGAnim.h" -#include "../plMessage/plAvatarMsg.h" -#include "../plMessage/plLoadAgeMsg.h" +#include "plAvatar/plArmatureMod.h" +#include "plAvatar/plAvatarTasks.h" +#include "plAvatar/plAGAnim.h" +#include "plMessage/plAvatarMsg.h" +#include "plMessage/plLoadAgeMsg.h" plLinkEffectsMgr::plLinkEffectsMgr() { diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.h b/Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.h index 1381759b..c73687b8 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.h +++ b/Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLinkEffectsMgr_inc #define plLinkEffectsMgr_inc -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" class plLinkEffectsTriggerMsg; class plPseudoLinkEffectMsg; diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.cpp index d934ed81..f7ecea28 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.cpp @@ -51,28 +51,28 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNetClientMgr.h" #include "plNetLinkingMgr.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" -#include "../pnMessage/plPlayerPageMsg.h" -#include "../pnMessage/plTimeMsg.h" +#include "pnMessage/plPlayerPageMsg.h" +#include "pnMessage/plTimeMsg.h" -#include "../plNetClientComm/plNetClientComm.h" -#include "../plAgeLoader/plAgeLoader.h" -#include "../plAgeLoader/plBackgroundDownloader.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plVault/plVault.h" +#include "plNetClientComm/plNetClientComm.h" +#include "plAgeLoader/plAgeLoader.h" +#include "plAgeLoader/plBackgroundDownloader.h" +#include "plAvatar/plAvatarMgr.h" +#include "plVault/plVault.h" -#include "../plNetMessage/plNetMessage.h" +#include "plNetMessage/plNetMessage.h" -#include "../plMessage/plNetCommMsgs.h" -#include "../plMessage/plAgeLoadedMsg.h" -#include "../plMessage/plInputIfaceMgrMsg.h" -#include "../plMessage/plNetClientMgrMsg.h" +#include "plMessage/plNetCommMsgs.h" +#include "plMessage/plAgeLoadedMsg.h" +#include "plMessage/plInputIfaceMgrMsg.h" +#include "plMessage/plNetClientMgrMsg.h" -#include "../plProgressMgr/plProgressMgr.h" -#include "../pnDispatch/plDispatch.h" -#include "../plResMgr/plResManager.h" +#include "plProgressMgr/plProgressMgr.h" +#include "pnDispatch/plDispatch.h" +#include "plResMgr/plResManager.h" /***************************************************************************** diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.h b/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.h index 16fa91c0..51e4ce74 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.h +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.h @@ -50,8 +50,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" -#include "../pnUtils/pnUtils.h" -#include "../plNetClientComm/plNetClientComm.h" +#include "pnUtils/pnUtils.h" +#include "plNetClientComm/plNetClientComm.h" /***************************************************************************** diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.cpp index 4d39e138..8b355871 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.cpp @@ -49,18 +49,18 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNetClientMgr.h" #include "plNetLinkingMgr.h" -#include "../pnMessage/plTimeMsg.h" - -#include "../plNetClientComm/plNetClientComm.h" -#include "../plNetGameLib/plNetGameLib.h" -#include "../plAgeLoader/plAgeLoader.h" -#include "../plAgeLoader/plBackgroundDownloader.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plVault/plVault.h" - -#include "../plMessage/plLoadAgeMsg.h" -#include "../plMessage/plAgeLoadedMsg.h" -#include "../plMessage/plInputIfaceMgrMsg.h" +#include "pnMessage/plTimeMsg.h" + +#include "plNetClientComm/plNetClientComm.h" +#include "plNetGameLib/plNetGameLib.h" +#include "plAgeLoader/plAgeLoader.h" +#include "plAgeLoader/plBackgroundDownloader.h" +#include "plAvatar/plAvatarMgr.h" +#include "plVault/plVault.h" + +#include "plMessage/plLoadAgeMsg.h" +#include "plMessage/plAgeLoadedMsg.h" +#include "plMessage/plInputIfaceMgrMsg.h" diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.h b/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.h index 7ef34811..5bac12ab 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.h +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.h @@ -50,8 +50,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" -#include "../pnUtils/pnUtils.h" -#include "../pnNetBase/pnNetBase.h" +#include "pnUtils/pnUtils.h" +#include "pnNetBase/pnNetBase.h" /***************************************************************************** diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientCommInterface.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientCommInterface.cpp index 42b4fc13..7cf83218 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientCommInterface.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientCommInterface.cpp @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNetClientMgr.h" #include "plNetLinkingMgr.h" -#include "../plNetClientRecorder/plNetClientRecorder.h" -#include "../plNetMessage/plNetMessage.h" +#include "plNetClientRecorder/plNetClientRecorder.h" +#include "plNetMessage/plNetMessage.h" #include "plgDispatch.h" diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientCreatable.h b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientCreatable.h index 0e871ca8..182b20fd 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientCreatable.h +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientCreatable.h @@ -42,12 +42,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plNetClientCreatable_inc #define plNetClientCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plNetClientMgr.h" REGISTER_CREATABLE( plNetClientMgr ); -#include "../plNetTransport/plNetTransportMember.h" +#include "plNetTransport/plNetTransportMember.h" REGISTER_CREATABLE( plNetTransportMember ); #include "plLinkEffectsMgr.h" diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.cpp index 3a0d0e17..d6fc5c63 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.cpp @@ -41,8 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsResMgr.h" #include "plNetClientGroup.h" -#include "../plResMgr/plKeyFinder.h" -#include "../plResMgr/plPageInfo.h" +#include "plResMgr/plKeyFinder.h" +#include "plResMgr/plPageInfo.h" // // cache room desc string, from fID diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h index b2459ddf..38c9a951 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plNetClientGroup_h #include "hsStlUtils.h" -#include "../../NucleusLib/pnNetCommon/plNetGroup.h" +#include "pnNetCommon/plNetGroup.h" // // represents a collection of net groups. diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp index b03b5d31..f9803fa5 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp @@ -49,62 +49,62 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNetLinkingMgr.h" #include "plNetObjectDebugger.h" -#include "../pnUtils/pnUtils.h" -#include "../pnProduct/pnProduct.h" -#include "../pnNetCommon/plSynchedObject.h" -#include "../pnNetCommon/plNetServers.h" -#include "../pnNetCommon/plSDLTypes.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plObjInterface.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnMessage/plClientMsg.h" -#include "../pnMessage/plSDLModifierMsg.h" -#include "../pnMessage/plPlayerPageMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnModifier/plModifier.h" -#include "../pnAsyncCore/pnAsyncCore.h" - -#include "../plAgeLoader/plAgeLoader.h" -#include "../plAgeLoader/plResPatcher.h" -#include "../plNetClientRecorder/plNetClientRecorder.h" -#include "../plScene/plSceneNode.h" -#include "../plNetCommon/plNetCommonConstants.h" -#include "../plNetMessage/plNetMessage.h" -#include "../plMessage/plLoadAvatarMsg.h" -#include "../plMessage/plLoadCloneMsg.h" -#include "../plMessage/plSynchEnableMsg.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../plMessage/plLoadAgeMsg.h" -#include "../plMessage/plAgeLoadedMsg.h" -#include "../plMessage/plCCRMsg.h" -#include "../plMessage/plAvatarMsg.h" -#include "../plMessage/plNetVoiceListMsg.h" -#include "../plMessage/plNetCommMsgs.h" -#include "../plMessage/plNetClientMgrMsg.h" -#include "../plResMgr/plKeyFinder.h" -#include "../plResMgr/plPageInfo.h" -#include "../plNetTransport/plNetTransportMember.h" -#include "../plAgeDescription/plAgeDescription.h" -#include "../plAvatar/plAvatarClothing.h" -#include "../plAvatar/plArmatureMod.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plSurface/plLayerInterface.h" -#include "../plStatusLog/plStatusLog.h" -#include "../plSDL/plSDL.h" -#include "../plUnifiedTime/plUnifiedTime.h" -#include "../plFile/plEncryptedStream.h" -#include "../plProgressMgr/plProgressMgr.h" -#include "../plVault/plVault.h" - -#include "../../FeatureLib/pfMessage/pfKIMsg.h" // Move this to PubUtil level +#include "pnUtils/pnUtils.h" +#include "pnProduct/pnProduct.h" +#include "pnNetCommon/plSynchedObject.h" +#include "pnNetCommon/plNetServers.h" +#include "pnNetCommon/plSDLTypes.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plObjInterface.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnMessage/plClientMsg.h" +#include "pnMessage/plSDLModifierMsg.h" +#include "pnMessage/plPlayerPageMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "pnModifier/plModifier.h" +#include "pnAsyncCore/pnAsyncCore.h" + +#include "plAgeLoader/plAgeLoader.h" +#include "plAgeLoader/plResPatcher.h" +#include "plNetClientRecorder/plNetClientRecorder.h" +#include "plScene/plSceneNode.h" +#include "plNetCommon/plNetCommonConstants.h" +#include "plNetMessage/plNetMessage.h" +#include "plMessage/plLoadAvatarMsg.h" +#include "plMessage/plLoadCloneMsg.h" +#include "plMessage/plSynchEnableMsg.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "plMessage/plLoadAgeMsg.h" +#include "plMessage/plAgeLoadedMsg.h" +#include "plMessage/plCCRMsg.h" +#include "plMessage/plAvatarMsg.h" +#include "plMessage/plNetVoiceListMsg.h" +#include "plMessage/plNetCommMsgs.h" +#include "plMessage/plNetClientMgrMsg.h" +#include "plResMgr/plKeyFinder.h" +#include "plResMgr/plPageInfo.h" +#include "plNetTransport/plNetTransportMember.h" +#include "plAgeDescription/plAgeDescription.h" +#include "plAvatar/plAvatarClothing.h" +#include "plAvatar/plArmatureMod.h" +#include "plAvatar/plAvatarMgr.h" +#include "plSurface/plLayerInterface.h" +#include "plStatusLog/plStatusLog.h" +#include "plSDL/plSDL.h" +#include "plUnifiedTime/plUnifiedTime.h" +#include "plFile/plEncryptedStream.h" +#include "plProgressMgr/plProgressMgr.h" +#include "plVault/plVault.h" + +#include "pfMessage/pfKIMsg.h" // Move this to PubUtil level #if 1 // for debugging #include "plCreatableIndex.h" -#include "../plModifier/plResponderModifier.h" -#include "../plSurface/plLayerAnimation.h" +#include "plModifier/plResponderModifier.h" +#include "plSurface/plLayerAnimation.h" #endif #include diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h index 8fe246b5..90332a8e 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h @@ -51,13 +51,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNetClientMsgHandler.h" #include "plNetClientStats.h" // STATS Counters -#include "../pnNetCommon/plNetApp.h" +#include "pnNetCommon/plNetApp.h" -#include "../plNetTransport/plNetTransport.h" -#include "../plEncryption/plChecksum.h" -#include "../plNetCommon/plNetServerSessionInfo.h" -#include "../plNetClientComm/plNetClientComm.h" -#include "../plUnifiedTime/plUnifiedTime.h" +#include "plNetTransport/plNetTransport.h" +#include "plEncryption/plChecksum.h" +#include "plNetCommon/plNetServerSessionInfo.h" +#include "plNetClientComm/plNetClientComm.h" +#include "plUnifiedTime/plUnifiedTime.h" #pragma warning(disable: 4284) //////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrLoad.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrLoad.cpp index a7b855f7..6357fff1 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrLoad.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrLoad.cpp @@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #if 1 // for debugging #include "plCreatableIndex.h" -#include "../plModifier/plResponderModifier.h" -#include "../plSurface/plLayerAnimation.h" +#include "plModifier/plResponderModifier.h" +#include "plSurface/plLayerAnimation.h" #endif #include "hsStream.h" @@ -52,38 +52,43 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "hsTimer.h" -#include "../plNetMessage/plNetMessage.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnModifier/plModifier.h" -#include "../pnMessage/plNodeRefMsg.h" -#include "../pnMessage/plClientMsg.h" -#include "../pnMessage/plNodeChangeMsg.h" -#include "../pnMessage/plPlayerPageMsg.h" - -#include "../plScene/plSceneNode.h" -#include "../plScene/plRelevanceMgr.h" -#include "../plNetTransport/plNetTransportMember.h" -#include "../plResMgr/plKeyFinder.h" -#include "../plAgeDescription/plAgeDescription.h" -#include "../plAvatar/plArmatureMod.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plSDL/plSDL.h" +#include "plNetMessage/plNetMessage.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnModifier/plModifier.h" +#include "pnMessage/plNodeRefMsg.h" +#include "pnMessage/plClientMsg.h" +#include "pnMessage/plNodeChangeMsg.h" +#include "pnMessage/plPlayerPageMsg.h" + +#include "plScene/plSceneNode.h" +#include "plScene/plRelevanceMgr.h" +#include "plNetTransport/plNetTransportMember.h" +#include "plResMgr/plKeyFinder.h" +#include "plAgeDescription/plAgeDescription.h" +#include "plAvatar/plArmatureMod.h" +#include "plAvatar/plAvatarMgr.h" +#include "plSDL/plSDL.h" /// TEMP HACK TO LOAD CONSOLE INIT FILES ON AGE LOAD -#include "../plMessage/plConsoleMsg.h" -#include "../plMessage/plLoadAvatarMsg.h" -#include "../plMessage/plAgeLoadedMsg.h" - -#include "../plAgeLoader/plResPatcher.h" -#include "../plProgressMgr/plProgressMgr.h" -#include "../plResMgr/plRegistryHelpers.h" -#include "../plResMgr/plRegistryNode.h" -#include "../plResMgr/plResManager.h" - -#include "process.h" // for getpid() +#include "plMessage/plConsoleMsg.h" +#include "plMessage/plLoadAvatarMsg.h" +#include "plMessage/plAgeLoadedMsg.h" + +#include "plAgeLoader/plResPatcher.h" +#include "plProgressMgr/plProgressMgr.h" +#include "plResMgr/plRegistryHelpers.h" +#include "plResMgr/plRegistryNode.h" +#include "plResMgr/plResManager.h" + +#ifdef _MSC_VER +#include // for getpid() +#else +#include +#include +#endif extern hsBool gDataServerLocal; diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrRecord.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrRecord.cpp index 28cd5428..3322bfaf 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrRecord.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrRecord.cpp @@ -42,10 +42,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plgDispatch.h" #include "plNetClientMgr.h" -#include "../pnNetCommon/pnNetCommon.h" -#include "../pnMessage/plTimeMsg.h" +#include "pnNetCommon/pnNetCommon.h" +#include "pnMessage/plTimeMsg.h" -#include "../plNetClientRecorder/plNetClientRecorder.h" +#include "plNetClientRecorder/plNetClientRecorder.h" // // make a recording of current play diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrSend.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrSend.cpp index ddd651fc..f3fe7f3a 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrSend.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrSend.cpp @@ -46,29 +46,29 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNetObjectDebugger.h" #include "plNetClientMsgScreener.h" -#include "../pnNetCommon/plSynchedObject.h" -#include "../pnNetCommon/plSDLTypes.h" -#include "../pnMessage/plCameraMsg.h" - -#include "../plNetClientRecorder/plNetClientRecorder.h" -#include "../plMessage/plLoadCloneMsg.h" -#include "../plMessage/plLoadAvatarMsg.h" -#include "../plAvatar/plAvatarClothing.h" -#include "../plAvatar/plArmatureMod.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plNetMessage/plNetMessage.h" -#include "../plMessage/plCCRMsg.h" -#include "../plVault/plVault.h" -#include "../plContainer/plConfigInfo.h" -#include "../plDrawable/plMorphSequence.h" -#include "../plParticleSystem/plParticleSystem.h" -#include "../plParticleSystem/plParticleSDLMod.h" -#include "../plResMgr/plLocalization.h" - -#include "../../FeatureLib/pfMessage/pfKIMsg.h" // TMP - -#include "../plNetGameLib/plNetGameLib.h" -#include "../plSDL/plSDL.h" +#include "pnNetCommon/plSynchedObject.h" +#include "pnNetCommon/plSDLTypes.h" +#include "pnMessage/plCameraMsg.h" + +#include "plNetClientRecorder/plNetClientRecorder.h" +#include "plMessage/plLoadCloneMsg.h" +#include "plMessage/plLoadAvatarMsg.h" +#include "plAvatar/plAvatarClothing.h" +#include "plAvatar/plArmatureMod.h" +#include "plAvatar/plAvatarMgr.h" +#include "plNetMessage/plNetMessage.h" +#include "plMessage/plCCRMsg.h" +#include "plVault/plVault.h" +#include "plContainer/plConfigInfo.h" +#include "plDrawable/plMorphSequence.h" +#include "plParticleSystem/plParticleSystem.h" +#include "plParticleSystem/plParticleSDLMod.h" +#include "plResMgr/plLocalization.h" + +#include "pfMessage/pfKIMsg.h" // TMP + +#include "plNetGameLib/plNetGameLib.h" +#include "plSDL/plSDL.h" // // request members list from server diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrShow.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrShow.cpp index 15ecc454..13be9d59 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrShow.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrShow.cpp @@ -42,13 +42,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNetClientMgr.h" #include "plNetLinkingMgr.h" -#include "../pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plSceneObject.h" -#include "../plPipeline/plPlates.h" -#include "../plPipeline/plDebugText.h" -#include "../plNetTransport/plNetTransportMember.h" -#include "../plAvatar/plArmatureMod.h" -#include "../plScene/plRelevanceMgr.h" +#include "plPipeline/plPlates.h" +#include "plPipeline/plDebugText.h" +#include "plNetTransport/plNetTransportMember.h" +#include "plAvatar/plArmatureMod.h" +#include "plScene/plRelevanceMgr.h" // // Code which displays stuff on the screen diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrVoice.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrVoice.cpp index ef3429f0..b4b1c610 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrVoice.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrVoice.cpp @@ -45,17 +45,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsGeometry3.h" #include "plNetClientMgr.h" -#include "../plNetMessage/plNetMessage.h" -#include "../pnNetCommon/plNetServers.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnKeyedObject/plKey.h" - -#include "../plNetTransport/plNetTransportMember.h" -#include "../plMessage/plMemberUpdateMsg.h" -#include "../plMessage/plNetVoiceListMsg.h" -#include "../plStatusLog/plStatusLog.h" -#include "../plVault/plVault.h" +#include "plNetMessage/plNetMessage.h" +#include "pnNetCommon/plNetServers.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnKeyedObject/plKey.h" + +#include "plNetTransport/plNetTransportMember.h" +#include "plMessage/plMemberUpdateMsg.h" +#include "plMessage/plNetVoiceListMsg.h" +#include "plStatusLog/plStatusLog.h" +#include "plVault/plVault.h" #define SAME_TALK_AND_LISTEN diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.cpp index 02f9ee90..4939842c 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.cpp @@ -48,36 +48,36 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNetLinkingMgr.h" #include "plCCRMgrBase.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plObjInterface.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../pnMessage/plNodeRefMsg.h" -#include "../pnMessage/plClientMsg.h" -//#include "../pnMessage/plWarpMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnMessage/plCameraMsg.h" -#include "../pnMessage/plPlayerPageMsg.h" -#include "../pnFactory/plCreator.h" -#include "../pnSceneObject/plAudioInterface.h" -#include "../pnNetCommon/plSDLTypes.h" - -#include "../plAudible/plWinAudible.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plNetTransport/plNetTransportMember.h" -#include "../plMessage/plMemberUpdateMsg.h" -#include "../plMessage/plNetOwnershipMsg.h" -#include "../plMessage/plCCRMsg.h" -#include "../plVault/plVault.h" -#include "../plSDL/plSDL.h" -#include "../plNetCommon/plNetCommonConstants.h" -#include "../plNetMessage/plNetMessage.h" -#include "../plNetMessage/plNetCommonMessage.h" - -#include "../../FeatureLib/pfMessage/pfKIMsg.h" // Should be moved to PubUtil level +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plObjInterface.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnMessage/plObjRefMsg.h" +#include "pnMessage/plNodeRefMsg.h" +#include "pnMessage/plClientMsg.h" +//#include "pnMessage/plWarpMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "pnMessage/plCameraMsg.h" +#include "pnMessage/plPlayerPageMsg.h" +#include "pnFactory/plCreator.h" +#include "pnSceneObject/plAudioInterface.h" +#include "pnNetCommon/plSDLTypes.h" + +#include "plAudible/plWinAudible.h" +#include "plAvatar/plAvatarMgr.h" +#include "plNetTransport/plNetTransportMember.h" +#include "plMessage/plMemberUpdateMsg.h" +#include "plMessage/plNetOwnershipMsg.h" +#include "plMessage/plCCRMsg.h" +#include "plVault/plVault.h" +#include "plSDL/plSDL.h" +#include "plNetCommon/plNetCommonConstants.h" +#include "plNetMessage/plNetMessage.h" +#include "plNetMessage/plNetCommonMessage.h" + +#include "pfMessage/pfKIMsg.h" // Should be moved to PubUtil level //////////////////////////////////////////////////////////////////////// @@ -241,7 +241,7 @@ MSG_HANDLER_DEFN(plNetClientMsgHandler,plNetMsgSDLState) plStateDataRecord::ReadStreamHeader(&stream, &descName, &ver); plStateDescriptor* des = plSDLMgr::GetInstance()->FindDescriptor(descName, ver); - if (strcmpi(descName, kSDLAvatarPhysical) == 0) + if (stricmp(descName, kSDLAvatarPhysical) == 0) rwFlags |= plSDL::kKeepDirty; // diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.h b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.h index 02492bf8..a561c75f 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.h +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plNetClientMsgHandler_inc #define plNetClientMsgHandler_inc -#include "../plNetCommon/plNetMsgHandler.h" +#include "plNetCommon/plNetMsgHandler.h" #include "hsStlUtils.h" /////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgScreener.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgScreener.cpp index d949a56a..0939b59a 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgScreener.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgScreener.cpp @@ -42,12 +42,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNetClientMsgScreener.h" #include "plNetLinkingMgr.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnMessage/plMessage.h" +#include "pnNetCommon/plNetApp.h" +#include "pnMessage/plMessage.h" -#include "../plStatusLog/plStatusLog.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plAvatar/plArmatureMod.h" +#include "plStatusLog/plStatusLog.h" +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plArmatureMod.h" /////////////////////////////////////////////////////////////// // CLIENT Version diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgScreener.h b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgScreener.h index cf197e6c..cbbeb320 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgScreener.h +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgScreener.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plNetClientMsgScreener_h #define plNetClientMsgScreener_h -#include "../plNetCommon/plNetMsgScreener.h" +#include "plNetCommon/plNetMsgScreener.h" // // Client-side version diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.cpp index 9ee48c4b..268d3dfc 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.cpp @@ -44,25 +44,25 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNetCliAgeJoiner.h" #include "plNetCliAgeLeaver.h" -#include "../plNetTransport/plNetTransportMember.h" // OfferLinkToPlayer() +#include "plNetTransport/plNetTransportMember.h" // OfferLinkToPlayer() #include "plgDispatch.h" -#include "../pnMessage/plTimeMsg.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plUoid.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../plNetCommon/plNetCommon.h" -#include "../plVault/plVault.h" -#include "../pnNetCommon/pnNetCommon.h" -#include "../plMessage/plVaultNotifyMsg.h" -#include "../plNetMessage/plNetMessage.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plAvatar/plArmatureMod.h" -#include "../plFile/hsFiles.h" -#include "../plMessage/plNCAgeJoinerMsg.h" -#include "../plVault/plVault.h" +#include "pnMessage/plTimeMsg.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plUoid.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnSceneObject/plSceneObject.h" +#include "plNetCommon/plNetCommon.h" +#include "plVault/plVault.h" +#include "pnNetCommon/pnNetCommon.h" +#include "plMessage/plVaultNotifyMsg.h" +#include "plNetMessage/plNetMessage.h" +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plArmatureMod.h" +#include "plFile/hsFiles.h" +#include "plMessage/plNCAgeJoinerMsg.h" +#include "plVault/plVault.h" /***************************************************************************** diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.h b/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.h index 1f905c09..f5ac3890 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.h +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.h @@ -45,9 +45,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsStlUtils.h" #include "hsBitVector.h" -#include "../plNetCommon/plNetServerSessionInfo.h" -#include "../plNetCommon/plNetCommon.h" -#include "../plMessage/plLinkToAgeMsg.h" +#include "plNetCommon/plNetServerSessionInfo.h" +#include "plNetCommon/plNetCommon.h" +#include "plMessage/plLinkToAgeMsg.h" class plMessage; struct plNCAgeJoiner; diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.cpp index 89f0b97a..4d092358 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.cpp @@ -43,13 +43,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "hsTemplates.h" -#include "../pnUtils/pnUtils.h" -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnUtils/pnUtils.h" +#include "pnKeyedObject/hsKeyedObject.h" -#include "../plStatusLog/plStatusLog.h" -#include "../plResMgr/plKeyFinder.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plAgeLoader/plAgeLoader.h" +#include "plStatusLog/plStatusLog.h" +#include "plResMgr/plKeyFinder.h" +#include "plNetClient/plNetClientMgr.h" +#include "plAgeLoader/plAgeLoader.h" plNetObjectDebugger::DebugObject::DebugObject(const char* objName, plLocation& loc, UInt32 flags) : fLoc(loc), diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.h b/Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.h index 68c7f627..9c421422 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.h +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.h @@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsStlUtils.h" -#include "../pnKeyedObject/plUoid.h" -#include "../pnNetCommon/plNetApp.h" +#include "pnKeyedObject/plUoid.h" +#include "pnNetCommon/plNetApp.h" class hsKeyedObject; class plStatusLog; diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetVoiceList.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetVoiceList.cpp index 04199116..88cd409a 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetVoiceList.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetVoiceList.cpp @@ -43,10 +43,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plgDispatch.h" #include "plNetClientMgr.h" #include "plNetVoiceList.h" -#include "../plNetTransport/plNetTransportMember.h" -#include "../pnMessage/plSoundMsg.h" -#include "../pnKeyedObject/plKey.h" -#include "../plStatusLog/plStatusLog.h" +#include "plNetTransport/plNetTransportMember.h" +#include "pnMessage/plSoundMsg.h" +#include "pnKeyedObject/plKey.h" +#include "plStatusLog/plStatusLog.h" // statics float plNetListenList::kUpdateInterval=0.5f; diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plNetCommon/CMakeLists.txt new file mode 100644 index 00000000..27c58694 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plNetCommon/CMakeLists.txt @@ -0,0 +1,33 @@ +include_directories("../../CoreLib") +include_directories("../../FeatureLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plNetCommon_SOURCES + plClientGuid.cpp + plNetCommon.cpp + plNetCommonHelpers.cpp + plNetMember.cpp + plNetMsgScreener.cpp + plNetServerSessionInfo.cpp + plSpawnPointInfo.cpp +) + +set(plNetCommon_HEADERS + plClientGuid.h + plNetCommon.h + plNetCommonConstants.h + plNetCommonCreatable.h + plNetCommonHelpers.h + plNetMember.h + plNetMsgHandler.h + plNetMsgScreener.h + plNetServerSessionInfo.h + plSpawnPointInfo.h +) + +add_library(plNetCommon STATIC ${plNetCommon_SOURCES} ${plNetCommon_HEADERS}) + +source_group("Source Files" FILES ${plNetCommon_SOURCES}) +source_group("Header Files" FILES ${plNetCommon_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.cpp b/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.cpp index 43f26462..13c80154 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.cpp +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.cpp @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include #include "plNetCommon.h" -#include "../pnMessage/plMessage.h" -#include "../plSockets/plNet.h" +#include "pnMessage/plMessage.h" +#include "plSockets/plNet.h" plClientGuid::plClientGuid() :fPlayerID(0) diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.h b/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.h index 9eedfee7..82be1990 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.h +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.h @@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsConfig.h" #include "hsStlUtils.h" -#include "../pnFactory/plCreatable.h" -#include "../plUUID/plUUID.h" +#include "pnFactory/plCreatable.h" +#include "plUUID/plUUID.h" class plClientGuid : public plCreatable { diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.cpp b/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.cpp index 99dc5435..d72fb8f5 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.cpp +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plNetCommon.h" #include "hsStlUtils.h" -#include "../plUUID/plUUID.h" +#include "plUUID/plUUID.h" #include namespace plNetCommon diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonCreatable.h b/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonCreatable.h index dfcc5260..da423728 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonCreatable.h +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonCreatable.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plNetCommonCreatable_inc #define plNetCommonCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #ifndef SERVER #include "plNetMember.h" diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.cpp b/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.cpp index 24ed7a2a..ccc80f55 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.cpp +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.cpp @@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "hsStlUtils.h" #include "plNetCommonHelpers.h" -#include "../pnNetCommon/plGenericVar.h" -#include "../plCompression/plZlibCompress.h" +#include "pnNetCommon/plGenericVar.h" +#include "plCompression/plZlibCompress.h" #include #include diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetMsgScreener.cpp b/Sources/Plasma/PubUtilLib/plNetCommon/plNetMsgScreener.cpp index 53b97ff5..c91c0160 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetMsgScreener.cpp +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plNetMsgScreener.cpp @@ -43,24 +43,24 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNetMsgScreener.h" #include "plCreatableIndex.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../pnMessage/plEnableMsg.h" -#include "../pnMessage/plSetNetGroupIDMsg.h" -#include "../pnInputCore/plControlEventCodes.h" - -#include "../plMessage/plCCRMsg.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../plMessage/plAvatarMsg.h" -#include "../plMessage/plInputIfaceMgrMsg.h" -#include "../plMessage/plInputEventMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plMessage/plBulletMsg.h" -#include "../plMessage/plAvCoopMsg.h" -#include "../plMessage/plParticleUpdateMsg.h" - -#include "../../FeatureLib/pfMessage/pfKIMsg.h" -#include "../../FeatureLib/pfMessage/plClothingMsg.h" +#include "pnNetCommon/plNetApp.h" +#include "pnMessage/plNotifyMsg.h" +#include "pnMessage/plEnableMsg.h" +#include "pnMessage/plSetNetGroupIDMsg.h" +#include "pnInputCore/plControlEventCodes.h" + +#include "plMessage/plCCRMsg.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "plMessage/plAvatarMsg.h" +#include "plMessage/plInputIfaceMgrMsg.h" +#include "plMessage/plInputEventMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plMessage/plBulletMsg.h" +#include "plMessage/plAvCoopMsg.h" +#include "plMessage/plParticleUpdateMsg.h" + +#include "pfMessage/pfKIMsg.h" +#include "pfMessage/plClothingMsg.h" // // say why the msg got rejected diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetMsgScreener.h b/Sources/Plasma/PubUtilLib/plNetCommon/plNetMsgScreener.h index 2ab523af..41f19f97 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetMsgScreener.h +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plNetMsgScreener.h @@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plNetMsgScreener_h #define plNetMsgScreener_h -#include "../pnKeyedObject/plKey.h" -#include "../plStatusLog/plLoggable.h" +#include "pnKeyedObject/plKey.h" +#include "plStatusLog/plLoggable.h" // // Class which decides what game messages are allowed to be sent to the server. diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.cpp b/Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.cpp index f0188727..50852417 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.cpp +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.cpp @@ -41,11 +41,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "hsStream.h" -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "plNetServerSessionInfo.h" #include "hsStlUtils.h" #include "plNetCommon.h" -#include "../plVault/plVault.h" +#include "plVault/plVault.h" #include diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plSpawnPointInfo.cpp b/Sources/Plasma/PubUtilLib/plNetCommon/plSpawnPointInfo.cpp index 8fec6de2..7b67de80 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plSpawnPointInfo.cpp +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plSpawnPointInfo.cpp @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plSpawnPointInfo.h" -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsStream.h" #include "hsBitVector.h" diff --git a/Sources/Plasma/PubUtilLib/plPhysX/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plPhysX/CMakeLists.txt new file mode 100644 index 00000000..0482c9ae --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plPhysX/CMakeLists.txt @@ -0,0 +1,30 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +include_directories(${PHYSX_INCLUDE_DIRS}) +include_directories(${OPENSSL_INCLUDE_DIR}) + +set(plPhysX_SOURCES + plLOSDispatch.cpp + plPXConvert.cpp + plPXPhysical.cpp + plPXPhysicalControllerCore.cpp + plSimulationMgr.cpp +) + +set(plPhysX_HEADERS + plLOSDispatch.h + plPhysXCreatable.h + plPXConvert.h + plPXPhysical.h + plPXPhysicalControllerCore.h + plPXStream.h + plSimulationMgr.h +) + +add_library(plPhysX STATIC ${plPhysX_SOURCES} ${plPhysX_HEADERS}) + +source_group("Source Files" FILES ${plPhysX_SOURCES}) +source_group("Header Files" FILES ${plPhysX_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plPhysX/plLOSDispatch.cpp b/Sources/Plasma/PubUtilLib/plPhysX/plLOSDispatch.cpp index 16bb5128..8bccac1b 100644 --- a/Sources/Plasma/PubUtilLib/plPhysX/plLOSDispatch.cpp +++ b/Sources/Plasma/PubUtilLib/plPhysX/plLOSDispatch.cpp @@ -42,19 +42,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plLOSDispatch.h" #include "plSimulationMgr.h" #include "plgDispatch.h" -#include "../plMessage/plLOSRequestMsg.h" -#include "../plMessage/plLOSHitMsg.h" -#include "../pnKeyedObject/plFixedKey.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../plModifier/plLogicModifier.h" +#include "plMessage/plLOSRequestMsg.h" +#include "plMessage/plLOSHitMsg.h" +#include "pnKeyedObject/plFixedKey.h" +#include "pnSceneObject/plSceneObject.h" +#include "plModifier/plLogicModifier.h" #include "plPXPhysical.h" #include "plPXPhysicalControllerCore.h" #include "plPXConvert.h" -#include "../plAvatar/plAvatarMgr.h" -#include "../plAvatar/plArmatureMod.h" +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plArmatureMod.h" -#include "NxPhysics.h" +#include #include "plProfile.h" plProfile_Extern(LineOfSight); diff --git a/Sources/Plasma/PubUtilLib/plPhysX/plLOSDispatch.h b/Sources/Plasma/PubUtilLib/plPhysX/plLOSDispatch.h index b7ec9525..cce93709 100644 --- a/Sources/Plasma/PubUtilLib/plPhysX/plLOSDispatch.h +++ b/Sources/Plasma/PubUtilLib/plPhysX/plLOSDispatch.h @@ -39,7 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" class plLOSRequestMsg; struct hsMatrix44; diff --git a/Sources/Plasma/PubUtilLib/plPhysX/plPXConvert.h b/Sources/Plasma/PubUtilLib/plPhysX/plPXConvert.h index 17817dbb..28e727f9 100644 --- a/Sources/Plasma/PubUtilLib/plPhysX/plPXConvert.h +++ b/Sources/Plasma/PubUtilLib/plPhysX/plPXConvert.h @@ -46,9 +46,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsQuat.h" #include "hsMatrix44.h" -#include "NxVec3.h" -#include "NxQuat.h" -#include "NxMat34.h" +#include +#include +#include // Converts to and from the PhysX types namespace plPXConvert diff --git a/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp b/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp index 3745f067..af914716 100644 --- a/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp +++ b/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp @@ -52,24 +52,24 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsSTLStream.h" #include "plSimulationMgr.h" -#include "../plPhysical/plPhysicalSDLModifier.h" -#include "../plPhysical/plPhysicalSndGroup.h" -#include "../plPhysical/plPhysicalProxy.h" -#include "../pnSceneObject/plSimulationInterface.h" -#include "../pnSceneObject/plCoordinateInterface.h" - -#include "../pnKeyedObject/plKey.h" -#include "../pnMessage/plCorrectionMsg.h" -#include "../pnMessage/plNodeRefMsg.h" -#include "../pnMessage/plSDLModifierMsg.h" -#include "../plMessage/plSimStateMsg.h" -#include "../plMessage/plSimInfluenceMsg.h" -#include "../plMessage/plLinearVelocityMsg.h" -#include "../plMessage/plAngularVelocityMsg.h" -#include "../plDrawable/plDrawableGenerator.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plNetTransport/plNetTransportMember.h" -#include "../plStatusLog/plStatusLog.h" +#include "plPhysical/plPhysicalSDLModifier.h" +#include "plPhysical/plPhysicalSndGroup.h" +#include "plPhysical/plPhysicalProxy.h" +#include "pnSceneObject/plSimulationInterface.h" +#include "pnSceneObject/plCoordinateInterface.h" + +#include "pnKeyedObject/plKey.h" +#include "pnMessage/plCorrectionMsg.h" +#include "pnMessage/plNodeRefMsg.h" +#include "pnMessage/plSDLModifierMsg.h" +#include "plMessage/plSimStateMsg.h" +#include "plMessage/plSimInfluenceMsg.h" +#include "plMessage/plLinearVelocityMsg.h" +#include "plMessage/plAngularVelocityMsg.h" +#include "plDrawable/plDrawableGenerator.h" +#include "plNetClient/plNetClientMgr.h" +#include "plNetTransport/plNetTransportMember.h" +#include "plStatusLog/plStatusLog.h" #include "plPXConvert.h" #include "plPXPhysicalControllerCore.h" diff --git a/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.h b/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.h index 5c4ca8ae..896f7404 100644 --- a/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.h +++ b/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPhysical.h" #include "hsMatrix44.h" -#include "../plPhysical/plSimDefs.h" +#include "plPhysical/plSimDefs.h" #include "hsBitVector.h" #include "hsUtils.h" diff --git a/Sources/Plasma/PubUtilLib/plPhysX/plPXStream.h b/Sources/Plasma/PubUtilLib/plPhysX/plPXStream.h index e4c32719..5133a3e8 100644 --- a/Sources/Plasma/PubUtilLib/plPhysX/plPXStream.h +++ b/Sources/Plasma/PubUtilLib/plPhysX/plPXStream.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plPXStream_h_inc #include "hsStream.h" -#include "NxPhysics.h" -#include "NxStream.h" +#include +#include // A super simple wrapper to convert a Plasma stream into a PhysX one class plPXStream : public NxStream diff --git a/Sources/Plasma/PubUtilLib/plPhysX/plPhysXCreatable.h b/Sources/Plasma/PubUtilLib/plPhysX/plPhysXCreatable.h index cf986171..16c8c1be 100644 --- a/Sources/Plasma/PubUtilLib/plPhysX/plPhysXCreatable.h +++ b/Sources/Plasma/PubUtilLib/plPhysX/plPhysXCreatable.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPhysXCreatable_inc #define plPhysXCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plPXPhysical.h" diff --git a/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.cpp b/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.cpp index 5603c566..332a96c2 100644 --- a/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.cpp @@ -50,14 +50,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPXPhysicalControllerCore.h" #include "plPXConvert.h" #include "plLOSDispatch.h" -#include "../plPhysical/plPhysicsSoundMgr.h" -#include "../plStatusLog/plStatusLog.h" -#include "../pnSceneObject/plSimulationInterface.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnNetCommon/plSDLTypes.h" -#include "../plMessage/plCollideMsg.h" - -#include "../plModifier/plDetectorLog.h" +#include "plPhysical/plPhysicsSoundMgr.h" +#include "plStatusLog/plStatusLog.h" +#include "pnSceneObject/plSimulationInterface.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnNetCommon/plSDLTypes.h" +#include "plMessage/plCollideMsg.h" + +#include "plModifier/plDetectorLog.h" #ifndef PLASMA_EXTERNAL_RELEASE bool plSimulationMgr::fDisplayAwakeActors=false; diff --git a/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.h b/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.h index 7f85cd1c..a8251bc4 100644 --- a/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.h +++ b/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plSimulationMgr_H #include "hsStlUtils.h" -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include "hsTemplates.h" class plPXPhysical; diff --git a/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt new file mode 100644 index 00000000..142c378a --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt @@ -0,0 +1,87 @@ +include_directories("../../CoreLib") +include_directories("../../FeatureLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plPipeline_SOURCES + hsG3DDeviceSelector.cpp + hsGColorizer.cpp + hsGDDrawDllLoad.cpp + plBinkPlayer.cpp + plCaptureRender.cpp + plCubicRenderTargetModifier.cpp + plCullTree.cpp + plDebugText.cpp + plDTProgressMgr.cpp + plDXEnumerate.cpp + plDXPipeline.cpp + plDXPixelShader.cpp + plDXShader.cpp + plDXTextFont.cpp + plDXVertexShader.cpp + plDynamicEnvMap.cpp + plFogEnvironment.cpp + plGBufferGroup.cpp + plPlates.cpp + plRenderTarget.cpp + plStatusLogDrawer.cpp + plTextFont.cpp + plTextGenerator.cpp + plTransitionMgr.cpp + plVertCoder.cpp +) + +set(plPipeline_HEADERS + hsFogControl.h + hsG3DDeviceSelector.h + hsGColorizer.h + hsGDDrawDllLoad.h + hsWinRef.h + plBinkPlayer.h + plCaptureRender.h + plCubicRenderTarget.h + plCubicRenderTargetModifier.h + plCuller.h + plCullTree.h + plDebugText.h + plDrawPrim.h + plDTProgressMgr.h + plDXEnumerate.h + plDXPipeline.h + plDXPixelShader.h + plDXSettings.h + plDXShader.h + plDXTextFont.h + plDXVertexShader.h + plDynamicEnvMap.h + plFogEnvironment.h + plGBufferGroup.h + plPipeDebugFlags.h + plPipelineCreatable.h + plPipelineCreate.h + plPlates.h + plRenderTarget.h + plStatusLogDrawer.h + plStencil.h + plTextFont.h + plTextGenerator.h + plTransitionMgr.h + plVertCoder.h +) + +set(plPipeline_DEVICEREFS + hsGDeviceRef.h + plDXBufferRefs.h + plDXDeviceRef.h + plDXDeviceRefs.cpp + plDXLightRef.h + plDXRenderTargetRef.h + plDXTextureRef.h +) + +add_library(plPipeline STATIC ${plPipeline_SOURCES} ${plPipeline_HEADERS} ${plPipeline_DEVICEREFS}) + +source_group("Source Files" FILES ${plPipeline_SOURCES}) +source_group("Header Files" FILES ${plPipeline_HEADERS}) +source_group("DeviceRefs" FILES ${plPipeline_DEVICEREFS}) diff --git a/Sources/Plasma/PubUtilLib/plPipeline/hsG3DDeviceSelector.cpp b/Sources/Plasma/PubUtilLib/plPipeline/hsG3DDeviceSelector.cpp index 8f3053b9..bc5ebd1c 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/hsG3DDeviceSelector.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/hsG3DDeviceSelector.cpp @@ -55,9 +55,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifdef HS_OPEN_GL #if HS_BUILD_FOR_WIN32 -#include "gls.h" -#include "glswgl.h" -#include "glext.h" +#include +#include +#include #endif #endif diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plCaptureRender.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plCaptureRender.cpp index 498f9e44..39ddb1d6 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plCaptureRender.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plCaptureRender.cpp @@ -45,16 +45,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef MF_FRONTBUFF_CAPTURE -#include "../plGImage/plMipmap.h" -#include "../plMessage/plCaptureRenderMsg.h" +#include "plGImage/plMipmap.h" +#include "plMessage/plCaptureRenderMsg.h" #include "plPipeline.h" #include "plRenderTarget.h" -#include "../plScene/plPageTreeMgr.h" -#include "../plScene/plPostEffectMod.h" +#include "plScene/plPageTreeMgr.h" +#include "plScene/plPostEffectMod.h" #include "hsResMgr.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plUoid.h" -#include "../pfGameGUIMgr/pfGameGUIMgr.h" +#include "pfGameGUIMgr/pfGameGUIMgr.h" // CaptureRenderRequest // diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plCaptureRender.h b/Sources/Plasma/PubUtilLib/plPipeline/plCaptureRender.h index 6550b727..66d6fa43 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plCaptureRender.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/plCaptureRender.h @@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef MF_FRONTBUFF_CAPTURE -#include "../plScene/plRenderRequest.h" +#include "plScene/plRenderRequest.h" class plRenderTarget; class plCaptureRenderMsg; diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plCubicRenderTargetModifier.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plCubicRenderTargetModifier.cpp index b71c35cc..7657fb0f 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plCubicRenderTargetModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plCubicRenderTargetModifier.cpp @@ -58,12 +58,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plDrawable.h" #include "hsBounds.h" -#include "../plScene/plRenderRequest.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnSceneObject/plDrawInterface.h" -#include "../pnMessage/plTimeMsg.h" -#include "../plMessage/plRenderRequestMsg.h" +#include "plScene/plRenderRequest.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plDrawInterface.h" +#include "pnMessage/plTimeMsg.h" +#include "plMessage/plRenderRequestMsg.h" #include "hsResMgr.h" #include "hsTimer.h" diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plCubicRenderTargetModifier.h b/Sources/Plasma/PubUtilLib/plPipeline/plCubicRenderTargetModifier.h index 54aebbfc..d967a3de 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plCubicRenderTargetModifier.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/plCubicRenderTargetModifier.h @@ -57,8 +57,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plCubicRenderTargetModifier_h #define _plCubicRenderTargetModifier_h -#include "../../NucleusLib/pnModifier/plModifier.h" -#include "../pnNetCommon/plSynchedValue.h" +#include "pnModifier/plModifier.h" +#include "pnNetCommon/plSynchedValue.h" class plCubicRenderTarget; diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plCullTree.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plCullTree.cpp index daab443e..efede854 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plCullTree.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plCullTree.cpp @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plCullTree.h" -#include "../plDrawable/plSpaceTree.h" +#include "plDrawable/plSpaceTree.h" #include "hsFastMath.h" #include "hsColorRGBA.h" #include "plProfile.h" diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plCullTree.h b/Sources/Plasma/PubUtilLib/plPipeline/plCullTree.h index 88b0b3cf..061454c3 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plCullTree.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/plCullTree.h @@ -47,7 +47,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsGeometry3.h" #include "hsBitVector.h" #include "plCuller.h" -#include "../plScene/plCullPoly.h" +#include "plScene/plCullPoly.h" #ifdef HS_DEBUGGING #define DEBUG_POINTERS diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDTProgressMgr.h b/Sources/Plasma/PubUtilLib/plPipeline/plDTProgressMgr.h index a1074602..932296a3 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plDTProgressMgr.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/plDTProgressMgr.h @@ -52,7 +52,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plDTProgressMgr_h #define _plDTProgressMgr_h -#include "../plProgressMgr/plProgressMgr.h" +#include "plProgressMgr/plProgressMgr.h" class plPipeline; diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXDeviceRefs.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plDXDeviceRefs.cpp index 6c5f3f2e..be7e422c 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plDXDeviceRefs.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plDXDeviceRefs.cpp @@ -64,15 +64,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plDXTextureRef.h" #include "plDXRenderTargetRef.h" #include "plGBufferGroup.h" -#include "../plDrawable/plGeometrySpan.h" -#include "../plDrawable/plDrawableSpans.h" -#include "../plGLight/plLightInfo.h" +#include "plDrawable/plGeometrySpan.h" +#include "plDrawable/plDrawableSpans.h" +#include "plGLight/plLightInfo.h" #include "plRenderTarget.h" #include "plCubicRenderTarget.h" #include "plDynamicEnvMap.h" #include "plProfile.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" plProfile_CreateMemCounter("Vertices", "Memory", MemVertex); plProfile_CreateMemCounter("Indices", "Memory", MemIndex); diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp index 81d50943..70357d33 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp @@ -77,40 +77,40 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTemplates.h" //#include "hsGEnviron.h" #include "plProfile.h" -#include "../plMessage/plDeviceRecreateMsg.h" -#include "../pnMessage/plSelfDestructMsg.h" -#include "../pnMessage/plClientMsg.h" -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plLayerInterface.h" -#include "../plSurface/plLayerShadowBase.h" -#include "../plGImage/plMipmap.h" -#include "../plGImage/plCubicEnvironmap.h" -#include "../plDrawable/plDrawableSpans.h" -#include "../plDrawable/plGeometrySpan.h" -#include "../plDrawable/plSpaceTree.h" -#include "../plDrawable/plDrawableGenerator.h" -#include "../plDrawable/plSpanTypes.h" -#include "../plDrawable/plAccessSpan.h" -#include "../plDrawable/plAuxSpan.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plDrawInterface.h" +#include "plMessage/plDeviceRecreateMsg.h" +#include "pnMessage/plSelfDestructMsg.h" +#include "pnMessage/plClientMsg.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plLayerInterface.h" +#include "plSurface/plLayerShadowBase.h" +#include "plGImage/plMipmap.h" +#include "plGImage/plCubicEnvironmap.h" +#include "plDrawable/plDrawableSpans.h" +#include "plDrawable/plGeometrySpan.h" +#include "plDrawable/plSpaceTree.h" +#include "plDrawable/plDrawableGenerator.h" +#include "plDrawable/plSpanTypes.h" +#include "plDrawable/plAccessSpan.h" +#include "plDrawable/plAuxSpan.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plDrawInterface.h" #include "hsFastMath.h" -#include "../plGLight/plLightInfo.h" -#include "../plParticleSystem/plParticleEmitter.h" -#include "../plParticleSystem/plParticle.h" -#include "../plAvatar/plAvatarClothing.h" +#include "plGLight/plLightInfo.h" +#include "plParticleSystem/plParticleEmitter.h" +#include "plParticleSystem/plParticle.h" +#include "plAvatar/plAvatarClothing.h" #include "plDebugText.h" #include "plFogEnvironment.h" #include "plDXTextFont.h" #include "plGBufferGroup.h" #include "hsTimer.h" #include "plgDispatch.h" -#include "../plScene/plRenderRequest.h" -#include "../plScene/plVisMgr.h" +#include "plScene/plRenderRequest.h" +#include "plScene/plVisMgr.h" #include "plRenderTarget.h" #include "plCubicRenderTarget.h" #include "plDynamicEnvMap.h" -#include "../../FeatureLib/pfCamera/plVirtualCamNeu.h" +#include "pfCamera/plVirtualCamNeu.h" #include "plDXBufferRefs.h" #include "plDXTextureRef.h" @@ -119,32 +119,32 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plDXVertexShader.h" #include "plDXPixelShader.h" -#include "../plGLight/plShadowSlave.h" -#include "../plGLight/plShadowCaster.h" +#include "plGLight/plShadowSlave.h" +#include "plGLight/plShadowCaster.h" #include "hsGMatState.inl" -#include "../plSurface/plShader.h" +#include "plSurface/plShader.h" #include "plDXVertexShader.h" #include "plDXPixelShader.h" -#include "../pnMessage/plPipeResMakeMsg.h" +#include "pnMessage/plPipeResMakeMsg.h" #include "plPipeResReq.h" -#include "../pnNetCommon/plNetApp.h" // for dbg logging -#include "../../FeatureLib/pfCamera/plVirtualCamNeu.h" -#include "../../FeatureLib/pfCamera/plCameraModifier.h" -#include "../plResMgr/plLocalization.h" +#include "pnNetCommon/plNetApp.h" // for dbg logging +#include "pfCamera/plVirtualCamNeu.h" +#include "pfCamera/plCameraModifier.h" +#include "plResMgr/plLocalization.h" // mf horse - test hack, nuke this later -#include "../plSurface/plLayerDepth.h" +#include "plSurface/plLayerDepth.h" -#include "../plGImage/hsCodecManager.h" -//#include "../plGImage/hsDXTDirectXCodec.h" +#include "plGImage/hsCodecManager.h" +//#include "plGImage/hsDXTDirectXCodec.h" #ifdef HS_DEBUGGING // This is so VC++ will let us view the contents of plIcicle::fOwnerKey -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #endif #include "plCullTree.h" diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.h b/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.h index 71d75637..ecda292a 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.h @@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPipeline.h" #include "plDXSettings.h" -#include "../plSurface/plLayerInterface.h" +#include "plSurface/plLayerInterface.h" #include "hsMatrix44.h" #include "plFogEnvironment.h" #include "hsG3DDeviceSelector.h" diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXPixelShader.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plDXPixelShader.cpp index 95fd106c..e61d5f41 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plDXPixelShader.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plDXPixelShader.cpp @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plDXPixelShader.h" -#include "../plSurface/plShader.h" +#include "plSurface/plShader.h" #include "plDXPipeline.h" diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXShader.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plDXShader.cpp index 6854b9e4..8864fd1d 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plDXShader.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plDXShader.cpp @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plDXShader.h" -#include "../plSurface/plShader.h" +#include "plSurface/plShader.h" #include "plDXPipeline.h" diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXVertexShader.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plDXVertexShader.cpp index 69c6f868..210d93ce 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plDXVertexShader.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plDXVertexShader.cpp @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plDXVertexShader.h" -#include "../plSurface/plShader.h" +#include "plSurface/plShader.h" #include "plGBufferGroup.h" #include "plDXPipeline.h" diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDynamicEnvMap.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plDynamicEnvMap.cpp index b8ab4006..5da10629 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plDynamicEnvMap.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plDynamicEnvMap.cpp @@ -52,20 +52,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTimer.h" #include "hsStream.h" -#include "../plMessage/plRenderRequestMsg.h" -#include "../plMessage/plDynamicEnvMapMsg.h" -#include "../pfCamera/plCameraModifier.h" -#include "../pfCamera/plVirtualCamNeu.h" -#include "../plMessage/plRenderMsg.h" -#include "../plMessage/plAgeLoadedMsg.h" -#include "../plMessage/plLayRefMsg.h" -#include "../pnMessage/plPipeResMakeMsg.h" -#include "../pnMessage/plRefMsg.h" - -#include "../plScene/plVisRegion.h" -#include "../plScene/plVisMgr.h" -#include "../plResMgr/plKeyFinder.h" -#include "../plSurface/plLayer.h" +#include "plMessage/plRenderRequestMsg.h" +#include "plMessage/plDynamicEnvMapMsg.h" +#include "pfCamera/plCameraModifier.h" +#include "pfCamera/plVirtualCamNeu.h" +#include "plMessage/plRenderMsg.h" +#include "plMessage/plAgeLoadedMsg.h" +#include "plMessage/plLayRefMsg.h" +#include "pnMessage/plPipeResMakeMsg.h" +#include "pnMessage/plRefMsg.h" + +#include "plScene/plVisRegion.h" +#include "plScene/plVisMgr.h" +#include "plResMgr/plKeyFinder.h" +#include "plSurface/plLayer.h" plDynamicEnvMap::plDynamicEnvMap() : fPos(0,0,0), diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDynamicEnvMap.h b/Sources/Plasma/PubUtilLib/plPipeline/plDynamicEnvMap.h index ada9fa65..070690d8 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plDynamicEnvMap.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/plDynamicEnvMap.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plDynamicEnvMap_inc #include "plCubicRenderTarget.h" -#include "../plScene/plRenderRequest.h" +#include "plScene/plRenderRequest.h" #include "hsBitVector.h" class plRenderRequestMsg; diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plFogEnvironment.h b/Sources/Plasma/PubUtilLib/plPipeline/plFogEnvironment.h index 07d4900b..2f86c886 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plFogEnvironment.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/plFogEnvironment.h @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plFogEnvironment_h #define _plFogEnvironment_h -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include "hsTypes.h" #include "hsColorRGBA.h" #include "hsTemplates.h" diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plGBufferGroup.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plGBufferGroup.cpp index ee45c3da..284effeb 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plGBufferGroup.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plGBufferGroup.cpp @@ -55,8 +55,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plGBufferGroup.h" #include "hsStream.h" -#include "../plSurface/hsGMaterial.h" -#include "../plDrawable/plGeometrySpan.h" +#include "plSurface/hsGMaterial.h" +#include "plDrawable/plGeometrySpan.h" #include "plPipeline.h" #include "hsGDeviceRef.h" #include "plProfile.h" diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plPipelineCreatable.h b/Sources/Plasma/PubUtilLib/plPipeline/plPipelineCreatable.h index 6137e990..ea92b5a7 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plPipelineCreatable.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/plPipelineCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPipelineCreatable_inc #define plPipelineCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plPlates.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plPlates.cpp index cc32b44f..9c56446a 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plPlates.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plPlates.cpp @@ -50,13 +50,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPipeline.h" #include "plPlates.h" -#include "../plJPEG/plJPEG.h" -#include "../plGImage/plPNG.h" -#include "../plGImage/plMipmap.h" -#include "../plSurface/plLayer.h" -#include "../plSurface/hsGMaterial.h" -#include "../plMessage/plLayRefMsg.h" -#include "../pnMessage/plRefMsg.h" +#include "plJPEG/plJPEG.h" +#include "plGImage/plPNG.h" +#include "plGImage/plMipmap.h" +#include "plSurface/plLayer.h" +#include "plSurface/hsGMaterial.h" +#include "plMessage/plLayRefMsg.h" +#include "pnMessage/plRefMsg.h" #include "hsGDeviceRef.h" #include "hsResMgr.h" #include "plPipeDebugFlags.h" diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plRenderTarget.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plRenderTarget.cpp index 7267db59..3dc7dc67 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plRenderTarget.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plRenderTarget.cpp @@ -58,7 +58,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPipeline.h" #include "plgDispatch.h" -#include "../pnMessage/plPipeResMakeMsg.h" +#include "pnMessage/plPipeResMakeMsg.h" /////////////////////////////////////////////////////////////////////////////// //// plRenderTarget Functions ///////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plRenderTarget.h b/Sources/Plasma/PubUtilLib/plPipeline/plRenderTarget.h index d2a23cd9..3f14a5c3 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plRenderTarget.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/plRenderTarget.h @@ -55,7 +55,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPipeResReq.h" -#include "../plGImage/plBitmap.h" +#include "plGImage/plBitmap.h" #define ASSERT_ABSOLUTE hsAssert( !fProportionalViewport, "Cannot perform this on a proportional RenderTarget" ); #define ASSERT_PROPORTIONAL hsAssert( fProportionalViewport, "Cannot perform this on an absolute RenderTarget" ); diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plStatusLogDrawer.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plStatusLogDrawer.cpp index ce0f2513..9f1b7825 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plStatusLogDrawer.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plStatusLogDrawer.cpp @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plStatusLogDrawer.h" #include "plPipeline.h" #include "plDebugText.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" //// Draw //////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plStatusLogDrawer.h b/Sources/Plasma/PubUtilLib/plPipeline/plStatusLogDrawer.h index 9d916a90..7c3b7efb 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plStatusLogDrawer.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/plStatusLogDrawer.h @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plStatusLogDrawer_h #define _plStatusLogDrawer_h -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" //// plStatusLogDrawer Class Definition //////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plTextGenerator.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plTextGenerator.cpp index d8c682c7..f3f49bf2 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plTextGenerator.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plTextGenerator.cpp @@ -53,11 +53,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsWindows.h" #include "hsTypes.h" #include "hsMatrix44.h" -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include "plTextGenerator.h" -#include "../plGImage/plMipmap.h" -#include "../plPipeline/hsGDeviceRef.h" -#include "../pnMessage/plRefMsg.h" +#include "plGImage/plMipmap.h" +#include "plPipeline/hsGDeviceRef.h" +#include "pnMessage/plRefMsg.h" #include "plgDispatch.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plTransitionMgr.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plTransitionMgr.cpp index 1ce66a56..ea4ab5ae 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plTransitionMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plTransitionMgr.cpp @@ -57,26 +57,26 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plTransitionMgr.h" #include "plPlates.h" -#include "../plGImage/plMipmap.h" -#include "../plSurface/plLayer.h" -#include "../plSurface/hsGMaterial.h" -#include "../plMessage/plLayRefMsg.h" -#include "../pnMessage/plRefMsg.h" -#include "../plMessage/plTransitionMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnMessage/plEventCallbackMsg.h" -#include "../plMessage/plLinkToAgeMsg.h" +#include "plGImage/plMipmap.h" +#include "plSurface/plLayer.h" +#include "plSurface/hsGMaterial.h" +#include "plMessage/plLayRefMsg.h" +#include "pnMessage/plRefMsg.h" +#include "plMessage/plTransitionMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "pnMessage/plEventCallbackMsg.h" +#include "plMessage/plLinkToAgeMsg.h" #include "plgDispatch.h" #include "hsGDeviceRef.h" #include "hsResMgr.h" #include "hsTimer.h" -#include "../plAudio/plAudioSystem.h" -#include "../pnNetCommon/plNetApp.h" -#include "../plNetClient/plLinkEffectsMgr.h" -#include "../pnNetCommon/plNetApp.h" +#include "plAudio/plAudioSystem.h" +#include "pnNetCommon/plNetApp.h" +#include "plNetClient/plLinkEffectsMgr.h" +#include "pnNetCommon/plNetApp.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" //// Constructor/Destructor ////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plTransitionMgr.h b/Sources/Plasma/PubUtilLib/plPipeline/plTransitionMgr.h index 111edfec..8994f1fb 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plTransitionMgr.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/plTransitionMgr.h @@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsTemplates.h" -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include "hsUtils.h" diff --git a/cmake/FindOgg.cmake b/cmake/FindOgg.cmake new file mode 100644 index 00000000..e62e601c --- /dev/null +++ b/cmake/FindOgg.cmake @@ -0,0 +1,30 @@ +if(Ogg_INCLUDE_DIR AND Ogg_LIBRARY) + set(Ogg_FIND_QUIETLY TRUE) +endif() + + +find_path(Ogg_INCLUDE_DIR ogg/ogg.h + /usr/local/include + /usr/include +) + +find_library(Ogg_LIBRARY NAMES ogg + PATHS /usr/local/lib /usr/lib +) + +set(Ogg_LIBRARIES ${Ogg_LIBRARY}) + + +if(Ogg_INCLUDE_DIR AND Ogg_LIBRARY) + set(Ogg_FOUND TRUE) +endif() + +if (Ogg_FOUND) + if(NOT Ogg_FIND_QUIETLY) + message(STATUS "Found libogg: ${Ogg_INCLUDE_DIR}") + endif() +else() + if(Ogg_FIND_REQUIRED) + message(FATAL_ERROR "Could not find libogg") + endif() +endif() diff --git a/cmake/FindPhysX.cmake b/cmake/FindPhysX.cmake new file mode 100644 index 00000000..8a99e234 --- /dev/null +++ b/cmake/FindPhysX.cmake @@ -0,0 +1,61 @@ +if(NOT PHYSX_SDK_PATH) + find_path(PHYSX_SDK_PATH Foundation/include/Nx.h) +elseif(PHYSX_SDK_PATH AND PHYSX_LOADER_LIBRARY) + set(PHYSX_FIND_QUIETLY TRUE) +endif() + +if(PHYSX_SDK_PATH) + set(PHYSX_FOUNDATION_INCLUDE_DIR "${PHYSX_SDK_PATH}/Foundation/include") + set(PHYSX_COOKING_INCLUDE_DIR "${PHYSX_SDK_PATH}/Cooking/include") + set(PHYSX_FRAMEWORK_INCLUDE_DIR "${PHYSX_SDK_PATH}/Framework/include") + set(PHYSX_CHARACTER_INCLUDE_DIR "${PHYSX_SDK_PATH}/NxCharacter/include") + set(PHYSX_EXTENSIONS_INCLUDE_DIR "${PHYSX_SDK_PATH}/NxExtensions/include") + set(PHYSX_PHYSICS_INCLUDE_DIR "${PHYSX_SDK_PATH}/Physics/include") + set(PHYSX_LOADER_INCLUDE_DIR "${PHYSX_SDK_PATH}/PhysXLoader/include") + + set(PHYSX_INCLUDE_DIRS + ${PHYSX_COOKING_INCLUDE_DIR} + ${PHYSX_FOUNDATION_INCLUDE_DIR} + ${PHYSX_FRAMEWORK_INCLUDE_DIR} + ${PHYSX_CHARACTER_INCLUDE_DIR} + ${PHYSX_EXTENSIONS_INCLUDE_DIR} + ${PHYSX_PHYSICS_INCLUDE_DIR} + ${PHYSX_LOADER_INCLUDE_DIR} + ) +endif() + +#TODO: Make find paths work for Linux builds too +find_library(PHYSX_COOKING_LIBRARY NAMES NxCooking + PATHS "${PHYSX_SDK_PATH}/lib/win32") +find_library(PHYSX_CHARACTER_LIBRARY NAMES NxCharacter + PATHS "${PHYSX_SDK_PATH}/lib/win32") +find_library(PHYSX_EXTENSIONS_LIBRARY NAMES NxExtensions + PATHS "${PHYSX_SDK_PATH}/lib/win32") +find_library(PHYSX_LOADER_LIBRARY NAMES PhysXLoader + PATHS "${PHYSX_SDK_PATH}/lib/win32") + +set(PHYSX_LIBRARIES + ${PHYSX_COOKING_LIBRARY} + ${PHYSX_CHARACTER_LIBRARY} + ${PHYSX_EXTENSIONS_LIBRARY} + ${PHYSX_LOADER_LIBRARY} +) + +mark_as_advanced(PHYSX_COOKING_LIBRARY + PHYSX_CHARACTER_LIBRARY + PHYSX_EXTENSIONS_LIBRARY + PHYSX_LOADER_LIBRARY) + +if(PHYSX_SDK_PATH AND PHYSX_LOADER_LIBRARY) + set(PHYSX_FOUND TRUE) +endif() + +if (PHYSX_FOUND) + if(NOT PHYSX_FIND_QUIETLY) + message(STATUS "Found PhysX: ${PHYSX_SDK_PATH}") + endif() +else() + if(PHYSX_FIND_REQUIRED) + message(FATAL_ERROR "Could not find PhysX. Please set your PHYSX_SDK_PATH appropriately and try again") + endif() +endif() diff --git a/cmake/FindSpeex.cmake b/cmake/FindSpeex.cmake new file mode 100644 index 00000000..306d177c --- /dev/null +++ b/cmake/FindSpeex.cmake @@ -0,0 +1,30 @@ +if(Speex_INCLUDE_DIR AND Speex_LIBRARY) + set(Speex_FIND_QUIETLY TRUE) +endif() + + +find_path(Speex_INCLUDE_DIR speex.h + /usr/local/include + /usr/include +) + +find_library(Speex_LIBRARY NAMES speex + PATHS /usr/local/lib /usr/lib +) + +set(Speex_LIBRARIES ${Speex_LIBRARY}) + + +if(Speex_INCLUDE_DIR AND Speex_LIBRARY) + set(Speex_FOUND TRUE) +endif() + +if (Speex_FOUND) + if(NOT Speex_FIND_QUIETLY) + message(STATUS "Found speex: ${Speex_INCLUDE_DIR}") + endif() +else() + if(Speex_FIND_REQUIRED) + message(FATAL_ERROR "Could not find speex") + endif() +endif() diff --git a/cmake/FindVorbis.cmake b/cmake/FindVorbis.cmake new file mode 100644 index 00000000..36f3872d --- /dev/null +++ b/cmake/FindVorbis.cmake @@ -0,0 +1,37 @@ +if(Vorbis_INCLUDE_DIR AND Vorbis_LIBRARY) + set(Vorbis_FIND_QUIETLY TRUE) +endif() + + +find_path(Vorbis_INCLUDE_DIR vorbis/codec.h + /usr/local/include + /usr/include +) + +find_library(Vorbis_LIBRARY NAMES vorbis + PATHS /usr/local/lib /usr/lib +) + +find_library(VorbisFile_LIBRARY NAMES vorbisfile + PATHS /usr/local/lib /usr/lib +) + +set(Vorbis_LIBRARIES + ${Vorbis_LIBRARY} + ${VorbisFile_LIBRARY} +) + + +if(Vorbis_INCLUDE_DIR AND Vorbis_LIBRARY AND VorbisFile_LIBRARY) + set(Vorbis_FOUND TRUE) +endif() + +if (Vorbis_FOUND) + if(NOT Vorbis_FIND_QUIETLY) + message(STATUS "Found libvorbis: ${Vorbis_INCLUDE_DIR}") + endif() +else() + if(Vorbis_FIND_REQUIRED) + message(FATAL_ERROR "Could not find libvorbis") + endif() +endif()