Made menu decorations work on all resolutions

Removed unused shaders from project

Assets/EdgeDetMat.mat

@@ -7,19 +7,17 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: TransparrentRed
+  m_Name: EdgeDetMat
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Shader: {fileID: 4800000, guid: 211b73cf71b1f6a48aa152214d4a886d, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
-  m_ValidKeywords:
+  m_ValidKeywords: []
-  - _ALPHAPREMULTIPLY_ON
   m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3000
+  m_CustomRenderQueue: -1
-  stringTagMap:
+  stringTagMap: {}
-    RenderType: Transparent
   disabledShaderPasses: []
   m_LockedProperties: 
   m_SavedProperties:
@@ -66,20 +64,20 @@ Material:
     - _BumpScale: 1
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
-    - _DstBlend: 10
+    - _DstBlend: 0
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _GlossyReflections: 1
     - _Metallic: 0
-    - _Mode: 3
+    - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
     - _UVSec: 0
-    - _ZWrite: 0
+    - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 1, g: 0, b: 0, a: 0.5019608}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
   m_BuildTextureStacks: []

Assets/EdgeDetMat.mat.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 45fd8ac89ef24ee4a8f8aef5818a3179
+guid: b4f28ecf1d1c85941ae7097df1b9f763
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000

Assets/Prefabs/Portal.prefab

@@ -215,7 +215,7 @@ Transform:
   m_GameObject: {fileID: 4525855263416128436}
   serializedVersion: 2
   m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: 5, z: -0.1}
+  m_LocalPosition: {x: 0, y: 5, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -317,6 +317,7 @@ GameObject:
   m_Component:
   - component: {fileID: 8290014685027761188}
   - component: {fileID: 4196137517685965440}
+  - component: {fileID: 848597767875800347}
   m_Layer: 0
   m_Name: Back
   m_TagString: Untagged
@@ -360,3 +361,16 @@ BoxCollider:
   serializedVersion: 3
   m_Size: {x: 10, y: 10, z: 5}
   m_Center: {x: 0, y: 5, z: -3.5}
+--- !u!114 &848597767875800347
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7967144210440699741}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 859e4c4c9b11c654a8ab3891fbd8c5b3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Manager: {fileID: 4470023418895194988}

Assets/Prefabs/PortalCam.prefab

@@ -110,7 +110,7 @@ Camera:
     width: 1
     height: 1
   near clip plane: 0.3
-  far clip plane: 100
+  far clip plane: 500
   field of view: 60
   orthographic: 0
   orthographic size: 5

Assets/Red.mat

@@ -78,6 +78,6 @@ Material:
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 1, g: 0, b: 0, a: 1}
+    - _Color: {r: 0, g: 0, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
   m_BuildTextureStacks: []

Assets/Scenes/MainMenu.unity

@@ -1406,8 +1406,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 100, y: 300}
+  m_AnchoredPosition: {x: 100, y: 2000}
-  m_SizeDelta: {x: 30, y: 500}
+  m_SizeDelta: {x: 30, y: 4000}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &429625967
 MonoBehaviour:
@@ -1929,8 +1929,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 100, y: 150}
+  m_AnchoredPosition: {x: 100, y: 1900}
-  m_SizeDelta: {x: 30, y: 500}
+  m_SizeDelta: {x: 30, y: 4000}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &494790299
 MonoBehaviour:
@@ -2843,8 +2843,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -100, y: 150}
+  m_AnchoredPosition: {x: -100, y: 1900}
-  m_SizeDelta: {x: 30, y: 500}
+  m_SizeDelta: {x: 30, y: 4000}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &891445732
 MonoBehaviour:
@@ -3522,8 +3522,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 375, y: 300}
+  m_AnchoredPosition: {x: 375, y: 2000}
-  m_SizeDelta: {x: 30, y: 400}
+  m_SizeDelta: {x: 30, y: 4000}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1105138783
 MonoBehaviour:
