diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 00000000..61e1a5db --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,26 @@ +project(CyanWorldsEngine) +cmake_minimum_required(VERSION 2.8) + +# Find all 3rd-party libraries that are required +find_package(OpenSSL REQUIRED) +find_package(OpenAL REQUIRED) + +option(EXTERNAL_RELEASE "Is this release intended for the general public?" OFF) + +# TODO: are there any other build types which are useful for us? +add_definitions(-DBUILD_TYPE_LIVE) + +if(EXTERNAL_RELEASE) + add_definitions(-DPLASMA_EXTERNAL_RELEASE) +endif(EXTERNAL_RELEASE) + +if(CMAKE_BUILD_TYPE STREQUAL Debug) + add_definitions(-D_DEBUG) +endif(CMAKE_BUILD_TYPE STREQUAL Debug) + +if(MSVC) + add_definitions(-D_CRT_SECURE_NO_WARNINGS) +endif(MSVC) + +add_subdirectory(Sources/Plasma) +# add_subdirectory(Sources/Tools) diff --git a/Sources/Plasma/CMakeLists.txt b/Sources/Plasma/CMakeLists.txt new file mode 100644 index 00000000..8f2b2722 --- /dev/null +++ b/Sources/Plasma/CMakeLists.txt @@ -0,0 +1,4 @@ +add_subdirectory(CoreLib) +add_subdirectory(CoreLibExe) +add_subdirectory(FeatureLib) +add_subdirectory(NucleusLib) diff --git a/Sources/Plasma/CoreLib/CMakeLists.txt b/Sources/Plasma/CoreLib/CMakeLists.txt new file mode 100644 index 00000000..5944e2c7 --- /dev/null +++ b/Sources/Plasma/CoreLib/CMakeLists.txt @@ -0,0 +1,99 @@ +add_definitions(-D_LIB) + +set(CoreLib_SOURCES + HeadSpin.cpp + hsBitVector.cpp + hsBounds.cpp + hsCritSect.cpp + hsExceptionStack.cpp + hsFastMath.cpp + hsGeometry3.cpp + hsMalloc.cpp + hsMatrix33.cpp + hsMatrix44.cpp + hsMemory.cpp + hsMMIOStream.cpp + hsQuat.cpp + hsSafeRefCnt.cpp + hsSTLStream.cpp + hsStlUtils.cpp + hsStream.cpp + hsStringTokenizer.cpp + hsTemplates.cpp + hsThread.cpp + hsUtils.cpp + hsWide.cpp + pcSmallRect.cpp + plGeneric.cpp + plLoadMask.cpp + plViewTransform.cpp +) + +if(WIN32 AND NOT CYGWIN) + set(CoreLib_SOURCES ${CoreLib_SOURCES} + hsThread_Win.cpp + ) +endif(WIN32 AND NOT CYGWIN) +if(UNIX) + set(CoreLib_SOURCES ${CoreLib_SOURCES} + hsThread_Unix.cpp + ) +endif(UNIX) + +# for now we use the Unix file on mac... I think this is Carbon code, which +# we don't want to use. I don't think it's worth support OS9 anymore +#if(APPLE) +# set(CoreLib_SOURCES ${CoreLib_SOURCES} +# hsThread_Mac.cpp +# ) +#endif(APPLE) + + +set(CoreLib_HEADERS + HeadSpin.h + hsBiExpander.h + hsBitVector.h + hsBounds.h + hsColorRGBA.h + hsConfig.h + hsCritSect.h + hsExceptions.h + hsFastMath.h + hsFixedTypes.h + hsGeometry3.h + hsHashTable.h + hsMalloc.h + hsMatrix44.h + hsMemory.h + hsMMIOStream.h + hsPoint2.h + hsQuat.h + hsQueue.h + hsRefCnt.h + hsSafeRefCnt.h + hsScalar.h + hsStlSortUtils.h + hsSTLStream.h + hsStream.h + hsStringTokenizer.h + hsTemplates.h + hsTempPointer.h + hsThread.h + hsTypes.h + hsUtils.h + hsWide.h + hsWindowHndl.h + hsWindows.h + pcSmallRect.h + plGeneric.h + plLoadMask.h + plQuality.h + plRefCnt.h + plTweak.h + plViewTransform.h +) + +add_library(CoreLib STATIC ${CoreLib_SOURCES} ${CoreLib_HEADERS}) + +source_group("Source Files" FILES ${CoreLib_SOURCES}) +source_group("Header Files" FILES ${CoreLib_HEADERS}) diff --git a/Sources/Plasma/CoreLibExe/CMakeLists.txt b/Sources/Plasma/CoreLibExe/CMakeLists.txt new file mode 100644 index 00000000..c077c368 --- /dev/null +++ b/Sources/Plasma/CoreLibExe/CMakeLists.txt @@ -0,0 +1,16 @@ +add_definitions(-D_LIB) + +set(CoreLibExe_SOURCES + hsExeError.cpp + hsExeMalloc.cpp +) + +set(CoreLibExe_HEADERS + Intern.h + Pch.h +) + +add_library(CoreLibExe STATIC ${CoreLibExe_SOURCES} ${CoreLibExe_HEADERS}) + +source_group("Source Files" FILES ${CoreLibExe_SOURCES}) +source_group("Header Files" FILES ${CoreLibExe_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/CMakeLists.txt b/Sources/Plasma/FeatureLib/CMakeLists.txt new file mode 100644 index 00000000..a60bb33a --- /dev/null +++ b/Sources/Plasma/FeatureLib/CMakeLists.txt @@ -0,0 +1,2 @@ +add_subdirectory(pfAnimation) +add_subdirectory(pfAudio) diff --git a/Sources/Plasma/FeatureLib/pfAnimation/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfAnimation/CMakeLists.txt new file mode 100644 index 00000000..713776eb --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfAnimation/CMakeLists.txt @@ -0,0 +1,41 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") +include_directories("../../NucleusLib/inc") +include_directories("../../PubUtilLib") + +include_directories(${OPENSSL_INCLUDE_DIR}) + +# this is in the vcproj, but it seems silly for animation... +# find_package(OpenSSL REQUIRED) + +set(pfAnimation_SOURCES + pfObjectFlocker.cpp + plAnimDebugList.cpp + plBlower.cpp + plFilterCoordInterface.cpp + plFollowMod.cpp + plLightModifier.cpp + plLineFollowMod.cpp + plRandomCommandMod.cpp + plStereizer.cpp + plViewFaceModifier.cpp +) + +set(pfAnimation_HEADERS + pfAnimationCreatable.h + pfObjectFlocker.h + plAnimDebugList.h + plBlower.h + plFilterCoordInterface.h + plFollowMod.h + plLightModifier.h + plLineFollowMod.h + plRandomCommandMod.h + plStereizer.h + plViewFaceModifier.h +) + +add_library(pfAnimation STATIC ${pfAnimation_SOURCES} ${pfAnimation_HEADERS}) + +source_group("Source Files" FILES ${pfAnimation_SOURCES}) +source_group("Header Files" FILES ${pfAnimation_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfAnimation/pfAnimationCreatable.h b/Sources/Plasma/FeatureLib/pfAnimation/pfAnimationCreatable.h index 02bfcb1b..ab0ff140 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/pfAnimationCreatable.h +++ b/Sources/Plasma/FeatureLib/pfAnimation/pfAnimationCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pfAnimationCreatable_inc #define pfAnimationCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plViewFaceModifier.h" diff --git a/Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.cpp b/Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.cpp index 00146c53..3ba10702 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.cpp +++ b/Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.cpp @@ -45,15 +45,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsGeometry3.h" #include "plgDispatch.h" #include "hsResMgr.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnMessage/plRefMsg.h" -#include "../plMessage/plAgeLoadedMsg.h" -#include "../pnSceneObject/plSceneObject.h" +#include "pnMessage/plTimeMsg.h" +#include "pnMessage/plRefMsg.h" +#include "plMessage/plAgeLoadedMsg.h" +#include "pnSceneObject/plSceneObject.h" #include "hsTimer.h" -#include "../plMath/plRandom.h" -#include "../pnMessage/plEnableMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plMessage/plLoadCloneMsg.h" +#include "plMath/plRandom.h" +#include "pnMessage/plEnableMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plMessage/plLoadCloneMsg.h" //#include "../plPipeline/plDebugGeometry.h" diff --git a/Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.h b/Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.h index 505d78a9..79797c32 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.h +++ b/Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef OBJECT_FLOCKER_H #define OBJECT_FLOCKER_H -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" class hsStream; class hsResMgr; diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plAnimDebugList.cpp b/Sources/Plasma/FeatureLib/pfAnimation/plAnimDebugList.cpp index a6bd335a..11ae6029 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plAnimDebugList.cpp +++ b/Sources/Plasma/FeatureLib/pfAnimation/plAnimDebugList.cpp @@ -44,14 +44,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTemplates.h" #include "hsTimer.h" #include "plAnimDebugList.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plLayerAnimation.h" -#include "../plAvatar/plAGMasterMod.h" -#include "../plAvatar/plAGAnimInstance.h" -#include "../plAvatar/plAGAnim.h" -#include "../plResMgr/plKeyFinder.h" -#include "../plPipeline/plDebugText.h" +#include "pnSceneObject/plSceneObject.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plLayerAnimation.h" +#include "plAvatar/plAGMasterMod.h" +#include "plAvatar/plAGAnimInstance.h" +#include "plAvatar/plAGAnim.h" +#include "plResMgr/plKeyFinder.h" +#include "plPipeline/plDebugText.h" void plAnimDebugList::AddObjects(char *subString) { diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plBlower.cpp b/Sources/Plasma/FeatureLib/pfAnimation/plBlower.cpp index 41300036..5d0367a3 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plBlower.cpp +++ b/Sources/Plasma/FeatureLib/pfAnimation/plBlower.cpp @@ -44,9 +44,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plBlower.h" #include "plgDispatch.h" #include "hsFastMath.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnMessage/plTimeMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnMessage/plTimeMsg.h" #include "hsTimer.h" plRandom plBlower::fRandom; diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plBlower.h b/Sources/Plasma/FeatureLib/pfAnimation/plBlower.h index f6a63bd9..73129967 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plBlower.h +++ b/Sources/Plasma/FeatureLib/pfAnimation/plBlower.h @@ -43,9 +43,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plBlower_inc #define plBlower_inc -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" #include "hsGeometry3.h" -#include "../plMath/plRandom.h" +#include "plMath/plRandom.h" #include "hsTemplates.h" class plSceneObject; diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plFilterCoordInterface.h b/Sources/Plasma/FeatureLib/pfAnimation/plFilterCoordInterface.h index 49a61fd4..4156d280 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plFilterCoordInterface.h +++ b/Sources/Plasma/FeatureLib/pfAnimation/plFilterCoordInterface.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plFilterCoordInterface_inc #define plFilterCoordInterface_inc -#include "../pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plCoordinateInterface.h" class plFilterCoordInterface : public plCoordinateInterface { diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plFollowMod.cpp b/Sources/Plasma/FeatureLib/pfAnimation/plFollowMod.cpp index e1ddd4f8..07af95af 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plFollowMod.cpp +++ b/Sources/Plasma/FeatureLib/pfAnimation/plFollowMod.cpp @@ -43,12 +43,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plFollowMod.h" #include "plgDispatch.h" -#include "../pnNetCommon/plNetApp.h" -#include "../plMessage/plListenerMsg.h" -#include "../plMessage/plRenderMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnMessage/plRefMsg.h" +#include "pnNetCommon/plNetApp.h" +#include "plMessage/plListenerMsg.h" +#include "plMessage/plRenderMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnMessage/plRefMsg.h" #include "hsResMgr.h" #include "plPipeline.h" diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plFollowMod.h b/Sources/Plasma/FeatureLib/pfAnimation/plFollowMod.h index 77109181..92d7b456 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plFollowMod.h +++ b/Sources/Plasma/FeatureLib/pfAnimation/plFollowMod.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plFollowMod_inc #include "hsMatrix44.h" -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" class plSceneObject; class plMessage; diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plLightModifier.cpp b/Sources/Plasma/FeatureLib/pfAnimation/plLightModifier.cpp index f633e42e..7b97760c 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plLightModifier.cpp +++ b/Sources/Plasma/FeatureLib/pfAnimation/plLightModifier.cpp @@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plLightModifier.h" -#include "../plGLight/plLightInfo.h" -#include "../plInterp/plController.h" +#include "plGLight/plLightInfo.h" +#include "plInterp/plController.h" #include "hsStream.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plLightModifier.h b/Sources/Plasma/FeatureLib/pfAnimation/plLightModifier.h index fc176e42..edbe9904 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plLightModifier.h +++ b/Sources/Plasma/FeatureLib/pfAnimation/plLightModifier.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLightModifier_inc #define plLightModifier_inc -#include "../../PubUtilLib/plModifier/plSimpleModifier.h" +#include "plModifier/plSimpleModifier.h" #include "hsGeometry3.h" class plController; diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plLineFollowMod.cpp b/Sources/Plasma/FeatureLib/pfAnimation/plLineFollowMod.cpp index 8ac68991..7738e22e 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plLineFollowMod.cpp +++ b/Sources/Plasma/FeatureLib/pfAnimation/plLineFollowMod.cpp @@ -43,22 +43,22 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plLineFollowMod.h" #include "plStereizer.h" -#include "../plInterp/plAnimPath.h" +#include "plInterp/plAnimPath.h" #include "hsResMgr.h" -#include "../pnMessage/plRefMsg.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnSceneObject/plDrawInterface.h" +#include "pnMessage/plRefMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plDrawInterface.h" #include "plgDispatch.h" -#include "../plMessage/plListenerMsg.h" -#include "../plMessage/plRenderMsg.h" -#include "../pnMessage/plTimeMsg.h" +#include "plMessage/plListenerMsg.h" +#include "plMessage/plRenderMsg.h" +#include "pnMessage/plTimeMsg.h" #include "hsBounds.h" #include "plPipeline.h" #include "hsFastMath.h" -#include "../pnMessage/plPlayerPageMsg.h" -#include "../pnNetCommon/plNetApp.h" -#include "../plNetClient/plNetClientMgr.h" +#include "pnMessage/plPlayerPageMsg.h" +#include "pnNetCommon/plNetApp.h" +#include "plNetClient/plNetClientMgr.h" #include "hsTimer.h" plLineFollowMod::plLineFollowMod() diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plLineFollowMod.h b/Sources/Plasma/FeatureLib/pfAnimation/plLineFollowMod.h index a7c25475..102f60a6 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plLineFollowMod.h +++ b/Sources/Plasma/FeatureLib/pfAnimation/plLineFollowMod.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLineFollowMod_inc #define plLineFollowMod_inc -#include "../pnModifier/plMultiModifier.h" +#include "pnModifier/plMultiModifier.h" #include "hsGeometry3.h" #include "hsMatrix44.h" diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plRandomCommandMod.cpp b/Sources/Plasma/FeatureLib/pfAnimation/plRandomCommandMod.cpp index bf54da11..d535d9c9 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plRandomCommandMod.cpp +++ b/Sources/Plasma/FeatureLib/pfAnimation/plRandomCommandMod.cpp @@ -44,9 +44,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plRandomCommandMod.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../pnMessage/plEventCallbackMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "plMessage/plAnimCmdMsg.h" +#include "pnMessage/plEventCallbackMsg.h" #include "plgDispatch.h" #include "hsTimer.h" #include "hsUtils.h" diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plRandomCommandMod.h b/Sources/Plasma/FeatureLib/pfAnimation/plRandomCommandMod.h index 02f9f71b..1e39f2e4 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plRandomCommandMod.h +++ b/Sources/Plasma/FeatureLib/pfAnimation/plRandomCommandMod.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plRandomCommandMod_inc #define plRandomCommandMod_inc -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" #include "hsTemplates.h" class plRandomCommandMod : public plSingleModifier diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plStereizer.cpp b/Sources/Plasma/FeatureLib/pfAnimation/plStereizer.cpp index 99fb659f..790b6433 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plStereizer.cpp +++ b/Sources/Plasma/FeatureLib/pfAnimation/plStereizer.cpp @@ -48,11 +48,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plStereizer.h" #include "plLineFollowMod.h" -#include "../plMessage/plListenerMsg.h" +#include "plMessage/plListenerMsg.h" #include "plgDispatch.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" #include "hsFastMath.h" diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plStereizer.h b/Sources/Plasma/FeatureLib/pfAnimation/plStereizer.h index 38fbb9ba..09f2d6b5 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plStereizer.h +++ b/Sources/Plasma/FeatureLib/pfAnimation/plStereizer.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plStereizer_inc #define plStereizer_inc -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" #include "hsGeometry3.h" #include "hsMatrix44.h" diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plViewFaceModifier.cpp b/Sources/Plasma/FeatureLib/pfAnimation/plViewFaceModifier.cpp index 8d8c9e5d..434b2d35 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plViewFaceModifier.cpp +++ b/Sources/Plasma/FeatureLib/pfAnimation/plViewFaceModifier.cpp @@ -43,16 +43,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plViewFaceModifier.h" #include "plgDispatch.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" #include "hsFastMath.h" #include "plPipeline.h" -#include "../plMessage/plRenderMsg.h" -#include "../plMessage/plListenerMsg.h" -#include "../plMessage/plAvatarMsg.h" -#include "../plAvatar/plAvBrainHuman.h" -#include "../plAvatar/plArmatureMod.h" +#include "plMessage/plRenderMsg.h" +#include "plMessage/plListenerMsg.h" +#include "plMessage/plAvatarMsg.h" +#include "plAvatar/plAvBrainHuman.h" +#include "plAvatar/plArmatureMod.h" plViewFaceModifier::plViewFaceModifier() : fFacePoint(0,0,0), diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plViewFaceModifier.h b/Sources/Plasma/FeatureLib/pfAnimation/plViewFaceModifier.h index 78e2b59e..051ff64e 100644 --- a/Sources/Plasma/FeatureLib/pfAnimation/plViewFaceModifier.h +++ b/Sources/Plasma/FeatureLib/pfAnimation/plViewFaceModifier.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsMatrix44.h" #include "hsBounds.h" -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" class plGenRefMsg; class plPipeline; diff --git a/Sources/Plasma/FeatureLib/pfAudio/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfAudio/CMakeLists.txt new file mode 100644 index 00000000..423240b0 --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfAudio/CMakeLists.txt @@ -0,0 +1,25 @@ +include_directories(../../CoreLib) +include_directories(../../FeatureLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) +include_directories(../../PubUtilLib) +#include_directories(../../PubUtilLib/inc) + +include_directories(${OPENSSL_INCLUDE_DIR}) +include_directories(${OPENAL_INCLUDE_DIR}) + +set(pfAudio_SOURCES + plListener.cpp + plRandomSoundMod.cpp +) + +set(pfAudio_HEADERS + pfAudioCreatable.h + plListener.h + plRandomSoundMod.h +) + +add_library(pfAudio STATIC ${pfAudio_SOURCES} ${pfAudio_HEADERS}) + +source_group("Source Files" FILES ${pfAudio_SOURCES}) +source_group("Header Files" FILES ${pfAudio_HEADERS}) diff --git a/Sources/Plasma/FeatureLib/pfAudio/pfAudioCreatable.h b/Sources/Plasma/FeatureLib/pfAudio/pfAudioCreatable.h index 30f740e4..7fd4a9f5 100644 --- a/Sources/Plasma/FeatureLib/pfAudio/pfAudioCreatable.h +++ b/Sources/Plasma/FeatureLib/pfAudio/pfAudioCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pfAudioCreatable_inc #define pfAudioCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plListener.h" diff --git a/Sources/Plasma/FeatureLib/pfAudio/plListener.cpp b/Sources/Plasma/FeatureLib/pfAudio/plListener.cpp index d6178216..12a223db 100644 --- a/Sources/Plasma/FeatureLib/pfAudio/plListener.cpp +++ b/Sources/Plasma/FeatureLib/pfAudio/plListener.cpp @@ -43,21 +43,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plListener.h" #include "plgDispatch.h" -#include "../plAudio/plAudioSystem.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnMessage/plAudioSysMsg.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnSceneObject/plSimulationInterface.h" -#include "../pfCamera/plVirtualCamNeu.h" -#include "../plMessage/plListenerMsg.h" -#include "../plNetClient/plNetClientMgr.h" -#include "../plPipeline/plDebugText.h" - -#include "../plAvatar/plAvatarMgr.h" -#include "../plAvatar/plArmatureMod.h" -#include "../plAvatar/plPhysicalControllerCore.h" +#include "plAudio/plAudioSystem.h" +#include "pnMessage/plTimeMsg.h" +#include "pnMessage/plAudioSysMsg.h" +#include "pnKeyedObject/plKey.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plSimulationInterface.h" +#include "pfCamera/plVirtualCamNeu.h" +#include "plMessage/plListenerMsg.h" +#include "plNetClient/plNetClientMgr.h" +#include "plPipeline/plDebugText.h" + +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plArmatureMod.h" +#include "plAvatar/plAvCallbackAction.h" hsBool plListener::fPrintDbgInfo = false; @@ -325,4 +325,4 @@ hsBool plListener::MsgReceive(plMessage* msg) } return plSingleModifier::MsgReceive(msg); -} \ No newline at end of file +} diff --git a/Sources/Plasma/FeatureLib/pfAudio/plListener.h b/Sources/Plasma/FeatureLib/pfAudio/plListener.h index 1d7c982a..83269e6d 100644 --- a/Sources/Plasma/FeatureLib/pfAudio/plListener.h +++ b/Sources/Plasma/FeatureLib/pfAudio/plListener.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plListener_h #define plListener_h -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" class plSceneObject; diff --git a/Sources/Plasma/FeatureLib/pfAudio/plRandomSoundMod.cpp b/Sources/Plasma/FeatureLib/pfAudio/plRandomSoundMod.cpp index d19a73af..b29156ec 100644 --- a/Sources/Plasma/FeatureLib/pfAudio/plRandomSoundMod.cpp +++ b/Sources/Plasma/FeatureLib/pfAudio/plRandomSoundMod.cpp @@ -42,16 +42,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plRandomSoundMod.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plAudioInterface.h" -#include "../pnMessage/plSoundMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plAudio/plAudioSystem.h" -#include "../plAudio/plSound.h" -#include "../plAudio/plWin32GroupedSound.h" // EEK BAD +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plAudioInterface.h" +#include "pnMessage/plSoundMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plAudio/plAudioSystem.h" +#include "plAudio/plSound.h" +#include "plAudio/plWin32GroupedSound.h" // EEK BAD #include "plgDispatch.h" #include "hsTimer.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" plRandomSoundModGroup::plRandomSoundModGroup() : fNumSounds(0), fIndices(nil), fGroupedIdx(-1), fCurrent(-1) { diff --git a/Sources/Plasma/FeatureLib/pfAudio/plRandomSoundMod.h b/Sources/Plasma/FeatureLib/pfAudio/plRandomSoundMod.h index 409b5159..87c0d409 100644 --- a/Sources/Plasma/FeatureLib/pfAudio/plRandomSoundMod.h +++ b/Sources/Plasma/FeatureLib/pfAudio/plRandomSoundMod.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plRandomSoundMod_inc #define plRandomSoundMod_inc -#include "../pfAnimation/plRandomCommandMod.h" +#include "pfAnimation/plRandomCommandMod.h" class plSound; struct hsPoint3; diff --git a/Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.h index 340a4e33..5dca3d42 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plSimpleModifier_inc #define plSimpleModifier_inc -#include "../pnModifier/plModifier.h" -#include "../pnNetCommon/plSynchedValue.h" +#include "pnModifier/plModifier.h" +#include "pnNetCommon/plSynchedValue.h" #include "../plInterp/plAnimTimeConvert.h" class plSceneObject;