1
0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 19:29:09 +00:00

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
This commit is contained in:
2011-04-08 18:09:44 -07:00
parent 4134a68f2c
commit 0477edc597
171 changed files with 1356 additions and 811 deletions

View File

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

View File

@ -39,9 +39,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 <gls.h>
#include <glswgl.h>
#include <glext.h>
#endif
#endif

View File

@ -29,16 +29,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
//

View File

@ -29,7 +29,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;

View File

@ -42,12 +42,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"

View File

@ -41,8 +41,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;

View File

@ -26,7 +26,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"

View File

@ -31,7 +31,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

View File

@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plDebugText.h"
#include "plPlates.h"
#include "../Apps/plClient/res/resource.h"
#include "../../Apps/plClient/res/resource.h"
#include "hsTimer.h"

View File

@ -36,7 +36,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;

View File

@ -48,15 +48,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);

View File

@ -61,40 +61,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"
@ -103,32 +103,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"
@ -10559,7 +10559,7 @@ inline void inlTESTPOINT(const hsPoint3& destP,
void plDXPipeline::IBlendVertsIntoBuffer( plSpan* span,
hsMatrix44* matrixPalette, int numMatrices,
UInt8 *src, UInt8 format, UInt32 srcStride,
const UInt8 *src, UInt8 format, UInt32 srcStride,
UInt8 *dest, UInt32 destStride, UInt32 count,
UInt16 localUVWChans )
{

View File

@ -29,7 +29,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"
@ -448,7 +448,7 @@ protected:
hsBool IAvatarSort(plDrawableSpans* d, const hsTArray<Int16>& visList);
void IBlendVertsIntoBuffer( plSpan* span,
hsMatrix44* matrixPalette, int numMatrices,
UInt8 *src, UInt8 format, UInt32 srcStride,
const UInt8 *src, UInt8 format, UInt32 srcStride,
UInt8 *dest, UInt32 destStride, UInt32 count, UInt16 localUVWChans );
hsBool ISoftwareVertexBlend( plDrawableSpans* drawable, const hsTArray<Int16>& visList );

View File

@ -33,7 +33,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"

View File

@ -33,7 +33,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"

View File

@ -33,7 +33,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"

View File

@ -36,20 +36,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 "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 "plScene/plVisRegion.h"
#include "plScene/plVisMgr.h"
#include "plResMgr/plKeyFinder.h"
#include "plSurface/plLayer.h"
plDynamicEnvMap::plDynamicEnvMap()
: fPos(0,0,0),

View File

@ -28,7 +28,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;

View File

@ -32,7 +32,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"

View File

@ -39,8 +39,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"

View File

@ -27,7 +27,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 <d3d9.h>

View File

@ -34,12 +34,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plPipeline.h"
#include "plPlates.h"
#include "../plJPEG/plJPEG.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/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"

View File

@ -42,7 +42,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 /////////////////////////////////////////////////

View File

@ -39,7 +39,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" );

View File

@ -33,7 +33,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 ////////////////////////////////////////////////////////////////////

View File

@ -32,7 +32,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 ////////////////////////////////////////////

View File

@ -37,11 +37,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"

View File

@ -41,26 +41,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 //////////////////////////////////////////////////

View File

@ -34,7 +34,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"