player controller rework

2023-02-01 13:24:48 +01:00
parent 2837b80902
commit f05b68f9ba
16 changed files with 4750 additions and 486 deletions
--- a/Assets/Resources/Models/World
+++ b/Assets/Resources/Models/World
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b86869ef370235859b0c69446fa51a54
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Models/World
+++ b/Assets/Resources/Models/World
--- a/Assets/Resources/Models/World
+++ b/Assets/Resources/Models/World
@@ -0,0 +1,106 @@
+fileFormatVersion: 2
+guid: fd275518d3aad0536b1b8b19df0306ad
+ModelImporter:
+  serializedVersion: 21300
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 1
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Models/World
+++ b/Assets/Resources/Models/World
--- a/Assets/Resources/Models/World
+++ b/Assets/Resources/Models/World
@@ -0,0 +1,106 @@
+fileFormatVersion: 2
+guid: 96fc57865274c379c95131f0a424cd26
+ModelImporter:
+  serializedVersion: 21300
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 1
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Prefabs/Modulok/module1.prefab
+++ b/Assets/Resources/Prefabs/Modulok/module1.prefab
@@ -294,7 +294,7 @@ MeshRenderer:
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
-  - {fileID: 2100000, guid: 197ee10712c66054cb2f88781c8d94f4, type: 2}
+  - {fileID: 2100000, guid: 1afa0118e3d81e54598c9479c5e31eb9, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
@@ -488,7 +488,7 @@ MeshRenderer:
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
-  - {fileID: 2100000, guid: 197ee10712c66054cb2f88781c8d94f4, type: 2}
+  - {fileID: 2100000, guid: 97cabee3711df3b4b944878d6d30edda, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
--- a/Assets/Resources/Prefabs/Modulok/module2.prefab
+++ b/Assets/Resources/Prefabs/Modulok/module2.prefab
@@ -62,7 +62,7 @@ MeshRenderer:
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
-  - {fileID: 2100000, guid: 197ee10712c66054cb2f88781c8d94f4, type: 2}
+  - {fileID: 2100000, guid: 97cabee3711df3b4b944878d6d30edda, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
@@ -780,7 +780,7 @@ MeshRenderer:
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
-  - {fileID: 2100000, guid: 197ee10712c66054cb2f88781c8d94f4, type: 2}
+  - {fileID: 2100000, guid: 1afa0118e3d81e54598c9479c5e31eb9, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
--- a/Assets/Scenes/EndlessRunnerTest.unity
+++ b/Assets/Scenes/EndlessRunnerTest.unity
--- a/Assets/Scripts/PlayerController.cs
+++ b/Assets/Scripts/PlayerController.cs
@@ -5,35 +5,53 @@ using UnityEngine;
 public class PlayerController : MonoBehaviour
 {
    public Rigidbody rb;
-    public float moveSpeed = 5f;
+    //public float moveSpeed = 5f;
    public float jumpforce = 5f;
    private Vector3 direction;
    private float horizontal, vertical, isJumping;
    private bool isOnGround;

+    //swipe movement
+    private Vector2 startTouchPosition;
+    private Vector2 endTouchPosition;
+
    private void Awake() {
        rb = GetComponent<Rigidbody>();
    }

    void Update()
    {
-        horizontal = Input.GetAxis("Horizontal");
+        /*horizontal = Input.GetAxis("Horizontal");
        vertical = Input.GetAxis("Vertical");
-        isJumping = Input.GetAxis("Jump");
+        isJumping = Input.GetAxis("Jump");*/

        //jumping
-        if (isJumping > 0 && isOnGround) {
+        /*if (isJumping > 0 && isOnGround) {
            rb.AddForce(new Vector3(horizontal, jumpforce, vertical));
            isOnGround = false;
-        }
+        }*/

-        direction = new Vector3(horizontal, 0,vertical);
-
-        rb.AddForce(direction * moveSpeed * Time.deltaTime);
+        /*direction = new Vector3(horizontal, 0,vertical);
+        rb.AddForce(direction * moveSpeed * Time.deltaTime);*/



        //new character controller with swipe lane changing
+        if(Input.touchCount > 0 && Input.GetTouch(0).phase == TouchPhase.Began){
+            startTouchPosition = Input.GetTouch(0).position;
+        }
+        if(Input.touchCount > 0 && Input.GetTouch(0).phase == TouchPhase.Ended){
+            endTouchPosition = Input.GetTouch(0).position;
+
+            if(endTouchPosition.x < startTouchPosition.x){
+                //left
+                goLeft();
+
+            }else if(endTouchPosition.x > startTouchPosition.x){
+                //right
+                goRight();
+            }
+        }
    }

    private void OnCollisionEnter(Collision collision) {
@@ -41,4 +59,12 @@ public class PlayerController : MonoBehaviour
            isOnGround = true;
        }
    }
+
+    private void goLeft(){
+        rb.transform.position = new Vector3(rb.transform.position.x + 5, rb.transform.position.y, rb.transform.position.z);
+    }
+
+    private void goRight(){
+        rb.transform.position = new Vector3(rb.transform.position.x - 5, rb.transform.position.y, rb.transform.position.z);
+    }
 }
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -2,12 +2,12 @@
  "dependencies": {
    "com.unity.collab-proxy": "1.17.7",
    "com.unity.feature.development": "1.0.1",
-    "com.unity.ide.rider": "3.0.16",
-    "com.unity.ide.visualstudio": "2.0.16",
+    "com.unity.ide.visualstudio": "2.0.17",
    "com.unity.ide.vscode": "1.2.5",
-    "com.unity.test-framework": "1.1.31",
+    "com.unity.test-framework": "1.1.33",
    "com.unity.textmeshpro": "3.0.6",
    "com.unity.timeline": "1.6.4",
+    "com.unity.toolchain.linux-x86_64": "2.0.4",
    "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.2",
    "com.unity.ugui": "1.0.0",
    "com.unity.visualscripting": "1.7.8",
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -39,7 +39,7 @@
    },
    "com.unity.ide.rider": {
      "version": "3.0.16",
-      "depth": 0,
+      "depth": 1,
      "source": "registry",
      "dependencies": {
        "com.unity.ext.nunit": "1.0.6"
@@ -47,7 +47,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.ide.visualstudio": {
-      "version": "2.0.16",
+      "version": "2.0.17",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@@ -95,23 +95,23 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.sysroot": {
-      "version": "2.0.3",
+      "version": "2.0.5",
      "depth": 1,
      "source": "registry",
      "dependencies": {},
      "url": "https://packages.unity.com"
    },
    "com.unity.sysroot.linux-x86_64": {
-      "version": "2.0.2",
+      "version": "2.0.4",
      "depth": 1,
      "source": "registry",
      "dependencies": {
-        "com.unity.sysroot": "2.0.3"
+        "com.unity.sysroot": "2.0.5"
      },
      "url": "https://packages.unity.com"
    },
    "com.unity.test-framework": {
-      "version": "1.1.31",
+      "version": "1.1.33",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@@ -152,6 +152,16 @@
      },
      "url": "https://packages.unity.com"
    },
+    "com.unity.toolchain.linux-x86_64": {
+      "version": "2.0.4",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.sysroot": "2.0.5",
+        "com.unity.sysroot.linux-x86_64": "2.0.4"
+      },
+      "url": "https://packages.unity.com"
+    },
    "com.unity.toolchain.win-x86_64-linux-x86_64": {
      "version": "2.0.2",
      "depth": 0,
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -6,6 +6,6 @@ EditorBuildSettings:
  serializedVersion: 2
  m_Scenes:
  - enabled: 1
-    path: Assets/Scenes/Main.unity
-    guid: 9fc0d4010bbf28b4594072e72b8655ab
+    path: Assets/Scenes/EndlessRunnerTest.unity
+    guid: 704dd654004d8294087e65b01ffe8600
  m_configObjects: {}
--- a/ProjectSettings/InputManager.asset
+++ b/ProjectSettings/InputManager.asset
@@ -37,54 +37,6 @@ InputManager:
    type: 0
    axis: 0
    joyNum: 0
-  - serializedVersion: 3
-    m_Name: Fire1
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: left ctrl
-    altNegativeButton: 
-    altPositiveButton: mouse 0
-    gravity: 1000
-    dead: 0.001
-    sensitivity: 1000
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 0
-    joyNum: 0
-  - serializedVersion: 3
-    m_Name: Fire2
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: left alt
-    altNegativeButton: 
-    altPositiveButton: mouse 1
-    gravity: 1000
-    dead: 0.001
-    sensitivity: 1000
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 0
-    joyNum: 0
-  - serializedVersion: 3
-    m_Name: Fire3
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: left shift
-    altNegativeButton: 
-    altPositiveButton: mouse 2
-    gravity: 1000
-    dead: 0.001
-    sensitivity: 1000
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 0
-    joyNum: 0
  - serializedVersion: 3
    m_Name: Jump
    descriptiveName: 
@@ -149,118 +101,6 @@ InputManager:
    type: 1
    axis: 2
    joyNum: 0
-  - serializedVersion: 3
-    m_Name: Horizontal
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: 
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 0
-    dead: 0.19
-    sensitivity: 1
-    snap: 0
-    invert: 0
-    type: 2
-    axis: 0
-    joyNum: 0
-  - serializedVersion: 3
-    m_Name: Vertical
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: 
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 0
-    dead: 0.19
-    sensitivity: 1
-    snap: 0
-    invert: 1
-    type: 2
-    axis: 1
-    joyNum: 0
-  - serializedVersion: 3
-    m_Name: Fire1
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: joystick button 0
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 1000
-    dead: 0.001
-    sensitivity: 1000
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 0
-    joyNum: 0
-  - serializedVersion: 3
-    m_Name: Fire2
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: joystick button 1
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 1000
-    dead: 0.001
-    sensitivity: 1000
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 0
-    joyNum: 0
-  - serializedVersion: 3
-    m_Name: Fire3
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: joystick button 2
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 1000
-    dead: 0.001
-    sensitivity: 1000
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 0
-    joyNum: 0
-  - serializedVersion: 3
-    m_Name: Jump
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: joystick button 0
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 1000
-    dead: 0.001
-    sensitivity: 1000
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 0
-    joyNum: 0
-  - serializedVersion: 3
-    m_Name: Submit
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: return
-    altNegativeButton: 
-    altPositiveButton: joystick button 0
-    gravity: 1000
-    dead: 0.001
-    sensitivity: 1000
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 0
-    joyNum: 0
  - serializedVersion: 3
    m_Name: Submit
    descriptiveName: 
--- a/ProjectSettings/QualitySettings.asset
+++ b/ProjectSettings/QualitySettings.asset
@@ -4,44 +4,8 @@
 QualitySettings:
  m_ObjectHideFlags: 0
  serializedVersion: 5
-  m_CurrentQuality: 5
+  m_CurrentQuality: 0
  m_QualitySettings:
-  - serializedVersion: 2
-    name: Very Low
-    pixelLightCount: 0
-    shadows: 0
-    shadowResolution: 0
-    shadowProjection: 1
-    shadowCascades: 1
-    shadowDistance: 15
-    shadowNearPlaneOffset: 3
-    shadowCascade2Split: 0.33333334
-    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
-    shadowmaskMode: 0
-    skinWeights: 1
-    textureQuality: 1
-    anisotropicTextures: 0
-    antiAliasing: 0
-    softParticles: 0
-    softVegetation: 0
-    realtimeReflectionProbes: 0
-    billboardsFaceCameraPosition: 0
-    vSyncCount: 0
-    lodBias: 0.3
-    maximumLODLevel: 0
-    streamingMipmapsActive: 0
-    streamingMipmapsAddAllCameras: 1
-    streamingMipmapsMemoryBudget: 512
-    streamingMipmapsRenderersPerFrame: 512
-    streamingMipmapsMaxLevelReduction: 2
-    streamingMipmapsMaxFileIORequests: 1024
-    particleRaycastBudget: 4
-    asyncUploadTimeSlice: 2
-    asyncUploadBufferSize: 16
-    asyncUploadPersistentBuffer: 1
-    resolutionScalingFixedDPIFactor: 1
-    customRenderPipeline: {fileID: 0}
-    excludedTargetPlatforms: []
  - serializedVersion: 2
    name: Low
    pixelLightCount: 0
@@ -150,90 +114,18 @@ QualitySettings:
    resolutionScalingFixedDPIFactor: 1
    customRenderPipeline: {fileID: 0}
    excludedTargetPlatforms: []
-  - serializedVersion: 2
-    name: Very High
-    pixelLightCount: 3
-    shadows: 2
-    shadowResolution: 2
-    shadowProjection: 1
-    shadowCascades: 2
-    shadowDistance: 70
-    shadowNearPlaneOffset: 3
-    shadowCascade2Split: 0.33333334
-    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
-    shadowmaskMode: 1
-    skinWeights: 4
-    textureQuality: 0
-    anisotropicTextures: 2
-    antiAliasing: 2
-    softParticles: 1
-    softVegetation: 1
-    realtimeReflectionProbes: 1
-    billboardsFaceCameraPosition: 1
-    vSyncCount: 1
-    lodBias: 1.5
-    maximumLODLevel: 0
-    streamingMipmapsActive: 0
-    streamingMipmapsAddAllCameras: 1
-    streamingMipmapsMemoryBudget: 512
-    streamingMipmapsRenderersPerFrame: 512
-    streamingMipmapsMaxLevelReduction: 2
-    streamingMipmapsMaxFileIORequests: 1024
-    particleRaycastBudget: 1024
-    asyncUploadTimeSlice: 2
-    asyncUploadBufferSize: 16
-    asyncUploadPersistentBuffer: 1
-    resolutionScalingFixedDPIFactor: 1
-    customRenderPipeline: {fileID: 0}
-    excludedTargetPlatforms: []
-  - serializedVersion: 2
-    name: Ultra
-    pixelLightCount: 4
-    shadows: 2
-    shadowResolution: 2
-    shadowProjection: 1
-    shadowCascades: 4
-    shadowDistance: 150
-    shadowNearPlaneOffset: 3
-    shadowCascade2Split: 0.33333334
-    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
-    shadowmaskMode: 1
-    skinWeights: 4
-    textureQuality: 0
-    anisotropicTextures: 2
-    antiAliasing: 2
-    softParticles: 1
-    softVegetation: 1
-    realtimeReflectionProbes: 1
-    billboardsFaceCameraPosition: 1
-    vSyncCount: 1
-    lodBias: 2
-    maximumLODLevel: 0
-    streamingMipmapsActive: 0
-    streamingMipmapsAddAllCameras: 1
-    streamingMipmapsMemoryBudget: 512
-    streamingMipmapsRenderersPerFrame: 512
-    streamingMipmapsMaxLevelReduction: 2
-    streamingMipmapsMaxFileIORequests: 1024
-    particleRaycastBudget: 4096
-    asyncUploadTimeSlice: 2
-    asyncUploadBufferSize: 16
-    asyncUploadPersistentBuffer: 1
-    resolutionScalingFixedDPIFactor: 1
-    customRenderPipeline: {fileID: 0}
-    excludedTargetPlatforms: []
  m_PerPlatformDefaultQuality:
-    Android: 2
-    Lumin: 5
-    Nintendo 3DS: 5
-    Nintendo Switch: 5
-    PS4: 5
-    PSP2: 2
+    Android: 1
+    Lumin: 2
+    Nintendo 3DS: 2
+    Nintendo Switch: 2
+    PS4: 2
+    PSP2: 1
    Server: 0
-    Stadia: 5
-    Standalone: 5
-    WebGL: 3
-    Windows Store Apps: 5
-    XboxOne: 5
-    iPhone: 2
-    tvOS: 2
+    Stadia: 2
+    Standalone: 2
+    WebGL: 2
+    Windows Store Apps: 2
+    XboxOne: 2
+    iPhone: 1
+    tvOS: 1
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -6,10 +6,10 @@ EditorUserSettings:
  serializedVersion: 4
  m_ConfigSettings:
    RecentlyUsedSceneGuid-0:
-      value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
+      value: 5b55515706060d025a5f0d2043260744414f482c7e2b7263747d4a32b0b9313b
      flags: 0
    RecentlyUsedSceneGuid-1:
-      value: 5b55515706060d025a5f0d2043260744414f482c7e2b7263747d4a32b0b9313b
+      value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
      flags: 0
    RecentlyUsedSceneGuid-2:
      value: 5401000201035c0f5d5e582648710644464f4f2f7a7d24607c2f1b36bab66468
--- a/UserSettings/Layouts/default-2021.dwlt
+++ b/UserSettings/Layouts/default-2021.dwlt
@@ -15,42 +15,16 @@ MonoBehaviour:
  m_PixelRect:
    serializedVersion: 2
    x: 0
-    y: 43
-    width: 1920
-    height: 997
+    y: 28
+    width: 1366
+    height: 672
  m_ShowMode: 4
-  m_Title: Hierarchy
-  m_RootView: {fileID: 3}
+  m_Title: Scene
+  m_RootView: {fileID: 2}
  m_MinSize: {x: 875, y: 371}
  m_MaxSize: {x: 10000, y: 10000}
-  m_Maximized: 1
+  m_Maximized: 0
 --- !u!114 &2
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: GameView
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 883
-    y: 0
-    width: 562
-    height: 544
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 13}
-  m_Panes:
-  - {fileID: 13}
-  m_Selected: 0
-  m_LastSelected: 0
--- !u!114 &3
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@@ -63,22 +37,22 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Children:
-  - {fileID: 4}
-  - {fileID: 6}
+  - {fileID: 3}
  - {fileID: 5}
+  - {fileID: 4}
  m_Position:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 1920
-    height: 997
+    width: 1366
+    height: 672
  m_MinSize: {x: 875, y: 300}
  m_MaxSize: {x: 10000, y: 10000}
  m_UseTopView: 1
  m_TopViewHeight: 30
  m_UseBottomView: 1
  m_BottomViewHeight: 20
--- !u!114 &4
+--- !u!114 &3
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@@ -95,12 +69,12 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 1920
+    width: 1366
    height: 30
  m_MinSize: {x: 0, y: 0}
  m_MaxSize: {x: 0, y: 0}
  m_LastLoadedLayoutName: 
--- !u!114 &5
+--- !u!114 &4
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@@ -116,11 +90,36 @@ MonoBehaviour:
  m_Position:
    serializedVersion: 2
    x: 0
-    y: 977
-    width: 1920
+    y: 652
+    width: 1366
    height: 20
  m_MinSize: {x: 0, y: 0}
  m_MaxSize: {x: 0, y: 0}
+--- !u!114 &5
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {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: 6}
+  - {fileID: 11}
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 30
+    width: 1366
+    height: 622
+  m_MinSize: {x: 300, y: 200}
+  m_MaxSize: {x: 24288, y: 16192}
+  vertical: 0
+  controlID: 16
 --- !u!114 &6
 MonoBehaviour:
  m_ObjectHideFlags: 52
@@ -135,17 +134,17 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_Children:
  - {fileID: 7}
-  - {fileID: 12}
+  - {fileID: 10}
  m_Position:
    serializedVersion: 2
    x: 0
-    y: 30
-    width: 1920
-    height: 947
-  m_MinSize: {x: 400, y: 200}
-  m_MaxSize: {x: 32384, y: 16192}
-  vertical: 0
-  controlID: 63
+    y: 0
+    width: 1028
+    height: 622
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 16192, y: 16192}
+  vertical: 1
+  controlID: 17
 --- !u!114 &7
 MonoBehaviour:
  m_ObjectHideFlags: 52
@@ -160,44 +159,18 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_Children:
  - {fileID: 8}
-  - {fileID: 11}
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1445
-    height: 947
-  m_MinSize: {x: 300, y: 200}
-  m_MaxSize: {x: 24288, y: 16192}
-  vertical: 1
-  controlID: 64
--- !u!114 &8
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {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: 9}
-  - {fileID: 10}
-  - {fileID: 2}
  m_Position:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 1445
-    height: 544
-  m_MinSize: {x: 300, y: 100}
-  m_MaxSize: {x: 24288, y: 8096}
+    width: 1028
+    height: 357
+  m_MinSize: {x: 200, y: 100}
+  m_MaxSize: {x: 16192, y: 8096}
  vertical: 0
-  controlID: 65
--- !u!114 &9
+  controlID: 18
+--- !u!114 &8
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@@ -214,16 +187,16 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 260
-    height: 544
+    width: 185
+    height: 357
  m_MinSize: {x: 201, y: 221}
  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 14}
+  m_ActualView: {fileID: 13}
  m_Panes:
-  - {fileID: 14}
+  - {fileID: 13}
  m_Selected: 0
  m_LastSelected: 0
--- !u!114 &10
+--- !u!114 &9
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@@ -238,18 +211,19 @@ MonoBehaviour:
  m_Children: []
  m_Position:
    serializedVersion: 2
-    x: 260
+    x: 185
    y: 0
-    width: 623
-    height: 544
+    width: 843
+    height: 357
  m_MinSize: {x: 202, y: 221}
  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 15}
+  m_ActualView: {fileID: 14}
  m_Panes:
-  - {fileID: 15}
+  - {fileID: 14}
+  - {fileID: 12}
  m_Selected: 0
-  m_LastSelected: 0
--- !u!114 &11
+  m_LastSelected: 1
+--- !u!114 &10
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@@ -265,18 +239,18 @@ MonoBehaviour:
  m_Position:
    serializedVersion: 2
    x: 0
-    y: 544
-    width: 1445
-    height: 403
+    y: 357
+    width: 1028
+    height: 265
  m_MinSize: {x: 231, y: 271}
  m_MaxSize: {x: 10001, y: 10021}
-  m_ActualView: {fileID: 16}
+  m_ActualView: {fileID: 15}
  m_Panes:
+  - {fileID: 15}
  - {fileID: 16}
-  - {fileID: 17}
  m_Selected: 0
  m_LastSelected: 1
--- !u!114 &12
+--- !u!114 &11
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@@ -291,18 +265,18 @@ MonoBehaviour:
  m_Children: []
  m_Position:
    serializedVersion: 2
-    x: 1445
+    x: 1028
    y: 0
-    width: 475
-    height: 947
+    width: 338
+    height: 622
  m_MinSize: {x: 276, y: 71}
  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 18}
+  m_ActualView: {fileID: 17}
  m_Panes:
