Replaced character controller with rigidbody and fixed all player controller script errors - player character can only spin in place

.gitignore

@@ -5,8 +5,8 @@
 /[Ll]ibrary/
 /[Tt]emp/
 /[Oo]bj/
-/[Bb]uild*/
+/[Bb]uild/
-/[Bb]uilds*/
+/[Bb]uilds/
 /[Ll]ogs/
 /[Mm]emoryCaptures/
 

Assets/Materials/Prototype checker.mat

@@ -1,77 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Prototype checker
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 5, y: 5}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 10309, guid: 0000000000000000f000000000000000, type: 0}
-        m_Scale: {x: 5, y: 5}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Floats:
-    - _BumpScale: 1
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _GlossyReflections: 1
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _UVSec: 0
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Materials/Prototype checker.mat.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4995e529222357e47a1b77d2e400ff1d
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/PlayerController.cs

@@ -9,206 +9,78 @@ using System.Collections;
 
 public class PlayerController : MonoBehaviour
 {
-    CharacterController characterController;
+    Rigidbody rb;
-    CapsuleCollider capsule;
 
-    public float maxSpeed;
+    public float speed;
-    public float acceleration;
+    public float jumpSpeed;
-    public float friction;
-    public float jumpHeight;
     public float gravity;
     public float rotationSpeed;
     public Transform pivot;
     public GameObject playerModel;
 
-    private bool wallRunning = false;
+    private bool extraJump = true;
-    private int jump = 0;
+    private float distToGround;
-    private int wall = 0;
-    private float maxSpeedStore;
-    private float maxSpeedCap = 100;
-    private float accelerationStore;
-    private float capsuleHeight;
-    private float controllerHeight;
-    private float transformHeight;
-    private float xVelocity = 0.0f;
-    private float zVelocity = 0.0f;
     private Vector3 moveDirection;
-    private Vector3 velocity;
-
-    float startTime = 0.0f;
-    float oneSec = 1.0f;
 
     void Start()
     {
-        characterController = GetComponent<CharacterController>();
+        rb = GetComponent<Rigidbody>();
-        capsule = GetComponent<CapsuleCollider>();
-        transformHeight = transform.localScale.y;
-        controllerHeight = characterController.height;
-        capsuleHeight = capsule.height;
-        maxSpeedStore = maxSpeed;
-        accelerationStore = acceleration;
     }
 
-    void OnControllerColliderHit(ControllerColliderHit hit)
+    bool IsGrounded(){
-    {
+        return Physics.Raycast(transform.position, -Vector3.up, distToGround + 0.1f);
-
-        if(hit.gameObject.tag == "Wall")
-        {
-            wallRunning = true;
-            wall++;
     }
 
-    }
+    void FixedUpdate()
-
-    void Update()
     {
 
         float yStore = moveDirection.y;
-        moveDirection = new Vector3(Input.GetAxis("Horizontal"), moveDirection.y, Input.GetAxis("Vertical"));
+        //Need to switch to 'raw' when using keyboard
-        moveDirection = transform.TransformDirection(moveDirection);
+        moveDirection = (transform.forward * Input.GetAxis("Vertical")) + (transform.right * Input.GetAxis("Horizontal"));
-        moveDirection = Vector3.ClampMagnitude(moveDirection, 1.0f);
 
-        if (jump >= 2)
+        if (extraJump == true)
         {
-            if(maxSpeed > maxSpeedStore/1.75f)
+            moveDirection = moveDirection.normalized * speed; //Remove this line to make running diagonal the fastest standard run
+        } else
         {
-                maxSpeed -= acceleration;
+            moveDirection = (moveDirection.normalized * speed)/4; //Remove this line to make running diagonal the fastest standard run
-            }
         }
 
         moveDirection.y = yStore;
 
-        if (characterController.isGrounded)
+        if (IsGrounded())
         {
-            jump = 0;
+            extraJump = true;
             moveDirection.y = 0.0f;
 
-            if(maxSpeed > maxSpeedStore)
-            {
-                maxSpeed -= acceleration/10;
-            }
-
-            if(maxSpeed < maxSpeedStore && !Input.GetKey(KeyCode.LeftShift) && !Input.GetKey(KeyCode.LeftControl))
-            {
-                maxSpeed += acceleration;
-            }
-
             if(Input.GetKey(KeyCode.LeftShift))
             {
-                if(maxSpeed > maxSpeedStore/2)
+                moveDirection = (moveDirection.normalized * speed/2);
-                {
+            } else {
-                    maxSpeed -= acceleration;
+                moveDirection = moveDirection.normalized * speed;
-                }
             }
 
-            if(Input.GetKey(KeyCode.LeftControl))
+            if (Input.GetButtonDown("Jump"))
             {
-
+                moveDirection.y = jumpSpeed;
-                characterController.height /= 2;
-                capsule.height /= 2;
-                transform.localScale = new Vector3(transform.localScale.x, transformHeight/2, transform.localScale.z);
-
-                if(Input.GetKeyDown(KeyCode.LeftControl) && characterController.velocity != new Vector3(0, 0, 0)
-                    && (Input.GetAxis("Horizontal") != 0 || Input.GetAxis("Vertical") != 0))
-                {
-                    startTime = Time.time;
-                } 
-
-                if(startTime + oneSec >= Time.time)
-                {
-                
-                    if(maxSpeed < maxSpeedStore*2)
-                    {
-                        maxSpeed += acceleration*2;
             }
 
         } else {
-                
+            if (Input.GetButtonDown("Jump") && extraJump == true)
-                    if(maxSpeed > maxSpeedStore/4)
             {
-                        maxSpeed -= acceleration;
+                moveDirection.y = jumpSpeed;
+                extraJump = false;
             }
 
         }
 
-            } else {
+        moveDirection.y = moveDirection.y + (Physics.gravity.y * gravity * Time.deltaTime);
-
-                characterController.height = controllerHeight;
-                capsule.height = capsuleHeight;
-                transform.localScale = new Vector3(transform.localScale.x, transformHeight, transform.localScale.z);
-            
-            }
-
-        }
-
-        if (Input.GetButtonDown("Jump") && jump <= 1)
-        {
-            moveDirection.y = jumpHeight;
-            jump++;
-        }
-
-        if (characterController.collisionFlags == CollisionFlags.None)
-        {
-            wallRunning = false;
-            wall = 0;
-        }
-
-        moveDirection.y += Physics.gravity.y * gravity * Time.deltaTime;
-
-        if (wallRunning)
-        {
-
-            if(maxSpeed < maxSpeedStore*1.5f)
-            {
-                maxSpeed += acceleration;
-            }
-
-            jump = 0;
-
-            if(wall == 1)
-            {
-                startTime = Time.time;
-            }
-
-            if(startTime + oneSec < Time.time)
-            {
-                
-                moveDirection.y += Physics.gravity.y * (gravity/8) * Time.deltaTime;
-                
-            } else {
-                moveDirection.y = 0.0f;
-            }
-        }
-
-        velocity.x += moveDirection.x; 
-        velocity.z += moveDirection.z;
-
-        if(Input.GetAxis("Horizontal") == 0 && Input.GetAxis("Vertical") == 0){
-
-            //Remove or "lower" friction to add an 'ice' effect
-            velocity.x = Mathf.SmoothDamp(velocity.x, 0.0f, ref xVelocity, friction);
-            velocity.z = Mathf.SmoothDamp(velocity.z, 0.0f, ref zVelocity, friction);
-
-        } 
-
-        if(maxSpeed > maxSpeedCap)
-        {
-            maxSpeed = maxSpeedCap;
-        }
-
-        if(characterController.velocity == new Vector3(0, 0, 0))
-        {
-            maxSpeed = maxSpeedStore;
-        }
-
-        velocity = Vector3.ClampMagnitude(velocity, maxSpeed);
-
-        velocity.y = moveDirection.y;
 
         // Move the controller
-        characterController.Move(velocity * Time.deltaTime);
+        rb.AddForce(moveDirection * Time.deltaTime);
 
         //Move the player in different directions based on camera look direction
+        //Need to switch to 'raw' when using keyboard
         if(Input.GetAxis("Horizontal") != 0 || Input.GetAxis("Vertical") != 0)
         {
             transform.rotation = Quaternion.Euler(0f, pivot.rotation.eulerAngles.y, 0f);

Assets/Textures/Prototype Icon.png.meta

@@ -1,91 +0,0 @@
-fileFormatVersion: 2
-guid: 02594762d533dff4688ad6df3869341a
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 10
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
-    wrapU: -1
-    wrapV: -1
-    wrapW: -1
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 1
-  singleChannelComponent: 0
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

ProjectSettings/EditorBuildSettings.asset

@@ -4,8 +4,5 @@
 EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
-  m_Scenes:
+  m_Scenes: []
-  - enabled: 1
-    path: Assets/Scenes/Test Scene.unity
-    guid: 9fc0d4010bbf28b4594072e72b8655ab
   m_configObjects: {}

ProjectSettings/GraphicsSettings.asset

@@ -35,10 +35,6 @@ GraphicsSettings:
   - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
-  - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
-  - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
-  - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
-  - {fileID: 16002, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}

ProjectSettings/InputManager.asset

@@ -13,10 +13,10 @@ InputManager:
     positiveButton: right
     altNegativeButton: a
     altPositiveButton: d
-    gravity: 1000
+    gravity: 3
     dead: 0.001
     sensitivity: 3
-    snap: 0
+    snap: 1
     invert: 0
     type: 0
     axis: 0
@@ -29,10 +29,10 @@ InputManager:
     positiveButton: up
     altNegativeButton: s
     altPositiveButton: w
-    gravity: 1000
+    gravity: 3
     dead: 0.001
     sensitivity: 3
-    snap: 0
+    snap: 1
     invert: 0
     type: 0
     axis: 0
@@ -157,7 +157,7 @@ InputManager:
     positiveButton: 
     altNegativeButton: 
     altPositiveButton: 
-    gravity: 1000
+    gravity: 0
     dead: 0.19
     sensitivity: 1
     snap: 0
@@ -173,7 +173,7 @@ InputManager:
     positiveButton: 
     altNegativeButton: 
     altPositiveButton: 
-    gravity: 1000
+    gravity: 0
     dead: 0.19
     sensitivity: 1
     snap: 0

ProjectSettings/ProjectSettings.asset

@@ -3,7 +3,7 @@
 --- !u!129 &1
 PlayerSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 20
+  serializedVersion: 18
   productGUID: 2fb2c0092f93c6c4b83dffcbfbd4e6a3
   AndroidProfiler: 0
   AndroidFilterTouchesWhenObscured: 0
@@ -12,7 +12,7 @@ PlayerSettings:
   targetDevice: 2
   useOnDemandResources: 0
   accelerometerFrequency: 60
-  companyName: GCProductions
+  companyName: DefaultCompany
   productName: Speed Platformer Prototype
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
@@ -52,6 +52,7 @@ PlayerSettings:
   m_StackTraceTypes: 010000000100000001000000010000000100000001000000
   iosShowActivityIndicatorOnLoading: -1
   androidShowActivityIndicatorOnLoading: -1
+  displayResolutionDialog: 0
   iosUseCustomAppBackgroundBehavior: 0
   iosAllowHTTPDownload: 1
   allowedAutorotateToPortrait: 1
@@ -84,6 +85,7 @@ PlayerSettings:
   useMacAppStoreValidation: 0
   macAppStoreCategory: public.app-category.games
   gpuSkinning: 1
+  graphicsJobs: 0
   xboxPIXTextureCapture: 0
   xboxEnableAvatar: 0
   xboxEnableKinect: 0
@@ -91,6 +93,7 @@ PlayerSettings:
   xboxEnableFitness: 0
   visibleInBackground: 1
   allowFullscreenSwitch: 1
+  graphicsJobMode: 0
   fullscreenMode: 1
   xboxSpeechDB: 0
   xboxEnableHeadOrientation: 0
@@ -110,7 +113,6 @@ PlayerSettings:
   switchNVNShaderPoolsGranularity: 33554432
   switchNVNDefaultPoolsGranularity: 16777216
   switchNVNOtherPoolsGranularity: 16777216
-  vulkanNumSwapchainBuffers: 3
   vulkanEnableSetSRGBWrite: 0
   m_SupportedAspectRatios:
     4:3: 1
@@ -153,9 +155,9 @@ PlayerSettings:
       v2Signing: 0
     enable360StereoCapture: 0
   isWsaHolographicRemotingEnabled: 0
+  protectGraphicsMemory: 0
   enableFrameTimingStats: 0
   useHDRDisplay: 0
-  D3DHDRBitDepth: 0
   m_ColorGamuts: 00000000
   targetPixelDensity: 30
   resolutionScalingMode: 0
@@ -164,7 +166,7 @@ PlayerSettings:
   applicationIdentifier: {}
   buildNumber: {}
   AndroidBundleVersionCode: 1
-  AndroidMinSdkVersion: 19
+  AndroidMinSdkVersion: 16
   AndroidTargetSdkVersion: 0
   AndroidPreferredInstallLocation: 1
   aotOptions: 
@@ -179,10 +181,10 @@ PlayerSettings:
   StripUnusedMeshComponents: 1
   VertexChannelCompressionMask: 4054
   iPhoneSdkVersion: 988
-  iOSTargetOSVersionString: 10.0
+  iOSTargetOSVersionString: 9.0
   tvOSSdkVersion: 0
   tvOSRequireExtendedGameController: 0
-  tvOSTargetOSVersionString: 10.0
+  tvOSTargetOSVersionString: 9.0
   uIPrerenderedIcon: 0
   uIRequiresPersistentWiFi: 0
   uIRequiresFullScreen: 1
@@ -272,14 +274,8 @@ PlayerSettings:
   androidGamepadSupportLevel: 0
   AndroidValidateAppBundleSize: 1
   AndroidAppBundleSizeToValidate: 150
-  m_BuildTargetIcons:
+  resolutionDialogBanner: {fileID: 0}
-  - m_BuildTarget: 
+  m_BuildTargetIcons: []
-    m_Icons:
-    - serializedVersion: 2
-      m_Icon: {fileID: 2800000, guid: 02594762d533dff4688ad6df3869341a, type: 3}
-      m_Width: 128
-      m_Height: 128
-      m_Kind: 0
   m_BuildTargetPlatformIcons: []
   m_BuildTargetBatching:
   - m_BuildTarget: Standalone
@@ -297,38 +293,6 @@ PlayerSettings:
   - m_BuildTarget: WebGL
     m_StaticBatching: 0
     m_DynamicBatching: 0
-  m_BuildTargetGraphicsJobs:
-  - m_BuildTarget: MacStandaloneSupport
-    m_GraphicsJobs: 0
-  - m_BuildTarget: Switch
-    m_GraphicsJobs: 0
-  - m_BuildTarget: MetroSupport
-    m_GraphicsJobs: 0
-  - m_BuildTarget: AppleTVSupport
-    m_GraphicsJobs: 0
-  - m_BuildTarget: BJMSupport
-    m_GraphicsJobs: 0
-  - m_BuildTarget: LinuxStandaloneSupport
-    m_GraphicsJobs: 0
-  - m_BuildTarget: PS4Player
-    m_GraphicsJobs: 0
-  - m_BuildTarget: iOSSupport
-    m_GraphicsJobs: 0
-  - m_BuildTarget: WindowsStandaloneSupport
-    m_GraphicsJobs: 0
-  - m_BuildTarget: XboxOnePlayer
-    m_GraphicsJobs: 0
-  - m_BuildTarget: LuminSupport
-    m_GraphicsJobs: 0
-  - m_BuildTarget: AndroidPlayer
-    m_GraphicsJobs: 0
-  - m_BuildTarget: WebGLSupport
-    m_GraphicsJobs: 0
-  m_BuildTargetGraphicsJobMode:
-  - m_BuildTarget: PS4Player
-    m_GraphicsJobMode: 0
-  - m_BuildTarget: XboxOnePlayer
-    m_GraphicsJobMode: 0
   m_BuildTargetGraphicsAPIs:
   - m_BuildTarget: AndroidPlayer
     m_APIs: 150000000b000000
@@ -351,6 +315,7 @@ PlayerSettings:
   openGLRequireES31: 0
   openGLRequireES31AEP: 0
   openGLRequireES32: 0
+  vuforiaEnabled: 0
   m_TemplateCustomTags: {}
   mobileMTRendering:
     Android: 1
@@ -466,7 +431,6 @@ PlayerSettings:
   switchRatingsInt_9: 0
   switchRatingsInt_10: 0
   switchRatingsInt_11: 0
-  switchRatingsInt_12: 0
   switchLocalCommunicationIds_0: 
   switchLocalCommunicationIds_1: 
   switchLocalCommunicationIds_2: 
@@ -566,7 +530,6 @@ PlayerSettings:
   ps4contentSearchFeaturesUsed: 0
   ps4attribEyeToEyeDistanceSettingVR: 0
   ps4IncludedModules: []
-  ps4attribVROutputEnabled: 0
   monoEnv: 
   splashScreenBackgroundSourceLandscape: {fileID: 0}
   splashScreenBackgroundSourcePortrait: {fileID: 0}
@@ -651,6 +614,7 @@ PlayerSettings:
   XboxOneAllowedProductIds: []
   XboxOnePersistentLocalStorageSize: 0
   XboxOneXTitleMemory: 8
+  xboxOneScriptCompiler: 1
   XboxOneOverrideIdentityName: 
   vrEditorSettings:
     daydream:
@@ -669,6 +633,13 @@ PlayerSettings:
   luminVersion:
     m_VersionCode: 1
     m_VersionName: 
+  facebookSdkVersion: 7.9.4
+  facebookAppId: 
+  facebookCookies: 1
+  facebookLogging: 1
+  facebookStatus: 1
+  facebookXfbml: 0
+  facebookFrictionlessRequests: 1
   apiCompatibilityLevel: 6
   cloudProjectId: 
   framebufferDepthMemorylessMode: 0

ProjectSettings/TagManager.asset

@@ -5,7 +5,6 @@ TagManager:
   serializedVersion: 2
   tags:
   - Environment
-  - Wall
   layers:
   - Default
   - TransparentFX