修复
This commit is contained in:
@@ -14,6 +14,7 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap
|
||||
public float timeAngle = 0.1f;
|
||||
public float stepA = 0.25f;
|
||||
public float stepB = 0.24f;
|
||||
public float baseSpeed = 0.2f;
|
||||
|
||||
public bool enableOuterBorder = true;
|
||||
public float outerBorderColorR = 1f;
|
||||
@@ -32,7 +33,7 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap
|
||||
public DTMRandomGridFloor_BM(string elementName, Guid elementGuid, List<string> tags, GameElement_BM attachedElement,
|
||||
string themeBundleName, string objectName, bool isStatic,
|
||||
float patternSizeX, float patternSizeY, float gridDensity,
|
||||
float timeAngle, float stepA, float stepB,
|
||||
float timeAngle, float stepA, float stepB, float baseSpeed,
|
||||
bool enableOuterBorder, Color outerColor, float outerBorderWidth,
|
||||
float fadeFar = 100f, float fadeNear = 20f)
|
||||
: base(elementName, elementGuid, tags, attachedElement, themeBundleName, objectName, isStatic)
|
||||
@@ -43,6 +44,7 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap
|
||||
this.timeAngle = timeAngle;
|
||||
this.stepA = stepA;
|
||||
this.stepB = stepB;
|
||||
this.baseSpeed = baseSpeed;
|
||||
|
||||
this.enableOuterBorder = enableOuterBorder;
|
||||
this.outerBorderColorR = outerColor.r;
|
||||
@@ -62,7 +64,7 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap
|
||||
matchedElement = DTMRandomGridFloor.GenerateElement(elementName, elementGuid, tags, false,
|
||||
themeBundleName, objectName, GetElement(attachedElementGuid), isStatic,
|
||||
patternSizeX, patternSizeY, gridDensity,
|
||||
timeAngle, stepA, stepB,
|
||||
timeAngle, stepA, stepB, baseSpeed,
|
||||
enableOuterBorder, outerColor, outerBorderWidth,
|
||||
fadeFar, fadeNear);
|
||||
}
|
||||
|
||||
@@ -15,6 +15,7 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap
|
||||
|
||||
public float stepA = 0.293f;
|
||||
public float stepB = 0.345f;
|
||||
public float baseSpeed = 0.2f;
|
||||
|
||||
public float seamRotation = -90f;
|
||||
public float seamFadeWidth = 0.2f;
|
||||
@@ -32,7 +33,7 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap
|
||||
public DTMRandomGridTube_BM(string elementName, Guid elementGuid, List<string> tags, GameElement_BM attachedElement,
|
||||
string themeBundleName, string objectName, bool isStatic,
|
||||
float patternSizeX, float patternSizeY, float gridDensity,
|
||||
float timeAngle, float stepA, float stepB,
|
||||
float timeAngle, float stepA, float stepB, float baseSpeed,
|
||||
float seamRotation, float seamFadeWidth, float seamFadeSmoothness,
|
||||
float fadeFar, float fadeNear, float tubeRadius)
|
||||
: base(elementName, elementGuid, tags, attachedElement, themeBundleName, objectName, isStatic)
|
||||
@@ -43,6 +44,7 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap
|
||||
this.timeAngle = timeAngle;
|
||||
this.stepA = stepA;
|
||||
this.stepB = stepB;
|
||||
this.baseSpeed = baseSpeed;
|
||||
this.seamRotation = seamRotation;
|
||||
this.seamFadeWidth = seamFadeWidth;
|
||||
this.seamFadeSmoothness = seamFadeSmoothness;
|
||||
@@ -56,7 +58,7 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap
|
||||
matchedElement = DTMRandomGridTube.GenerateElement(elementName, elementGuid, tags, false,
|
||||
themeBundleName, objectName, GetElement(attachedElementGuid), isStatic,
|
||||
patternSizeX, patternSizeY, gridDensity, timeAngle,
|
||||
stepA, stepB,
|
||||
stepA, stepB, baseSpeed,
|
||||
seamRotation, seamFadeWidth, seamFadeSmoothness,
|
||||
fadeFar, fadeNear, tubeRadius);
|
||||
}
|
||||
@@ -66,7 +68,7 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap
|
||||
return DTMRandomGridTube.GenerateElement(elementName, Guid.NewGuid(), tags, true,
|
||||
themeBundleName, objectName, parent, isStatic,
|
||||
patternSizeX, patternSizeY, gridDensity, timeAngle,
|
||||
stepA, stepB,
|
||||
stepA, stepB, baseSpeed,
|
||||
seamRotation, seamFadeWidth, seamFadeSmoothness,
|
||||
fadeFar, fadeNear, tubeRadius);
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse
|
||||
matchedBM = new DTMRandomGridFloor_BM(elementName, elementGuid, tags, parentElement.matchedBM as GameElement_BM,
|
||||
themeBundleName, objectName, isStatic,
|
||||
patternSizeX, patternSizeY, gridDensity,
|
||||
timeAngle, stepA, stepB,
|
||||
timeAngle, stepA, stepB, baseSpeed,
|
||||
enableOuterBorder, outerBorderColor, outerBorderWidth,
|
||||
fadeFar, fadeNear);
|
||||
}
|
||||
@@ -31,6 +31,7 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse
|
||||
inspector.GenerateInputField(this, subcontainer, "Time Angle", nameof(timeAngle)).AddListenerFunction(UpdateMaterialProperties);
|
||||
inspector.GenerateInputField(this, subcontainer, "Step A", nameof(stepA)).AddListenerFunction(UpdateMaterialProperties);
|
||||
inspector.GenerateInputField(this, subcontainer, "Step B", nameof(stepB)).AddListenerFunction(UpdateMaterialProperties);
|
||||
inspector.GenerateInputField(this, subcontainer, "Base Speed", nameof(baseSpeed)).AddListenerFunction(UpdateMaterialProperties);
|
||||
|
||||
inspector.GenerateToggle(this, subcontainer, "Enable Outer Border", nameof(enableOuterBorder)).AddListenerFunction(UpdateMaterialProperties);
|
||||
inspector.GenerateBaseColorPicker(this, subcontainer, "Outer Border Color", nameof(outerBorderColor)).AddListenerFunction(UpdateMaterialProperties);
|
||||
|
||||
@@ -12,7 +12,7 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse
|
||||
matchedBM = new DTMRandomGridTube_BM(elementName, elementGuid, tags, parentElement.matchedBM as GameElement_BM,
|
||||
themeBundleName, objectName, isStatic,
|
||||
patternSizeX, patternSizeY, gridDensity,
|
||||
timeAngle, stepA, stepB,
|
||||
timeAngle, stepA, stepB, baseSpeed,
|
||||
seamRotation, seamFadeWidth, seamFadeSmoothness,
|
||||
fadeFar, fadeNear, tubeRadius);
|
||||
}
|
||||
@@ -31,6 +31,7 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse
|
||||
inspector.GenerateInputField(this, subcontainer, "Time Angle", nameof(timeAngle)).AddListenerFunction(UpdateMaterialProperties);
|
||||
inspector.GenerateInputField(this, subcontainer, "Step A", nameof(stepA)).AddListenerFunction(UpdateMaterialProperties);
|
||||
inspector.GenerateInputField(this, subcontainer, "Step B", nameof(stepB)).AddListenerFunction(UpdateMaterialProperties);
|
||||
inspector.GenerateInputField(this, subcontainer, "Base Speed", nameof(baseSpeed)).AddListenerFunction(UpdateMaterialProperties);
|
||||
|
||||
inspector.GenerateInputField(this, subcontainer, "Seam Rotation", nameof(seamRotation)).AddListenerFunction(UpdateMaterialProperties);
|
||||
inspector.GenerateInputField(this, subcontainer, "Seam Fade Width", nameof(seamFadeWidth)).AddListenerFunction(UpdateMaterialProperties);
|
||||
|
||||
@@ -14,6 +14,7 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse
|
||||
public float timeAngle;
|
||||
public float stepA;
|
||||
public float stepB;
|
||||
public float baseSpeed = 0.2f;
|
||||
|
||||
public bool enableOuterBorder;
|
||||
public Color outerBorderColor;
|
||||
@@ -30,8 +31,8 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse
|
||||
bool isFirstGenerated, string themeBundleName, string objectName, GameElement parentElement,
|
||||
bool isStatic,
|
||||
float patternSizeX, float patternSizeY, float gridDensity,
|
||||
float timeAngle, float stepA, float stepB,
|
||||
bool enableOuterBorder,
|
||||
float timeAngle, float stepA, float stepB, float baseSpeed,
|
||||
bool enableOuterBorder,
|
||||
Color outerBorderColor,
|
||||
float outerBorderWidth,
|
||||
float fadeFar = 100f,
|
||||
@@ -46,6 +47,7 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse
|
||||
randomGridFloor.timeAngle = timeAngle;
|
||||
randomGridFloor.stepA = stepA;
|
||||
randomGridFloor.stepB = stepB;
|
||||
randomGridFloor.baseSpeed = baseSpeed;
|
||||
|
||||
randomGridFloor.enableOuterBorder = enableOuterBorder;
|
||||
randomGridFloor.outerBorderColor = outerBorderColor;
|
||||
@@ -87,6 +89,7 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse
|
||||
mat.SetFloat("_TimeAngle", timeAngle);
|
||||
mat.SetFloat("_StepA", stepA);
|
||||
mat.SetFloat("_StepB", stepB);
|
||||
mat.SetFloat("_BaseSpeed", baseSpeed);
|
||||
|
||||
float borderOn = enableOuterBorder ? 1f : 0f;
|
||||
mat.SetFloat("_EnableOuterBorder", borderOn);
|
||||
|
||||
@@ -15,6 +15,7 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse
|
||||
|
||||
public float stepA = 0.293f;
|
||||
public float stepB = 0.345f;
|
||||
public float baseSpeed = 0.2f;
|
||||
|
||||
public float seamRotation = -90f;
|
||||
public float seamFadeWidth = 0.2f;
|
||||
@@ -36,7 +37,7 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse
|
||||
bool isFirstGenerated, string themeBundleName, string objectName, GameElement parentElement,
|
||||
bool isStatic,
|
||||
float patternSizeX, float patternSizeY, float gridDensity,
|
||||
float timeAngle, float stepA, float stepB,
|
||||
float timeAngle, float stepA, float stepB, float baseSpeed,
|
||||
float seamRotation, float seamFadeWidth, float seamFadeSmoothness,
|
||||
float fadeFar, float fadeNear, float tubeRadius)
|
||||
{
|
||||
@@ -50,6 +51,7 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse
|
||||
|
||||
randomGridTube.stepA = stepA;
|
||||
randomGridTube.stepB = stepB;
|
||||
randomGridTube.baseSpeed = baseSpeed;
|
||||
|
||||
randomGridTube.seamRotation = seamRotation;
|
||||
randomGridTube.seamFadeWidth = seamFadeWidth;
|
||||
@@ -97,6 +99,7 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse
|
||||
|
||||
mat.SetFloat("_StepA", stepA);
|
||||
mat.SetFloat("_StepB", stepB);
|
||||
mat.SetFloat("_BaseSpeed", baseSpeed);
|
||||
|
||||
mat.SetFloat("_SeamRotation", seamRotation);
|
||||
mat.SetFloat("_SeamFadeWidth", seamFadeWidth);
|
||||
|
||||
Reference in New Issue
Block a user