-  - {fileID: 18}
+  - {fileID: 17}
  m_Selected: 0
  m_LastSelected: 0
--- !u!114 &13
+--- !u!114 &12
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@@ -322,10 +296,10 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 883
-    y: 73
-    width: 560
-    height: 523
+    x: 185
+    y: 86
+    width: 841
+    height: 336
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@@ -336,7 +310,7 @@ MonoBehaviour:
  m_ShowGizmos: 0
  m_TargetDisplay: 0
  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 560, y: 502}
+  m_TargetSize: {x: 841, y: 315}
  m_TextureFilterMode: 0
  m_TextureHideFlags: 61
  m_RenderIMGUI: 1
@@ -351,10 +325,10 @@ MonoBehaviour:
    m_VRangeLocked: 0
    hZoomLockedByDefault: 0
    vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -280
-    m_HBaseRangeMax: 280
-    m_VBaseRangeMin: -251
-    m_VBaseRangeMax: 251
+    m_HBaseRangeMin: -420.5
+    m_HBaseRangeMax: 420.5
+    m_VBaseRangeMin: -157.5
+    m_VBaseRangeMax: 157.5
    m_HAllowExceedBaseRangeMin: 1
    m_HAllowExceedBaseRangeMax: 1
    m_VAllowExceedBaseRangeMin: 1
