andys-branch

Assets/Tutorial/Ball.prefab → Assets/PreFabs/Ball.prefab

@@ -1,58 +1,58 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &3699522791426926661
+--- !u!1 &3444545851502743619
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 3699522791426926665}
-  - component: {fileID: 3699522791426926666}
-  - component: {fileID: 3699522791426926667}
-  - component: {fileID: 3699522791426926660}
-  - component: {fileID: 3699522791426926664}
-  - component: {fileID: 3699522791426926671}
-  - component: {fileID: 3699522791426926670}
-  - component: {fileID: 3699522791426926669}
+  - component: {fileID: 3444545851502743623}
+  - component: {fileID: 3444545851502743620}
+  - component: {fileID: 3444545851502743621}
+  - component: {fileID: 3444545851502743618}
+  - component: {fileID: 3444545851502743622}
+  - component: {fileID: 3444545851502743625}
+  - component: {fileID: 3444545851502743624}
+  - component: {fileID: 3444545851502743627}
   m_Layer: 0
   m_Name: Ball
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &3699522791426926665
+--- !u!4 &3444545851502743623
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3699522791426926661}
+  m_GameObject: {fileID: 3444545851502743619}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 16.81, z: 0}
+  m_LocalPosition: {x: 0, y: 19.5, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &3699522791426926666
+--- !u!33 &3444545851502743620
 MeshFilter:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3699522791426926661}
+  m_GameObject: {fileID: 3444545851502743619}
   m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &3699522791426926667
+--- !u!23 &3444545851502743621
 MeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3699522791426926661}
+  m_GameObject: {fileID: 3444545851502743619}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
@@ -88,26 +88,26 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!135 &3699522791426926660
+--- !u!135 &3444545851502743618
 SphereCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3699522791426926661}
-  m_Material: {fileID: 13400000, guid: c42fc56a3b3cb194697c7d11a9144897, type: 2}
+  m_GameObject: {fileID: 3444545851502743619}
+  m_Material: {fileID: 13400000, guid: 31eb94ba385e7e44bb3731162610764a, type: 2}
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
   m_Radius: 0.5
   m_Center: {x: 0, y: 0, z: 0}
---- !u!54 &3699522791426926664
+--- !u!54 &3444545851502743622
 Rigidbody:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3699522791426926661}
+  m_GameObject: {fileID: 3444545851502743619}
   serializedVersion: 2
   m_Mass: 1
   m_Drag: 0
@@ -117,39 +117,39 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 0
---- !u!114 &3699522791426926671
+--- !u!114 &3444545851502743625
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3699522791426926661}
+  m_GameObject: {fileID: 3444545851502743619}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0c78b87b9b278c04bb5f4f57e5b3fea7, type: 3}
+  m_Script: {fileID: 11500000, guid: d748851d086005441aa9a21945d1a213, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &3699522791426926670
+--- !u!114 &3444545851502743624
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3699522791426926661}
+  m_GameObject: {fileID: 3444545851502743619}
   m_Enabled: 0
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 68c331a0b4d02de4da7c6e92fcd27be2, type: 3}
+  m_Script: {fileID: 11500000, guid: 8896c892928b40744ba15bc05e13f53a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &3699522791426926669
+--- !u!114 &3444545851502743627
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3699522791426926661}
+  m_GameObject: {fileID: 3444545851502743619}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b1a02b6e0ffe30340a363a5bc97f1354, type: 3}
+  m_Script: {fileID: 11500000, guid: d6ecbfcecf50a0c4293ba13eac530f3c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 

Assets/Tutorial/HitFloor.cs → Assets/Scripts/HitFloor.cs

@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
@@ -13,8 +13,7 @@ void Start()
     // Update is called once per frame
     void Update()
     {
-        if (this.transform.position.y <= 0.5f)
-        {
+        if (this.transform.position.y <= 0.5f){
             Debug.Log("hit");
         }
     }

Assets/Scripts/HitFloorCollider.cs

@@ -0,0 +1,43 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class HitFloorCollider : MonoBehaviour
+{
+
+    Renderer ballRenderer;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+       ballRenderer = this.GetComponent<Renderer>();
+       ballRenderer.material.color = Color.red; 
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+
+    }
+
+    private void OnCollisionEnter(Collision collision){
+        //Debug.Log("I hit " + collision.gameObject.name);
+        if(collision.gameObject.name == "Floor"){
+            ballRenderer.material.color = Color.blue;
+        } else if(collision.gameObject.name == "Cube"){
+            ballRenderer.material.color = Color.yellow;
+        }
+    }
+
+    private void OnCollisionExit(Collision collision){
+        // ballRenderer.material.color = Color.red;
+    }
+
+    private void OnTriggerEnter(Collider other){
+        ballRenderer.material.color = Color.green;
+    }
+
+    private void OnTriggerExit(Collider other){
+        ballRenderer.material.color = Color.red;
+    }
+}

Assets/Tutorial/RandomForces.cs → Assets/Scripts/RandomForces.cs

@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 

Assets/Tutorial/SpawnBouncyBalls.cs → Assets/Scripts/SpawnBouncyBalls.cs

@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
@@ -11,13 +11,12 @@ public class SpawnBouncyBalls : MonoBehaviour
     // Start is called before the first frame update
     void Start()
     {
-        for (int i=0; i < numberOfBalls; i++)
-        {
+        for(int i=0; i<numberOfBalls; i++){
             Vector3 ballPosition = new Vector3(
                 Random.Range(-10f, 10f),
                 heightAboveGround,
-                Random.Range(-10f, 10f)
-                );
+                Random.Range(-10f,10f)
+            );
             Instantiate(bouncyBallsPrefab, ballPosition, Quaternion.identity);
         }
     }