updated hlsl files to work on some android devices

4 年前 · 6b9d79f6
--- a/Assets/Shaders/Shadows/Prefabs/ShadowObject.prefab
+++ b/Assets/Shaders/Shadows/Prefabs/ShadowObject.prefab
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4216103412072782249
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1543768388634976300}
+  - component: {fileID: 4242899073917107358}
+  - component: {fileID: 2827586192608677794}
+  - component: {fileID: 187399941932435136}
+  m_Layer: 0
+  m_Name: Cube
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1543768388634976300
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4216103412072782249}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.328, y: 0.18, z: 0.61}
+  m_LocalScale: {x: 0.34722, y: 0.34722, z: 0.34722}
+  m_Children: []
+  m_Father: {fileID: 8658607402519927358}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &4242899073917107358
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4216103412072782249}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &2827586192608677794
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4216103412072782249}
+  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: 31321ba15b8f8eb4c954353edc038b1d, 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!65 &187399941932435136
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4216103412072782249}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &4687476865244239166
 GameObject:
  m_ObjectHideFlags: 0
  m_Children:
  - {fileID: 1748037316647009009}
  - {fileID: 4687476865244239298}
+  - {fileID: 1543768388634976300}
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- a/Assets/Shaders/Shadows/Scenes/ShadowPlacement.unity
+++ b/Assets/Shaders/Shadows/Scenes/ShadowPlacement.unity
  m_ReflectionIntensity: 1
  m_CustomReflection: {fileID: 0}
  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.1727681, g: 0.21589199, b: 0.29782572, a: 1}
+  m_IndirectSpecularColor: {r: 0.17276844, g: 0.21589246, b: 0.2978263, a: 1}
-  serializedVersion: 12
+  serializedVersion: 11
  m_GIWorkflowMode: 0
  m_GISettings:
    serializedVersion: 2
    m_TrainingDataDestination: TrainingData
    m_LightProbeSampleCountMultiplier: 4
  m_LightingDataAsset: {fileID: 0}
-  m_LightingSettings: {fileID: 4890085278179872738, guid: d87f43bc71927441f8a6fbd41c454da3,
-    type: 2}
+  m_UseShadowmask: 0
 --- !u!196 &4
 NavMeshSettings:
  serializedVersion: 2
    manualTileSize: 0
    tileSize: 256
    accuratePlacement: 0
-    maxJobWorkers: 0
-    preserveTilesOutsideBounds: 0
    debug:
      m_Flags: 0
  m_NavMeshData: {fileID: 0}
  m_UseColorTemperature: 0
  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
  m_UseBoundingSphereOverride: 0
-  m_UseViewFrustumForShadowCasterCull: 1
  m_ShadowRadius: 0
  m_ShadowAngle: 0
 --- !u!4 &1015722067
  - component: {fileID: 1335839536}
  - component: {fileID: 1335839538}
  - component: {fileID: 1335839539}
-  - component: {fileID: 1335839540}
-  - component: {fileID: 1335839542}
-  - component: {fileID: 1335839541}
  m_Layer: 0
  m_Name: AR Session Origin
  m_TagString: Untagged
    type: 3}
  m_MaxNumberOfObjectsToPlace: 1
  m_CanReposition: 1