@@ -372,29 +346,29 @@ MonoBehaviour:
      serializedVersion: 2
      x: 0
      y: 21
-      width: 560
-      height: 502
+      width: 841
+      height: 315
    m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 280, y: 251}
+    m_Translation: {x: 420.5, y: 157.5}
    m_MarginLeft: 0
    m_MarginRight: 0
    m_MarginTop: 0
    m_MarginBottom: 0
    m_LastShownAreaInsideMargins:
      serializedVersion: 2
-      x: -280
-      y: -251
-      width: 560
-      height: 502
+      x: -420.5
+      y: -157.5
+      width: 841
+      height: 315
    m_MinimalGUI: 1
  m_defaultScale: 1
-  m_LastWindowPixelSize: {x: 560, y: 523}
+  m_LastWindowPixelSize: {x: 841, y: 336}
  m_ClearInEditMode: 1
  m_NoCameraWarning: 1
  m_LowResolutionForAspectRatios: 01000000000000000000
  m_XRRenderMode: 0
  m_RenderTexture: {fileID: 0}
--- !u!114 &14
+--- !u!114 &13
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@@ -415,9 +389,9 @@ MonoBehaviour:
  m_Pos:
    serializedVersion: 2
    x: 0
-    y: 73
-    width: 259
-    height: 523
+    y: 86
+    width: 184
+    height: 336
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@@ -425,9 +399,9 @@ MonoBehaviour:
  m_SceneHierarchy:
    m_TreeViewState:
      scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 
-      m_LastClickedID: 0
-      m_ExpandedIDs: de81ffff2882ffff7282ffff1aeeffff
+      m_SelectedIDs: 085e0000
+      m_LastClickedID: 24072
+      m_ExpandedIDs: 6ee0ffffaee4ffff34fbffff3c5e0000
      m_RenameOverlay:
        m_UserAcceptedRename: 0
        m_Name: 
@@ -443,7 +417,7 @@ MonoBehaviour:
        m_IsRenaming: 0
        m_OriginalEventType: 11
        m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 9}
+        m_ClientGUIView: {fileID: 8}
      m_SearchString: 
    m_ExpandedScenes: []
    m_CurrenRootInstanceID: 0
@@ -451,7 +425,7 @@ MonoBehaviour:
      m_IsLocked: 0
    m_CurrentSortingName: TransformSorting
  m_WindowGUID: 4c969a2b90040154d917609493e03593
--- !u!114 &15
+--- !u!114 &14
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@@ -471,10 +445,10 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 260
-    y: 73
-    width: 621
-    height: 523
+    x: 185
+    y: 86
+    width: 841
+    height: 336
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@@ -676,9 +650,9 @@ MonoBehaviour:
  m_PlayAudio: 0
  m_AudioPlay: 0
  m_Position:
