mirror/quantum-space-buddies
1
0
Fork 0
mirror of https://github.com/misternebula/quantum-space-buddies.git synced 2025-02-23 15:40:43 +00:00
Code Issues Projects Releases Wiki Activity

refactored tools (#109)

Browse Source
This commit is contained in:
AmazingAlek 2020-07-30 22:17:51 +02:00 committed by GitHub
parent c2763b186d
commit 3260c1acb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 55 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
QSB/Animation/QSBFlashlight.cs
View File

@ -1,14 +1,15 @@
using UnityEngine;
using OWML.ModHelper.Events;
using UnityEngine;
namespace QSB.Animation
{
public class QSBFlashlight : MonoBehaviour
{
public OWLight2[] _lights;
public OWLight2 _illuminationCheckLight;
public Transform _root;
public Transform _basePivot;
public Transform _wobblePivot;
private OWLight2[] _lights;
private OWLight2 _illuminationCheckLight;
private Transform _root;
private Transform _basePivot;
private Transform _wobblePivot;
private bool _flashlightOn;
private Vector3 _baseForward;
@ -20,6 +21,15 @@ namespace QSB.Animation
_baseRotation = _basePivot.rotation;
}
public void Init(Flashlight oldComponent)
{
_lights = oldComponent.GetValue<OWLight2[]>("_lights");
_illuminationCheckLight = oldComponent.GetValue<OWLight2>("_illuminationCheckLight");
_root = oldComponent.GetValue<Transform>("_root");
_basePivot = oldComponent.GetValue<Transform>("_basePivot");
_wobblePivot = oldComponent.GetValue<Transform>("_wobblePivot");
}
public void TurnOn()
{
if (_flashlightOn)

28
QSB/Animation/QSBTool.cs
View File

@ -4,8 +4,32 @@ namespace QSB.Animation
{
public class QSBTool : PlayerTool
{
public ToolType Type;
public GameObject ToolGameObject;
public ToolType Type { get; set; }
public GameObject ToolGameObject { get; set; }
public DampedSpringQuat MoveSpring
{
get => _moveSpring;
set => _moveSpring = value;
}
public Transform StowTransform
{
get => _stowTransform;
set => _stowTransform = value;
}
public Transform HoldTransform
{
get => _holdTransform;
set => _holdTransform = value;
}
public float ArrivalDegrees
{
get => _arrivalDegrees;
set => _arrivalDegrees = value;
}
private void OnEnable()
{

30
QSB/Utility/PlayerToolsManager.cs
View File

@ -20,7 +20,7 @@ namespace QSB.Utility
public static void Init(Transform camera)
{
_cameraBody = camera;
CreateStowTransforms(_cameraBody);
CreateStowTransforms();
_playerToolsMaterial = GameObject.Find("PlayerSuit_Jetpack").GetComponent<MeshRenderer>().materials[0];
_lightbulbMaterial = GameObject.Find("Props_HEA_Lantern (10)/Lantern_Lamp").GetComponent<MeshRenderer>().materials[0];
@ -30,17 +30,17 @@ namespace QSB.Utility
CreateTranslator();
}
private static void CreateStowTransforms(Transform root)
private static void CreateStowTransforms()
{
var stow = new GameObject("ToolStowTransform");
_toolStowTransform = stow.transform;
stow.transform.parent = root;
stow.transform.parent = _cameraBody;
stow.transform.localPosition = Vector3.zero;
stow.transform.localRotation = Quaternion.Euler(45f, 0f, 0f);
var hold = new GameObject("ToolHoldTransform");
_toolHoldTransform = hold.transform;
hold.transform.parent = root;
hold.transform.parent = _cameraBody;
hold.transform.localPosition = Vector3.zero;
hold.transform.localRotation = Quaternion.Euler(0f, 0f, 0f);
}
@ -51,11 +51,7 @@ namespace QSB.Utility
flashlightRoot.SetActive(false);
var oldComponent = flashlightRoot.GetComponent<Flashlight>();
var component = flashlightRoot.AddComponent<QSBFlashlight>();
component._lights = oldComponent.GetValue<OWLight2[]>("_lights");
component._illuminationCheckLight = oldComponent.GetValue<OWLight2>("_illuminationCheckLight");
component._root = oldComponent.GetValue<Transform>("_root");
component._basePivot = oldComponent.GetValue<Transform>("_basePivot");
component._wobblePivot = oldComponent.GetValue<Transform>("_wobblePivot");
component.Init(oldComponent);
oldComponent.enabled = false;
flashlightRoot.transform.parent = _cameraBody;
flashlightRoot.transform.localPosition = FlashlightOffset;
@ -73,10 +69,10 @@ namespace QSB.Utility
var oldSignalscope = signalscopeRoot.GetComponent<Signalscope>();
var tool = signalscopeRoot.AddComponent<QSBTool>();
tool.SetValue("_moveSpring", oldSignalscope.GetValue<DampedSpringQuat>("_moveSpring"));
tool.SetValue("_stowTransform", _toolStowTransform);
tool.SetValue("_holdTransform", _toolHoldTransform);
tool.SetValue("_arrivalDegrees", 5f);
tool.MoveSpring = oldSignalscope.GetValue<DampedSpringQuat>("_moveSpring");
tool.StowTransform = _toolStowTransform;
tool.HoldTransform = _toolHoldTransform;
tool.ArrivalDegrees = 5f;
tool.Type = ToolType.Signalscope;
tool.ToolGameObject = signalscopeRoot.transform.Find("Props_HEA_Signalscope").gameObject;
oldSignalscope.enabled = false;
@ -108,10 +104,10 @@ namespace QSB.Utility
var oldTranslator = translatorRoot.GetComponent<NomaiTranslator>();
var tool = translatorRoot.AddComponent<QSBTool>();
tool.SetValue("_moveSpring", oldTranslator.GetValue<DampedSpringQuat>("_moveSpring"));
tool.SetValue("_stowTransform", _toolStowTransform);
tool.SetValue("_holdTransform", _toolHoldTransform);
tool.SetValue("_arrivalDegrees", 5f);
tool.MoveSpring = oldTranslator.GetValue<DampedSpringQuat>("_moveSpring");
tool.StowTransform = _toolStowTransform;
tool.HoldTransform = _toolHoldTransform;
tool.ArrivalDegrees = 5f;
tool.Type = ToolType.Translator;
tool.ToolGameObject = group.gameObject;
oldTranslator.enabled = false;