New movement in work

2022-03-03 07:29:00 +01:00
parent 1fb4ef72a4
commit 5fedd586a1
5 changed files with 189 additions and 167 deletions
--- a/3D/Assets/Scenes/Main.unity
+++ b/3D/Assets/Scenes/Main.unity
@@ -38,7 +38,7 @@ RenderSettings:
  m_ReflectionIntensity: 1
  m_CustomReflection: {fileID: 0}
  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.5748171, a: 1}
  m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -206,89 +206,6 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!1001 &594617921
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: -8679921383154817045, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 10
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 10
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 10
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -6.0409164
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 64.87306
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -53.86888
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -7171607895111325692, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -5477749408508380018, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3}
-      propertyPath: m_RootOrder
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: -2021178655527167927, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3}
-      propertyPath: m_Name
-      value: Tank 1
-      objectReference: {fileID: 0}
-    m_RemovedComponents:
-    - {fileID: -1853094968961178454, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3}
-    - {fileID: 3725102176391765030, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3}
-  m_SourcePrefab: {fileID: 100100000, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3}
 --- !u!1 &598081035
 GameObject:
  m_ObjectHideFlags: 0
@@ -419,7 +336,7 @@ Rigidbody:
  m_IsKinematic: 0
  m_Interpolate: 0
  m_Constraints: 0
-  m_CollisionDetection: 1
+  m_CollisionDetection: 0
 --- !u!114 &915004375
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -429,13 +346,10 @@ MonoBehaviour:
  m_GameObject: {fileID: 915004373}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3d1003961d12b50469d57cf00114c3f4, type: 3}
+  m_Script: {fileID: 11500000, guid: ac60c4a928e1042438bc00bd2f70af0a, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  movespeed: 30
-  rb: {fileID: 915004374}
-  movement: {x: 0, y: 0, z: 0}
-  rotation: {x: 0, y: 0, z: 0}
+  playerMovement: {fileID: 915004380}
 --- !u!65 &915004376
 BoxCollider:
  m_ObjectHideFlags: 0
@@ -521,78 +435,110 @@ MonoBehaviour:
  m_GameObject: {fileID: 915004373}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ac60c4a928e1042438bc00bd2f70af0a, type: 3}
+  m_Script: {fileID: 11500000, guid: 3d1003961d12b50469d57cf00114c3f4, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  playerMovement: {fileID: 915004375}
--- !u!1 &1209288074 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: -8391222552659086748, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3}
-  m_PrefabInstance: {fileID: 594617921}
-  m_PrefabAsset: {fileID: 0}
+  movespeed: 15
+  rb: {fileID: 915004374}
+  movement: {x: 0, y: 0, z: 0}
+  rotation: {x: 0, y: 0, z: 0}
 --- !u!65 &1209288078
 BoxCollider:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1209288074}
+  m_GameObject: {fileID: 832149484756735013}
  m_Material: {fileID: 0}
  m_IsTrigger: 0
  m_Enabled: 1
  serializedVersion: 2
  m_Size: {x: 3.6340976, y: 4.530515, z: 3.2187436}
  m_Center: {x: 0, y: 0.07058166, z: 0.45564726}
--- !u!1 &1448135152 stripped
+--- !u!4 &543450653147283882
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 919132148676172560}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -6.0409164, y: 64.87306, z: -53.86888}
+  m_LocalScale: {x: 10, y: 10, z: 10}
+  m_Children:
+  - {fileID: 3745622627825310415}
+  m_Father: {fileID: 0}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &832149484756735013
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3}
-  m_PrefabInstance: {fileID: 594617921}
-  m_PrefabAsset: {fileID: 0}
--- !u!114 &1448135154
-MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1448135152}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3745622627825310415}
+  - component: {fileID: 5334037119917370449}
+  - component: {fileID: 4539702727796617358}
+  - component: {fileID: 1209288078}
+  - component: {fileID: 832149484756735015}
+  - component: {fileID: 832149484756735014}
+  m_Layer: 0
+  m_Name: Cube
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!143 &832149484756735014
+CharacterController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 832149484756735013}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ac60c4a928e1042438bc00bd2f70af0a, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  playerMovement: {fileID: 1448135155}
--- !u!114 &1448135155
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1448135152}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3d1003961d12b50469d57cf00114c3f4, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  movespeed: 15
-  rb: {fileID: 1448135156}
-  movement: {x: 0, y: 0, z: 0}
-  rotation: {x: 0, y: 0, z: 0}
--- !u!54 &1448135156
-Rigidbody:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1448135152}
  serializedVersion: 2
