diff --git a/Assets/ForwardRenderer.asset b/Assets/ForwardRenderer.asset index c3817eda0911afca7a563bea11b5f4ea2ab0afe0..9da76e27d964acfa6884482a86e6d1e800ae30a3 100644 --- a/Assets/ForwardRenderer.asset +++ b/Assets/ForwardRenderer.asset @@ -14,13 +14,14 @@ MonoBehaviour: m_EditorClassIdentifier: m_RendererFeatures: [] m_RendererFeatureMap: - postProcessData: {fileID: 0} + postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} shaders: - blitPS: {fileID: 0} - copyDepthPS: {fileID: 0} - screenSpaceShadowPS: {fileID: 0} - samplingPS: {fileID: 0} - fallbackErrorPS: {fileID: 0} + 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} + fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/Assets/Materials/Mechanics/BrushMaterial.mat b/Assets/Materials/Mechanics/BrushMaterial.mat index 6593955cd86ca72a97f1b33b5a70ba5cac4ef441..4ceb0600d597921ac54ce660a69fde37f7269485 100644 --- a/Assets/Materials/Mechanics/BrushMaterial.mat +++ b/Assets/Materials/Mechanics/BrushMaterial.mat @@ -20,7 +20,7 @@ Material: serializedVersion: 3 m_TexEnvs: - Texture2D_ABCA0391: - m_Texture: {fileID: 0} + m_Texture: {fileID: 10300, guid: 0000000000000000f000000000000000, type: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseMap: @@ -83,4 +83,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - - _UV: {r: 1.1936076, g: 1.6746478, b: 0, a: 0} + - _UV: {r: 0.8346672, g: 0.22467056, b: 0, a: 0} diff --git a/Assets/Materials/Mechanics/Materials.meta b/Assets/Materials/Mechanics/Materials.meta new file mode 100644 index 0000000000000000000000000000000000000000..b754fcc3c47b8b9be9a6efba883abc351797149e --- /dev/null +++ b/Assets/Materials/Mechanics/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 52831de0f06bffb4b8abfa46ea48b4f5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Mechanics/Materials/MessRender.mat b/Assets/Materials/Mechanics/Materials/MessRender.mat new file mode 100644 index 0000000000000000000000000000000000000000..87902d124d808ffc0e42e3665346556b63f947f3 --- /dev/null +++ b/Assets/Materials/Mechanics/Materials/MessRender.mat @@ -0,0 +1,90 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-369809852999052083 +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: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: MessRender + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 10, y: 10} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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: 0} + m_Scale: {x: 10, y: 10} + 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} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.20754719, g: 0.20754719, b: 0.20754719, 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} diff --git a/Assets/Settings/ForwardRenderer.asset.meta b/Assets/Materials/Mechanics/Materials/MessRender.mat.meta similarity index 64% rename from Assets/Settings/ForwardRenderer.asset.meta rename to Assets/Materials/Mechanics/Materials/MessRender.mat.meta index 0bc8ceecaf84cdc5ebd2c8f413e94d7c90642c63..9ebd47cdaca69c7f0ba43dd09abe3249dd05ba59 100644 --- a/Assets/Settings/ForwardRenderer.asset.meta +++ b/Assets/Materials/Mechanics/Materials/MessRender.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 33e96c7e7789c4e41b5e0cacfe887404 +guid: edae9461cdea4324496a862de32e1875 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 2100000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.meta b/Assets/Scenes/SampleScene.meta new file mode 100644 index 0000000000000000000000000000000000000000..e0d1ae0b294cd1ccf701d507b102d240a9435513 --- /dev/null +++ b/Assets/Scenes/SampleScene.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7243817e53e0a0340b31d4ee729eff37 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 5bd63eca6f1072249b41d326898c924ee4dc3ee1..61050ac94006da9478c6012f9c8a9e79b0a4a527 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} + m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -97,7 +97,8 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 112000000, guid: 04cf84013fef0734ab0635c8df17679f, + type: 2} m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: @@ -1175,7 +1176,7 @@ Light: m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_BoundingSphereOverride: {x: -1.49e-43, y: 1.1e-44, z: 3.15e-43, w: -59.719635} m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 @@ -1246,7 +1247,7 @@ MonoBehaviour: ModeOverride: 0 LensShift: {x: 0, y: 0} GateFit: 0 - m_SensorSize: {x: 1.601695, y: 1} + m_SensorSize: {x: 1.6, y: 1} m_Transitions: m_BlendHint: 0 m_InheritPosition: 0 @@ -1262,7 +1263,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 718610513} - m_LocalRotation: {x: 0.14247817, y: 0.32499772, z: -0.049598195, w: 0.93360406} + m_LocalRotation: {x: 0.027754217, y: 0.9716821, z: -0.14828931, w: 0.1818626} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -1384,6 +1385,7 @@ GameObject: - component: {fileID: 963194226} - component: {fileID: 963194229} - component: {fileID: 963194230} + - component: {fileID: 963194232} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -1449,8 +1451,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963194225} - m_LocalRotation: {x: 0.14247817, y: 0.32499775, z: -0.049598202, w: 0.933604} - m_LocalPosition: {x: -0.017773628, y: 4.949, z: -6.2706637} + m_LocalRotation: {x: 0.02775422, y: 0.9716821, z: -0.14828932, w: 0.1818626} + m_LocalPosition: {x: 1.3967483, y: 46.58, z: -2.4915085} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -1502,6 +1504,37 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8d51524cd006b044296d8651c6d4849d, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &963194232 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963194225} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 --- !u!1001 &979400973 PrefabInstance: m_ObjectHideFlags: 0 @@ -1805,6 +1838,29 @@ PrefabInstance: m_RemovedComponents: - {fileID: 3056552613195421783, guid: a8f5f999b2a8ed248b35381c313567ed, type: 3} m_SourcePrefab: {fileID: 100100000, guid: a8f5f999b2a8ed248b35381c313567ed, type: 3} +--- !u!1 &1015858495 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3056552613199346310, guid: a8f5f999b2a8ed248b35381c313567ed, + type: 3} + m_PrefabInstance: {fileID: 1964494303} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1015858501 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1015858495} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 96d805133f5e84f459c5d6bb06b7b3bb, type: 3} + m_Name: + m_EditorClassIdentifier: + gooTex: {fileID: 8400000, guid: fca03971f2f4a4942b4879f5aad6a1b7, type: 2} + brushMaterial: {fileID: 2100000, guid: 2b93d62d4525db844a9bbdf89747e9cf, type: 2} + multiplier: 1 + worldScale: {x: 10, y: 10} + worldOffset: {x: 5, y: 5} --- !u!1001 &1057633701 PrefabInstance: m_ObjectHideFlags: 0 @@ -2098,7 +2154,7 @@ MonoBehaviour: ModeOverride: 0 LensShift: {x: 0, y: 0} GateFit: 0 - m_SensorSize: {x: 1.601695, y: 1} + m_SensorSize: {x: 1.6, y: 1} m_Transitions: m_BlendHint: 0 m_InheritPosition: 0 @@ -2180,7 +2236,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1367486312} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.017773628, y: 4.949, z: -6.2706637} + m_LocalPosition: {x: 1.3967483, y: 46.58, z: -2.4915085} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 718610515} @@ -2398,7 +2454,7 @@ MonoBehaviour: ModeOverride: 0 LensShift: {x: 0, y: 0} GateFit: 0 - m_SensorSize: {x: 1.601695, y: 1} + m_SensorSize: {x: 1.6, y: 1} m_Transitions: m_BlendHint: 0 m_InheritPosition: 0 @@ -2414,7 +2470,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1482850052} - m_LocalRotation: {x: 0.14247817, y: 0.32499775, z: -0.049598202, w: 0.933604} + m_LocalRotation: {x: 0.027754217, y: 0.9716821, z: -0.14828931, w: 0.1818626} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -2497,6 +2553,100 @@ PrefabInstance: m_RemovedComponents: - {fileID: 3056552613195421783, guid: a8f5f999b2a8ed248b35381c313567ed, type: 3} m_SourcePrefab: {fileID: 100100000, guid: a8f5f999b2a8ed248b35381c313567ed, type: 3} +--- !u!1 &1566379158 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1566379162} + - component: {fileID: 1566379161} + - component: {fileID: 1566379160} + - component: {fileID: 1566379159} + m_Layer: 9 + m_Name: Plane + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &1566379159 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1566379158} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1566379160 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1566379158} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: edae9461cdea4324496a862de32e1875, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &1566379161 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1566379158} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1566379162 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1566379158} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 42.7, z: -11.0234375} + m_LocalScale: {x: 7.4574, y: 7.4574, z: 7.4574} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 19 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1601441755 stripped GameObject: m_CorrespondingSourceObject: {fileID: 100000, guid: 4b56a3686f4feb74c9cb5d61e9cc5126, @@ -2570,7 +2720,7 @@ MonoBehaviour: ModeOverride: 0 LensShift: {x: 0, y: 0} GateFit: 0 - m_SensorSize: {x: 1.601695, y: 1} + m_SensorSize: {x: 1.6, y: 1} m_Transitions: m_BlendHint: 0 m_InheritPosition: 0 @@ -2586,7 +2736,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1639425696} - m_LocalRotation: {x: 0.14247817, y: 0.32499775, z: -0.049598202, w: 0.933604} + m_LocalRotation: {x: 0.027754214, y: 0.9716821, z: -0.1482893, w: 0.18186258} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -2840,12 +2990,12 @@ PrefabInstance: - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed, type: 3} propertyPath: m_LocalPosition.x - value: 0.2 + value: 1.65 objectReference: {fileID: 0} - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed, type: 3} propertyPath: m_LocalPosition.y - value: 1.9211903 + value: 43.51 objectReference: {fileID: 0} - target: {fileID: 3056552613199346306, guid: a8f5f999b2a8ed248b35381c313567ed, type: 3} @@ -3031,17 +3181,17 @@ PrefabInstance: - target: {fileID: 2263208524393207166, guid: b4ba6cbe0ccf7bf4a8e955a550e7e525, type: 3} propertyPath: m_LocalPosition.x - value: 4.95 + value: 4.29 objectReference: {fileID: 0} - target: {fileID: 2263208524393207166, guid: b4ba6cbe0ccf7bf4a8e955a550e7e525, type: 3} propertyPath: m_LocalPosition.y - value: 2.449 + value: 44.08 objectReference: {fileID: 0} - target: {fileID: 2263208524393207166, guid: b4ba6cbe0ccf7bf4a8e955a550e7e525, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -9.95 objectReference: {fileID: 0} - target: {fileID: 2263208524393207166, guid: b4ba6cbe0ccf7bf4a8e955a550e7e525, type: 3} diff --git a/Assets/Scenes/SampleScene/LightingData.asset b/Assets/Scenes/SampleScene/LightingData.asset new file mode 100644 index 0000000000000000000000000000000000000000..195aa77b6a1e8ccc69f56716a049df7f626a43d0 Binary files /dev/null and b/Assets/Scenes/SampleScene/LightingData.asset differ diff --git a/Assets/Scenes/SampleScene/LightingData.asset.meta b/Assets/Scenes/SampleScene/LightingData.asset.meta new file mode 100644 index 0000000000000000000000000000000000000000..af91f54d2418c8ad9277033b0b515ab5b3968005 --- /dev/null +++ b/Assets/Scenes/SampleScene/LightingData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 04cf84013fef0734ab0635c8df17679f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 112000000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/SampleScene/ReflectionProbe-0.exr b/Assets/Scenes/SampleScene/ReflectionProbe-0.exr new file mode 100644 index 0000000000000000000000000000000000000000..f38e702271bdeaeada94347ac0ba7616f66eff97 Binary files /dev/null and b/Assets/Scenes/SampleScene/ReflectionProbe-0.exr differ diff --git a/Assets/Scenes/SampleScene/ReflectionProbe-0.exr.meta b/Assets/Scenes/SampleScene/ReflectionProbe-0.exr.meta new file mode 100644 index 0000000000000000000000000000000000000000..0b9e12f8c664bf0266a277179d91ae0deb4991db --- /dev/null +++ b/Assets/Scenes/SampleScene/ReflectionProbe-0.exr.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 3631e3c3192cd7e4cab304cdec0d181a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 2 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Settings/ForwardRenderer.asset b/Assets/Settings/ForwardRenderer.asset deleted file mode 100644 index 9da76e27d964acfa6884482a86e6d1e800ae30a3..0000000000000000000000000000000000000000 --- a/Assets/Settings/ForwardRenderer.asset +++ /dev/null @@ -1,38 +0,0 @@ -%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: ForwardRenderer - m_EditorClassIdentifier: - m_RendererFeatures: [] - m_RendererFeatureMap: - postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, 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} - fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, 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: 0 - failOperation: 0 - zFailOperation: 0 - m_ShadowTransparentReceive: 1 diff --git a/Assets/Settings/LWRP-HighQuality.asset b/Assets/Settings/LWRP-HighQuality.asset index 77d7b451e4afd714ce2eda7456312da418c5584d..919cf717af76b6935e11552efd13e5e0d44f9d05 100644 --- a/Assets/Settings/LWRP-HighQuality.asset +++ b/Assets/Settings/LWRP-HighQuality.asset @@ -17,7 +17,7 @@ MonoBehaviour: m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: - - {fileID: 11400000, guid: 33e96c7e7789c4e41b5e0cacfe887404, type: 2} + - {fileID: 11400000, guid: fb179cd40823c9343ac4270f1ea9f2b9, type: 2} m_DefaultRendererIndex: 0 m_RequireDepthTexture: 0 m_RequireOpaqueTexture: 0 @@ -44,6 +44,7 @@ MonoBehaviour: m_SupportsDynamicBatching: 1 m_MixedLightingSupported: 1 m_DebugLevel: 0 + m_UseAdaptivePerformance: 0 m_PostProcessingFeatureSet: 0 m_ColorGradingMode: 0 m_ColorGradingLutSize: 32 diff --git a/Assets/Settings/PostProcessProfile.asset b/Assets/Settings/PostProcessProfile.asset index 769a5d954a2f8bb58e2cbeda30900e84f59708c3..9239a1d7327456cef66b11c9e3800719755c1b52 100644 --- a/Assets/Settings/PostProcessProfile.asset +++ b/Assets/Settings/PostProcessProfile.asset @@ -121,8 +121,8 @@ MonoBehaviour: overrideState: 0 value: 0 colorFilter: - overrideState: 0 - value: {r: 1, g: 1, b: 1, a: 1} + overrideState: 1 + value: {r: 0, g: 0.5821352, b: 1, a: 1} hueShift: overrideState: 0 value: 0 @@ -167,7 +167,7 @@ MonoBehaviour: value: 100 lift: overrideState: 0 - value: {x: 1, y: 1, z: 1, w: 0} + value: {x: 0.9647255, y: 0.9652918, z: 1, w: 0} gamma: overrideState: 0 value: {x: 1, y: 1, z: 1, w: 0} diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 06eb96b13be0113dbaf590cf6538dea9dae8ab3f..0c4ee792ac33061f36fd96acd09f0a74a1541a0f 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,7 +3,7 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 13 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} @@ -59,5 +59,7 @@ GraphicsSettings: m_FogKeepExp: 1 m_FogKeepExp2: 1 m_AlbedoSwatchInfos: [] - m_LightsUseLinearIntensity: 1 + m_LightsUseLinearIntensity: 0 m_LightsUseColorTemperature: 0 + m_LogWhenShaderIsCompiled: 0 + m_AllowEnlightenSupportForUpgradedProject: 1 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 9815d040d909ab85a42380a243bffdb6c5b1a576..ba8a7362e901c13ed89a021df1cf14fbaeabd1ca 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -47,7 +47,7 @@ PlayerSettings: defaultScreenWidthWeb: 960 defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 - m_ActiveColorSpace: 1 + m_ActiveColorSpace: 0 m_MTRendering: 1 m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1