--- !u!114 &1335839540
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1335839533}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dc252b3c751134839a8699af7e6f4d80, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_DisableFeaturePoints: 1
-  m_DisablePlaneRendering: 0
-  m_PointCloudManager: {fileID: 1335839536}
-  m_PlaneManager: {fileID: 1335839537}
--- !u!114 &1335839541
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1335839533}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 73a025b51106444e18fb408fde19ac53, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_AutomaticPlacement: 0
-  m_EnvironmentTextureFilterMode: 2
-  m_EnvironmentTextureHDR: 1
-  m_DebugPrefab: {fileID: 0}
--- !u!114 &1335839542
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1335839533}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 863a70230e6b84d53bf526189f949eef, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_ProbeManager: {fileID: 1335839541}
-  m_RaycastManager: {fileID: 1335839538}
 --- !u!1 &2146458540
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/Shaders/Shadows/ShaderGraphs/BlurredShadowPlane.shadergraph
+++ b/Assets/Shaders/Shadows/ShaderGraphs/BlurredShadowPlane.shadergraph
--- a/Assets/Shaders/Shadows/ShaderGraphs/BlurredShadowPlaneLighting.hlsl
+++ b/Assets/Shaders/Shadows/ShaderGraphs/BlurredShadowPlaneLighting.hlsl
-#ifndef SHADERGRAPH_PREVIEW
+/*#ifndef SHADERGRAPH_PREVIEW
 real SampleShadowmapDirect(TEXTURE2D_SHADOW_PARAM(ShadowMap, sampler_ShadowMap), SamplerState PointClamp, float4 shadowCoord, ShadowSamplingData samplingData, bool isPerspectiveProjection = true)
 {


 	// Instead of getting a value of 0 or 1 depending on a shadowmap comparison, we want to actually sample the shadowmap's values
 	distance = SAMPLE_TEXTURE2D_LOD(ShadowMap, PointClamp, shadowCoord.xy, 0);
+	
+	//int smWidth, smHeight;
+	//ShadowMap.GetDimensions(smWidth, smHeight);
+	//shadowCoord = saturate(shadowCoord);
+	//distance = ShadowMap[int2(smWidth * shadowCoord.x, smHeight * shadowCoord.y)];
-#endif
+#endif*/

 void MainLightBlurShadow_half(half rand, half fadeTightness, SamplerState pointClamp, half blurRadius, half3 worldPos, out half shadowAtten)
 {
 		half cascadeIndex = 0;
 #endif
 		float shadowScale = pow(_MainLightWorldToShadow[cascadeIndex], 0.7) * 20; // Some "Magic Math" to try to make transitions between cascades smoother
-		float shadowMapSample = SampleShadowmapDirect(TEXTURE2D_ARGS(_MainLightShadowmapTexture, sampler_MainLightShadowmapTexture), pointClamp, shadowCoord, shadowSamplingData, false);
+		//float shadowMapSample = SampleShadowmapDirect(TEXTURE2D_ARGS(_MainLightShadowmapTexture, sampler_MainLightShadowmapTexture), pointClamp, shadowCoord, shadowSamplingData, false);
+		float shadowMapSample = SAMPLE_TEXTURE2D_LOD(_MainLightShadowmapTexture, pointClamp, shadowCoord.xy, 0);
+#if defined(SHADER_API_GLES3) || defined(SHADER_API_GLES) || defined(SHADER_API_GLCORE)
+		shadowMapSample = 1 - shadowMapSample;
+		shadowCoord.z = 1 - shadowCoord.z;
+#endif
 		float shadowCoordPos = shadowCoord.z / shadowScale; //Divide by shadowScale to get transitions more close-ish when using shadow cascades
 		float shadowMapPos = shadowMapSample / shadowScale;
 		//blurAmount is a value between 0 and 1 expressing how much to blur 
--- a/Assets/Shaders/Shadows/ShaderGraphs/PlaneContactShadows.hlsl
+++ b/Assets/Shaders/Shadows/ShaderGraphs/PlaneContactShadows.hlsl
 		// Get the XY position of the projected position to be checked against the depth texture
 		float4 newPos = mul(UNITY_MATRIX_VP, float4(posStep, 1.0));
 		newPos /= newPos.w;
+#if defined(SHADER_API_GLES3) || defined(SHADER_API_GLES) || defined(SHADER_API_GLCORE)
+		newPos *= float4(0.5, 0.5, 1, 1);
+		newPos += float4(0.5, 0.5, 0, 0);
+#else
+#endif
 		// Prevent the depth texture values from bleeding from one side to the other
 		newPos = clamp(newPos, 0, 0.999);
 		//Get the view space depth value of our projected point
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
    "com.unity.ide.rider": "1.1.4",
    "com.unity.ide.vscode": "1.2.1",
    "com.unity.localization": "0.7.1-preview",
+    "com.unity.mobile.android-logcat": "1.1.1",
    "com.unity.render-pipelines.universal": "7.3.1",
    "com.unity.test-framework": "1.1.14",
    "com.unity.textmeshpro": "2.0.1",
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
      },
      "url": "https://packages.unity.com"
    },
+    "com.unity.mobile.android-logcat": {
+      "version": "1.1.1",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
    "com.unity.nuget.newtonsoft-json": {
      "version": "1.1.2",
      "depth": 1,
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
 EditorBuildSettings:
  m_ObjectHideFlags: 0
  serializedVersion: 2
-  m_Scenes:
-  - enabled: 1
-    path: Assets/UX/Scenes/UXManagerScene.unity
-    guid: 5d9539f4c7ee5c74c85a038c90cb6e1b
+  m_Scenes: []
  m_configObjects:
    UnityEditor.XR.ARCore.ARCoreSettings: {fileID: 11400000, guid: 0f640456e31a1497aa336938d310040e,
      type: 2}
--- a/ProjectSettings/GraphicsSettings.asset
+++ b/ProjectSettings/GraphicsSettings.asset
  m_PreloadedShaders: []
  m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
    type: 0}
-  m_CustomRenderPipeline: {fileID: 0}
+  m_CustomRenderPipeline: {fileID: 11400000, guid: efc9f20e6a4b0423ebd19efb551d21a0,
+    type: 2}
  m_TransparencySortMode: 0
  m_TransparencySortAxis: {x: 0, y: 0, z: 1}
  m_DefaultRenderingPath: 1
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
  bundleVersion: 0.1
  preloadedAssets:
  - {fileID: 11400000, guid: 6f7fbab671a5848ddae17e25cb330888, type: 2}
-  - {fileID: 2703266020209631490, guid: 5c86decb01f9d6b46a50ce486fba0042, type: 2}
-  - {fileID: 4800000, guid: c9f956787b1d945e7b36e0516201fc76, type: 3}
  metroInputSource: 0
  wsaTransparentSwapchain: 0
  m_HolographicPauseOnTrackingLoss: 1
    m_APIs: 1000000011000000
    m_Automatic: 1
  - m_BuildTarget: WindowsStandaloneSupport
-    m_APIs: 02000000
-    m_Automatic: 1
+    m_APIs: 0b00000002000000
+    m_Automatic: 0
  m_BuildTargetVRSettings:
  - m_BuildTarget: Standalone
    m_Enabled: 0
--- a/Assets/ARFoundationDemos.meta
+++ b/Assets/ARFoundationDemos.meta
-fileFormatVersion: 2
-guid: 783345e968e6f4707b4e7ea940738cc0
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: