mirror of
https://github.com/DerTyp7/defrain-shooter-unity.git
synced 2025-10-29 20:52:10 +01:00
Procedual Animation Hand Fix
See "Procedual Animation Hand Fix" issue
This commit is contained in:
@@ -1,156 +0,0 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class ShootAnimation : MonoBehaviour
|
||||
{
|
||||
|
||||
[Header("GameObjects")]
|
||||
[SerializeField] private GameObject gun;
|
||||
[SerializeField] private GameObject gunHolder;
|
||||
[SerializeField] private GameObject gunPositionObj;
|
||||
[SerializeField] private GameObject gunRotationObj;
|
||||
|
||||
|
||||
[Header("Settings")]
|
||||
[SerializeField] bool positionRecoil = true;
|
||||
[SerializeField] bool rotationRecoil = true;
|
||||
|
||||
[Header("Position Settings")]
|
||||
[SerializeField] float positionMultX = 25f;
|
||||
[SerializeField] float positionMultY = 25f;
|
||||
[SerializeField] float positionMultZ = 25f;
|
||||
|
||||
[Header("Rotation Settings")]
|
||||
[SerializeField] PlayerMouseLook playerMouseLook;
|
||||
[SerializeField] float cameraRecoilX = 0.1f;
|
||||
[SerializeField] float cameraRecoilY = 0.1f;
|
||||
|
||||
|
||||
[SerializeField] bool rotX = true;
|
||||
[SerializeField] float rotationMultX = 25f;
|
||||
[SerializeField] float rotationOffsetX = 0.1f;
|
||||
[SerializeField] bool rotY = true;
|
||||
[SerializeField] float rotationMultY = 25f;
|
||||
[SerializeField] bool rotZ = true;
|
||||
[SerializeField] float rotationMultZ = 15f;
|
||||
|
||||
[Header("Swey Settings")]
|
||||
[SerializeField] AimDownSights ADSController;
|
||||
[SerializeField] bool sideSwey = true;
|
||||
[SerializeField] float sweyMult = 15f;
|
||||
[SerializeField] float sweyWhileAim = 0.1f;
|
||||
float swey = 0f;
|
||||
|
||||
|
||||
|
||||
[SerializeField] float returnForce = 0.006f;
|
||||
[SerializeField] float impulsForce = 0.025f;
|
||||
[SerializeField] float maxRecoil = 0.1f;
|
||||
|
||||
private Animator anim;
|
||||
|
||||
Vector3 startPos,startRot;
|
||||
|
||||
float zOffset = 0f;
|
||||
float zVelocity = 0f;
|
||||
|
||||
int recoilCounter = 0;
|
||||
|
||||
//Has to be called once at the beginning and then again when switching guns
|
||||
public void OnSwitchWeapon(float fireRate)
|
||||
{
|
||||
//gun = newGun;
|
||||
anim = gun.GetComponent<Animator>();
|
||||
anim.SetFloat("ShootSpeed",1f/(60f/fireRate));
|
||||
startPos = gunPositionObj.transform.localPosition;
|
||||
startRot = gunRotationObj.transform.localRotation.eulerAngles;
|
||||
}
|
||||
|
||||
|
||||
public void recoil(float force)
|
||||
{
|
||||
//Play the animation
|
||||
anim.Play("Shoot");
|
||||
playerMouseLook.fullPitch -= cameraRecoilX * Mathf.PerlinNoise(Time.time * 3f + 10f, 1f);
|
||||
transform.Rotate(Vector3.up * ((Mathf.PerlinNoise(Time.time * 1f + 10f, 1f) - 0.5f) * 2f) * cameraRecoilY);
|
||||
//Add force for the recoil
|
||||
recoilCounter++;
|
||||
}
|
||||
|
||||
public void gunSideSwey(float sinVal,float moveInput)
|
||||
{
|
||||
|
||||
swey = (sweyMult * sinVal * moveInput * 0.7f
|
||||
+ sweyMult * sinVal * moveInput * ((Mathf.PerlinNoise(Time.time * 1f + 10f, 1f) - 0.5f) * 2f) * 0.3f) * Mathf.Clamp((1 - ADSController.aimVal) * (1 - ADSController.aimVal), sweyWhileAim,1f);
|
||||
|
||||
}
|
||||
|
||||
|
||||
void FixedUpdate()
|
||||
{
|
||||
//Apply recoil based on the number of shots fired
|
||||
for (int i = 0; i < recoilCounter; i++)
|
||||
{
|
||||
zVelocity -= impulsForce * 0.9f + impulsForce * 0.1f * Mathf.PerlinNoise(i,1f);
|
||||
}
|
||||
recoilCounter = 0;
|
||||
|
||||
|
||||
zOffset += zVelocity;
|
||||
|
||||
if (zOffset > 0)
|
||||
{
|
||||
zOffset = 0f;
|
||||
zVelocity = 0f;
|
||||
}
|
||||
else if (zOffset < 0)
|
||||
{
|
||||
zVelocity += returnForce * 0.9f + returnForce * 0.1f * Mathf.PerlinNoise(Time.time,1f);
|
||||
|
||||
}
|
||||
|
||||
zOffset = Mathf.Clamp(zOffset,-maxRecoil * 0.5f + -maxRecoil * 0.5f * Mathf.PerlinNoise(Time.time * 1000,1),0);
|
||||
|
||||
//Position recoil
|
||||
if (positionRecoil)
|
||||
{
|
||||
int sideLock = 0;
|
||||
|
||||
if (sideSwey) sideLock = 1;
|
||||
gunPositionObj.transform.localPosition = startPos + new Vector3(
|
||||
positionMultX * zOffset * ((Mathf.PerlinNoise(Time.time * 1f + 10f, 1f) - 0.5f) * 2f) + sideLock * swey,
|
||||
positionMultY * zOffset * Mathf.PerlinNoise(Time.time * 2f + 20f, 2f),
|
||||
positionMultZ* zOffset * ((Mathf.PerlinNoise(Time.time * 3f + 30f, 3f) - 0.5f) * 2f));
|
||||
}
|
||||
else
|
||||
{
|
||||
gunPositionObj.transform.localPosition = startPos;
|
||||
}
|
||||
|
||||
//Rotation recoil
|
||||
if (rotationRecoil)
|
||||
{
|
||||
int xLock = 0;
|
||||
int yLock = 0;
|
||||
int zLock = 0;
|
||||
|
||||
|
||||
if (rotX) xLock = 1;
|
||||
if (rotY) yLock = 1;
|
||||
if (rotZ) zLock = 1;
|
||||
|
||||
|
||||
gunRotationObj.transform.localRotation = Quaternion.Euler(
|
||||
startRot.x + xLock * rotationMultX * zOffset * Mathf.PerlinNoise(Time.time * 3f + 30f, 4f),
|
||||
startRot.y + yLock * rotationMultY * zOffset * ((Mathf.PerlinNoise(Time.time * 2f + 10f, 3f) - 0.5f) * 2f),
|
||||
startRot.z + zLock * rotationMultZ * zOffset * ((Mathf.PerlinNoise(Time.time * 1.5f, 2f) - 0.5f) * 2f));
|
||||
}
|
||||
else
|
||||
{
|
||||
gunRotationObj.transform.localRotation = Quaternion.Euler(startRot.x, startRot.y, startRot.z);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b366149a1bdd3ad4884ac2afe0fe11a1
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in New Issue
Block a user