diff --git a/Assets/Project Files/Materials/Helar/Capsule.mat b/Assets/Project Files/Materials/Helar/Capsule.mat index f132ff5e..b0d0b893 100644 --- a/Assets/Project Files/Materials/Helar/Capsule.mat +++ b/Assets/Project Files/Materials/Helar/Capsule.mat @@ -8,18 +8,22 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Capsule - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHAPREMULTIPLY_ON + m_Shader: {fileID: 4800000, guid: b7839dad95683814aa64166edc107ae2, type: 3} + m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 + m_CustomRenderQueue: -1 stringTagMap: - RenderType: Transparent + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -58,10 +62,24 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 + - _ColorMode: 0 + - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - - _DstBlend: 10 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0.1 + - _DstBlend: 0 + - _FlipbookBlending: 0 + - _FlipbookMode: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -69,12 +87,23 @@ Material: - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _Surface: 0 - _UVSec: 0 - - _ZWrite: 0 + - _ZWrite: 1 m_Colors: - - _Color: {r: 0, g: 0, b: 0, a: 0.23921569} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} + - _CameraFadeParams: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] diff --git a/Assets/Scenes/JonasB/SampleScene.unity.meta b/Assets/Scenes/JonasB/SampleScene.unity.meta deleted file mode 100644 index 2c32fa3e..00000000 --- a/Assets/Scenes/JonasB/SampleScene.unity.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 2b69378e75b5d0a449891a859b5afe0a -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/JoonasP/SampleScene/New Universal Render Pipeline Asset_Renderer.asset b/Assets/Scenes/JoonasP/SampleScene/New Universal Render Pipeline Asset_Renderer.asset index 728f780a..39bc866f 100644 --- a/Assets/Scenes/JoonasP/SampleScene/New Universal Render Pipeline Asset_Renderer.asset +++ b/Assets/Scenes/JoonasP/SampleScene/New Universal Render Pipeline Asset_Renderer.asset @@ -18,7 +18,7 @@ MonoBehaviour: m_RendererFeatures: [] m_RendererFeatureMap: m_UseNativeRenderPass: 0 - postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} + postProcessData: {fileID: 0} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} diff --git a/Assets/SimpleNaturePack/Materials/SimpleNaturePack_Texture_01.mat b/Assets/SimpleNaturePack/Materials/SimpleNaturePack_Texture_01.mat index 22b1bb1d..02642475 100644 --- a/Assets/SimpleNaturePack/Materials/SimpleNaturePack_Texture_01.mat +++ b/Assets/SimpleNaturePack/Materials/SimpleNaturePack_Texture_01.mat @@ -8,13 +8,14 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SimpleNaturePack_Texture_01 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: - DistortionVectors - TransparentDepthPrepass @@ -32,6 +33,10 @@ Material: m_Texture: {fileID: 2800000, guid: 28a51d508c86a8948b59df81d5188b17, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BentNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -89,7 +94,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 28a51d508c86a8948b59df81d5188b17, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: @@ -116,6 +121,10 @@ Material: 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} - _SpecularColorMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -140,23 +149,42 @@ Material: 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: - _AORemapMax: 1 - _AORemapMin: 0 - _ATDistance: 1 - _AlbedoAffectEmissive: 0 + - _AlphaClip: 0 - _AlphaCutoff: 0.5 - _AlphaCutoffEnable: 0 - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 - _Anisotropy: 0 + - _Blend: 0 - _BlendMode: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _CoatMask: 0 + - _Cull: 2 - _CullMode: 2 - _CullModeForward: 2 - _Cutoff: 0.5 - _DepthOffsetEnable: 0 + - _DetailAlbedoMapScale: 1 - _DetailAlbedoScale: 1 - _DetailNormalMapScale: 1 - _DetailNormalScale: 1 @@ -191,6 +219,7 @@ Material: - _EnableSpecularOcclusion: 0 - _EnableWind: 0 - _EnergyConservingSpecularColor: 1 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.25 - _GlossyReflections: 1 @@ -223,6 +252,8 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.02 - _PreRefractionPass: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 - _ReceivesSSR: 1 - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 @@ -243,6 +274,7 @@ Material: - _Stiffness: 1 - _SubsurfaceMask: 1 - _SupportDecals: 1 + - _Surface: 0 - _SurfaceType: 0 - _TexWorldScale: 1 - _TexWorldScaleEmissive: 1 @@ -257,6 +289,7 @@ Material: - _UVDetail: 0 - _UVEmissive: 0 - _UVSec: 0 + - _WorkflowMode: 1 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 @@ -269,9 +302,11 @@ Material: - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} - _ThicknessRemap: {r: 0, g: 1, b: 0, a: 0} - _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1} - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/Packages/manifest.json b/Packages/manifest.json index f337b30b..489be995 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -11,7 +11,6 @@ "com.unity.postprocessing": "3.2.1", "com.unity.render-pipelines.universal": "12.1.4", "com.unity.searcher": "4.9.1", - "com.unity.render-pipelines.universal": "12.1.4", "com.unity.test-framework": "1.1.29", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.6.3", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index c941a1b5..4122a8c9 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -102,7 +102,7 @@ }, "com.unity.mathematics": { "version": "1.2.5", - "depth": 1, + "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" @@ -121,34 +121,6 @@ "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.render-pipelines.core": { - "version": "12.1.4", - "depth": 1, - "source": "builtin", - "dependencies": { - "com.unity.ugui": "1.0.0", - "com.unity.modules.physics": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0" - } - }, - "com.unity.render-pipelines.universal": { - "version": "12.1.4", - "depth": 0, - "source": "builtin", - "dependencies": { - "com.unity.mathematics": "1.2.1", - "com.unity.burst": "1.5.0", - "com.unity.render-pipelines.core": "12.1.4", - "com.unity.shadergraph": "12.1.4" - } - }, - "com.unity.searcher": { - "version": "4.9.1", - "depth": 2, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.postprocessing": { "version": "3.2.1", "depth": 0, diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 371bc31c..e50c733e 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,7 +3,7 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 13 + serializedVersion: 14 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} @@ -64,9 +64,10 @@ GraphicsSettings: m_FogKeepExp: 1 m_FogKeepExp2: 1 m_AlbedoSwatchInfos: [] - m_LightsUseLinearIntensity: 0 - m_LightsUseColorTemperature: 0 + m_LightsUseLinearIntensity: 1 + m_LightsUseColorTemperature: 1 + m_DefaultRenderingLayerMask: 1 m_LogWhenShaderIsCompiled: 0 m_SRPDefaultSettings: - UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 28fa652f498e17e4d996b6f46781a605, + UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: ac81af946f34efc449947236acd2683f, type: 2}