janis/defrain-shooter-unity
1
0
Fork 0
mirror of https://github.com/DerTyp7/defrain-shooter-unity.git synced 2025-10-29 12:52:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Procedual Animation Hand Fix

Browse Source 
See "Procedual Animation Hand Fix" issue
This commit is contained in:
juliuse98
2021-11-28 20:21:47 +01:00
parent a4fb6b9f33
commit 58092d6b7e
18 changed files with 1479 additions and 3584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Assets/Objects/Human/Human.blend.meta
View File

@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: 94eb43ab67867914c9ac3de46caa4c67
ModelImporter:
serializedVersion: 21100
serializedVersion: 21202
internalIDToNameTable:
- first:
74: -623603649343465320
@@ -17,8 +17,10 @@ ModelImporter:
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
rigImportErrors:
rigImportErrors: "Copied Avatar Rig Configuration mis-match. Transform hierarchy
does not match:\n\tTransform 'Spine' for human bone 'Spine' not found\n"
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
@@ -26,7 +28,7 @@ ModelImporter:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationCompression: 3
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
@@ -46,6 +48,7 @@ ModelImporter:
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 0
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
@@ -57,6 +60,7 @@ ModelImporter:
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
@@ -91,13 +95,13 @@ ModelImporter:
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
hasExtraRoot: 1
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
animationType: 3
humanoidOversampling: 1
avatarSetup: 0
avatarSetup: 1
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
additionalBone: 0
userData:

12
Assets/Objects/Human/HumanAnimationControler.controller
View File

@@ -46,7 +46,7 @@ BlendTree:
m_Motion: {fileID: 5138602965388526686, guid: 97968620e18a7bb47b9b9d1407b00047, type: 3}
m_Threshold: 0.25
m_Position: {x: 1, y: 0}
m_TimeScale: 1
m_TimeScale: 2
m_CycleOffset: 0
m_DirectBlendParameter: Time
m_Mirror: 0
@@ -62,7 +62,7 @@ BlendTree:
m_Motion: {fileID: 5138602965388526686, guid: 97968620e18a7bb47b9b9d1407b00047, type: 3}
m_Threshold: 0.75
m_Position: {x: -1, y: 0}
m_TimeScale: -1
m_TimeScale: -2
m_CycleOffset: 0
m_DirectBlendParameter: Time
m_Mirror: 0
@@ -172,25 +172,25 @@ AnimatorController:
m_DefaultFloat: 1
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: Blend
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: x
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: y
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer

1098
Assets/Prefabs/Player/NewSimplePlayer.prefab
View File

File diff suppressed because it is too large Load Diff

7
Assets/Prefabs/Player/NewSimplePlayer.prefab.meta
View File

@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 815ba91b9da92294f8041b56643e5e15
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

1550
Assets/Prefabs/Player/Player Animation Test.prefab
View File

File diff suppressed because it is too large Load Diff

7
Assets/Prefabs/Player/Player Animation Test.prefab.meta
View File

@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: a14d876ac00bdf6498e30b3e58b68fdf
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

1571
Assets/Prefabs/Player/Player.prefab
View File

File diff suppressed because it is too large Load Diff

34
Assets/Scripts/Player/AimDownSights.cs
View File

@@ -1,34 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class AimDownSights : MonoBehaviour
{
[SerializeField] float aimSpeed = 0.01f;
[SerializeField][Range(0,1)] public float aimVal = 0;
[SerializeField] private GameObject gun;
[SerializeField] GameObject AimPoint;
[SerializeField] GameObject HoldPoint;
public bool isAiming = false;
bool ADS()
{
return true;
}
private void FixedUpdate()
{
if (Input.GetButton("Aim"))
{
isAiming = true;
aimVal += aimSpeed;
}
else
{
isAiming = false;
aimVal -= aimSpeed;
}
aimVal = Mathf.Clamp(aimVal,0,1);
gun.transform.position = Vector3.Lerp(HoldPoint.transform.position, AimPoint.transform.position,Mathf.Pow(aimVal,1.3f)) ;
}
}

11
Assets/Scripts/Player/AimDownSights.cs.meta
View File

@@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 916f2d37f60a91149bbca3280a1b69ec
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

78
Assets/Scripts/Player/Headbob.cs
View File

