Merge branch 'main' of https://github.com/MiracleForest-Ichni/IchniCreatorStudio
This commit is contained in:
@@ -144,26 +144,26 @@ namespace Ichni.RhythmGame
|
||||
.AddListenerFunction(() => particlesContainer.SetPrewarm(prewarm));
|
||||
inspector.GenerateInputField(this, particleSettings0, "Play Time", nameof(playTime));
|
||||
inspector.GenerateInputField(this, particleSettings0, "Stop Time", nameof(stopTime));
|
||||
|
||||
|
||||
|
||||
DynamicUISubcontainer particleSettings2 = container.GenerateSubcontainer(3);
|
||||
inspector.GenerateDropdown(this, particleSettings2, "Simulation Space", typeof(ParticleSystemSimulationSpace), nameof(simulationSpace))
|
||||
.AddListenerFunction(() => particlesContainer.SetSimulationSpace(simulationSpace));
|
||||
inspector.GenerateInputField(this, particleSettings2, "Density", nameof(density))
|
||||
.AddListenerFunction(()=>particlesContainer.SetDensity(density));
|
||||
.AddListenerFunction(() => particlesContainer.SetDensity(density));
|
||||
inspector.GenerateInputField(this, particleSettings2, "Life Time", nameof(lifeTime))
|
||||
.AddListenerFunction(()=>particlesContainer.SetLifeTime(lifeTime));
|
||||
.AddListenerFunction(() => particlesContainer.SetLifeTime(lifeTime));
|
||||
inspector.GenerateInputField(this, particleSettings2, "Speed", nameof(speed))
|
||||
.AddListenerFunction(()=>particlesContainer.SetSpeed(speed));
|
||||
.AddListenerFunction(() => particlesContainer.SetSpeed(speed));
|
||||
inspector.GenerateInputField(this, particleSettings2, "Radius", nameof(radius))
|
||||
.AddListenerFunction(()=>particlesContainer.SetRadius(radius));
|
||||
.AddListenerFunction(() => particlesContainer.SetRadius(radius));
|
||||
|
||||
DynamicUISubcontainer particleSettings3_0 = container.GenerateSubcontainer(3);
|
||||
inspector.GenerateToggle(this, particleSettings3_0, "Is Auto Orient", nameof(isAutoOrient))
|
||||
.AddListenerFunction(()=>particlesContainer.SetAlignment(isAutoOrient, particleRotation));
|
||||
.AddListenerFunction(() => particlesContainer.SetAlignment(isAutoOrient, particleRotation));
|
||||
DynamicUISubcontainer particleSettings3_1 = container.GenerateSubcontainer(1);
|
||||
inspector.GenerateVector3InputField(this, particleSettings3_1, "Particle Rotation", nameof(particleRotation))
|
||||
.AddListenerFunction(()=>particlesContainer.SetParticleRotation(particleRotation));
|
||||
.AddListenerFunction(() => particlesContainer.SetParticleRotation(particleRotation));
|
||||
|
||||
DynamicUISubcontainer materialSettings = container.GenerateSubcontainer(3);
|
||||
var themeBundleDropdown =
|
||||
|
||||
@@ -8,15 +8,15 @@ namespace Ichni.RhythmGame
|
||||
{
|
||||
public class RadialBlurEffect : EffectBase
|
||||
{
|
||||
private readonly NBPostProcessingController nbController;
|
||||
|
||||
private readonly PostProcessingController nbController;
|
||||
|
||||
public float duration;
|
||||
public int sampleLevel;
|
||||
public float position;
|
||||
public float fadeRange;
|
||||
public float peakIntensity;
|
||||
public AnimationCurve intensityCurve;
|
||||
|
||||
|
||||
public RadialBlurEffect(float duration, int sampleLevel, float position, float fadeRange, float peakIntensity, AnimationCurve intensityCurve)
|
||||
{
|
||||
this.effectTime = duration;
|
||||
@@ -28,19 +28,7 @@ namespace Ichni.RhythmGame
|
||||
this.intensityCurve = intensityCurve;
|
||||
this.nbController = EditorManager.instance.postProcessingManager.nbController;
|
||||
}
|
||||
public override void CopyParametersFrom(EffectBase other)
|
||||
{
|
||||
if (other is RadialBlurEffect otherEffect)
|
||||
{
|
||||
this.duration = otherEffect.duration;
|
||||
this.sampleLevel = otherEffect.sampleLevel;
|
||||
this.position = otherEffect.position;
|
||||
this.fadeRange = otherEffect.fadeRange;
|
||||
this.peakIntensity = otherEffect.peakIntensity;
|
||||
this.intensityCurve = otherEffect.intensityCurve != null ? new AnimationCurve(otherEffect.intensityCurve.keys) : null;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public override void Recover()
|
||||
{
|
||||
nbController.radialBlurToggle = false;
|
||||
@@ -64,7 +52,7 @@ namespace Ichni.RhythmGame
|
||||
float intensity = Mathf.Lerp(0, peakIntensity, intensityCurve.Evaluate(effectProgressPercent));
|
||||
nbController.radialBlurIntensity = intensity;
|
||||
}
|
||||
|
||||
|
||||
public override void Adjust()
|
||||
{
|
||||
nbController.radialBlurToggle = false;
|
||||
@@ -116,7 +104,7 @@ namespace Ichni.RhythmGame
|
||||
this.peakIntensity = peakIntensity;
|
||||
this.intensityCurve = intensityCurve;
|
||||
}
|
||||
|
||||
|
||||
public override EffectBase ConvertToGameType(GameElement attachedGameElement)
|
||||
{
|
||||
return new RadialBlurEffect(duration, sampleLevel, position, fadeRange, peakIntensity, intensityCurve)
|
||||
|
||||
@@ -17,6 +17,7 @@ namespace Ichni.RhythmGame
|
||||
public GameObject judgeEffect;
|
||||
|
||||
public List<GameObject> notePartList;
|
||||
public List<GameObject> extraPartList;
|
||||
public List<GameObject> effectPrefabList;
|
||||
|
||||
public virtual Vector3 noteVisualPosition => noteMain.transform.position;
|
||||
|
||||
@@ -12,7 +12,7 @@ namespace Ichni.Editor
|
||||
public class PostProcessingManager : MonoBehaviour
|
||||
{
|
||||
public Volume globalVolume;
|
||||
public NBPostProcessingController nbController;
|
||||
public PostProcessingController nbController;
|
||||
public PixelateFeature pixelateFeature;
|
||||
|
||||
void Awake()
|
||||
|
||||
Reference in New Issue
Block a user