Fixed screenshots using the wrong camera.

Fixed screenshot file paths displaying incorrectly.
Added a discord link.
This commit is contained in:
Katboi01
2023-11-05 19:45:32 +01:00
parent 2915e0408a
commit 0897daf89c
6 changed files with 221 additions and 555 deletions
+10 -3
View File
@@ -19,7 +19,7 @@ public class Screenshot : MonoBehaviour
public static void TakeScreenshot()
{
var camera = UmaViewerBuilder.Instance.AnimationCamera.GetComponent<Camera>().enabled ? UmaViewerBuilder.Instance.AnimationCamera : Camera.main;
var camera = GetActiveCamera();
int width = int.Parse(UmaViewerUI.Instance.SSWidth.text);
int height = int.Parse(UmaViewerUI.Instance.SSHeight.text);
width = width == -1 ? Screen.width : width;
@@ -29,7 +29,8 @@ public class Screenshot : MonoBehaviour
string fileName = Application.dataPath + "/../Screenshots/" + string.Format("UmaViewer_{0}", DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss-fff"));
byte[] pngShot = ImageConversion.EncodeToPNG(image);
Directory.CreateDirectory(Application.dataPath + "/../Screenshots");
var fullpath = $"{fileName}.png";
//fixes "/../" in path
var fullpath = Path.GetFullPath($"{fileName}.png");
File.WriteAllBytes(fullpath, pngShot);
UmaViewerUI.Instance.ShowMessage($"Screenshot saved: {fullpath}", UIMessageType.Success);
Destroy(image);
@@ -47,7 +48,7 @@ public class Screenshot : MonoBehaviour
private IEnumerator RecordGif(int width, int height, bool transparent, int quality)
{
var camera = UmaViewerBuilder.Instance.AnimationCamera.GetComponent<Camera>().enabled ? UmaViewerBuilder.Instance.AnimationCamera : Camera.main;
var camera = GetActiveCamera();
var ppLayer = camera.GetComponent<PostProcessLayer>();
bool oldPpState = ppLayer.enabled;
ppLayer.enabled = false;
@@ -127,6 +128,12 @@ public class Screenshot : MonoBehaviour
return tex_color;
}
private static Camera GetActiveCamera()
{
//sometimes animation camera gameobject is enabled even when camera component is disabled
return UmaViewerBuilder.Instance.AnimationCamera.isActiveAndEnabled ? UmaViewerBuilder.Instance.AnimationCamera : Camera.main;
}
public static Vector2Int GetResolution(int width, int height)
{
if (width == 0 && height == 0)
+3 -2
View File
@@ -39,8 +39,9 @@ namespace uGIF
while(bytes == null) yield return new WaitForEndOfFrame();
string fileName = Application.dataPath + "/../Screenshots/" + string.Format("UmaViewer_{0}", DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss-fff"));
Directory.CreateDirectory(Application.dataPath + "/../Screenshots");
var fullpath = $"{fileName}.gif";
File.WriteAllBytes(fullpath, bytes);
//fixes "/../" in path
var fullpath = Path.GetFullPath($"{fileName}.gif");
File.WriteAllBytes(fullpath, bytes);
bytes = null;
UmaViewerUI.Instance.ShowMessage($"GIF saved: {fullpath}", UIMessageType.Success);
Frames.Clear();