-  m_Mass: 1
-  m_Drag: 0
-  m_AngularDrag: 0.05
-  m_UseGravity: 1
-  m_IsKinematic: 0
-  m_Interpolate: 0
-  m_Constraints: 0
-  m_CollisionDetection: 0
+  m_Height: 4.6716785
+  m_Radius: 2.0650191
+  m_SlopeLimit: 45
+  m_StepOffset: 0.3
+  m_SkinWidth: 0.08
+  m_MinMoveDistance: 0.001
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &832149484756735015
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 832149484756735013}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a2650ec0c90cfb74da510d0f0961bab4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  controller: {fileID: 832149484756735014}
+  speed: 15
+--- !u!1 &919132148676172560
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 543450653147283882}
+  m_Layer: 0
+  m_Name: Tank 1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1001 &2271212633275908120
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -730,3 +676,74 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 97fd77a6e795be94a94adfb881cd3bf3, type: 3}
+--- !u!4 &3745622627825310415
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 832149484756735013}
+  m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: -0, y: 2.0031369, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 543450653147283882}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
+--- !u!23 &4539702727796617358
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 832149484756735013}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: -7316598087742248325, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3}
+  - {fileID: -7620096366412119848, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3}
+  - {fileID: 4150785142872711056, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3}
+  - {fileID: -2337025540300520294, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3}
+  - {fileID: -8669568717249319911, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3}
+  - {fileID: 3633462617325354397, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3}
+  - {fileID: -213150381197032823, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3}
+  - {fileID: 4874126678125670354, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3}
+  - {fileID: -3846018093981099296, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &5334037119917370449
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 832149484756735013}
+  m_Mesh: {fileID: -5495902117074765545, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3}
--- a/3D/Assets/Scripts/PlayerMovement.cs
+++ b/3D/Assets/Scripts/PlayerMovement.cs
@@ -1,24 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class PlayerMovement : MonoBehaviour
-{
-    public float movespeed = 15f;
-
-    public Rigidbody2D rb;
-    Vector2 movement;
-    // Update is called once per frame
-
-    void Update()
-    {
-        //Input
-        movement.x = Input.GetAxisRaw("Horizontal");
-        movement.y = Input.GetAxisRaw("Vertical");
-    }
-
-    void FixedUpdate() {
-        //Movement
-        rb.MovePosition(rb.position + movement * movespeed * Time.fixedDeltaTime);
-    }
-}
--- a/3D/Assets/Scripts/PlayerMovement3d.cs
+++ b/3D/Assets/Scripts/PlayerMovement3d.cs
@@ -24,6 +24,6 @@ public class PlayerMovement3d : MonoBehaviour
        //Movement
        rb.MovePosition(rb.position + movement * movespeed * Time.deltaTime);
        //rb.AddForce(rb.position + movement * movespeed * Time.deltaTime);
-        rb.MoveRotation(rb.rotation * Quaternion.Euler(rotation.x, rotation.y, rotation.z));
+        rb.MoveRotation(rb.rotation * Quaternion.Euler(0f, rotation.y, 0f));
    }
 }
--- a/3D/Assets/Scripts/TestMovement.cs
+++ b/3D/Assets/Scripts/TestMovement.cs
@@ -0,0 +1,29 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class TestMovement : MonoBehaviour
+{
+    public CharacterController controller;
+
+    public float speed = 15f;
+    public float turnSmoothness = 0.1f;
+    float turnSmoothVelocity;
+    float x, y;
+    Vector3 direction;
+    
+    void Update()
+    {
+        x = Input.GetAxisRaw("Horizontal");   
+        y = Input.GetAxisRaw("Vertical");
+        direction = new Vector3(x, 0f, y).normalized;
+
+        if (direction.magnitude >= 0.1f) {
+            float targetAngle = Mathf.Atan2(direction.x, direction.z) * Mathf.Rad2Deg;
+            float angle = Mathf.SmoothDampAngle(transform.eulerAngles.z, targetAngle, ref turnSmoothVelocity, turnSmoothness);
+            transform.rotation = Quaternion.Euler(-90f, angle, 0f);
+
+            controller.Move(direction * speed * Time.deltaTime);
+        }
+    }
+}
--- a/3D/Assets/Scripts/PlayerMovement.cs.meta
+++ b/3D/Assets/Scripts/PlayerMovement.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: fda61d03b14c837488d1c1b99723d96c
+guid: a2650ec0c90cfb74da510d0f0961bab4
 MonoImporter:
  externalObjects: {}
  serializedVersion: 2