Merge from 'develop' into 'main' for CLOiSim-4.7.3 (#311)

lge-ros2 · Aug 19, 2024 · 9fe147d · 9fe147d
2 parents da86f78 + c4b2443
commit 9fe147d
Show file tree

Hide file tree

Showing 36 changed files with 1,074 additions and 496 deletions.
diff --git a/Assets/Resources/RenderPipelines/UniversalRenderPipelineAsset_Renderer.asset b/Assets/Resources/RenderPipelines/UniversalRenderPipelineAsset_Renderer.asset
@@ -46,7 +46,7 @@ MonoBehaviour:
     m_Bits: 9
   m_TransparentLayerMask:
     serializedVersion: 2
-    m_Bits: 1
+    m_Bits: 9
   m_DefaultStencilState:
     overrideStencilState: 0
     stencilReference: 15

diff --git a/Assets/Resources/RenderPipelines/UniversalRenderPipelineGlobalSettings.asset b/Assets/Resources/RenderPipelines/UniversalRenderPipelineGlobalSettings.asset
@@ -17,7 +17,8 @@ MonoBehaviour:
   k_AssetVersion: 3
   m_RenderingLayerNames:
   - Default
-  m_ValidRenderingLayers: 0
+  - Plane
+  m_ValidRenderingLayers: 3
   lightLayerName0: Light Layer default
   lightLayerName1: Light Layer 1
   lightLayerName2: Light Layer 2

diff --git a/Assets/Resources/Shader/GeometryGrass.shader b/Assets/Resources/Shader/GeometryGrass.shader
@@ -54,6 +54,8 @@ Shader "Custom/GeometryGrass"
 		Cull Off
 
 		HLSLINCLUDE
+		#pragma target 4.5
+
 		#include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl"
 		#include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Lighting.hlsl"
 

diff --git a/Assets/Resources/Shader/Segmentation.shader b/Assets/Resources/Shader/Segmentation.shader
@@ -38,6 +38,7 @@ Shader "Sensor/Segmentation"
 
 			HLSLPROGRAM
 
+			#pragma target 4.5
 			#pragma vertex vert
 			#pragma fragment frag