aboutsummaryrefslogtreecommitdiff
path: root/Assets
diff options
context:
space:
mode:
authorAndrew Lee <alee14498@protonmail.com>2021-05-25 18:21:31 -0400
committerAndrew Lee <alee14498@protonmail.com>2021-05-25 18:21:31 -0400
commit914e6702935f5b76cbb078117de575dc26e5ef1f (patch)
tree50e31b4da500a0d37dfd5d3774d446422654105a /Assets
parenta203857b77c1e2562abcc0dda4140ac21ebea1e1 (diff)
downloadprototype-a-914e6702935f5b76cbb078117de575dc26e5ef1f.tar.gz
prototype-a-914e6702935f5b76cbb078117de575dc26e5ef1f.tar.bz2
prototype-a-914e6702935f5b76cbb078117de575dc26e5ef1f.zip
Project now uses URP
Diffstat (limited to 'Assets')
-rw-r--r--Assets/Materials/Blue.mat54
-rw-r--r--Assets/Materials/Gray.mat54
-rw-r--r--Assets/Materials/White.mat54
-rw-r--r--Assets/Models.meta8
-rw-r--r--Assets/Scenes/SampleScene.unity3
-rw-r--r--Assets/UniversalRenderPipelineAsset.asset57
-rw-r--r--Assets/UniversalRenderPipelineAsset.asset.meta8
-rw-r--r--Assets/UniversalRenderPipelineAsset_Renderer.asset44
-rw-r--r--Assets/UniversalRenderPipelineAsset_Renderer.asset.meta8
9 files changed, 280 insertions, 10 deletions
diff --git a/Assets/Materials/Blue.mat b/Assets/Materials/Blue.mat
index 05b7aed..41d7cd7 100644
--- a/Assets/Materials/Blue.mat
+++ b/Assets/Materials/Blue.mat
@@ -8,17 +8,22 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Blue
- m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+ m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
- stringTagMap: {}
+ m_CustomRenderQueue: 2000
+ stringTagMap:
+ 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}
@@ -55,11 +60,34 @@ 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}
+ - 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_Floats:
+ - _AlphaClip: 0
+ - _Blend: 0
- _BumpScale: 1
+ - _ClearCoatMask: 0
+ - _ClearCoatSmoothness: 0
+ - _Cull: 2
- _Cutoff: 0.5
+ - _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
+ - _EnvironmentReflections: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
@@ -67,12 +95,32 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
+ - _QueueOffset: 0
+ - _ReceiveShadows: 1
+ - _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
+ - _Surface: 0
- _UVSec: 0
+ - _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
+ - _BaseColor: {r: 0, g: 0.19188643, b: 1, a: 1}
- _Color: {r: 0, g: 0.19188643, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_BuildTextureStacks: []
+--- !u!114 &1733500197208844855
+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:
+ version: 4
diff --git a/Assets/Materials/Gray.mat b/Assets/Materials/Gray.mat
index f05a91b..631d0a5 100644
--- a/Assets/Materials/Gray.mat
+++ b/Assets/Materials/Gray.mat
@@ -1,5 +1,18 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-5373530148142588565
+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:
+ version: 4
--- !u!21 &2100000
Material:
serializedVersion: 6
@@ -8,17 +21,22 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Gray
- m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+ m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
- stringTagMap: {}
+ m_CustomRenderQueue: 2000
+ stringTagMap:
+ 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}
@@ -55,11 +73,34 @@ 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}
+ - 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_Floats:
+ - _AlphaClip: 0
+ - _Blend: 0
- _BumpScale: 1
+ - _ClearCoatMask: 0
+ - _ClearCoatSmoothness: 0
+ - _Cull: 2
- _Cutoff: 0.5
+ - _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
+ - _EnvironmentReflections: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
@@ -67,12 +108,19 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
+ - _QueueOffset: 0
+ - _ReceiveShadows: 1
+ - _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
+ - _Surface: 0
- _UVSec: 0
+ - _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
+ - _BaseColor: {r: 0.4716981, g: 0.4716981, b: 0.4716981, a: 1}
- _Color: {r: 0.4716981, g: 0.4716981, b: 0.4716981, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_BuildTextureStacks: []
diff --git a/Assets/Materials/White.mat b/Assets/Materials/White.mat
index 5c800d9..e5db984 100644
--- a/Assets/Materials/White.mat
+++ b/Assets/Materials/White.mat
@@ -8,17 +8,22 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: White
- m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+ m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
- stringTagMap: {}
+ m_CustomRenderQueue: 2000
+ stringTagMap:
+ 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}
@@ -55,11 +60,34 @@ 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}
+ - 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_Floats:
+ - _AlphaClip: 0
+ - _Blend: 0
- _BumpScale: 1
+ - _ClearCoatMask: 0
+ - _ClearCoatSmoothness: 0
+ - _Cull: 2
- _Cutoff: 0.5
+ - _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
+ - _EnvironmentReflections: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
@@ -67,12 +95,32 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
+ - _QueueOffset: 0
+ - _ReceiveShadows: 1
+ - _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
+ - _Surface: 0
- _UVSec: 0
+ - _WorkflowMode: 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.2, g: 0.2, b: 0.2, a: 1}
m_BuildTextureStacks: []
+--- !u!114 &591653077824082779
+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:
+ version: 4
diff --git a/Assets/Models.meta b/Assets/Models.meta
new file mode 100644
index 0000000..24f185f
--- /dev/null
+++ b/Assets/Models.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2299ee65c05ffc64c83194434a6df750
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity
index 1c1e1c1..4e6dbf2 100644
--- a/Assets/Scenes/SampleScene.unity
+++ b/Assets/Scenes/SampleScene.unity
@@ -650,7 +650,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+ - {fileID: 2100000, guid: 68237de25d228ce07b3f5506d873b3a9, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -1713,6 +1713,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
physGun: {fileID: 1738192761}
+ cineCamera: {fileID: 0}
--- !u!4 &1826398603
Transform:
m_ObjectHideFlags: 0
diff --git a/Assets/UniversalRenderPipelineAsset.asset b/Assets/UniversalRenderPipelineAsset.asset
new file mode 100644
index 0000000..04bfa64
--- /dev/null
+++ b/Assets/UniversalRenderPipelineAsset.asset
@@ -0,0 +1,57 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ 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: bf2edee5c58d82540a51f03df9d42094, type: 3}
+ m_Name: UniversalRenderPipelineAsset
+ m_EditorClassIdentifier:
+ k_AssetVersion: 6
+ k_AssetPreviousVersion: 5
+ m_RendererType: 1
+ m_RendererData: {fileID: 0}
+ m_RendererDataList:
+ - {fileID: 11400000, guid: c2ccb63a2cad469199e7f279dc1c53bd, type: 2}
+ m_DefaultRendererIndex: 0
+ m_RequireDepthTexture: 0
+ m_RequireOpaqueTexture: 0
+ m_OpaqueDownsampling: 1
+ m_SupportsTerrainHoles: 1
+ m_SupportsHDR: 1
+ m_MSAA: 2
+ m_RenderScale: 1
+ m_MainLightRenderingMode: 1
+ m_MainLightShadowsSupported: 1
+ m_MainLightShadowmapResolution: 2048
+ m_AdditionalLightsRenderingMode: 1
+ m_AdditionalLightsPerObjectLimit: 4
+ m_AdditionalLightShadowsSupported: 0
+ m_AdditionalLightsShadowmapResolution: 512
+ m_ShadowDistance: 50
+ m_ShadowCascadeCount: 1
+ m_Cascade2Split: 0.25
+ m_Cascade3Split: {x: 0.1, y: 0.3}
+ m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467}
+ m_ShadowDepthBias: 1
+ m_ShadowNormalBias: 1
+ m_SoftShadowsSupported: 0
+ m_UseSRPBatcher: 1
+ m_SupportsDynamicBatching: 0
+ m_MixedLightingSupported: 1
+ m_DebugLevel: 0
+ m_UseAdaptivePerformance: 1
+ m_ColorGradingMode: 0
+ m_ColorGradingLutSize: 32
+ m_ShadowType: 1
+ m_LocalShadowsSupported: 0
+ m_LocalShadowsAtlasResolution: 256
+ m_MaxPixelLights: 0
+ m_ShadowAtlasResolution: 256
+ m_ShaderVariantLogLevel: 0
+ m_ShadowCascades: 0
diff --git a/Assets/UniversalRenderPipelineAsset.asset.meta b/Assets/UniversalRenderPipelineAsset.asset.meta
new file mode 100644
index 0000000..b282e0f
--- /dev/null
+++ b/Assets/UniversalRenderPipelineAsset.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1980b22a8fbaae42f8f269662c179fd5
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/UniversalRenderPipelineAsset_Renderer.asset b/Assets/UniversalRenderPipelineAsset_Renderer.asset
new file mode 100644
index 0000000..aeacd71
--- /dev/null
+++ b/Assets/UniversalRenderPipelineAsset_Renderer.asset
@@ -0,0 +1,44 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ 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: de640fe3d0db1804a85f9fc8f5cadab6, type: 3}
+ m_Name: UniversalRenderPipelineAsset_Renderer
+ m_EditorClassIdentifier:
+ m_RendererFeatures: []
+ m_RendererFeatureMap:
+ postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
+ xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2}
+ shaders:
+ blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
+ copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
+ screenSpaceShadowPS: {fileID: 4800000, guid: 0f854b35a0cf61a429bd5dcfea30eddd, type: 3}
+ samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
+ tileDepthInfoPS: {fileID: 0}
+ tileDeferredPS: {fileID: 0}
+ stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3}
+ fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3}
+ materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3}
+ m_OpaqueLayerMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_TransparentLayerMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_DefaultStencilState:
+ overrideStencilState: 0
+ stencilReference: 0
+ stencilCompareFunction: 8
+ passOperation: 2
+ failOperation: 0
+ zFailOperation: 0
+ m_ShadowTransparentReceive: 1
+ m_RenderingMode: 0
+ m_AccurateGbufferNormals: 0
diff --git a/Assets/UniversalRenderPipelineAsset_Renderer.asset.meta b/Assets/UniversalRenderPipelineAsset_Renderer.asset.meta
new file mode 100644
index 0000000..a1a125e
--- /dev/null
+++ b/Assets/UniversalRenderPipelineAsset_Renderer.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c2ccb63a2cad469199e7f279dc1c53bd
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant: