Skip to content

Commit

Permalink
Added FOV controls
Browse files Browse the repository at this point in the history
  • Loading branch information
@OrangeSpork
OrangeSpork committed Jan 11, 2022
1 parent 1bceff2 commit f481d04
Show file tree
Hide file tree
Showing 9 changed files with 57 additions and 10 deletions.
Binary file modified AI_MoarCamz/Resources/moarcamzui.unity3d
View file
Binary file not shown.
Binary file added AI_MoarCamz/Resources/moarcamzui.unity3d.bak
View file
Binary file not shown.
Binary file modified HS2_MoarCamz/Resources/moarcamzui.unity3d
View file
Binary file not shown.
Binary file added HS2_MoarCamz/Resources/moarcamzui.unity3d.bak
View file
Binary file not shown.
Binary file modified KKS_MoarCamz/Resources/moarcamzui.unity3d
View file
Binary file not shown.
Binary file added KKS_MoarCamz/Resources/moarcamzui.unity3d.bak
View file
Binary file not shown.
Binary file modified KK_MoarCamz/Resources/moarcamzui.unity3d
View file
Binary file not shown.
Binary file added KK_MoarCamz/Resources/moarcamzui.unity3d.bak
View file
Binary file not shown.
67 changes: 57 additions & 10 deletions MoarCamz/MoarCamzPlugin.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class MoarCamzPlugin : BaseUnityPlugin
{
public const string GUID = "orange.spork.moarcamzplugin";
public const string PluginName = "MoarCamz";
public const string Version = "1.0.7";
public const string Version = "1.0.8";

public static MoarCamzPlugin Instance { get; private set; }

Expand Down Expand Up @@ -231,6 +231,8 @@ private void InitUI()
PositionButton = ui.transform.Find("Position/PositionButton").GetComponent<Button>();
RotationButton = ui.transform.Find("Rotation/RotationButton").GetComponent<Button>();
DistanceButton = ui.transform.Find("Distance/DistanceButton").GetComponent<Button>();
FOVButton = ui.transform.Find("FOV/FOVButton").GetComponent<Button>();
FOVSlider = ui.transform.Find("FOV/FOVSlider").GetComponent<Slider>();

#if KK
PositionX = ui.transform.Find("Position/PositionX").GetComponent<InputField>();
Expand All @@ -242,6 +244,8 @@ private void InitUI()
RotationZ = ui.transform.Find("Rotation/RotationZ").GetComponent<InputField>();

Distance = ui.transform.Find("Distance/Distance").GetComponent<InputField>();
FOV = ui.transform.Find("FOV/FOV").GetComponent<InputField>();

#else
PositionX = ui.transform.Find("Position/PositionX").GetComponent<TMP_InputField>();
PositionY = ui.transform.Find("Position/PositionY").GetComponent<TMP_InputField>();
Expand All @@ -252,8 +256,10 @@ private void InitUI()
RotationZ = ui.transform.Find("Rotation/RotationZ").GetComponent<TMP_InputField>();

Distance = ui.transform.Find("Distance/Distance").GetComponent<TMP_InputField>();
FOV = ui.transform.Find("FOV/FOV").GetComponent<TMP_InputField>();

#endif



ScrollNav = ui.transform.Find("ScrollNav").gameObject;
Expand Down Expand Up @@ -387,6 +393,26 @@ private void InitUI()
#endif
}
});
FOV.onEndEdit.AddListener((s) =>
{
if (int.TryParse(s, out int d))
{
SetFOV(d);
#if !KK
FOV.m_isSelected = false;
#endif
}
});
FOVSlider.minValue = 5;
FOVSlider.maxValue = 179;
FOVSlider.onValueChanged.AddListener((f) =>
{
SetFOV((int)f);
});
FOVButton.onClick.AddListener(() =>
{
SetFOV(23);
});

EventTrigger.Entry xzDragEvent = new EventTrigger.Entry();
xzDragEvent.eventID = EventTriggerType.Drag;
Expand Down Expand Up @@ -718,6 +744,13 @@ private void Update()

if (!Distance.isFocused)
Distance.text = string.Format("{0:F2}", -1 * Studio.Studio.Instance.cameraCtrl.cameraData.distance.z);

if (!FOV.isFocused)
{
FOV.text = string.Format("{0}", Studio.Studio.Instance.cameraCtrl.cameraData.parse);
FOVSlider.value = Studio.Studio.Instance.cameraCtrl.cameraData.parse;
}

}
for (int i = 0; i < MoarCamz.Count; i++)
{
Expand Down Expand Up @@ -808,7 +841,7 @@ public void PrevCamera()
private void LateUpdate()
{

}
}

private void SetPositionX(float x)
{
Expand Down Expand Up @@ -924,11 +957,21 @@ private void SetDistance(float distance)
Log.LogInfo($"Cam Pos: {Studio.Studio.Instance.cameraCtrl.cameraData.pos} Rot: {Studio.Studio.Instance.cameraCtrl.cameraData.rotate} Dis: {Studio.Studio.Instance.cameraCtrl.cameraData.distance}");
#endif
}

private void AddDistance(float d)
{
SetDistance((Studio.Studio.Instance.cameraCtrl.cameraData.distance.z * -1f) + d);
}