@@ -3708,8 +3708,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -375, y: 300}
+  m_AnchoredPosition: {x: -375, y: 2000}
-  m_SizeDelta: {x: 30, y: 400}
+  m_SizeDelta: {x: 30, y: 4000}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1270506661
 MonoBehaviour:
@@ -4055,8 +4055,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 215, y: 300}
+  m_AnchoredPosition: {x: 215, y: 2000}
-  m_SizeDelta: {x: 30, y: 500}
+  m_SizeDelta: {x: 30, y: 4000}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1326695718
 MonoBehaviour:
@@ -4500,7 +4500,7 @@ MonoBehaviour:
     m_LineSpacing: 1
   m_Text: 'Note:
 
-    Only works on red walls'
+    Only works on BLUE walls'
 --- !u!222 &1529889363
 CanvasRenderer:
   m_ObjectHideFlags: 0

Assets/Scripts/GravityController.cs

@@ -8,6 +8,10 @@ public class GravityController
     // Constant gravity scale
     const float m_GravityScale = -20.0f;
 
+    Vector3 m_Up = Vector3.zero;
+
+    public static Vector3 up => s_Instance.m_Up;
+
     // Private constructor to stop accidental creation
     private GravityController() { }
 
@@ -27,5 +31,6 @@ public class GravityController
     {
         // Sets the gravity
         Physics.gravity = new Vector3(0, m_GravityScale * scale, 0);
+        m_Up = Physics.gravity;
     }
 }

Assets/Scripts/Portals/PortalBack.cs

@@ -0,0 +1,10 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class PortalBack : MonoBehaviour
+{
+    [SerializeField] PortalManager m_Manager;
+
+    // private void OnCollisionEnter(Collision collision) => m_Manager.ForceTeleport();
+}

Assets/Scripts/Portals/PortalBack.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 859e4c4c9b11c654a8ab3891fbd8c5b3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Portals/PortalManager.cs

@@ -18,7 +18,7 @@ public class PortalManager : MonoBehaviour
     // Private variables //
 
     PortalManager m_OtherManager;
-    PortalCamera m_PortalCamera;
+    [SerializeField] PortalCamera m_PortalCamera;
 
     // Gets the other end of the portal
     public PortalManager Linked() => m_OtherManager;
@@ -52,6 +52,23 @@ public class PortalManager : MonoBehaviour
         m_PlayerPoint.position = CameraController.Instance().transform.position;
     }
 
+    public void ForceTeleport()
+    {
+        // Calculates if the player is going towards the portal
+        Vector3 difference = PlayerMovement.Pos() - transform.position;
+
+        // Rotates the player
+        float rotDif = -Quaternion.Angle(transform.rotation, m_OtherManager.transform.rotation) + m_AngleDif;
+        CameraController.Instance().RotatePlayerDirection(new Vector2(0f, rotDif));
+
+        // Tellss the player it went through a portal
+        PlayerMovement.Instance().WentThroughPortal(rotDif);
+
+        // Teleports the player
+        Vector3 offset = Quaternion.Euler(0f, rotDif, 0f) * difference;
+        PlayerMovement.SetPos(m_OtherManager.transform.position + offset - new Vector3(0, 1.0f, 0));
+    }
+
     // When something enters the portal
     private void OnTriggerEnter(Collider other)
     {

Assets/Thirdparty/Ciathyza/Gridbox Prototype Materials/Textures/prototype_512x512_grey4.png.meta

@@ -1,9 +1,9 @@
 fileFormatVersion: 2
 guid: ed0c2c8a99e92e14ba740ac8aa428288
 TextureImporter:
-  internalIDToNameTable: []
+  fileIDToRecycleName: {}
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 7
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
@@ -57,33 +57,30 @@ TextureImporter:
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
-  applyGammaDecoding: 1
   platformSettings:
-  - serializedVersion: 3
+  - serializedVersion: 2
     buildTarget: DefaultTexturePlatform
     maxTextureSize: 512
     resizeAlgorithm: 0
     textureFormat: -1
-    textureCompression: 1
+    textureCompression: 2
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 2
-  - serializedVersion: 3
     buildTarget: Standalone
     maxTextureSize: 512
     resizeAlgorithm: 0
     textureFormat: -1
-    textureCompression: 1
+    textureCompression: 2
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 2
-  - serializedVersion: 3
     buildTarget: iPhone
     maxTextureSize: 512
     resizeAlgorithm: 0
@@ -94,8 +91,7 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 2
-  - serializedVersion: 3
     buildTarget: WebGL
     maxTextureSize: 512
     resizeAlgorithm: 0
@@ -106,7 +102,6 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -114,12 +109,10 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 
-    internalID: 0
     vertices: []
     indices: 
     edges: []
     weights: []
-    secondaryTextures: []
   spritePackingTag: 
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0

Assets/Ultimate 10 Plus Shaders.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 29720fcdf33dc1c44900e42bb5835507
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Ultimate 10 Plus Shaders/Shaders.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7abb74942295fc244bdfe8bb8236881d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Ultimate 10 Plus Shaders/Shaders/Edge Detection.shader

@@ -0,0 +1,110 @@
+/*
+
+███████╗██████╗░░██████╗░███████╗  ██████╗░███████╗████████╗███████╗░█████╗░████████╗██╗░█████╗░███╗░░██╗
+██╔════╝██╔══██╗██╔════╝░██╔════╝  ██╔══██╗██╔════╝╚══██╔══╝██╔════╝██╔══██╗╚══██╔══╝██║██╔══██╗████╗░██║
+█████╗░░██║░░██║██║░░██╗░█████╗░░  ██║░░██║█████╗░░░░░██║░░░█████╗░░██║░░╚═╝░░░██║░░░██║██║░░██║██╔██╗██║
+██╔══╝░░██║░░██║██║░░╚██╗██╔══╝░░  ██║░░██║██╔══╝░░░░░██║░░░██╔══╝░░██║░░██╗░░░██║░░░██║██║░░██║██║╚████║
+███████╗██████╔╝╚██████╔╝███████╗  ██████╔╝███████╗░░░██║░░░███████╗╚█████╔╝░░░██║░░░██║╚█████╔╝██║░╚███║
+╚══════╝╚═════╝░░╚═════╝░╚══════╝  ╚═════╝░╚══════╝░░░╚═╝░░░╚══════╝░╚════╝░░░░╚═╝░░░╚═╝░╚════╝░╚═╝░░╚══╝
+
+                            ░██████╗██╗░░██╗░█████╗░██████╗░███████╗██████╗░
+                            ██╔════╝██║░░██║██╔══██╗██╔══██╗██╔════╝██╔══██╗
+                            ╚█████╗░███████║███████║██║░░██║█████╗░░██████╔╝
+                            ░╚═══██╗██╔══██║██╔══██║██║░░██║██╔══╝░░██╔══██╗
+                            ██████╔╝██║░░██║██║░░██║██████╔╝███████╗██║░░██║
+                            ╚═════╝░╚═╝░░╚═╝╚═╝░░╚═╝╚═════╝░╚══════╝╚═╝░░╚═╝
+            
+                █▀▀▄ █──█ 　 ▀▀█▀▀ █──█ █▀▀ 　 ░█▀▀▄ █▀▀ ▀█─█▀ █▀▀ █── █▀▀█ █▀▀█ █▀▀ █▀▀█ 
+                █▀▀▄ █▄▄█ 　 ─░█── █▀▀█ █▀▀ 　 ░█─░█ █▀▀ ─█▄█─ █▀▀ █── █──█ █──█ █▀▀ █▄▄▀ 
+                ▀▀▀─ ▄▄▄█ 　 ─░█── ▀──▀ ▀▀▀ 　 ░█▄▄▀ ▀▀▀ ──▀── ▀▀▀ ▀▀▀ ▀▀▀▀ █▀▀▀ ▀▀▀ ▀─▀▀
+____________________________________________________________________________________________________________________________________________
+
+        ▄▀█ █▀ █▀ █▀▀ ▀█▀ ▀   █░█ █░░ ▀█▀ █ █▀▄▀█ ▄▀█ ▀█▀ █▀▀   ▄█ █▀█ ▄█▄   █▀ █░█ ▄▀█ █▀▄ █▀▀ █▀█ █▀
+        █▀█ ▄█ ▄█ ██▄ ░█░ ▄   █▄█ █▄▄ ░█░ █ █░▀░█ █▀█ ░█░ ██▄   ░█ █▄█ ░▀░   ▄█ █▀█ █▀█ █▄▀ ██▄ █▀▄ ▄█
+____________________________________________________________________________________________________________________________________________
+License:
+    The license is ATTRIBUTION 3.0
+
+    More license info here:
+        https://creativecommons.org/licenses/by/3.0/
+____________________________________________________________________________________________________________________________________________
+This shader has NOT been tested on any other PC configuration except the following:
+    CPU: Intel Core i5-6400
+    GPU: NVidia GTX 750Ti
+    RAM: 16GB
+    Windows: 10 x64
+    DirectX: 11
+____________________________________________________________________________________________________________________________________________
+*/
+
+Shader "Ultimate 10+ Shaders/Edge Detection" /* The edge detection algorithm that is implemented in this shader is named "Sobel Edge Detection" */
+{
+    Properties
+    {
+        _Color ("Color", Color) = (1,1,1,1)
+    }
+    SubShader
+    {
+        Tags { "Queue"="Transparent" }
+        Cull Back
+
+        GrabPass { }
+
+        Pass
+        {
+            CGPROGRAM
+            #pragma vertex vert
+            #pragma fragment frag
+            #include "UnityCG.cginc"
+
+            struct appdata
+            {
+                float4 vertex : POSITION;
+                float3 normal : NORMAL;
+            };    
+
+            struct v2f
+            {
+                float4 position : POSITION;
+                float4 screenPos : TEXCOORD0;
+            };
+
+            fixed4 _Color;
+            sampler2D _GrabTexture : register(s0);
+
+            v2f vert(appdata input)
+            {
+                v2f output;
+
+                output.position = UnityObjectToClipPos(input.vertex);
+                output.screenPos = output.position;
+
+                return output;
+            }
+
+            half4 pixel;
+            half2 uv;
+            fixed onePixelW, onePixelH;
+            half4 frag(v2f input) : SV_Target
+            {    
+                uv = input.screenPos.xy / input.screenPos.w;
+                uv.x = (uv.x + 1) * .5;
+                uv.y = 1.0 - (uv.y + 1) * .5;
+
+                onePixelW = 1.0 / _ScreenParams.x;
+                onePixelH = 1.0 / _ScreenParams.y;
+
+                pixel = 0;
+                pixel = abs(
+                        tex2D(_GrabTexture, half2(uv.x - onePixelW, uv.y)) - 
+                        tex2D(_GrabTexture, half2(uv.x + onePixelW, uv.y)) + 
+                        tex2D(_GrabTexture, half2(uv.x, uv.y + onePixelH)) -
+                        tex2D(_GrabTexture, half2(uv.x, uv.y - onePixelH))
+                    );
+
+                return pixel * _Color;
+            }    
+            ENDCG
+        }
+    }
+}

Assets/Ultimate 10 Plus Shaders/Shaders/Edge Detection.shader.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 211b73cf71b1f6a48aa152214d4a886d
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

README.md

@@ -1,2 +1,7 @@
-# TheMobiusLine
+# The Mobius Line
- 
+
+This is my FMP (final major project) that I created for my first year of Level 3 Game development. Windows downloads can be found under releases but if you wish to play via your browser you can play [here](https://pashabibko.itch.io/the-mobius-line).
+
+### About
+
+The mobius line is a speedrunning game built around non-Euclidean concepts set in the London Underground. Your goal is to get from one platform (the starting area) to the other (green wall) as fast as possible.