diff --git a/.vs/ViveGame/v14/.suo b/.vs/ViveGame/v14/.suo index 5364a984..f3bbb1f5 100644 Binary files a/.vs/ViveGame/v14/.suo and b/.vs/ViveGame/v14/.suo differ diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 081b2425..f00ff712 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -47,6 +47,8 @@ + + diff --git a/Assets/Materials/StartMarker.mat b/Assets/Materials/StartMarker.mat new file mode 100644 index 00000000..b35e7be0 Binary files /dev/null and b/Assets/Materials/StartMarker.mat differ diff --git a/Assets/Materials/StartMarker.mat.meta b/Assets/Materials/StartMarker.mat.meta new file mode 100644 index 00000000..25ee3ee9 --- /dev/null +++ b/Assets/Materials/StartMarker.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 52eb1c85eeacd7344a8bca9cabcd4a21 +timeCreated: 1498848001 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/ViveMap.mat b/Assets/Materials/ViveMap.mat index ed8075e8..e03fdef4 100644 Binary files a/Assets/Materials/ViveMap.mat and b/Assets/Materials/ViveMap.mat differ diff --git a/Assets/Materials/marker.mat b/Assets/Materials/marker.mat new file mode 100644 index 00000000..2bc60b77 Binary files /dev/null and b/Assets/Materials/marker.mat differ diff --git a/Assets/Materials/marker.mat.meta b/Assets/Materials/marker.mat.meta new file mode 100644 index 00000000..8d7c1ead --- /dev/null +++ b/Assets/Materials/marker.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 87172a77014757342b28486d0b41653f +timeCreated: 1498600516 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/red.mat b/Assets/Materials/red.mat index d5c64586..6295b857 100644 Binary files a/Assets/Materials/red.mat and b/Assets/Materials/red.mat differ diff --git a/Assets/Models/Materials.meta b/Assets/Models/Materials.meta new file mode 100644 index 00000000..3eb24fcc --- /dev/null +++ b/Assets/Models/Materials.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: ab30ece100a115e4b99bc3df09e535c9 +folderAsset: yes +timeCreated: 1498502033 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Materials/lambert1.mat b/Assets/Models/Materials/lambert1.mat new file mode 100644 index 00000000..93798744 Binary files /dev/null and b/Assets/Models/Materials/lambert1.mat differ diff --git a/Assets/Models/Materials/lambert1.mat.meta b/Assets/Models/Materials/lambert1.mat.meta new file mode 100644 index 00000000..d97f1b6a --- /dev/null +++ b/Assets/Models/Materials/lambert1.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: dd926120345d29240a5db05253f61165 +timeCreated: 1498227058 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/ringarrow.fbx b/Assets/Models/ringarrow.fbx new file mode 100644 index 00000000..6b1b24f5 Binary files /dev/null and b/Assets/Models/ringarrow.fbx differ diff --git a/Assets/Models/ringarrow.fbx.meta b/Assets/Models/ringarrow.fbx.meta new file mode 100644 index 00000000..167f34da --- /dev/null +++ b/Assets/Models/ringarrow.fbx.meta @@ -0,0 +1,93 @@ +fileFormatVersion: 2 +guid: 6898663e27ac65a458c6a9a6630a74c1 +timeCreated: 1498227058 +licenseType: Free +ModelImporter: + serializedVersion: 19 + fileIDToRecycleName: + 100000: pPipe1 + 100002: pPyramid1 + 100004: pPyramid2 + 100006: //RootNode + 100008: transform1 + 100010: transform2 + 400000: pPipe1 + 400002: pPyramid1 + 400004: pPyramid2 + 400006: //RootNode + 400008: transform1 + 400010: transform2 + 2300000: pPyramid2 + 3300000: pPyramid2 + 4300000: pPyramid2 + 9500000: //RootNode + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + importBlendShapes: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + serializedVersion: 2 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + rootMotionBoneName: + rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 2 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/ringarrow.prefab b/Assets/Models/ringarrow.prefab new file mode 100644 index 00000000..a55a2c0e Binary files /dev/null and b/Assets/Models/ringarrow.prefab differ diff --git a/Assets/Models/ringarrow.prefab.meta b/Assets/Models/ringarrow.prefab.meta new file mode 100644 index 00000000..c7bfe51b --- /dev/null +++ b/Assets/Models/ringarrow.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 979a3b11995d7b84fbe4a6100673fac0 +timeCreated: 1498485667 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MarkerScene2.unity b/Assets/Scenes/MarkerFinal.unity similarity index 55% rename from Assets/Scenes/MarkerScene2.unity rename to Assets/Scenes/MarkerFinal.unity index bb73988d..c055f3cc 100644 Binary files a/Assets/Scenes/MarkerScene2.unity and b/Assets/Scenes/MarkerFinal.unity differ diff --git a/Assets/Scenes/MarkerScene2.unity.meta b/Assets/Scenes/MarkerFinal.unity.meta similarity index 77% rename from Assets/Scenes/MarkerScene2.unity.meta rename to Assets/Scenes/MarkerFinal.unity.meta index e517414a..623f8e65 100644 --- a/Assets/Scenes/MarkerScene2.unity.meta +++ b/Assets/Scenes/MarkerFinal.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d22ca80feb130b9418c51883f880fa00 +guid: a5b64cbf74ce6114cab7433887e123b4 timeCreated: 1480809050 licenseType: Free DefaultImporter: diff --git a/Assets/Scripts/ArrowRotate.cs b/Assets/Scripts/ArrowRotate.cs new file mode 100644 index 00000000..2932498a --- /dev/null +++ b/Assets/Scripts/ArrowRotate.cs @@ -0,0 +1,63 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ArrowRotate : MonoBehaviour { + public static int randNum; + public static int randDegree; + GameObject marker; + float markerX; + float markerZ; + + //Random rand = new Random(); + //ArrayList angleArray = new ArrayList(); + + int[] angleArray = new int[] { 0, 45, 90, 135, 180, 225, 270, 315 }; + //int randNum; + + + // Use this for initialization + void Start () { + + //if marker is in a certain position, prevent degree from being such that it points back to the origin + marker = GameObject.Find("FirstMarker"); + markerX = marker.transform.position.x; + markerZ = marker.transform.position.z; + + if (((marker.transform.position.z < 0) && (marker.transform.position.x == 0)) || ((markerZ > 0) && (markerX == 0))) + { + GetRandDegree(180, 0); + } + else if (((markerZ < 0) && (markerX < 0)) || ((markerZ > 0) && (markerX > 0))) + { + GetRandDegree(225, 45); + } + else if (((markerZ == 0) && (markerX < 0)) || ((markerZ == 0) && (markerX > 0))) + { + GetRandDegree(270, 90); + } + else if (((markerZ > 0) && (markerX < 0)) || ((markerZ < 0) && (markerX > 0))) + { + GetRandDegree(315, 135); + } + + this.transform.Rotate(0, randDegree, 0); + } + + // Update is called once per frame + void Update () { + + } + + public void GetRandDegree(int wrongDegree, int wrongDegree2) { + do + { + randNum = Random.Range(0, 8); + randDegree = angleArray[randNum]; + } while (randDegree == wrongDegree || randDegree == wrongDegree2); + + + + + } +} diff --git a/Assets/Scripts/ArrowRotate.cs.meta b/Assets/Scripts/ArrowRotate.cs.meta new file mode 100644 index 00000000..e77286d6 --- /dev/null +++ b/Assets/Scripts/ArrowRotate.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: a84f4464a19896c4e914e9cb69f14d1c +timeCreated: 1498596564 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 200 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Collide.cs b/Assets/Scripts/Collide.cs new file mode 100644 index 00000000..f3f2b1a5 --- /dev/null +++ b/Assets/Scripts/Collide.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Collide : MonoBehaviour +{ + //private GameObject rig; + private GameObject cam; + // Use this for initialization + void Start() + { + //rig = GetComponent(); + cam = GameObject.Find("Camera (head)"); + + } + + // Update is called once per frame + void Update() + { + //sets the center of the collider to the camera location + this.GetComponent().center = cam.GetComponent().position; + } +} diff --git a/Assets/Scripts/Collide.cs.meta b/Assets/Scripts/Collide.cs.meta new file mode 100644 index 00000000..81484952 --- /dev/null +++ b/Assets/Scripts/Collide.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 99540b53f4983e84aa1896d3f624fc8f +timeCreated: 1498167328 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/FirstMarkerSpawn.cs b/Assets/Scripts/FirstMarkerSpawn.cs new file mode 100644 index 00000000..a5326ca3 --- /dev/null +++ b/Assets/Scripts/FirstMarkerSpawn.cs @@ -0,0 +1,93 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class FirstMarkerSpawn : MonoBehaviour { + + private GameObject FirstMarker; + private GameObject StartMarker; + private GameObject arrow; + + Renderer rend; //renderer for FirstMarker + Renderer rend2; //renderer for FirstArrow + int startDegree; //degree of start arrow + float degree; //degree of first arrow + float currentRotation; + float randNum; //determines which random length is picked + float randNum2; //determines which random degree is picked + + int startPosition; //determines which start position was picked + int[] degreeChange = new int[] {-70, -42, -14, 14, 42, 70}; //degrees plus or minus the current heading -- change this to change angles of triangles + + void Start () { + //how much distance the first marker will change by, randomly + randNum = Random.Range(0, 6) / 3.28f; //divide to convert to meter amt + randNum2 = Random.Range(0, 6); //number of options for degree picked + //Debug.Log(randNum2); + + + //start marker + StartMarker = GameObject.Find("StartMarker"); + StartMarkerSpawn StartMarkerScript = StartMarker.GetComponent(); + startPosition = StartMarkerScript.randNum; //number of options for degrees picked + + //firstmarker's arrow + arrow = GameObject.Find("ringarrow"); + + + rend = this.GetComponent(); + rend2 = arrow.GetComponent(); + + //make firstmarker invisible on start, until startmarker collision + rend.enabled = false; + rend2.enabled = false; + } + + // Update is called once per frame + void Update () { + + } + + public void SpawnFirstMarker() + { + + rend.enabled = true; + rend2.enabled = true; + + //changing first marker position depending on starting position + if (startPosition == 1) + { + this.transform.position = new Vector3(1.524f + randNum, 0, 0); + } + else if (startPosition == 2) + { + this.transform.position = new Vector3(0, 0, -1.524f - randNum); + } + else if (startPosition == 3) + { + this.transform.position = new Vector3(-1.524f - randNum, 0, 0); + } + else { + this.transform.position = new Vector3(0, 0, 1.524f + randNum); + } + + //changing rotation of firstmarker + + //finding the rotation of start arrow + startDegree = (int)StartMarker.transform.rotation.y; + + //and setting the second arrow to the same rotation + this.transform.Rotate(0, startDegree, 0); + + float currentDegree = this.transform.rotation.y; + + //then transforming rotation by a random amount + degree = currentDegree + degreeChange[(int)randNum2]; + //this.transform.Rotate(0, degree, 0); + Debug.Log("Start degree is: " + startDegree); + Debug.Log("Current degree is: " + currentDegree); + Debug.Log("Adding: " + degreeChange[(int)randNum2]); + Debug.Log("Final result: " + degree); + + } +} diff --git a/Assets/Scripts/MarkerSpawn.cs.meta b/Assets/Scripts/FirstMarkerSpawn.cs.meta similarity index 82% rename from Assets/Scripts/MarkerSpawn.cs.meta rename to Assets/Scripts/FirstMarkerSpawn.cs.meta index 0d721757..e1842251 100644 --- a/Assets/Scripts/MarkerSpawn.cs.meta +++ b/Assets/Scripts/FirstMarkerSpawn.cs.meta @@ -1,11 +1,11 @@ fileFormatVersion: 2 guid: cdfa293ece8246a459103ce895a6c4bc -timeCreated: 1497995303 +timeCreated: 1498596564 licenseType: Free MonoImporter: serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: 150 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Scripts/MarkerDestroy.cs b/Assets/Scripts/MarkerDestroy.cs index 7452fc90..5d21bf51 100644 --- a/Assets/Scripts/MarkerDestroy.cs +++ b/Assets/Scripts/MarkerDestroy.cs @@ -4,7 +4,8 @@ public class MarkerDestroy : MonoBehaviour { - public SecondMarkerSpawn otherScript; + public FirstMarkerSpawn otherScript; + //public SecondArrowSpawn otherScript2; // Use this for initialization void Start () { @@ -21,7 +22,10 @@ public void OnTriggerEnter(Collider other) if (other.gameObject.CompareTag("Marker")) { other.gameObject.SetActive(false); - otherScript.SpawnSecondMarker(); + otherScript.SpawnFirstMarker(); + + //otherScript2.SpawnSecondArrow(); } + } } diff --git a/Assets/Scripts/MarkerSpawn.cs b/Assets/Scripts/MarkerSpawn.cs deleted file mode 100644 index 5b87affb..00000000 --- a/Assets/Scripts/MarkerSpawn.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class MarkerSpawn : MonoBehaviour { - // Use this for initialization - - void Start () { - //sets initial position of first marker - this.transform.position = new Vector3(Random.Range(-3, 4), 0, Random.Range(-3, 4)); - } - - // Update is called once per frame - void Update () { - - } -} diff --git a/Assets/Scripts/SecondMarkerSpawn.cs b/Assets/Scripts/SecondMarkerSpawn.cs index dcb072fa..aab20557 100644 --- a/Assets/Scripts/SecondMarkerSpawn.cs +++ b/Assets/Scripts/SecondMarkerSpawn.cs @@ -7,20 +7,31 @@ public class SecondMarkerSpawn : MonoBehaviour // Use this for initialization private GameObject SecondMarker; private GameObject FirstMarker; + private GameObject arrow; + int xRange; int zRange; Renderer rend; - + Renderer rend2; + int degree; + int randNum; + Random rand = new Random(); + + void Start() { - + //get components of first and second marker SecondMarker = GetComponent(); - FirstMarker = GameObject.Find("FirstMarker"); - xRange = Random.Range(-3, 4); - zRange = Random.Range(-3, 4); + //get random number to adjust distance to second marker + + randNum = Random.Range(1, 4); + + //distance away second marker will be + xRange = 0; + zRange = 0; rend = GetComponent(); @@ -37,11 +48,67 @@ void Update() public void SpawnSecondMarker() { + + + //adjusting the second arrow's ring + arrow = GameObject.Find("ringarrow2"); + + //finding the rotation of first arrow + degree = ArrowRotate.randDegree; //GameObject.Find("ringarrow").GetComponent().randNum; + + //and setting the second arrow to the same rotation + arrow.transform.Rotate(0, degree, 0); + + rend2 = arrow.GetComponent(); + rend2.enabled = true; + + //then adjusting the position of the second marker + + //put a random number of coords away + + while (randNum > 0) + { + if (degree == 0 | degree == 315 | degree == 45) + { + SubtractZ(); + } + if (degree == 135 | degree == 180 | degree == 225) + { + AddZ(); + } + if (degree == 45 | degree == 90 | degree == 135) + { + SubtractX(); + } + if (degree == 225 | degree == 270 | degree == 315) + { + AddX(); + } + randNum = randNum - 1; + } + + + this.transform.position = new Vector3(FirstMarker.transform.position.x + xRange, 0, FirstMarker.transform.position.z + zRange); - //SecondMarker.GetComponent().enabled = true; rend.enabled = true; } + + public void SubtractZ() { + zRange = zRange - 1; + } + + public void AddZ() { + zRange = zRange + 1; + } + + public void SubtractX() { + xRange = xRange - 1; + } + + public void AddX() { + xRange = xRange + 1; + } } diff --git a/Assets/Scripts/StartMarkerSpawn.cs b/Assets/Scripts/StartMarkerSpawn.cs new file mode 100644 index 00000000..e9a35371 --- /dev/null +++ b/Assets/Scripts/StartMarkerSpawn.cs @@ -0,0 +1,52 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +//This script positions the first marker at the starting marker position. + +public class StartMarkerSpawn : MonoBehaviour { + public int randNum; //randomly pick starting position + float xCoord; + float zCoord; + int degree; + + + // Use this for initialization + void Start () { + xCoord = 0; + zCoord = 0; + + randNum = Random.Range(1, 5); //let this be the number of starting positions, min (inclusive) to max (exclusive) + + //depending on random roll, set start marker to start position and rotation towards origin + if (randNum == 1) + { + xCoord = -1.83f; + degree = 270; + + } + else if (randNum == 2) + { + zCoord = 2.44f; + degree = 0; + } + else if (randNum == 3) + { + xCoord = 1.83f; + degree = 90; + } + else { //if randNum == 3 + zCoord = -2.44f; //left + degree = 180; + } + + this.transform.Rotate(0, degree, 0); + this.transform.position = new Vector3(xCoord, 0, zCoord); + + } + + // Update is called once per frame + void Update () { + + } +} diff --git a/Assets/Scripts/StartMarkerSpawn.cs.meta b/Assets/Scripts/StartMarkerSpawn.cs.meta new file mode 100644 index 00000000..f4323dbe --- /dev/null +++ b/Assets/Scripts/StartMarkerSpawn.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: db3cb7aff4aeba247b0964583903b169 +timeCreated: 1498860091 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 100 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SecondMarker.prefab b/Assets/SecondMarker.prefab new file mode 100644 index 00000000..e98f7c62 Binary files /dev/null and b/Assets/SecondMarker.prefab differ diff --git a/Assets/Textures/green.mat b/Assets/Textures/green.mat index cebbc169..0b93d42e 100644 Binary files a/Assets/Textures/green.mat and b/Assets/Textures/green.mat differ diff --git a/Library/CurrentLayout.dwlt b/Library/CurrentLayout.dwlt index fcf1e2fb..af514931 100644 --- a/Library/CurrentLayout.dwlt +++ b/Library/CurrentLayout.dwlt @@ -16,13 +16,38 @@ MonoBehaviour: x: 0 y: 43 width: 1920 - height: 1117 + height: 997 m_ShowMode: 4 m_Title: - m_RootView: {fileID: 6} - m_MinSize: {x: 950, y: 542} + m_RootView: {fileID: 8} + m_MinSize: {x: 950, y: 300} m_MaxSize: {x: 10000, y: 10000} --- !u!114 &2 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 632 + width: 555 + height: 315 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 19} + m_Panes: + - {fileID: 19} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_PrefabParentObject: {fileID: 0} @@ -34,19 +59,43 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 9} + - {fileID: 5} + - {fileID: 2} + m_Position: + serializedVersion: 2 + x: 1365 + y: 0 + width: 555 + height: 947 + m_MinSize: {x: 277, y: 271} + m_MaxSize: {x: 4002, y: 8021} + vertical: 1 + controlID: 179 +--- !u!114 &4 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 11} - {fileID: 3} m_Position: serializedVersion: 2 x: 0 y: 30 width: 1920 - height: 1067 + height: 947 m_MinSize: {x: 683, y: 492} m_MaxSize: {x: 14004, y: 14042} vertical: 0 controlID: 9 ---- !u!114 &3 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_PrefabParentObject: {fileID: 0} @@ -60,18 +109,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1365 + x: 0 y: 0 width: 555 - height: 1067 + height: 632 m_MinSize: {x: 277, y: 71} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 14} + m_ActualView: {fileID: 16} m_Panes: - - {fileID: 14} + - {fileID: 16} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &4 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_PrefabParentObject: {fileID: 0} @@ -88,15 +137,15 @@ MonoBehaviour: x: 0 y: 0 width: 405 - height: 645 + height: 573 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 15} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 15} + - {fileID: 17} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &5 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_PrefabParentObject: {fileID: 0} @@ -111,18 +160,18 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 645 + y: 573 width: 1365 - height: 422 + height: 374 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} - m_ActualView: {fileID: 13} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 13} - - {fileID: 18} + - {fileID: 15} + - {fileID: 20} m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &6 + m_LastSelected: 1 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_PrefabParentObject: {fileID: 0} @@ -134,18 +183,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 7} - - {fileID: 2} - - {fileID: 8} + - {fileID: 9} + - {fileID: 4} + - {fileID: 10} m_Position: serializedVersion: 2 x: 0 y: 0 width: 1920 - height: 1117 + height: 997 m_MinSize: {x: 950, y: 300} m_MaxSize: {x: 10000, y: 10000} ---- !u!114 &7 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_PrefabParentObject: {fileID: 0} @@ -166,7 +215,7 @@ MonoBehaviour: m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &8 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_PrefabParentObject: {fileID: 0} @@ -181,12 +230,12 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 1097 + y: 977 width: 1920 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &9 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_PrefabParentObject: {fileID: 0} @@ -198,19 +247,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 10} - - {fileID: 5} + - {fileID: 12} + - {fileID: 7} m_Position: serializedVersion: 2 x: 0 y: 0 width: 1365 - height: 1067 + height: 947 m_MinSize: {x: 406, y: 492} m_MaxSize: {x: 10002, y: 14042} vertical: 1 controlID: 10 ---- !u!114 &10 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_PrefabParentObject: {fileID: 0} @@ -222,19 +271,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 4} - - {fileID: 11} + - {fileID: 6} + - {fileID: 13} m_Position: serializedVersion: 2 x: 0 y: 0 width: 1365 - height: 645 + height: 573 m_MinSize: {x: 406, y: 221} m_MaxSize: {x: 8006, y: 4021} vertical: 0 controlID: 11 ---- !u!114 &11 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_PrefabParentObject: {fileID: 0} @@ -251,17 +300,16 @@ MonoBehaviour: x: 405 y: 0 width: 960 - height: 645 + height: 573 m_MinSize: {x: 204, y: 221} m_MaxSize: {x: 4004, y: 4021} - m_ActualView: {fileID: 16} + m_ActualView: {fileID: 18} m_Panes: - - {fileID: 16} - - {fileID: 17} - - {fileID: 12} + - {fileID: 18} + - {fileID: 14} m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &12 + m_LastSelected: 0 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_PrefabParentObject: {fileID: 0} @@ -287,7 +335,7 @@ MonoBehaviour: y: 92 width: 956 height: 624 ---- !u!114 &13 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_PrefabParentObject: {fileID: 0} @@ -310,9 +358,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 737 + y: 665 width: 1363 - height: 401 + height: 353 m_SearchFilter: m_NameFilter: m_ClassNames: [] @@ -324,19 +372,19 @@ MonoBehaviour: m_ShowAllHits: 0 m_SearchArea: 0 m_Folders: - - Assets + - Assets/Scripts m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets + - Assets/Scripts m_LastFoldersGridSize: -1 - m_LastProjectPath: C:\Users\avelasco\Documents\ViveGame + m_LastProjectPath: C:\Users\dacharya\Desktop\ViveGame m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 111} - m_SelectedIDs: 10250000 - m_LastClickedID: 9488 - m_ExpandedIDs: 0000000010250000762500001e260000082900000a29000066290000122a0000142a0000282a00002a2a000000ca9a3bffffff7f + scrollPos: {x: 0, y: 231} + m_SelectedIDs: 46260000 + m_LastClickedID: 9798 + m_ExpandedIDs: 0000000096250000c2250000ee25000006260000ca260000fe2600000c2700001a2a00001c2a00001e2a000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -364,7 +412,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000010250000762500001e260000082900000a290000 + m_ExpandedIDs: 0000000096250000c2250000ee25000006260000ca260000fe2600000c2700001a2a00001c2a00001e2a0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -419,7 +467,7 @@ MonoBehaviour: m_ScrollPosition: {x: 0, y: 0} m_GridSize: 64 m_DirectoriesAreaWidth: 115 ---- !u!114 &14 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_PrefabParentObject: {fileID: 0} @@ -444,7 +492,7 @@ MonoBehaviour: x: 1367 y: 92 width: 553 - height: 1046 + height: 611 m_ScrollPosition: {x: 0, y: 0} m_InspectorMode: 0 m_PreviewResizer: @@ -452,7 +500,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_PreviewWindow: {fileID: 0} ---- !u!114 &15 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_PrefabParentObject: {fileID: 0} @@ -477,12 +525,12 @@ MonoBehaviour: x: 0 y: 92 width: 403 - height: 624 + height: 552 m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 5afbffff - m_LastClickedID: -1190 - m_ExpandedIDs: d8d0ffff34d4ffffdcfbffff00000000fe260000 + m_SelectedIDs: 7a270000 + m_LastClickedID: 10106 + m_ExpandedIDs: 84f8ffffb8fafffff8fafffffafafffffcfaffff00000000a8270000ba270000ea27000008280000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -498,14 +546,14 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 6} m_SearchString: m_ExpandedScenes: - - Game + - MarkerScene2 m_CurrenRootInstanceID: 0 m_Locked: 0 m_CurrentSortingName: TransformSorting ---- !u!114 &16 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_PrefabParentObject: {fileID: 0} @@ -530,16 +578,16 @@ MonoBehaviour: x: 407 y: 92 width: 956 - height: 624 + height: 552 m_SceneLighting: 1 lastFramingTime: 8684.66860692389 m_2DMode: 0 m_isRotationLocked: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -56.366043, y: 18.439468, z: 68.41563} + m_Target: {x: -22.881273, y: -19.73953, z: 0.02048041} speed: 2 - m_Value: {x: -56.366043, y: 18.439468, z: 68.41563} + m_Value: {x: -22.881273, y: -19.73953, z: 0.02048041} m_RenderMode: 0 m_ValidateTrueMetals: 0 m_SceneViewState: @@ -566,9 +614,9 @@ MonoBehaviour: speed: 2 m_Value: {x: -0.25074303, y: 0.660135, z: -0.24984154, w: -0.66251725} m_Size: - m_Target: 289.4252 + m_Target: 36.948315 speed: 2 - m_Value: 289.4252 + m_Value: 36.948315 m_Ortho: m_Target: 0 speed: 2 @@ -579,7 +627,7 @@ MonoBehaviour: m_ReplacementString: m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &17 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_PrefabParentObject: {fileID: 0} @@ -601,10 +649,10 @@ MonoBehaviour: m_DepthBufferBits: 32 m_Pos: serializedVersion: 2 - x: 407 - y: 92 - width: 956 - height: 624 + x: 1367 + y: 724 + width: 553 + height: 294 m_MaximizeOnPlay: 0 m_Gizmos: 0 m_Stats: 0 @@ -613,10 +661,10 @@ MonoBehaviour: m_ZoomArea: m_HRangeLocked: 0 m_VRangeLocked: 0 - m_HBaseRangeMin: -478 - m_HBaseRangeMax: 478 - m_VBaseRangeMin: -303.5 - m_VBaseRangeMax: 303.5 + m_HBaseRangeMin: -276.5 + m_HBaseRangeMax: 276.5 + m_VBaseRangeMin: -138.5 + m_VBaseRangeMax: 138.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -625,7 +673,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 + m_EnableMouseInput: 1 m_EnableSliderZoom: 0 m_UniformScale: 1 m_UpDirection: 1 @@ -633,29 +681,29 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 17 - width: 956 - height: 607 + width: 553 + height: 277 m_Scale: {x: 1, y: 1} - m_Translation: {x: 478, y: 303.5} + m_Translation: {x: 276.5, y: 138.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -478 - y: -303.5 - width: 956 - height: 607 + x: -276.5 + y: -138.5 + width: 553 + height: 277 m_MinimalGUI: 1 m_defaultScale: 1 m_TargetTexture: {fileID: 0} m_CurrentColorSpace: 0 - m_LastWindowPixelSize: {x: 956, y: 624} + m_LastWindowPixelSize: {x: 553, y: 294} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000100000100 ---- !u!114 &18 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_PrefabParentObject: {fileID: 0} @@ -677,7 +725,7 @@ MonoBehaviour: m_DepthBufferBits: 0 m_Pos: serializedVersion: 2 - x: 8 - y: 718 - width: 1366 - height: 308 + x: 0 + y: 665 + width: 1363 + height: 353 diff --git a/Library/EditorUserBuildSettings.asset b/Library/EditorUserBuildSettings.asset index 6a4d83d1..36efbed1 100644 Binary files a/Library/EditorUserBuildSettings.asset and b/Library/EditorUserBuildSettings.asset differ diff --git a/Library/InspectorExpandedItems.asset b/Library/InspectorExpandedItems.asset index 874ee712..2dadde14 100644 Binary files a/Library/InspectorExpandedItems.asset and b/Library/InspectorExpandedItems.asset differ diff --git a/Library/LastBuild.buildreport b/Library/LastBuild.buildreport index 77db7a03..7c831e76 100644 Binary files a/Library/LastBuild.buildreport and b/Library/LastBuild.buildreport differ diff --git a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll new file mode 100644 index 00000000..c5566f6d Binary files /dev/null and b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll differ diff --git a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb index 65cae762..ac0a6786 100644 Binary files a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb and b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb differ diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll b/Library/ScriptAssemblies/Assembly-CSharp.dll index c904f527..a3cae5e7 100644 Binary files a/Library/ScriptAssemblies/Assembly-CSharp.dll and b/Library/ScriptAssemblies/Assembly-CSharp.dll differ diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb index 6509dd64..a2869924 100644 Binary files a/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb and b/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb differ diff --git a/Library/assetDatabase3 b/Library/assetDatabase3 index 80e5bae5..6128ecab 100644 Binary files a/Library/assetDatabase3 and b/Library/assetDatabase3 differ diff --git a/Library/expandedItems b/Library/expandedItems index 908f1d8d..8a03c6c8 100644 Binary files a/Library/expandedItems and b/Library/expandedItems differ diff --git a/Library/metadata/00/00000000000000002000000000000000 b/Library/metadata/00/00000000000000002000000000000000 new file mode 100644 index 00000000..5b884364 Binary files /dev/null and b/Library/metadata/00/00000000000000002000000000000000 differ diff --git a/Library/metadata/00/00000000000000002000000000000000.info b/Library/metadata/00/00000000000000002000000000000000.info new file mode 100644 index 00000000..650a3296 Binary files /dev/null and b/Library/metadata/00/00000000000000002000000000000000.info differ diff --git a/Library/metadata/00/00000000000000003000000000000000 b/Library/metadata/00/00000000000000003000000000000000 new file mode 100644 index 00000000..8d205621 Binary files /dev/null and b/Library/metadata/00/00000000000000003000000000000000 differ diff --git a/Library/metadata/00/00000000000000003000000000000000.info b/Library/metadata/00/00000000000000003000000000000000.info new file mode 100644 index 00000000..6f1239c3 Binary files /dev/null and b/Library/metadata/00/00000000000000003000000000000000.info differ diff --git a/Library/metadata/00/00000000000000004000000000000000 b/Library/metadata/00/00000000000000004000000000000000 new file mode 100644 index 00000000..124087ef Binary files /dev/null and b/Library/metadata/00/00000000000000004000000000000000 differ diff --git a/Library/metadata/00/00000000000000004000000000000000.info b/Library/metadata/00/00000000000000004000000000000000.info new file mode 100644 index 00000000..963c9de6 Binary files /dev/null and b/Library/metadata/00/00000000000000004000000000000000.info differ diff --git a/Library/metadata/00/00000000000000004100000000000000 b/Library/metadata/00/00000000000000004100000000000000 new file mode 100644 index 00000000..510d603c Binary files /dev/null and b/Library/metadata/00/00000000000000004100000000000000 differ diff --git a/Library/metadata/00/00000000000000004100000000000000.info b/Library/metadata/00/00000000000000004100000000000000.info new file mode 100644 index 00000000..98a4ff9d Binary files /dev/null and b/Library/metadata/00/00000000000000004100000000000000.info differ diff --git a/Library/metadata/00/00000000000000005000000000000000 b/Library/metadata/00/00000000000000005000000000000000 new file mode 100644 index 00000000..005ee5d1 Binary files /dev/null and b/Library/metadata/00/00000000000000005000000000000000 differ diff --git a/Library/metadata/00/00000000000000005000000000000000.info b/Library/metadata/00/00000000000000005000000000000000.info new file mode 100644 index 00000000..fade0c91 Binary files /dev/null and b/Library/metadata/00/00000000000000005000000000000000.info differ diff --git a/Library/metadata/00/00000000000000005100000000000000 b/Library/metadata/00/00000000000000005100000000000000 new file mode 100644 index 00000000..d045354b Binary files /dev/null and b/Library/metadata/00/00000000000000005100000000000000 differ diff --git a/Library/metadata/00/00000000000000005100000000000000.info b/Library/metadata/00/00000000000000005100000000000000.info new file mode 100644 index 00000000..baae2928 Binary files /dev/null and b/Library/metadata/00/00000000000000005100000000000000.info differ diff --git a/Library/metadata/00/00000000000000006000000000000000 b/Library/metadata/00/00000000000000006000000000000000 new file mode 100644 index 00000000..707a2104 Binary files /dev/null and b/Library/metadata/00/00000000000000006000000000000000 differ diff --git a/Library/metadata/00/00000000000000006000000000000000.info b/Library/metadata/00/00000000000000006000000000000000.info new file mode 100644 index 00000000..020e7721 Binary files /dev/null and b/Library/metadata/00/00000000000000006000000000000000.info differ diff --git a/Library/metadata/00/00000000000000006100000000000000 b/Library/metadata/00/00000000000000006100000000000000 new file mode 100644 index 00000000..2273eaf5 Binary files /dev/null and b/Library/metadata/00/00000000000000006100000000000000 differ diff --git a/Library/metadata/00/00000000000000006100000000000000.info b/Library/metadata/00/00000000000000006100000000000000.info new file mode 100644 index 00000000..b58d6a35 Binary files /dev/null and b/Library/metadata/00/00000000000000006100000000000000.info differ diff --git a/Library/metadata/00/00000000000000007000000000000000 b/Library/metadata/00/00000000000000007000000000000000 new file mode 100644 index 00000000..e49f3dd7 Binary files /dev/null and b/Library/metadata/00/00000000000000007000000000000000 differ diff --git a/Library/metadata/00/00000000000000007000000000000000.info b/Library/metadata/00/00000000000000007000000000000000.info new file mode 100644 index 00000000..5289be69 Binary files /dev/null and b/Library/metadata/00/00000000000000007000000000000000.info differ diff --git a/Library/metadata/00/00000000000000007100000000000000 b/Library/metadata/00/00000000000000007100000000000000 new file mode 100644 index 00000000..351926a8 Binary files /dev/null and b/Library/metadata/00/00000000000000007100000000000000 differ diff --git a/Library/metadata/00/00000000000000007100000000000000.info b/Library/metadata/00/00000000000000007100000000000000.info new file mode 100644 index 00000000..a0a78b5b Binary files /dev/null and b/Library/metadata/00/00000000000000007100000000000000.info differ diff --git a/Library/metadata/00/00000000000000008000000000000000 b/Library/metadata/00/00000000000000008000000000000000 new file mode 100644 index 00000000..436d1291 Binary files /dev/null and b/Library/metadata/00/00000000000000008000000000000000 differ diff --git a/Library/metadata/00/00000000000000008000000000000000.info b/Library/metadata/00/00000000000000008000000000000000.info new file mode 100644 index 00000000..94385d41 Binary files /dev/null and b/Library/metadata/00/00000000000000008000000000000000.info differ diff --git a/Library/metadata/00/00000000000000009000000000000000 b/Library/metadata/00/00000000000000009000000000000000 new file mode 100644 index 00000000..9abd4207 Binary files /dev/null and b/Library/metadata/00/00000000000000009000000000000000 differ diff --git a/Library/metadata/00/00000000000000009000000000000000.info b/Library/metadata/00/00000000000000009000000000000000.info new file mode 100644 index 00000000..5347fb6c Binary files /dev/null and b/Library/metadata/00/00000000000000009000000000000000.info differ diff --git a/Library/metadata/00/0000000000000000a000000000000000 b/Library/metadata/00/0000000000000000a000000000000000 new file mode 100644 index 00000000..98bb3870 Binary files /dev/null and b/Library/metadata/00/0000000000000000a000000000000000 differ diff --git a/Library/metadata/00/0000000000000000a000000000000000.info b/Library/metadata/00/0000000000000000a000000000000000.info new file mode 100644 index 00000000..32a7c62a Binary files /dev/null and b/Library/metadata/00/0000000000000000a000000000000000.info differ diff --git a/Library/metadata/00/0000000000000000a100000000000000 b/Library/metadata/00/0000000000000000a100000000000000 new file mode 100644 index 00000000..bc615be5 Binary files /dev/null and b/Library/metadata/00/0000000000000000a100000000000000 differ diff --git a/Library/metadata/00/0000000000000000a100000000000000.info b/Library/metadata/00/0000000000000000a100000000000000.info new file mode 100644 index 00000000..0827fee4 Binary files /dev/null and b/Library/metadata/00/0000000000000000a100000000000000.info differ diff --git a/Library/metadata/00/0000000000000000b000000000000000 b/Library/metadata/00/0000000000000000b000000000000000 new file mode 100644 index 00000000..6562a4a8 Binary files /dev/null and b/Library/metadata/00/0000000000000000b000000000000000 differ diff --git a/Library/metadata/00/0000000000000000b000000000000000.info b/Library/metadata/00/0000000000000000b000000000000000.info new file mode 100644 index 00000000..54067b17 Binary files /dev/null and b/Library/metadata/00/0000000000000000b000000000000000.info differ diff --git a/Library/metadata/00/0000000000000000c000000000000000 b/Library/metadata/00/0000000000000000c000000000000000 new file mode 100644 index 00000000..c1229eb5 Binary files /dev/null and b/Library/metadata/00/0000000000000000c000000000000000 differ diff --git a/Library/metadata/00/0000000000000000c000000000000000.info b/Library/metadata/00/0000000000000000c000000000000000.info new file mode 100644 index 00000000..e71d9d3e Binary files /dev/null and b/Library/metadata/00/0000000000000000c000000000000000.info differ diff --git a/Library/metadata/00/005ed5a6df2f5ff468efd6497d37fefa b/Library/metadata/00/005ed5a6df2f5ff468efd6497d37fefa new file mode 100644 index 00000000..8b17cb7d Binary files /dev/null and b/Library/metadata/00/005ed5a6df2f5ff468efd6497d37fefa differ diff --git a/Library/metadata/00/005ed5a6df2f5ff468efd6497d37fefa.info b/Library/metadata/00/005ed5a6df2f5ff468efd6497d37fefa.info new file mode 100644 index 00000000..a5d6bd5b Binary files /dev/null and b/Library/metadata/00/005ed5a6df2f5ff468efd6497d37fefa.info differ diff --git a/Library/metadata/0b/0b0f23454164a934f80aded688ea2775.info b/Library/metadata/0b/0b0f23454164a934f80aded688ea2775.info index 38d4a8b0..b8b235b0 100644 Binary files a/Library/metadata/0b/0b0f23454164a934f80aded688ea2775.info and b/Library/metadata/0b/0b0f23454164a934f80aded688ea2775.info differ diff --git a/Library/metadata/24/2427e03244253aa4c817279924e62098.info b/Library/metadata/24/2427e03244253aa4c817279924e62098.info index 62ceedf3..23ce06f3 100644 Binary files a/Library/metadata/24/2427e03244253aa4c817279924e62098.info and b/Library/metadata/24/2427e03244253aa4c817279924e62098.info differ diff --git a/Library/metadata/2f/2f8b0ad8b64356340886a221f2d1fa3e b/Library/metadata/2f/2f8b0ad8b64356340886a221f2d1fa3e index b6a30deb..015d1708 100644 Binary files a/Library/metadata/2f/2f8b0ad8b64356340886a221f2d1fa3e and b/Library/metadata/2f/2f8b0ad8b64356340886a221f2d1fa3e differ diff --git a/Library/metadata/43/43c37d47640a8a44f941123ea6462044.info b/Library/metadata/43/43c37d47640a8a44f941123ea6462044.info index f4866a89..71fae9fb 100644 Binary files a/Library/metadata/43/43c37d47640a8a44f941123ea6462044.info and b/Library/metadata/43/43c37d47640a8a44f941123ea6462044.info differ diff --git a/Library/metadata/66/66c4b7f66eb87aa49849494cd193e6d5.info b/Library/metadata/66/66c4b7f66eb87aa49849494cd193e6d5.info index 2f9eb0c1..2a5d0a54 100644 Binary files a/Library/metadata/66/66c4b7f66eb87aa49849494cd193e6d5.info and b/Library/metadata/66/66c4b7f66eb87aa49849494cd193e6d5.info differ diff --git a/Library/metadata/68/6898663e27ac65a458c6a9a6630a74c1 b/Library/metadata/68/6898663e27ac65a458c6a9a6630a74c1 new file mode 100644 index 00000000..03a0b993 Binary files /dev/null and b/Library/metadata/68/6898663e27ac65a458c6a9a6630a74c1 differ diff --git a/Library/metadata/68/6898663e27ac65a458c6a9a6630a74c1.info b/Library/metadata/68/6898663e27ac65a458c6a9a6630a74c1.info new file mode 100644 index 00000000..21a12fd2 Binary files /dev/null and b/Library/metadata/68/6898663e27ac65a458c6a9a6630a74c1.info differ diff --git a/Library/metadata/88/88ae0ab984026a942b403f4ad37c2d69.info b/Library/metadata/88/88ae0ab984026a942b403f4ad37c2d69.info index c23c5cc9..5b3ff0a5 100644 Binary files a/Library/metadata/88/88ae0ab984026a942b403f4ad37c2d69.info and b/Library/metadata/88/88ae0ab984026a942b403f4ad37c2d69.info differ diff --git a/Library/metadata/95/95e79f28aed64364fad2fe3e90e31e88.info b/Library/metadata/95/95e79f28aed64364fad2fe3e90e31e88.info index dc73b205..d2f2f348 100644 Binary files a/Library/metadata/95/95e79f28aed64364fad2fe3e90e31e88.info and b/Library/metadata/95/95e79f28aed64364fad2fe3e90e31e88.info differ diff --git a/Library/metadata/97/979a3b11995d7b84fbe4a6100673fac0 b/Library/metadata/97/979a3b11995d7b84fbe4a6100673fac0 new file mode 100644 index 00000000..2cd2de91 Binary files /dev/null and b/Library/metadata/97/979a3b11995d7b84fbe4a6100673fac0 differ diff --git a/Library/metadata/97/979a3b11995d7b84fbe4a6100673fac0.info b/Library/metadata/97/979a3b11995d7b84fbe4a6100673fac0.info new file mode 100644 index 00000000..163c36bb Binary files /dev/null and b/Library/metadata/97/979a3b11995d7b84fbe4a6100673fac0.info differ diff --git a/Library/metadata/99/99540b53f4983e84aa1896d3f624fc8f b/Library/metadata/99/99540b53f4983e84aa1896d3f624fc8f new file mode 100644 index 00000000..9fee4d4d Binary files /dev/null and b/Library/metadata/99/99540b53f4983e84aa1896d3f624fc8f differ diff --git a/Library/metadata/99/99540b53f4983e84aa1896d3f624fc8f.info b/Library/metadata/99/99540b53f4983e84aa1896d3f624fc8f.info new file mode 100644 index 00000000..7018655c Binary files /dev/null and b/Library/metadata/99/99540b53f4983e84aa1896d3f624fc8f.info differ diff --git a/Library/metadata/9d/9d7abb438e1b44d47a199625a41a53f5.info b/Library/metadata/9d/9d7abb438e1b44d47a199625a41a53f5.info index e3883a13..db15483a 100644 Binary files a/Library/metadata/9d/9d7abb438e1b44d47a199625a41a53f5.info and b/Library/metadata/9d/9d7abb438e1b44d47a199625a41a53f5.info differ diff --git a/Library/metadata/a8/a84f4464a19896c4e914e9cb69f14d1c b/Library/metadata/a8/a84f4464a19896c4e914e9cb69f14d1c new file mode 100644 index 00000000..0e6f1c22 Binary files /dev/null and b/Library/metadata/a8/a84f4464a19896c4e914e9cb69f14d1c differ diff --git a/Library/metadata/a8/a84f4464a19896c4e914e9cb69f14d1c.info b/Library/metadata/a8/a84f4464a19896c4e914e9cb69f14d1c.info new file mode 100644 index 00000000..53fedcf9 Binary files /dev/null and b/Library/metadata/a8/a84f4464a19896c4e914e9cb69f14d1c.info differ diff --git a/Library/metadata/ab/ab30ece100a115e4b99bc3df09e535c9 b/Library/metadata/ab/ab30ece100a115e4b99bc3df09e535c9 new file mode 100644 index 00000000..2052b6de Binary files /dev/null and b/Library/metadata/ab/ab30ece100a115e4b99bc3df09e535c9 differ diff --git a/Library/metadata/ab/ab30ece100a115e4b99bc3df09e535c9.info b/Library/metadata/ab/ab30ece100a115e4b99bc3df09e535c9.info new file mode 100644 index 00000000..4b51451e Binary files /dev/null and b/Library/metadata/ab/ab30ece100a115e4b99bc3df09e535c9.info differ diff --git a/Library/metadata/b7/b7e7204857220c548bd9926de3dfab44 b/Library/metadata/b7/b7e7204857220c548bd9926de3dfab44 index afa002c4..56ebbf32 100644 Binary files a/Library/metadata/b7/b7e7204857220c548bd9926de3dfab44 and b/Library/metadata/b7/b7e7204857220c548bd9926de3dfab44 differ diff --git a/Library/metadata/bd/bded7016213b5064d95bfc287213c237.info b/Library/metadata/bd/bded7016213b5064d95bfc287213c237.info index a064f4b4..de8ce3a6 100644 Binary files a/Library/metadata/bd/bded7016213b5064d95bfc287213c237.info and b/Library/metadata/bd/bded7016213b5064d95bfc287213c237.info differ diff --git a/Library/metadata/cd/cdb0b98f1a23cd8479a0dae88469a022.info b/Library/metadata/cd/cdb0b98f1a23cd8479a0dae88469a022.info index e3eacf02..d5c4de83 100644 Binary files a/Library/metadata/cd/cdb0b98f1a23cd8479a0dae88469a022.info and b/Library/metadata/cd/cdb0b98f1a23cd8479a0dae88469a022.info differ diff --git a/Library/metadata/d4/d4ab24f9ccb56774390c15bc8ee7341a.info b/Library/metadata/d4/d4ab24f9ccb56774390c15bc8ee7341a.info index 65353fbf..209b598d 100644 Binary files a/Library/metadata/d4/d4ab24f9ccb56774390c15bc8ee7341a.info and b/Library/metadata/d4/d4ab24f9ccb56774390c15bc8ee7341a.info differ diff --git a/Library/metadata/d8/d868a5da50a7dc24e8a32effb37785ed.info b/Library/metadata/d8/d868a5da50a7dc24e8a32effb37785ed.info index e66fae52..cd6f0075 100644 Binary files a/Library/metadata/d8/d868a5da50a7dc24e8a32effb37785ed.info and b/Library/metadata/d8/d868a5da50a7dc24e8a32effb37785ed.info differ diff --git a/Library/metadata/dd/dd926120345d29240a5db05253f61165 b/Library/metadata/dd/dd926120345d29240a5db05253f61165 new file mode 100644 index 00000000..2b645d06 Binary files /dev/null and b/Library/metadata/dd/dd926120345d29240a5db05253f61165 differ diff --git a/Library/metadata/dd/dd926120345d29240a5db05253f61165.info b/Library/metadata/dd/dd926120345d29240a5db05253f61165.info new file mode 100644 index 00000000..ae5e6876 Binary files /dev/null and b/Library/metadata/dd/dd926120345d29240a5db05253f61165.info differ diff --git a/Library/metadata/f3/f37a9401120c85b4db7418113ae243df b/Library/metadata/f3/f37a9401120c85b4db7418113ae243df new file mode 100644 index 00000000..fae35488 Binary files /dev/null and b/Library/metadata/f3/f37a9401120c85b4db7418113ae243df differ diff --git a/Library/metadata/f3/f37a9401120c85b4db7418113ae243df.info b/Library/metadata/f3/f37a9401120c85b4db7418113ae243df.info index 63c4a876..ae64b5c1 100644 Binary files a/Library/metadata/f3/f37a9401120c85b4db7418113ae243df.info and b/Library/metadata/f3/f37a9401120c85b4db7418113ae243df.info differ diff --git a/Library/shadercompiler-UnityShaderCompiler.exe0.log b/Library/shadercompiler-UnityShaderCompiler.exe0.log index 32f64583..5be4fabe 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe0.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe0.log @@ -1,22 +1,2 @@ Base path: C:/Program Files/Unity/Editor/Data Cmd: initializeCompiler -Cmd: compileSnippet - api=4 type=0 insize=14853 outsize=2514 kw=DIRECTIONAL pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA ok=1 -Cmd: compileSnippet - api=4 type=1 insize=14853 outsize=1698 kw=DIRECTIONAL pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA ok=1 -Cmd: compileSnippet - api=4 type=0 insize=5168 outsize=1842 kw=DIRECTIONAL pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA ok=1 -Cmd: compileSnippet - api=4 type=1 insize=5168 outsize=1602 kw=DIRECTIONAL pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA ok=1 -Cmd: preprocess - insize=972 outsize=483 ok=1 -Cmd: compileSnippet - api=4 type=0 insize=1588 outsize=762 kw= pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA ok=1 -Cmd: compileSnippet - api=4 type=1 insize=1588 outsize=382 kw= pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA ok=1 -Cmd: compileSnippet - api=4 type=0 insize=14853 outsize=3250 kw=DIRECTIONAL VERTEXLIGHT_ON pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA ok=1 -Cmd: compileSnippet - api=4 type=0 insize=5168 outsize=1842 kw=POINT pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA ok=1 -Cmd: compileSnippet - api=4 type=1 insize=5168 outsize=1974 kw=POINT pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA ok=1 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 70b3262a..05a796b5 100644 Binary files a/ProjectSettings/EditorBuildSettings.asset and b/ProjectSettings/EditorBuildSettings.asset differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 8ebd8db3..e0e0e3a7 100644 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