@@ -1,78 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Mirror;
public class Headbob : NetworkBehaviour
{
[SerializeField] private PlayerController playerController;
[SerializeField] private ShootAnimation gunAnimation;
[SerializeField] private float posCheckDistance = 0.01f;
[SerializeField] private float checkDist = 0.0f;
private float currentDist = 0;
[Header("Step Settings")]
[SerializeField] private float stepAmplitudeWalking;
[SerializeField] private float stepAmplitudeSprinting;
[SerializeField] [Range(0.01f, 10.0f)] private float stepFrequency;
[SerializeField] private Transform Neck;
private Vector3 lastPos;
private Vector3 startPos;
private Vector3 newPos;
private float oldDist = 0;
private float lerpVal = 0;
[Header("Gun Settings")]
[SerializeField] GameObject gunRotation;
[SerializeField] float rotationMultiplier = 0.1f;
private void Start()
{
lastPos = this.transform.position;
//startPos = this.transform.position;
}
private void Update()
{
float amplitude;
if (playerController.isGrounded)
{
lerpVal = 0;
float dist = Vector3.Distance(lastPos, this.transform.position);
if (playerController.isSprinting)
amplitude = stepAmplitudeSprinting;
else
amplitude = stepAmplitudeWalking;
if (dist > posCheckDistance)
{
currentDist += dist;
lastPos = this.transform.position;
}
else
{
checkDist = currentDist + dist;
}
gunAnimation.gunSideSwey(getSin(amplitude, stepFrequency/2, checkDist),playerController.inputDirection.magnitude);
newPos = new Vector3(getSin(amplitude / 2, stepFrequency, checkDist), getSin(amplitude, stepFrequency, checkDist), 0);
Neck.localPosition = newPos;
}
else
{
Neck.localPosition = Vector3.zero;
}
}
private float getSin(float multiplier, float devisor,float x)
{
return multiplier * Mathf.Sin((x/3.14f) * 10 * devisor);
}
}

11
Assets/Scripts/Player/Headbob.cs.meta
View File

@@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 4db7caf602ce379408a59c8722e06e46
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

28
Assets/Scripts/Player/PlayerColor.cs
View File

@@ -1,28 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Mirror;
public class PlayerColor : NetworkBehaviour
{
[SyncVar(hook = "SetColor")]
public Color color;
public Renderer renderer;
void SetColor(Color oldColor, Color newColor)
{
if (color == null)
{
color = renderer.material.color;
}
renderer.material.color = newColor;
color = newColor;
}
public override void OnStartClient()
{
renderer.material.color = color;
}
}

11
Assets/Scripts/Player/PlayerColor.cs.meta
View File

@@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 00dc60b61b501f2419e2abd7158be5f8
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

1
Assets/Scripts/Player/PlayerController.cs
View File

@@ -161,7 +161,6 @@ public class PlayerController : NetworkBehaviour
moveDirection = new Vector3(moveDirection.x, 0, moveDirection.z);
currentDir = moveDirection;
}
Debug.Log(currentMaxSpeed);
velocity = Vector3.SmoothDamp(velocity, currentDir * currentMaxSpeed + new Vector3(0, velocityY, 0),ref refVelocity,moveSmoothTime);
localVelocity = transform.InverseTransformDirection(velocity);
controller.Move(velocity * Time.deltaTime);

32
Assets/Scripts/Player/ProcedualAnimationController.cs
View File

@@ -5,6 +5,14 @@ using Mirror;
public class ProcedualAnimationController : NetworkBehaviour
{
[Header("Hand Settings")]
[SerializeField] private Transform rightHandREF;
[SerializeField] private Transform leftHandREF;
[SerializeField] private Transform gunRightHandREF;
[SerializeField] private Transform gunLeftHandREF;
[SerializeField] private Vector3 defaultRightHandPosition = Vector3.zero;
[SerializeField] private Vector3 defaultLeftHandPosition = Vector3.zero;
[Header("Step Settings")]
[SerializeField] private float stepAmplitudeWalking;
@@ -99,6 +107,28 @@ public class ProcedualAnimationController : NetworkBehaviour
playerAnimator.SetFloat("x", playerController.localVelocity.x / playerController.currentMaxSpeed);
playerAnimator.SetFloat("y", playerController.localVelocity.z / playerController.currentMaxSpeed);
}
public void handPositioning()
{
if (gunRightHandREF != null)
{
rightHandREF.position = gunRightHandREF.position;
rightHandREF.rotation = gunRightHandREF.rotation;
}
else
{
rightHandREF.position = defaultRightHandPosition;
}
if (gunLeftHandREF != null)
{
leftHandREF.position = gunLeftHandREF.position;
leftHandREF.rotation = gunLeftHandREF.rotation;
}
else
{
leftHandREF.position = defaultLeftHandPosition;
}
}
public void OnSwitchWeapon(GameObject currentWeapon)
{
if (isLocalPlayer) {
@@ -141,7 +171,7 @@ public class ProcedualAnimationController : NetworkBehaviour
if (isLocalPlayer)
{
walkAnimation();
handPositioning();
CmdAim(Input.GetButton("Aim"));
}
/*-----Aiming-----*/

156
Assets/Scripts/Weapons/ShootAnimation.cs
View File

@@ -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);
}
}
}

11
Assets/Scripts/Weapons/ShootAnimation.cs.meta
View File

@@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: b366149a1bdd3ad4884ac2afe0fe11a1
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: