mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

value changes

Browse source
This commit is contained in:
Firerise9402 2023-08-12 16:07:27 -04:00
parent 42439769d4
commit 13f476546b
3 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Assets/Scenes/Editor.unity
View file

@ -13810,6 +13810,10 @@ PrefabInstance:
propertyPath: letterboxMask
value:
objectReference: {fileID: 2105509201}
- target: {fileID: 4035854539513523048, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: viewportTexture
value:
objectReference: {fileID: 1638236456}
- target: {fileID: 4820152107260776423, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: m_RaycastTarget
value: 0
@ -33693,6 +33697,17 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 2464883521749415129, guid: 720073bc7682b1441bece7116681f72c, type: 3}
m_PrefabInstance: {fileID: 631525709}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1638236456 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 647613278910435637, guid: 720073bc7682b1441bece7116681f72c, type: 3}
m_PrefabInstance: {fileID: 631525709}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1638236449}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1647324172
GameObject:
m_ObjectHideFlags: 0

6
Assets/Scripts/Minigames.cs
View file

@ -721,7 +721,7 @@ namespace HeavenStudio
new Param("axis", StaticCamera.ViewAxis.All, "Axis", "The axis to scale the letterbox in")
}
),
new GameAction("complex pan", "Scale Viewport(Complex)", 1f, true, new List<Param>()
new GameAction("complex pan", "Pan Viewport(Complex)", 1f, true, new List<Param>()
{
new Param("valA", new EntityTypes.Float(-50, 50, 1), "Pan Viewport X"),
new Param("valB", new EntityTypes.Float(-50, 50, 1), "Pan Viewport Y"),
@ -731,8 +731,8 @@ namespace HeavenStudio
),
new GameAction("complex scale", "Scale Viewport(Complex)", 1f, true, new List<Param>()
{
new Param("valA", new EntityTypes.Float(0, 50, 1), "Scale Viewport X"),
new Param("valB", new EntityTypes.Float(0, 50, 1), "Scale Viewport Y"),
new Param("valA", new EntityTypes.Float(0, 200, 100), "Scale Viewport X"),
new Param("valB", new EntityTypes.Float(0, 200, 100), "Scale Viewport Y"),
new Param("ease", Util.EasingFunction.Ease.Linear, "Ease Type"),
new Param("axis", StaticCamera.ViewAxis.All, "Axis", "The axis to scale the viewport in")
}

14
Assets/Scripts/StaticCamera.cs
View file

@ -329,14 +329,14 @@ namespace HeavenStudio
switch (e["axis"])
{
case (int) ViewAxis.X:
complexScale.x = func(complexScaleLast.x, e["valA"], Mathf.Min(prog, 1f)) * AspectRatioWidth;
complexScale.x = func(complexScaleLast.x, e["valA"] * .01f, Mathf.Min(prog, 1f)) * AspectRatioWidth;
break;
case (int) ViewAxis.Y:
complexScale.y = func(complexScaleLast.y, e["valB"], Mathf.Min(prog, 1f)) * AspectRatioHeight;
complexScale.y = func(complexScaleLast.y, e["valB"] * .01f, Mathf.Min(prog, 1f)) * AspectRatioHeight;
break;
default:
float dx = func(complexScaleLast.x, e["valA"], Mathf.Min(prog, 1f)) * AspectRatioWidth;
float dy = func(complexScaleLast.y, e["valB"], Mathf.Min(prog, 1f)) * AspectRatioHeight;
float dx = func(complexScaleLast.x, e["valA"] * .01f, Mathf.Min(prog, 1f)) * AspectRatioWidth;
float dy = func(complexScaleLast.y, e["valB"] * .01f, Mathf.Min(prog, 1f)) * AspectRatioHeight;
complexScale = new Vector3(dx, dy, 1);
break;
}
@ -346,13 +346,13 @@ namespace HeavenStudio
switch (e["axis"])
{
case (int) ViewAxis.X:
complexScaleLast.x = e["valA"] * AspectRatioWidth;
complexScaleLast.x = e["valA"] * .01f * AspectRatioWidth;
break;
case (int) ViewAxis.Y:
complexScaleLast.y = e["valB"] * AspectRatioHeight;
complexScaleLast.y = e["valB"] * .01f * AspectRatioHeight;
break;
default:
complexScaleLast = new Vector3(e["valA"] * AspectRatioWidth, e["valB"] * AspectRatioHeight, 1);
complexScaleLast = new Vector3(e["valA"] * .01f * AspectRatioWidth, e["valB"] * .01f * AspectRatioHeight, 1);
break;
}
}