OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-21 04:39:45 +00:00
Code Releases Activity

Merge remote-tracking branch 'origin/master' into plString

Browse Source 
Conflicts:
	Sources/Plasma/CoreLib/hsStream.h
	Sources/Plasma/FeatureLib/pfAudio/plListener.cpp
	Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp
	Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.cpp
	Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp
	Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp
	Sources/Plasma/FeatureLib/pfPython/cyMisc.h
	Sources/Plasma/FeatureLib/pfPython/cyMiscGlue4.cpp
	Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.cpp
	Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.h
	Sources/Plasma/FeatureLib/pfPython/pyImage.cpp
	Sources/Plasma/FeatureLib/pfPython/pyJournalBook.cpp
	Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.h
	Sources/Plasma/NucleusLib/pnKeyedObject/plFixedKey.cpp
	Sources/Plasma/NucleusLib/pnKeyedObject/plKeyImp.cpp
	Sources/Plasma/NucleusLib/pnKeyedObject/plUoid.cpp
	Sources/Plasma/NucleusLib/pnKeyedObject/plUoid.h
	Sources/Plasma/NucleusLib/pnMessage/plMessage.h
	Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.h
	Sources/Plasma/PubUtilLib/plAvatar/plCoopCoordinator.cpp
	Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpansExport.cpp
	Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.cpp
	Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.cpp
	Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h
	Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h
	Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.h
	Sources/Plasma/PubUtilLib/plNetMessage/plNetMessage.cpp
	Sources/Plasma/PubUtilLib/plNetMessage/plNetMsgHelpers.h
	Sources/Plasma/PubUtilLib/plNetTransport/plNetTransportMember.h
	Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.cpp
	Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp
	Sources/Plasma/PubUtilLib/plPipeline/plPlates.cpp
	Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.cpp
	Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.h
	Sources/Plasma/PubUtilLib/plResMgr/plRegistryNode.cpp
	Sources/Plasma/PubUtilLib/plResMgr/plRegistryNode.h
	Sources/Plasma/PubUtilLib/plScene/plRelevanceMgr.cpp
	Sources/Plasma/PubUtilLib/plScene/plRelevanceMgr.h
	Sources/Plasma/PubUtilLib/plSurface/plGrassShaderMod.cpp
This commit is contained in:
Michael Hansen
2012-01-28 17:20:01 -08:00
parent e34414889f 7c2cb067ad
commit c339f947ba
1722 changed files with 24149 additions and 27599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Sources/Plasma/PubUtilLib/plScene/plPostEffectMod.cpp
View File

@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "hsTypes.h"
#include "HeadSpin.h"
#include "plPostEffectMod.h"
#include "plPageTreeMgr.h"
#include "plSceneNode.h"
@ -64,8 +64,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
plPostEffectMod::plPostEffectMod()
: fHither(1.f),
fYon(100.f),
fFovX(hsScalarPI * 0.25f),
fFovY(hsScalarPI * 0.25f * 0.75f),
fFovX(M_PI * 0.25f),
fFovY(M_PI * 0.25f * 0.75f),
fPageMgr(nil),
fRenderTarget(nil),
fRenderRequest(nil)
@ -83,18 +83,18 @@ plPostEffectMod::~plPostEffectMod()
void plPostEffectMod::ISetupRenderRequest()
{
UInt32 rtFlags = 0;
uint32_t rtFlags = 0;
// If we go to rendering to sub-window, we'll want to explicitly set width and height
UInt32 width = 0;
UInt32 height = 0;
uint32_t width = 0;
uint32_t height = 0;
UInt32 colorDepth = 0;
UInt32 zDepth = 0;
UInt32 stencilDepth = 0;
uint32_t colorDepth = 0;
uint32_t zDepth = 0;
uint32_t stencilDepth = 0;
fRenderRequest = TRACKED_NEW plRenderRequest;
UInt32 renderState = plPipeline::kRenderNormal
fRenderRequest = new plRenderRequest;
uint32_t renderState = plPipeline::kRenderNormal
| plPipeline::kRenderNoProjection
| plPipeline::kRenderNoLights
| plPipeline::kRenderClearDepth;
@ -107,7 +107,7 @@ void plPostEffectMod::ISetupRenderRequest()
fRenderRequest->SetRenderTarget(fRenderTarget);
fPageMgr = TRACKED_NEW plPageTreeMgr;
fPageMgr = new plPageTreeMgr;
fRenderRequest->SetPageTreeMgr(fPageMgr);
@ -157,7 +157,7 @@ hsBool plPostEffectMod::IIsEnabled() const
return /*GetTarget() &&*/ !fPageMgr->Empty() && fState.IsBitSet(kEnabled);
}
hsBool plPostEffectMod::IEval(double secs, hsScalar del, UInt32 dirty)
hsBool plPostEffectMod::IEval(double secs, float del, uint32_t dirty)
{
return false;
}
@ -223,7 +223,7 @@ void plPostEffectMod::ISubmitRequest()
IUpdateRenderRequest();
plRenderRequestMsg* req = TRACKED_NEW plRenderRequestMsg(GetKey(), fRenderRequest);
plRenderRequestMsg* req = new plRenderRequestMsg(GetKey(), fRenderRequest);
plgDispatch::MsgSend(req);
}
@ -305,7 +305,7 @@ void plPostEffectMod::Read(hsStream* s, hsResMgr* mgr)
fFovX = s->ReadLEScalar();
fFovY = s->ReadLEScalar();
fNodeKey = mgr->ReadKeyNotifyMe(s, TRACKED_NEW plGenRefMsg(GetKey(), plRefMsg::kOnCreate, -1, kNodeRef), plRefFlags::kPassiveRef);
fNodeKey = mgr->ReadKeyNotifyMe(s, new plGenRefMsg(GetKey(), plRefMsg::kOnCreate, -1, kNodeRef), plRefFlags::kPassiveRef);
fDefaultW2C.Read( s );
fDefaultC2W.Read( s );
@ -334,4 +334,4 @@ const plViewTransform& plPostEffectMod::GetViewTransform()
{
IUpdateRenderRequest();
return fRenderRequest->GetViewTransform();
}
}