后处理+FEEL完全改进
This commit is contained in:
@@ -74,7 +74,7 @@ namespace MoreMountains.FeedbacksForThirdParty
|
||||
}
|
||||
|
||||
float intensityMultiplier = ComputeIntensity(feedbacksIntensity, position);
|
||||
MMChromaticAberrationShakeEvent_URP.Trigger(Intensity, FeedbackDuration, RemapIntensityZero, RemapIntensityOne, RelativeIntensity, intensityMultiplier,
|
||||
MMChromaticAberrationShakeEvent_URP.Trigger(this, Intensity, FeedbackDuration, RemapIntensityZero, RemapIntensityOne, RelativeIntensity, intensityMultiplier,
|
||||
ChannelData, ResetShakerValuesAfterShake, ResetTargetValuesAfterShake, NormalPlayDirection, ComputedTimescaleMode);
|
||||
}
|
||||
|
||||
@@ -91,7 +91,7 @@ namespace MoreMountains.FeedbacksForThirdParty
|
||||
}
|
||||
base.CustomStopFeedback(position, feedbacksIntensity);
|
||||
|
||||
MMChromaticAberrationShakeEvent_URP.Trigger(Intensity, FeedbackDuration, RemapIntensityZero, RemapIntensityOne, RelativeIntensity, channelData:ChannelData, stop:true);
|
||||
MMChromaticAberrationShakeEvent_URP.Trigger(this, Intensity, FeedbackDuration, RemapIntensityZero, RemapIntensityOne, RelativeIntensity, channelData:ChannelData, stop:true);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -104,7 +104,7 @@ namespace MoreMountains.FeedbacksForThirdParty
|
||||
return;
|
||||
}
|
||||
|
||||
MMChromaticAberrationShakeEvent_URP.Trigger(Intensity, FeedbackDuration, RemapIntensityZero, RemapIntensityOne, RelativeIntensity, channelData:ChannelData, restore:true);
|
||||
MMChromaticAberrationShakeEvent_URP.Trigger(this, Intensity, FeedbackDuration, RemapIntensityZero, RemapIntensityOne, RelativeIntensity, channelData:ChannelData, restore:true);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -137,7 +137,7 @@ namespace MoreMountains.FeedbacksForThirdParty
|
||||
}
|
||||
|
||||
float intensityMultiplier = ComputeIntensity(feedbacksIntensity, position);
|
||||
MMColorAdjustmentsShakeEvent_URP.Trigger(ShakePostExposure, RemapPostExposureZero, RemapPostExposureOne,
|
||||
MMColorAdjustmentsShakeEvent_URP.Trigger(this, ShakePostExposure, RemapPostExposureZero, RemapPostExposureOne,
|
||||
ShakeHueShift, RemapHueShiftZero, RemapHueShiftOne,
|
||||
ShakeSaturation, RemapSaturationZero, RemapSaturationOne,
|
||||
ShakeContrast, RemapContrastZero, RemapContrastOne,
|
||||
@@ -160,7 +160,7 @@ namespace MoreMountains.FeedbacksForThirdParty
|
||||
}
|
||||
base.CustomStopFeedback(position, feedbacksIntensity);
|
||||
|
||||
MMColorAdjustmentsShakeEvent_URP.Trigger(ShakePostExposure, RemapPostExposureZero, RemapPostExposureOne,
|
||||
MMColorAdjustmentsShakeEvent_URP.Trigger(this, ShakePostExposure, RemapPostExposureZero, RemapPostExposureOne,
|
||||
ShakeHueShift, RemapHueShiftZero, RemapHueShiftOne,
|
||||
ShakeSaturation, RemapSaturationZero, RemapSaturationOne,
|
||||
ShakeContrast, RemapContrastZero, RemapContrastOne,
|
||||
@@ -179,7 +179,7 @@ namespace MoreMountains.FeedbacksForThirdParty
|
||||
return;
|
||||
}
|
||||
|
||||
MMColorAdjustmentsShakeEvent_URP.Trigger(ShakePostExposure, RemapPostExposureZero, RemapPostExposureOne,
|
||||
MMColorAdjustmentsShakeEvent_URP.Trigger(this, ShakePostExposure, RemapPostExposureZero, RemapPostExposureOne,
|
||||
ShakeHueShift, RemapHueShiftZero, RemapHueShiftOne,
|
||||
ShakeSaturation, RemapSaturationZero, RemapSaturationOne,
|
||||
ShakeContrast, RemapContrastZero, RemapContrastOne,
|
||||
|
||||
@@ -85,7 +85,7 @@ namespace MoreMountains.FeedbacksForThirdParty
|
||||
}
|
||||
|
||||
float intensityMultiplier = ComputeIntensity(feedbacksIntensity, position);
|
||||
MMLensDistortionShakeEvent_URP.Trigger(Intensity, FeedbackDuration, RemapIntensityZero, RemapIntensityOne, RelativeIntensity, intensityMultiplier,
|
||||
MMLensDistortionShakeEvent_URP.Trigger(this, Intensity, FeedbackDuration, RemapIntensityZero, RemapIntensityOne, RelativeIntensity, intensityMultiplier,
|
||||
ChannelData, ResetShakerValuesAfterShake, ResetTargetValuesAfterShake, NormalPlayDirection, ComputedTimescaleMode);
|
||||
|
||||
}
|
||||
@@ -102,7 +102,7 @@ namespace MoreMountains.FeedbacksForThirdParty
|
||||
return;
|
||||
}
|
||||
base.CustomStopFeedback(position, feedbacksIntensity);
|
||||
MMLensDistortionShakeEvent_URP.Trigger(Intensity, FeedbackDuration, RemapIntensityZero, RemapIntensityOne, RelativeIntensity, stop:true, channelData: ChannelData);
|
||||
MMLensDistortionShakeEvent_URP.Trigger(this, Intensity, FeedbackDuration, RemapIntensityZero, RemapIntensityOne, RelativeIntensity, stop:true, channelData: ChannelData);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -115,7 +115,7 @@ namespace MoreMountains.FeedbacksForThirdParty
|
||||
return;
|
||||
}
|
||||
|
||||
MMLensDistortionShakeEvent_URP.Trigger(Intensity, FeedbackDuration, RemapIntensityZero, RemapIntensityOne, RelativeIntensity, restore:true, channelData: ChannelData);
|
||||
MMLensDistortionShakeEvent_URP.Trigger(this, Intensity, FeedbackDuration, RemapIntensityZero, RemapIntensityOne, RelativeIntensity, restore:true, channelData: ChannelData);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -76,7 +76,7 @@ namespace MoreMountains.FeedbacksForThirdParty
|
||||
}
|
||||
|
||||
float intensityMultiplier = ComputeIntensity(feedbacksIntensity, position);
|
||||
MMMotionBlurShakeEvent_URP.Trigger(Intensity, FeedbackDuration, RemapIntensityZero, RemapIntensityOne, RelativeIntensity, intensityMultiplier,
|
||||
MMMotionBlurShakeEvent_URP.Trigger(this, Intensity, FeedbackDuration, RemapIntensityZero, RemapIntensityOne, RelativeIntensity, intensityMultiplier,
|
||||
ChannelData, ResetShakerValuesAfterShake, ResetTargetValuesAfterShake, NormalPlayDirection, ComputedTimescaleMode);
|
||||
|
||||
}
|
||||
@@ -93,7 +93,7 @@ namespace MoreMountains.FeedbacksForThirdParty
|
||||
return;
|
||||
}
|
||||
base.CustomStopFeedback(position, feedbacksIntensity);
|
||||
MMMotionBlurShakeEvent_URP.Trigger(Intensity, FeedbackDuration, RemapIntensityZero, RemapIntensityOne, RelativeIntensity, stop: true, channelData: ChannelData);
|
||||
MMMotionBlurShakeEvent_URP.Trigger(this, Intensity, FeedbackDuration, RemapIntensityZero, RemapIntensityOne, RelativeIntensity, stop: true, channelData: ChannelData);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -106,7 +106,7 @@ namespace MoreMountains.FeedbacksForThirdParty
|
||||
return;
|
||||
}
|
||||
|
||||
MMMotionBlurShakeEvent_URP.Trigger(Intensity, FeedbackDuration, RemapIntensityZero, RemapIntensityOne, RelativeIntensity, restore: true, channelData: ChannelData);
|
||||
MMMotionBlurShakeEvent_URP.Trigger(this, Intensity, FeedbackDuration, RemapIntensityZero, RemapIntensityOne, RelativeIntensity, restore: true, channelData: ChannelData);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -79,7 +79,7 @@ namespace MoreMountains.FeedbacksForThirdParty
|
||||
/// <param name="relativeIntensity"></param>
|
||||
/// <param name="attenuation"></param>
|
||||
/// <param name="channel"></param>
|
||||
public virtual void OnMMChromaticAberrationShakeEvent(AnimationCurve intensity, float duration, float remapMin, float remapMax, bool relativeIntensity = false,
|
||||
public virtual void OnMMChromaticAberrationShakeEvent(MMF_Feedback source, AnimationCurve intensity, float duration, float remapMin, float remapMax, bool relativeIntensity = false,
|
||||
float attenuation = 1.0f, MMChannelData channelData = null, bool resetShakerValuesAfterShake = true, bool resetTargetValuesAfterShake = true,
|
||||
bool forwardDirection = true, TimescaleModes timescaleMode = TimescaleModes.Scaled, bool stop = false, bool restore = false)
|
||||
{
|
||||
@@ -123,7 +123,7 @@ namespace MoreMountains.FeedbacksForThirdParty
|
||||
ForwardDirection = forwardDirection;
|
||||
}
|
||||
|
||||
Play();
|
||||
Play(source);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -178,15 +178,15 @@ namespace MoreMountains.FeedbacksForThirdParty
|
||||
static public void Register(Delegate callback) { OnEvent += callback; }
|
||||
static public void Unregister(Delegate callback) { OnEvent -= callback; }
|
||||
|
||||
public delegate void Delegate(AnimationCurve intensity, float duration, float remapMin, float remapMax, bool relativeIntensity = false,
|
||||
public delegate void Delegate(MMF_Feedback source, AnimationCurve intensity, float duration, float remapMin, float remapMax, bool relativeIntensity = false,
|
||||
float attenuation = 1.0f, MMChannelData channelData = null, bool resetShakerValuesAfterShake = true, bool resetTargetValuesAfterShake = true,
|
||||
bool forwardDirection = true, TimescaleModes timescaleMode = TimescaleModes.Scaled, bool stop = false, bool restore = false);
|
||||
|
||||
static public void Trigger(AnimationCurve intensity, float duration, float remapMin, float remapMax, bool relativeIntensity = false,
|
||||
static public void Trigger(MMF_Feedback source, AnimationCurve intensity, float duration, float remapMin, float remapMax, bool relativeIntensity = false,
|
||||
float attenuation = 1.0f, MMChannelData channelData = null, bool resetShakerValuesAfterShake = true, bool resetTargetValuesAfterShake = true,
|
||||
bool forwardDirection = true, TimescaleModes timescaleMode = TimescaleModes.Scaled, bool stop = false, bool restore = false)
|
||||
{
|
||||
OnEvent?.Invoke(intensity, duration, remapMin, remapMax, relativeIntensity, attenuation, channelData,
|
||||
OnEvent?.Invoke(source, intensity, duration, remapMin, remapMax, relativeIntensity, attenuation, channelData,
|
||||
resetShakerValuesAfterShake, resetTargetValuesAfterShake, forwardDirection, timescaleMode, stop, restore);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -185,7 +185,7 @@ namespace MoreMountains.FeedbacksForThirdParty
|
||||
/// <param name="relativeIntensity"></param>
|
||||
/// <param name="attenuation"></param>
|
||||
/// <param name="channel"></param>
|
||||
public virtual void OnMMColorGradingShakeEvent(AnimationCurve shakePostExposure, float remapPostExposureZero, float remapPostExposureOne,
|
||||
public virtual void OnMMColorGradingShakeEvent(MMF_Feedback source, AnimationCurve shakePostExposure, float remapPostExposureZero, float remapPostExposureOne,
|
||||
AnimationCurve shakeHueShift, float remapHueShiftZero, float remapHueShiftOne,
|
||||
AnimationCurve shakeSaturation, float remapSaturationZero, float remapSaturationOne,
|
||||
AnimationCurve shakeContrast, float remapContrastZero, float remapContrastOne,
|
||||
@@ -260,7 +260,7 @@ namespace MoreMountains.FeedbacksForThirdParty
|
||||
ForwardDirection = forwardDirection;
|
||||
}
|
||||
|
||||
Play();
|
||||
Play(source);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -332,7 +332,7 @@ namespace MoreMountains.FeedbacksForThirdParty
|
||||
static public void Register(Delegate callback) { OnEvent += callback; }
|
||||
static public void Unregister(Delegate callback) { OnEvent -= callback; }
|
||||
|
||||
public delegate void Delegate(AnimationCurve shakePostExposure, float remapPostExposureZero, float remapPostExposureOne,
|
||||
public delegate void Delegate(MMF_Feedback source, AnimationCurve shakePostExposure, float remapPostExposureZero, float remapPostExposureOne,
|
||||
AnimationCurve shakeHueShift, float remapHueShiftZero, float remapHueShiftOne,
|
||||
AnimationCurve shakeSaturation, float remapSaturationZero, float remapSaturationOne,
|
||||
AnimationCurve shakeContrast, float remapContrastZero, float remapContrastOne,
|
||||
@@ -341,7 +341,7 @@ namespace MoreMountains.FeedbacksForThirdParty
|
||||
float attenuation = 1.0f, MMChannelData channelData = null, bool resetShakerValuesAfterShake = true, bool resetTargetValuesAfterShake = true,
|
||||
bool forwardDirection = true, TimescaleModes timescaleMode = TimescaleModes.Scaled, bool stop = false, bool restore = false);
|
||||
|
||||
static public void Trigger(AnimationCurve shakePostExposure, float remapPostExposureZero, float remapPostExposureOne,
|
||||
static public void Trigger(MMF_Feedback source, AnimationCurve shakePostExposure, float remapPostExposureZero, float remapPostExposureOne,
|
||||
AnimationCurve shakeHueShift, float remapHueShiftZero, float remapHueShiftOne,
|
||||
AnimationCurve shakeSaturation, float remapSaturationZero, float remapSaturationOne,
|
||||
AnimationCurve shakeContrast, float remapContrastZero, float remapContrastOne,
|
||||
@@ -350,7 +350,7 @@ namespace MoreMountains.FeedbacksForThirdParty
|
||||
float attenuation = 1.0f, MMChannelData channelData = null, bool resetShakerValuesAfterShake = true, bool resetTargetValuesAfterShake = true,
|
||||
bool forwardDirection = true, TimescaleModes timescaleMode = TimescaleModes.Scaled, bool stop = false, bool restore = false)
|
||||
{
|
||||
OnEvent?.Invoke(shakePostExposure, remapPostExposureZero, remapPostExposureOne,
|
||||
OnEvent?.Invoke(source, shakePostExposure, remapPostExposureZero, remapPostExposureOne,
|
||||
shakeHueShift, remapHueShiftZero, remapHueShiftOne,
|
||||
shakeSaturation, remapSaturationZero, remapSaturationOne,
|
||||
shakeContrast, remapContrastZero, remapContrastOne,
|
||||
|
||||
@@ -98,7 +98,7 @@ namespace MoreMountains.FeedbacksForThirdParty
|
||||
/// <param name="relativeIntensity"></param>
|
||||
/// <param name="attenuation"></param>
|
||||
/// <param name="channel"></param>
|
||||
public virtual void OnMMLensDistortionShakeEvent(AnimationCurve intensity, float duration, float remapMin, float remapMax, bool relativeIntensity = false,
|
||||
public virtual void OnMMLensDistortionShakeEvent(MMF_Feedback source, AnimationCurve intensity, float duration, float remapMin, float remapMax, bool relativeIntensity = false,
|
||||
float attenuation = 1.0f, MMChannelData channelData = null, bool resetShakerValuesAfterShake = true, bool resetTargetValuesAfterShake = true,
|
||||
bool forwardDirection = true, TimescaleModes timescaleMode = TimescaleModes.Scaled, bool stop = false, bool restore = false)
|
||||
{
|
||||
@@ -142,7 +142,7 @@ namespace MoreMountains.FeedbacksForThirdParty
|
||||
ForwardDirection = forwardDirection;
|
||||
}
|
||||
|
||||
Play();
|
||||
Play(source);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -197,15 +197,15 @@ namespace MoreMountains.FeedbacksForThirdParty
|
||||
static public void Register(Delegate callback) { OnEvent += callback; }
|
||||
static public void Unregister(Delegate callback) { OnEvent -= callback; }
|
||||
|
||||
public delegate void Delegate(AnimationCurve intensity, float duration, float remapMin, float remapMax, bool relativeIntensity = false,
|
||||
public delegate void Delegate(MMF_Feedback source, AnimationCurve intensity, float duration, float remapMin, float remapMax, bool relativeIntensity = false,
|
||||
float attenuation = 1.0f, MMChannelData channelData = null, bool resetShakerValuesAfterShake = true, bool resetTargetValuesAfterShake = true,
|
||||
bool forwardDirection = true, TimescaleModes timescaleMode = TimescaleModes.Scaled, bool stop = false, bool restore = false);
|
||||
|
||||
static public void Trigger(AnimationCurve intensity, float duration, float remapMin, float remapMax, bool relativeIntensity = false,
|
||||
static public void Trigger(MMF_Feedback source, AnimationCurve intensity, float duration, float remapMin, float remapMax, bool relativeIntensity = false,
|
||||
float attenuation = 1.0f, MMChannelData channelData = null, bool resetShakerValuesAfterShake = true, bool resetTargetValuesAfterShake = true,
|
||||
bool forwardDirection = true, TimescaleModes timescaleMode = TimescaleModes.Scaled, bool stop = false, bool restore = false)
|
||||
{
|
||||
OnEvent?.Invoke(intensity, duration, remapMin, remapMax, relativeIntensity, attenuation, channelData,
|
||||
OnEvent?.Invoke(source, intensity, duration, remapMin, remapMax, relativeIntensity, attenuation, channelData,
|
||||
resetShakerValuesAfterShake, resetTargetValuesAfterShake, forwardDirection, timescaleMode, stop, restore);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -81,7 +81,7 @@ namespace MoreMountains.FeedbacksForThirdParty
|
||||
/// <param name="relativeIntensity"></param>
|
||||
/// <param name="attenuation"></param>
|
||||
/// <param name="channel"></param>
|
||||
public virtual void OnMotionBlurShakeEvent(AnimationCurve intensity, float duration, float remapMin, float remapMax, bool relativeIntensity = false,
|
||||
public virtual void OnMotionBlurShakeEvent(MMF_Feedback source, AnimationCurve intensity, float duration, float remapMin, float remapMax, bool relativeIntensity = false,
|
||||
float attenuation = 1.0f, MMChannelData channelData = null, bool resetShakerValuesAfterShake = true, bool resetTargetValuesAfterShake = true,
|
||||
bool forwardDirection = true, TimescaleModes timescaleMode = TimescaleModes.Scaled, bool stop = false, bool restore = false)
|
||||
{
|
||||
@@ -125,7 +125,7 @@ namespace MoreMountains.FeedbacksForThirdParty
|
||||
ForwardDirection = forwardDirection;
|
||||
}
|
||||
|
||||
Play();
|
||||
Play(source);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -180,15 +180,15 @@ namespace MoreMountains.FeedbacksForThirdParty
|
||||
static public void Register(Delegate callback) { OnEvent += callback; }
|
||||
static public void Unregister(Delegate callback) { OnEvent -= callback; }
|
||||
|
||||
public delegate void Delegate(AnimationCurve intensity, float duration, float remapMin, float remapMax, bool relativeIntensity = false,
|
||||
public delegate void Delegate(MMF_Feedback source, AnimationCurve intensity, float duration, float remapMin, float remapMax, bool relativeIntensity = false,
|
||||
float attenuation = 1.0f, MMChannelData channelData = null, bool resetShakerValuesAfterShake = true, bool resetTargetValuesAfterShake = true,
|
||||
bool forwardDirection = true, TimescaleModes timescaleMode = TimescaleModes.Scaled, bool stop = false, bool restore = false);
|
||||
|
||||
static public void Trigger(AnimationCurve intensity, float duration, float remapMin, float remapMax, bool relativeIntensity = false,
|
||||
static public void Trigger(MMF_Feedback source, AnimationCurve intensity, float duration, float remapMin, float remapMax, bool relativeIntensity = false,
|
||||
float attenuation = 1.0f, MMChannelData channelData = null, bool resetShakerValuesAfterShake = true, bool resetTargetValuesAfterShake = true,
|
||||
bool forwardDirection = true, TimescaleModes timescaleMode = TimescaleModes.Scaled, bool stop = false, bool restore = false)
|
||||
{
|
||||
OnEvent?.Invoke(intensity, duration, remapMin, remapMax, relativeIntensity, attenuation, channelData,
|
||||
OnEvent?.Invoke(source, intensity, duration, remapMin, remapMax, relativeIntensity, attenuation, channelData,
|
||||
resetShakerValuesAfterShake, resetTargetValuesAfterShake, forwardDirection, timescaleMode, stop, restore);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user