-    m_Target: {x: -8.353775, y: 7.685253, z: 62.741096}
+    m_Target: {x: 10.774578, y: 3.129278, z: -0.5137391}
    speed: 2
-    m_Value: {x: -8.353775, y: 7.685253, z: 62.741096}
+    m_Value: {x: 10.774578, y: 3.129278, z: -0.5137391}
  m_RenderMode: 0
  m_CameraMode:
    drawMode: 0
@@ -725,13 +699,13 @@ MonoBehaviour:
    m_GridAxis: 1
    m_gridOpacity: 0.5
  m_Rotation:
-    m_Target: {x: -0.03701341, y: 0.9162654, z: -0.087132014, w: -0.3892271}
+    m_Target: {x: 0.00018960606, y: -0.9997286, z: -0.022187298, w: -0.008392348}
    speed: 2
-    m_Value: {x: -0.037144028, y: 0.91567963, z: -0.0870763, w: -0.39060065}
+    m_Value: {x: 0.00013924947, y: -0.99983376, z: -0.0161884, w: -0.00839325}
  m_Size:
-    m_Target: 64.9515
+    m_Target: 3.9676936
    speed: 2
-    m_Value: 64.9515
+    m_Value: 3.9676936
  m_Ortho:
    m_Target: 0
    speed: 2
@@ -756,7 +730,7 @@ MonoBehaviour:
  m_SceneVisActive: 1
  m_LastLockedObject: {fileID: 0}
  m_ViewIsLockedToObject: 0
--- !u!114 &16
+--- !u!114 &15
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@@ -777,9 +751,9 @@ MonoBehaviour:
  m_Pos:
    serializedVersion: 2
    x: 0
-    y: 617
-    width: 1444
-    height: 382
+    y: 443
+    width: 1027
+    height: 244
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@@ -797,22 +771,22 @@ MonoBehaviour:
    m_SkipHidden: 0
    m_SearchArea: 1
    m_Folders:
-    - Assets/Resources/Prefabs/Modulok
+    - Assets/Resources/Models/World Objects
    m_Globs: []
    m_OriginalText: 
  m_ViewMode: 1
  m_StartGridSize: 81
  m_LastFolders:
-  - Assets/Resources/Prefabs/Modulok
+  - Assets/Resources/Models/World Objects
  m_LastFoldersGridSize: 81
-  m_LastProjectPath: C:\dev\zarodolgozat\ColorBall
+  m_LastProjectPath: /home/tom/Documents/dev/zarodolgozat/ColorRunner
  m_LockTracker:
    m_IsLocked: 0
  m_FolderTreeState:
    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 38ea0000
-    m_LastClickedID: 59960
-    m_ExpandedIDs: 00000000686d00008c6d00008e6d000024ea0000
+    m_SelectedIDs: 38610000
+    m_LastClickedID: 24888
+    m_ExpandedIDs: 0000000056600000ee6000002c61000000ca9a3bffffff7f
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@@ -840,7 +814,7 @@ MonoBehaviour:
    scrollPos: {x: 0, y: 0}
    m_SelectedIDs: 
    m_LastClickedID: 0
-    m_ExpandedIDs: 00000000686d0000
+    m_ExpandedIDs: 0000000056600000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@@ -884,7 +858,7 @@ MonoBehaviour:
      m_IsRenaming: 0
      m_OriginalEventType: 11
      m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 11}
+      m_ClientGUIView: {fileID: 0}
    m_CreateAssetUtility:
      m_EndAction: {fileID: 0}
      m_InstanceID: 0
@@ -896,7 +870,7 @@ MonoBehaviour:
    m_GridSize: 81
  m_SkipHiddenPackages: 0
  m_DirectoriesAreaWidth: 207
--- !u!114 &17
+--- !u!114 &16
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@@ -917,14 +891,14 @@ MonoBehaviour:
  m_Pos:
    serializedVersion: 2
    x: 0
-    y: 617
-    width: 1444
-    height: 382
+    y: 443
+    width: 1027
+    height: 244
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
    m_SaveData: []
--- !u!114 &18
+--- !u!114 &17
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@@ -944,10 +918,10 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 1445
-    y: 73
-    width: 474
-    height: 926
+    x: 1028
+    y: 86
+    width: 337
+    height: 601
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default