mirror/quantum-space-buddies
1
0
Fork 0
mirror of https://github.com/misternebula/quantum-space-buddies.git synced 2025-02-04 12:39:52 +00:00
Code Issues Projects Releases Wiki Activity

add clip prevention to camera

Browse Source
This commit is contained in:
Mister_Nebula 2020-11-01 11:52:31 +00:00
parent 69d11c805b
commit b61e95afb9
4 changed files with 39 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
QSB/Instruments/InstrumentsManager.cs
View File

@ -1,8 +1,4 @@
using QSB.Instruments.QSBCamera; using QSB.Instruments.QSBCamera;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using UnityEngine; using UnityEngine;
namespace QSB.Instruments namespace QSB.Instruments

42
QSB/Instruments/QSBCamera/CameraController.cs
View File

@ -1,8 +1,4 @@
using System; using UnityEngine;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using UnityEngine;
namespace QSB.Instruments.QSBCamera namespace QSB.Instruments.QSBCamera
{ {
@ -13,16 +9,50 @@ namespace QSB.Instruments.QSBCamera
private Quaternion _rotationX; private Quaternion _rotationX;
private Quaternion _rotationY; private Quaternion _rotationY;
private const float PercentToMove = 0.75f;
public GameObject CameraObject;
void FixedUpdate() void FixedUpdate()
{ {
if (CameraManager.Instance.Mode != CameraMode.ThirdPerson) if (CameraManager.Instance.Mode != CameraMode.ThirdPerson)
{ {
return; return;
} }
UpdatePosition();
UpdateInput(); UpdateInput();
UpdateRotation(); UpdateRotation();
} }
private void UpdatePosition()
{
var origin = transform.position;
var localDirection = CameraObject.transform.localPosition.normalized;
Vector3 localTargetPoint;
if (Physics.Raycast(origin, transform.TransformDirection(localDirection), out RaycastHit outRay, 10, LayerMask.GetMask("Default")))
{
localTargetPoint = transform.InverseTransformPoint(outRay.point) * PercentToMove;
}
else
{
localTargetPoint = localDirection * 10 * PercentToMove;
}
var targetDistance = Vector3.Distance(origin, transform.TransformPoint(localTargetPoint));
var currentDistance = Vector3.Distance(origin, CameraObject.transform.position);
Vector3 movement;
if (targetDistance < currentDistance)
{
// Snap to target to avoid clipping
movement = localTargetPoint;
}
else
{
// Move camera out slowly
movement = Vector3.MoveTowards(CameraObject.transform.localPosition, localTargetPoint, Time.fixedDeltaTime * 2f);
}
CameraObject.transform.localPosition = movement;
}
private void UpdateInput() private void UpdateInput()
{ {
var input = OWInput.GetValue(InputLibrary.look, false, InputMode.All); var input = OWInput.GetValue(InputLibrary.look, false, InputMode.All);
@ -38,7 +68,7 @@ namespace QSB.Instruments.QSBCamera
_rotationX = Quaternion.AngleAxis(_degreesX, Vector3.up); _rotationX = Quaternion.AngleAxis(_degreesX, Vector3.up);
_rotationY = Quaternion.AngleAxis(_degreesY, -Vector3.right); _rotationY = Quaternion.AngleAxis(_degreesY, -Vector3.right);
var localRotation = _rotationX * _rotationY * Quaternion.identity; var localRotation = _rotationX * _rotationY * Quaternion.identity;
gameObject.transform.parent.localRotation = localRotation; transform.localRotation = localRotation;
} }
} }
} }

8
QSB/Instruments/QSBCamera/CameraManager.cs
View File

@ -1,11 +1,6 @@
using OWML.Common; using OWML.Common;
using QSB.Utility; using QSB.Utility;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using UnityEngine; using UnityEngine;
using UnityEngine.PostProcessing;
namespace QSB.Instruments.QSBCamera namespace QSB.Instruments.QSBCamera
{ {
@ -59,7 +54,8 @@ namespace QSB.Instruments.QSBCamera
Camera.enabled = false; Camera.enabled = false;
OWCamera = CameraObj.AddComponent<OWCamera>(); OWCamera = CameraObj.AddComponent<OWCamera>();
OWCamera.renderSkybox = true; OWCamera.renderSkybox = true;
CameraObj.AddComponent<CameraController>();
CameraBase.AddComponent<CameraController>().CameraObject = CameraObj;
var screenGrab = CameraObj.AddComponent<FlashbackScreenGrabImageEffect>(); var screenGrab = CameraObj.AddComponent<FlashbackScreenGrabImageEffect>();
screenGrab._downsampleShader = Locator.GetPlayerCamera().gameObject.GetComponent<FlashbackScreenGrabImageEffect>()._downsampleShader; screenGrab._downsampleShader = Locator.GetPlayerCamera().gameObject.GetComponent<FlashbackScreenGrabImageEffect>()._downsampleShader;

7
QSB/Instruments/QSBCamera/CameraMode.cs
View File

@ -1,9 +1,4 @@
using System; namespace QSB.Instruments.QSBCamera
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace QSB.Instruments.QSBCamera
{ {
public enum CameraMode public enum CameraMode
{ {