private void SetFOV(int fov)
{
Studio.Studio.Instance.cameraCtrl.cameraData.parse = fov;
Studio.Studio.Instance.cameraCtrl.fieldOfView = fov;
#if DEBUG
Log.LogInfo($"Cam FOV: {Studio.Studio.Instance.cameraCtrl.cameraData.parse});
#endif
}

private bool CompareCamData(CameraData first, CameraData second)
{
if (first == null && second == null)
Expand All @@ -939,7 +982,7 @@ private bool CompareCamData(CameraData first, CameraData second)
return false;
else
{
if (first.pos.Equals(second.pos) && first.rotate.Equals(second.rotate) && first.distance.Equals(second.distance))
if (first.pos.Equals(second.pos) && first.rotate.Equals(second.rotate) && first.distance.Equals(second.distance) && first.parse.Equals(second.parse))
return true;
else
return false;
Expand All @@ -960,14 +1003,14 @@ private bool CompareCamData(CameraData first, CameraData second, MoarCamzData mo
{
if (LockOnEnabled)
{
if (moarCamzData.OffsetPosition.Equals(OffsetPosition) && first.rotate.Equals(second.rotate) && first.distance.Equals(second.distance) && moarCamzData.CenterTarget == CenterTargetKey && CompareBoneNames(moarCamzData.CenterTargetBone, CenterTarget))
if (moarCamzData.OffsetPosition.Equals(OffsetPosition) && first.rotate.Equals(second.rotate) && first.distance.Equals(second.distance) && moarCamzData.CenterTarget == CenterTargetKey && CompareBoneNames(moarCamzData.CenterTargetBone, CenterTarget) && first.parse.Equals(second.parse))
return true;
else
return false;
}
else
{
if (first.pos.Equals(second.pos) && first.rotate.Equals(second.rotate) && first.distance.Equals(second.distance) && moarCamzData.CenterTarget == CenterTargetKey && CompareBoneNames(moarCamzData.CenterTargetBone, CenterTarget))
if (first.pos.Equals(second.pos) && first.rotate.Equals(second.rotate) && first.distance.Equals(second.distance) && moarCamzData.CenterTarget == CenterTargetKey && CompareBoneNames(moarCamzData.CenterTargetBone, CenterTarget) && first.parse.Equals(second.parse))
return true;
else
return false;
Expand Down Expand Up @@ -1004,14 +1047,14 @@ private bool CompareCamData(MoarCamzData first, CameraData second)
{
if (LockOnEnabled)
{
if (first.OffsetPosition.Equals(OffsetPosition) && first.Rotation.Equals(second.rotate) && first.Distance.Equals(second.distance) && first.CenterTarget == CenterTargetKey && CompareBoneNames(first.CenterTargetBone, CenterTarget))
if (first.OffsetPosition.Equals(OffsetPosition) && first.Rotation.Equals(second.rotate) && first.Distance.Equals(second.distance) && first.CenterTarget == CenterTargetKey && CompareBoneNames(first.CenterTargetBone, CenterTarget) && first.FOV.Equals(second.parse))
return true;
else
return false;
}
else
{
if (first.Position.Equals(second.pos) && first.Rotation.Equals(second.rotate) && first.Distance.Equals(second.distance) && first.CenterTarget == CenterTargetKey && CompareBoneNames(first.CenterTargetBone, CenterTarget))
if (first.Position.Equals(second.pos) && first.Rotation.Equals(second.rotate) && first.Distance.Equals(second.distance) && first.CenterTarget == CenterTargetKey && CompareBoneNames(first.CenterTargetBone, CenterTarget) && first.FOV.Equals(second.parse))
return true;
else
return false;
Expand All @@ -1031,14 +1074,14 @@ private bool CompareCamData(MoarCamzData first, CameraData second, bool checkExt
{
if (!checkExtended)
{
if (first.Position.Equals(second.pos) && first.Rotation.Equals(second.rotate) && first.Distance.Equals(second.distance))
if (first.Position.Equals(second.pos) && first.Rotation.Equals(second.rotate) && first.Distance.Equals(second.distance) && first.FOV.Equals(second.parse))
return true;
else
return false;
}
else
{
if (first.Position.Equals(second.pos) && first.Rotation.Equals(second.rotate) && first.Distance.Equals(second.distance) && first.CenterTarget == CenterTargetKey && CompareBoneNames(first.CenterTargetBone, CenterTarget))
if (first.Position.Equals(second.pos) && first.Rotation.Equals(second.rotate) && first.Distance.Equals(second.distance) && first.CenterTarget == CenterTargetKey && CompareBoneNames(first.CenterTargetBone, CenterTarget) && first.FOV.Equals(second.parse))
return true;
else
return false;
Expand Down Expand Up @@ -1175,15 +1218,19 @@ public void SetResetCam()
private Button PositionButton;
private Button RotationButton;
private Button DistanceButton;
private Button FOVButton;
private Slider FOVSlider;

#if KK
private InputField PositionX, PositionY, PositionZ;
private InputField RotationX, RotationY, RotationZ;
private InputField Distance;
private InputField FOV;
#else
private TMP_InputField PositionX, PositionY, PositionZ;
private TMP_InputField RotationX, RotationY, RotationZ;
private TMP_InputField Distance;
private TMP_InputField FOV;
#endif

private GameObject FastNav;
Expand Down

0 comments on commit f481d04

Please sign in to comment.