diff --git a/Assets/Materials/GolvMaterial.mat b/Assets/Materials/GolvMaterial.mat index 599310a..ccbd047 100644 --- a/Assets/Materials/GolvMaterial.mat +++ b/Assets/Materials/GolvMaterial.mat @@ -129,8 +129,8 @@ Material: - _XRMotionVectorsPass: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.05660379, g: 0.05153081, b: 0.05153081, a: 1} - - _Color: {r: 0.056603767, g: 0.051530786, b: 0.051530786, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Materials/beton_floor.mat b/Assets/Materials/beton_floor.mat new file mode 100644 index 0000000..01d795d --- /dev/null +++ b/Assets/Materials/beton_floor.mat @@ -0,0 +1,138 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-1557357582119780605 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: beton_floor + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _NORMALMAP + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 3f78576b26cf1465e85b2a28726849be, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: f7eb9ef9bdaea49ef9226750f2270f6d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 3f78576b26cf1465e85b2a28726849be, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 0.1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0.119 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Materials/beton_floor.mat.meta b/Assets/Materials/beton_floor.mat.meta new file mode 100644 index 0000000..5dfbc6b --- /dev/null +++ b/Assets/Materials/beton_floor.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 06bb09b4baea24c1ab91b6729053485b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Spelscenen.unity b/Assets/Scenes/Spelscenen.unity index e2fd9d9..adb19ad 100644 --- a/Assets/Scenes/Spelscenen.unity +++ b/Assets/Scenes/Spelscenen.unity @@ -1070,7 +1070,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b30979357526f74697e6c11ac9dae81, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::SceneLoader - sceneName: Spelscenen + SceneName: --- !u!1 &458923161 GameObject: m_ObjectHideFlags: 0 @@ -2187,7 +2187,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: aa7bfebc785514c88b857722eeb3bc73, type: 2} + - {fileID: 2100000, guid: 06bb09b4baea24c1ab91b6729053485b, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2952,7 +2952,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0.36650118, y: 0, z: 0, w: 0.9304176} m_LocalPosition: {x: 0, y: -15.9, z: 11.7} - m_LocalScale: {x: 5, y: 5, z: 5} + m_LocalScale: {x: 15, y: 15, z: 15} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 0} @@ -3237,7 +3237,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b30979357526f74697e6c11ac9dae81, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::SceneLoader - sceneName: Spelscenen + SceneName: Spelscenen --- !u!4 &1816127644 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Startscen.unity b/Assets/Scenes/Startscen.unity index bc77c5d..1b2634b 100644 --- a/Assets/Scenes/Startscen.unity +++ b/Assets/Scenes/Startscen.unity @@ -1089,7 +1089,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b30979357526f74697e6c11ac9dae81, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::SceneLoader - sceneName: Spelscenen + SceneName: Spelscenen --- !u!4 &2125563086 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/BallController.cs b/Assets/Scripts/BallController.cs index a5e3bc1..dbd54f9 100644 --- a/Assets/Scripts/BallController.cs +++ b/Assets/Scripts/BallController.cs @@ -15,7 +15,7 @@ public class BallController : MonoBehaviour { float _brakeForce; float _jumpForce; Rigidbody _ball; - float outOfBounds = -1.8f; + float _outOfBounds = -1.8f; void Start() { _ball = GetComponent(); @@ -54,7 +54,7 @@ public class BallController : MonoBehaviour { } void CheckPlayerOut() { - if (transform.position.y < outOfBounds) { + if (transform.position.y < _outOfBounds) { transform.position = new Vector3(0, 1f, 0); transform.rotation = Quaternion.Euler(0, 0, 0); } diff --git a/Assets/Scripts/SceneLoader.cs b/Assets/Scripts/SceneLoader.cs index 59fd32c..6eadd7f 100644 --- a/Assets/Scripts/SceneLoader.cs +++ b/Assets/Scripts/SceneLoader.cs @@ -3,10 +3,10 @@ using UnityEngine; using UnityEngine.SceneManagement; public class SceneLoader : MonoBehaviour { - public string sceneName; + public string SceneName; public void LoadScene() { - SceneManager.LoadScene(sceneName); + SceneManager.LoadScene(SceneName); } public void Quit() { // Stänger spelet när det körs som en byggd applikation diff --git a/Assets/Textures/background.jpg b/Assets/Textures/background.jpg index f20fe9f..c2e5404 100644 Binary files a/Assets/Textures/background.jpg and b/Assets/Textures/background.jpg differ diff --git a/Assets/Textures/beton_floor.jpg b/Assets/Textures/beton_floor.jpg new file mode 100644 index 0000000..1facd3b Binary files /dev/null and b/Assets/Textures/beton_floor.jpg differ diff --git a/Assets/Textures/beton_floor.jpg.meta b/Assets/Textures/beton_floor.jpg.meta new file mode 100644 index 0000000..8db935b --- /dev/null +++ b/Assets/Textures/beton_floor.jpg.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 3f78576b26cf1465e85b2a28726849be +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures/beton_normal.png b/Assets/Textures/beton_normal.png new file mode 100644 index 0000000..e5b98c3 Binary files /dev/null and b/Assets/Textures/beton_normal.png differ diff --git a/Assets/Textures/beton_normal.png.meta b/Assets/Textures/beton_normal.png.meta new file mode 100644 index 0000000..e82ccd5 --- /dev/null +++ b/Assets/Textures/beton_normal.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: f7eb9ef9bdaea49ef9226750f2270f6d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 1 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: