mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-02-27 10:33:50 +00:00
shift attenuation to probes in general.
This commit is contained in:
parent
67ae3d136b
commit
5a2ec2731f
8 changed files with 21 additions and 31 deletions
|
|
@ -94,8 +94,6 @@ void BoxEnvironmentProbe::initPersistFields()
|
|||
// SceneObject already handles exposing the transform
|
||||
Parent::initPersistFields();
|
||||
|
||||
addField("attenuation", TypeF32, Offset(mAtten, BoxEnvironmentProbe), "falloff percent");
|
||||
|
||||
removeField("radius");
|
||||
}
|
||||
|
||||
|
|
@ -127,12 +125,6 @@ U32 BoxEnvironmentProbe::packUpdate(NetConnection *conn, U32 mask, BitStream *st
|
|||
{
|
||||
// Allow the Parent to get a crack at writing its info
|
||||
U32 retMask = Parent::packUpdate(conn, mask, stream);
|
||||
|
||||
if (stream->writeFlag(mask & StaticDataMask))
|
||||
{
|
||||
stream->write(mAtten);
|
||||
}
|
||||
|
||||
return retMask;
|
||||
}
|
||||
|
||||
|
|
@ -141,12 +133,6 @@ void BoxEnvironmentProbe::unpackUpdate(NetConnection *conn, BitStream *stream)
|
|||
// Let the Parent read any info it sent
|
||||
Parent::unpackUpdate(conn, stream);
|
||||
|
||||
if (stream->readFlag()) // StaticDataMask
|
||||
{
|
||||
stream->read(&mAtten);
|
||||
mDirty = true;
|
||||
}
|
||||
|
||||
if (mDirty)
|
||||
{
|
||||
updateProbeParams();
|
||||
|
|
@ -160,8 +146,6 @@ void BoxEnvironmentProbe::unpackUpdate(NetConnection *conn, BitStream *stream)
|
|||
void BoxEnvironmentProbe::updateProbeParams()
|
||||
{
|
||||
mProbeShapeType = ProbeInfo::Box;
|
||||
mProbeInfo.mAtten = mAtten;
|
||||
|
||||
Parent::updateProbeParams();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -56,7 +56,6 @@ class BaseMatInstance;
|
|||
class BoxEnvironmentProbe : public ReflectionProbe
|
||||
{
|
||||
typedef ReflectionProbe Parent;
|
||||
F32 mAtten;
|
||||
private:
|
||||
|
||||
//Debug rendering
|
||||
|
|
|
|||
|
|
@ -152,10 +152,11 @@ ReflectionProbe::~ReflectionProbe()
|
|||
void ReflectionProbe::initPersistFields()
|
||||
{
|
||||
docsURL;
|
||||
addField("canDamp", TypeBool, Offset(mCanDamp, ReflectionProbe),"wetness allowed");
|
||||
addGroup("Rendering");
|
||||
addProtectedField("enabled", TypeBool, Offset(mEnabled, ReflectionProbe),
|
||||
&_setEnabled, &defaultProtectedGetFn, "Is the probe enabled or not");
|
||||
addField("canDamp", TypeBool, Offset(mCanDamp, ReflectionProbe),"wetness allowed");
|
||||
addField("attenuation", TypeF32, Offset(mAtten, ReflectionProbe), "falloff percent");
|
||||
endGroup("Rendering");
|
||||
|
||||
addGroup("Reflection");
|
||||
|
|
@ -436,6 +437,7 @@ U32 ReflectionProbe::packUpdate(NetConnection *conn, U32 mask, BitStream *stream
|
|||
stream->write(mProbeUniqueID);
|
||||
stream->write((U32)mReflectionModeType);
|
||||
stream->writeString(mCubemapName);
|
||||
stream->write(mAtten);
|
||||
}
|
||||
|
||||
if (stream->writeFlag(mask & EnabledMask))
|
||||
|
|
@ -490,6 +492,7 @@ void ReflectionProbe::unpackUpdate(NetConnection *conn, BitStream *stream)
|
|||
if(oldReflectModeType != mReflectionModeType || oldCubemapName != mCubemapName)
|
||||
mCubemapDirty = true;
|
||||
|
||||
stream->read(&mAtten);
|
||||
mDirty = true;
|
||||
}
|
||||
|
||||
|
|
@ -565,6 +568,7 @@ void ReflectionProbe::updateProbeParams()
|
|||
mProbeInfo.mProbeRefOffset = mProbeRefOffset;
|
||||
mProbeInfo.mProbeRefScale = mProbeRefScale;
|
||||
mProbeInfo.mCanDamp = mCanDamp;
|
||||
mProbeInfo.mAtten = mAtten;
|
||||
|
||||
mProbeInfo.mDirty = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -167,6 +167,7 @@ protected:
|
|||
/// Whether this probe is enabled or not
|
||||
/// </summary>
|
||||
bool mEnabled;
|
||||
F32 mAtten;
|
||||
|
||||
bool mDirty;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue