Merge remote-tracking branch 'upstream/master' into development

Author: Scoolnik

README.md

@@ -131,6 +131,7 @@ The original Unity Explorer had a Freecam feature, but even if it was useful at
 - Added tilt support.
 - Added FOV control support.
 - Added near and far clip sliders on the Freecam panel, to cut out objects near the camera out of view, or include more scene objects on sight.
+- Added new freecam methods to increase compatibility across games.
 - Automatically disable the Cinemachine component if present when using the gameplay camera, to avoid the game from trying to take control.
 - Added a toggle to block the freecam from moving with user input.
 - Unlocked the mouse on freecam even when the mod UI is hidden.
@@ -143,6 +144,10 @@ You can click on the "Follow object" button on the panel and select the object y
 
 By default the camera only follows the object's position, but you can also make it follow its rotation as if the camera was physically bound to the object by checking the "Follow Object Rotation" toggle. Should be useful for mimicking a car camera, a character POV, or creating motion blur.
 
+### Look At Object
+
+As a side note, you can also "look at" a specific object in the world to force the camera to look directly toward it no matter the camera movement.
+
 ### Game input block for Unity's legacy system
 
 Added game input block for Unity's legacy system. You can now block (or unblock) the game's input when using the freecam, as long as the game is using the Unity Legacy Input system. If the game uses a custom solution or the latest Unity system then this won't work. Implementing this for Unity's new system is in the backlog, so if you find a game using it (should say "Initialized new InputSystem support." on the logs) then please let me know so I can implement it using that game!
@@ -188,6 +193,7 @@ It allows you to create nodes to build camera paths for videos and cinematics. F
 - Wait 3 seconds before start toggler.
 - Move nodes up or down on the list.
 - Control over the tension and alpha values of the path, which are curve constants that change the resulting path created from the nodes. Their effect can be clearly seen when visualizing the path, as explained below.
+- Saving and loading camera paths to reuse them in different sessions.
 
 As a side note, the mod UI will be disabled once the path starts, to ease video recording.
 
@@ -215,6 +221,8 @@ Alongside all of this, you can also open each character game object by clicking
 
 For each animator, you can also spawn a Bones Panel. This panel will list all of the character's bones and meshes, and provide easy-to-access toggles to disable them and sliders to move them around, allowing you to pose a character to your liking.
 
+You can also save and load poses across different characters (if they have the same skeleton) and sessions.
+
 ## Misc Panel
 
 - HUD toggle.

UnityEditorPackage/Runtime/CinematicUnityExplorer.STANDALONE.Mono.dll

@@ -1,6 +1,6 @@
 {
   "name": "com.originalnicodr.cinematicunityexplorer",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "displayName": "CinematicUnityExplorer",
   "description": "UnityExplorer fork focused on providing tools for creating marketing material for Unity games.",
   "unity": "2017.1",

UnityEditorPackage/package.json

@@ -43,16 +43,19 @@ public virtual GameObject CreateContent(GameObject parent)
             ButtonRef copyFovButton = UIFactory.CreateButton(UIRoot, "Copy Camera FoV", "Copy Camera FoV");
             UIFactory.SetLayoutElement(copyFovButton.GameObject, minWidth: 100, minHeight: 25, flexibleWidth: 9999);
             copyFovButton.OnClick += () => {
-                point.fov = FreeCamPanel.ourCamera.fieldOfView;
-                GetCamPathsPanel().controlPoints[index] = point;
+                Camera freecam = FreeCamPanel.GetFreecam();
+                if (freecam != null) {
+                    point.fov = freecam.fieldOfView;
+                    GetCamPathsPanel().controlPoints[index] = point;
+                }
             };
 
             ButtonRef moveToPointButton = UIFactory.CreateButton(UIRoot, "Move Cam to Node", "Move Cam to Node");
             UIFactory.SetLayoutElement(moveToPointButton.GameObject, minWidth: 100, minHeight: 25, flexibleWidth: 9999);
             moveToPointButton.OnClick += () => {
                 FreeCamPanel.SetCameraRotation(point.rotation);
                 FreeCamPanel.SetCameraPosition(point.position);
-                FreeCamPanel.ourCamera.fieldOfView = point.fov;
+                FreeCamPanel.SetFOV(point.fov);
             };
 
             ButtonRef moveUpButton = UIFactory.CreateButton(UIRoot, "MoveUp", "▲");

src/Cinematic/Cells/CamPathNodeCell.cs

@@ -29,7 +29,7 @@ public virtual GameObject CreateContent(GameObject parent)
 
             //Active toggle
             Toggle toggleLight;
-            GameObject toggleObj = UIFactory.CreateToggle(UIRoot, "UseGameCameraToggle", out toggleLight, out label);
+            GameObject toggleObj = UIFactory.CreateToggle(UIRoot, "ActivateLightToggle", out toggleLight, out label);
             UIFactory.SetLayoutElement(toggleObj, minHeight: 25, flexibleWidth: 9999);
             toggleLight.onValueChanged.AddListener(value => { light.SetActive(value); });
             toggleLight.isOn = true;
@@ -90,7 +90,7 @@ private void DestroyLight(){
         }
 
         public static void CopyFreeCamTransform(GameObject obj){
-            Camera freeCam = FreeCamPanel.ourCamera;
+            Camera freeCam = FreeCamPanel.GetFreecam();
 
             if (freeCam != null) {
                 obj.transform.position = freeCam.transform.position;

src/Cinematic/Cells/LightCell.cs

@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Xml.Serialization;
+
+namespace UnityExplorer.Serializers
+{
+    public class CamPathSerializer
+    {
+        public static string Serialize(List<CatmullRom.CatmullRomPoint> points, float time, float alpha, float tension, bool closePath, string sceneName)
+        {
+            CamPathSerializeObject serializeObject = new CamPathSerializeObject(points, time, alpha, tension, closePath, sceneName);
+            var serializer = new XmlSerializer(typeof(CamPathSerializeObject));
+            using (var writer = new StringWriter())
+            {
+                serializer.Serialize(writer, serializeObject);
+                return writer.ToString();
+            }
+        }
+
+        public static CamPathSerializeObject Deserialize(string xml)
+        {
+            var serializer = new XmlSerializer(typeof(CamPathSerializeObject));
+            using (var reader = new StringReader(xml))
+            {
+                return ((CamPathSerializeObject)serializer.Deserialize(reader));
+            }
+        }
+    }
+
+    public struct CamPathSerializeObject
+    {
+        public CamPathSerializeObject(List<CatmullRom.CatmullRomPoint> points, float time, float alpha, float tension, bool closePath, string sceneName)
+        {
+            this.points = points;
+            this.time = time;
+            this.tension = tension;
+            this.alpha = alpha;
+            this.closePath = closePath;
+            this.sceneName = sceneName;
+        }
+
+        public readonly List<CatmullRom.CatmullRomPoint> points;
+        public readonly float time;
+        public readonly float alpha;
+        public readonly float tension;
+        public readonly bool closePath;
+        public readonly string sceneName;
+    }
+}

src/Cinematic/Serializers/CamPathSerializer.cs

@@ -1,4 +1,5 @@
 using UnityExplorer.UI;
+using UnityExplorer.UI.Panels;
 
 namespace UnityExplorer.Config
 {
@@ -30,8 +31,9 @@ public static class ConfigManager
         public static ConfigElement<string> Reflection_Signature_Blacklist;
         public static ConfigElement<bool> Reflection_Hide_NativeInfoPtrs;
         public static ConfigElement<bool> Auto_Scale_UI;
+        public static ConfigElement<bool> Reset_Camera_Transform;
 
-        public static ConfigElement<bool> Default_Gameplay_Freecam;
+        public static ConfigElement<FreeCamPanel.FreeCameraType> Default_Freecam;
         public static ConfigElement<KeyCode> Pause;
         public static ConfigElement<KeyCode> Frameskip;
         public static ConfigElement<KeyCode> Screenshot;
@@ -184,10 +186,14 @@ private static void CreateConfigElements()
             Auto_Scale_UI = new("Make the mod UI automatically scale with resolution",
                 "Especially useful when running games in high resolutions and you are having a hard time reading the mods menu (requires restart).",
                 true);
+            
+            Reset_Camera_Transform = new("Reset Camera transform on freecam disable",
+                "Reset the camera position and rotation between freecam sessions, so the freecam always starts from the gameplay position and rotation.",
+                false);
 
-            Default_Gameplay_Freecam = new("Default Gameplay Freecam",
-                "Turn this on if you want the default gameplay freecam toggle on the Freecam panel to be on on startup.",
-                true);
+            Default_Freecam = new("Default Freecam mode",
+                "Default type of freecam selected on startup.",
+                FreeCamPanel.FreeCameraType.New);
 
             Pause = new("Pause",
                 "Toggle the pause of the game.",

src/Config/ConfigManager.cs

@@ -20,7 +20,7 @@ namespace UnityExplorer
     public static class ExplorerCore
     {
         public const string NAME = "CinematicUnityExplorer";
-        public const string VERSION = "1.2.0.1";
+        public const string VERSION = "1.3.0.1";
         public const string AUTHOR = "originalnicodr, Sinai, yukieiji";
         public const string GUID = "com.originalnicodr.cinematicunityexplorer";
 
@@ -205,6 +205,8 @@ private static void MakeUEUIScale(){
             foreach (CanvasScaler scaler in canvasScalers)
             {
                 scaler.uiScaleMode = CanvasScaler.ScaleMode.ScaleWithScreenSize;
+                scaler.screenMatchMode = CanvasScaler.ScreenMatchMode.MatchWidthOrHeight;
+                scaler.matchWidthOrHeight = 0f;
             }
         }
     }

src/ExplorerCore.cs

@@ -8,6 +8,7 @@
 using UnityEngine;
 using UnityExplorer.Config;
 using UnityExplorer.UI;
+using UnityExplorer.UI.Panels;
 using UniverseLib;
 
 namespace UnityExplorer.Loader.Standalone
@@ -26,6 +27,9 @@ public class ExplorerEditorBehaviour : MonoBehaviour
         public bool Force_Unlock_Mouse = true;
         public KeyCode Force_Unlock_Toggle;
         public bool Disable_EventSystem_Override;
+        public bool Auto_Scale_UI;
+        public bool Reset_Camera_Transform;
+        public FreeCamPanel.FreeCameraType Default_Freecam;
 
         public KeyCode Pause;
         public KeyCode Frameskip;
@@ -80,6 +84,9 @@ internal void LoadConfigs()
             ConfigManager.Force_Unlock_Mouse.Value = this.Force_Unlock_Mouse;
             ConfigManager.Force_Unlock_Toggle.Value = this.Force_Unlock_Toggle;
             ConfigManager.Disable_EventSystem_Override.Value = this.Disable_EventSystem_Override;
+            ConfigManager.Auto_Scale_UI.Value = this.Auto_Scale_UI;
+            ConfigManager.Reset_Camera_Transform.Value = this.Reset_Camera_Transform;
+            ConfigManager.Default_Freecam.Value = this.Default_Freecam;
 
             ConfigManager.Pause.Value = this.Pause;
             ConfigManager.Frameskip.Value = this.Frameskip;

src/Loader/Standalone/Editor/ExplorerEditorBehaviour.cs

@@ -199,19 +199,19 @@ private void SaveBones(){
             }
 
             string filename = saveLoadinputField.Component.text;
-            if (filename.EndsWith(".xml") || filename.EndsWith(".XML")) filename = filename.Substring(filename.Length-4);
+            if (filename.EndsWith(".cuepose") || filename.EndsWith(".CUEPOSE")) filename = filename.Substring(filename.Length-7);
             if (string.IsNullOrEmpty(filename)) filename = $"{animator?.name}-{DateTime.Now.ToString("yyyy-M-d HH-mm-ss")}";
             string posesPath = Path.Combine(ExplorerCore.ExplorerFolder, "Poses");
             System.IO.Directory.CreateDirectory(posesPath);
 
             // Serialize
             string serializedData = BonesSerializer.Serialize(bonesTreeCache);
-            File.WriteAllText($"{posesPath}\\{filename}.xml", serializedData);
+            File.WriteAllText($"{posesPath}\\{filename}.cuepose", serializedData);
         }
 
         private void LoadBones(){
             string filename = saveLoadinputField.Component.text;
-            if (filename.EndsWith(".xml") || filename.EndsWith(".XML")) filename = filename.Substring(filename.Length-4);
+            if (filename.EndsWith(".cuepose") || filename.EndsWith(".CUEPOSE")) filename = filename.Substring(filename.Length-7);
             if (string.IsNullOrEmpty(filename)){
                 ExplorerCore.LogWarning("Empty file name. Please write the name of the file to load.");
                 return;
@@ -220,7 +220,7 @@ private void LoadBones(){
             string posesPath = Path.Combine(ExplorerCore.ExplorerFolder, "Poses");
             string xml;
             try {
-                xml = File.ReadAllText($"{posesPath}\\{filename}.xml");
+                xml = File.ReadAllText($"{posesPath}\\{filename}.cuepose");
             }
             catch (Exception ex) {
                 ExplorerCore.LogWarning(ex);