Skip to content

Commit 5bd4a0d

Browse files
authored
Merge pull request #188 from Bob-Eric/dev/upstream
Added documents for migration to URP/HDRP, and other improvements.
2 parents 7c49804 + a8c2290 commit 5bd4a0d

File tree

131 files changed

+7167
-663
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+7167
-663
lines changed

.image/HDRP_ShaderGraph.png

+3
Loading

.image/HDRP_convert_materials.png

+3
Loading

.image/HDRP_custom_pass.png

+3
Loading

.image/HDRP_final_result.png

+3
Loading

.image/URP_ShaderGraph.png

+3
Loading

.image/URP_camera_renderer.png

+3
Loading

.image/URP_convert_materials.png

+3
Loading

.image/URP_final_result.png

+3
Loading

.image/URP_post_process.png

+3
Loading

.image/URP_render_list.png

+3
Loading

Assets/Resources/ROSConnectionPrefab.prefab

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ Transform:
2424
m_PrefabInstance: {fileID: 0}
2525
m_PrefabAsset: {fileID: 0}
2626
m_GameObject: {fileID: 5759000335426716240}
27+
serializedVersion: 2
2728
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
2829
m_LocalPosition: {x: 0, y: 0, z: 0}
2930
m_LocalScale: {x: 1, y: 1, z: 1}
3031
m_ConstrainProportionsScale: 0
3132
m_Children: []
3233
m_Father: {fileID: 0}
33-
m_RootOrder: 0
3434
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3535
--- !u!114 &8497029536680012343
3636
MonoBehaviour:
@@ -50,7 +50,7 @@ MonoBehaviour:
5050
m_KeepaliveTime: 1
5151
m_NetworkTimeoutSeconds: 2
5252
m_SleepTimeSeconds: 0.01
53-
m_ShowHUD: 1
53+
m_ShowHUD: 0
5454
m_TFTopics:
5555
- /tf
5656
listenForTFMessages: 1

Assets/UnitySensors/Editor/UnitySensorsEditor.asmdef

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
"GUID:d8b63aba1907145bea998dd612889d6b",
66
"GUID:e9a473e6ad03eae4a89800bf81bd1594"
77
],
8-
"includePlatforms": [],
8+
"includePlatforms": [
9+
"Editor"
10+
],
911
"excludePlatforms": [],
1012
"allowUnsafeCode": false,
1113
"overrideReferences": false,

Assets/UnitySensors/Runtime/Materials/CustomMaterials.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 8
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: UnitySensors_DepthBufferLidar
11+
m_Shader: {fileID: 4800000, guid: 9f39b9c496a4e9f489f510e6d57c5126, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
14+
m_ValidKeywords: []
15+
m_InvalidKeywords: []
16+
m_LightmapFlags: 4
17+
m_EnableInstancingVariants: 0
18+
m_DoubleSidedGI: 0
19+
m_CustomRenderQueue: -1
20+
stringTagMap: {}
21+
disabledShaderPasses: []
22+
m_LockedProperties:
23+
m_SavedProperties:
24+
serializedVersion: 3
25+
m_TexEnvs: []
26+
m_Ints: []
27+
m_Floats:
28+
- _F: 150
29+
- _Y_COEF: 6
30+
- _Y_MAX: 1
31+
- _Y_MIN: 0.8333333
32+
m_Colors: []
33+
m_BuildTextureStacks: []
34+
m_AllowLocking: 1

Assets/UnitySensors/Runtime/Materials/CustomMaterials/UnitySensors_DepthBufferLidar.mat.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 8
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: UnitySensors_DepthCameraLegacy
11+
m_Shader: {fileID: 4800000, guid: 2eb04f3fe23d2b148aab801c432da325, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
14+
m_ValidKeywords: []
15+
m_InvalidKeywords: []
16+
m_LightmapFlags: 4
17+
m_EnableInstancingVariants: 0
18+
m_DoubleSidedGI: 0
19+
m_CustomRenderQueue: -1
20+
stringTagMap: {}
21+
disabledShaderPasses: []
22+
m_LockedProperties:
23+
m_SavedProperties:
24+
serializedVersion: 3
25+
m_TexEnvs: []
26+
m_Ints: []
27+
m_Floats:
28+
- _F: 0
29+
- _Y_COEF: 1
30+
- _Y_MAX: 1
31+
- _Y_MIN: 0
32+
m_Colors: []
33+
m_BuildTextureStacks: []
34+
m_AllowLocking: 1

Assets/UnitySensors/Runtime/Materials/CustomMaterials/UnitySensors_DepthCameraLegacy.mat.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 8
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: UnitySensors_PointCloudXYZ
11+
m_Shader: {fileID: 4800000, guid: 0faabdfb36dc37944bd5237eb87dff3e, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
14+
m_ValidKeywords: []
15+
m_InvalidKeywords: []
16+
m_LightmapFlags: 4
17+
m_EnableInstancingVariants: 0
18+
m_DoubleSidedGI: 0
19+
m_CustomRenderQueue: -1
20+
stringTagMap: {}
21+
disabledShaderPasses: []
22+
m_LockedProperties:
23+
m_SavedProperties:
24+
serializedVersion: 3
25+
m_TexEnvs:
26+
- _MainTex:
27+
m_Texture: {fileID: 0}
28+
m_Scale: {x: 1, y: 1}
29+
m_Offset: {x: 0, y: 0}
30+
m_Ints: []
31+
m_Floats:
32+
- _Glossiness: 0.5
33+
- _Metallic: 0
34+
m_Colors: []
35+
m_BuildTextureStacks: []
36+
m_AllowLocking: 1

Assets/UnitySensors/Runtime/Materials/CustomMaterials/UnitySensors_PointCloudXYZ.mat.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 8
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: UnitySensors_PointCloudXYZI
11+
m_Shader: {fileID: 4800000, guid: f9fa29512657a5b408ef0c50698b141b, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
14+
m_ValidKeywords: []
15+
m_InvalidKeywords: []
16+
m_LightmapFlags: 4
17+
m_EnableInstancingVariants: 0
18+
m_DoubleSidedGI: 0
19+
m_CustomRenderQueue: -1
20+
stringTagMap: {}
21+
disabledShaderPasses: []
22+
m_LockedProperties:
23+
m_SavedProperties:
24+
serializedVersion: 3
25+
m_TexEnvs:
26+
- _MainTex:
27+
m_Texture: {fileID: 0}
28+
m_Scale: {x: 1, y: 1}
29+
m_Offset: {x: 0, y: 0}
30+
m_Ints: []
31+
m_Floats:
32+
- _Glossiness: 0.5
33+
- _Metallic: 0
34+
m_Colors: []
35+
m_BuildTextureStacks: []
36+
m_AllowLocking: 1

Assets/UnitySensors/Runtime/Materials/CustomMaterials/UnitySensors_PointCloudXYZI.mat.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 8
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: UnitySensors_PointCloudXYZRGB
11+
m_Shader: {fileID: 4800000, guid: 417e6f59011b2b743a51b9344a78b15d, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
14+
m_ValidKeywords: []
15+
m_InvalidKeywords: []
16+
m_LightmapFlags: 4
17+
m_EnableInstancingVariants: 0
18+
m_DoubleSidedGI: 0
19+
m_CustomRenderQueue: -1
20+
stringTagMap: {}
21+
disabledShaderPasses: []
22+
m_LockedProperties:
23+
m_SavedProperties:
24+
serializedVersion: 3
25+
m_TexEnvs:
26+
- _MainTex:
27+
m_Texture: {fileID: 0}
28+
m_Scale: {x: 1, y: 1}
29+
m_Offset: {x: 0, y: 0}
30+
m_Ints: []
31+
m_Floats:
32+
- _Glossiness: 0.5
33+
- _Metallic: 0
34+
m_Colors: []
35+
m_BuildTextureStacks: []
36+
m_AllowLocking: 1

Assets/UnitySensors/Runtime/Materials/CustomMaterials/UnitySensors_PointCloudXYZRGB.mat.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/UnitySensors/Runtime/Prefabs/Camera/DepthCamera.prefab

+29-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ GameObject:
1212
- component: {fileID: 1105687583338018399}
1313
- component: {fileID: 1105687583338018398}
1414
- component: {fileID: 859923666563037401}
15+
- component: {fileID: -1608031838711272521}
1516
m_Layer: 0
1617
m_Name: DepthCamera
1718
m_TagString: Untagged
@@ -26,13 +27,13 @@ Transform:
2627
m_PrefabInstance: {fileID: 0}
2728
m_PrefabAsset: {fileID: 0}
2829
m_GameObject: {fileID: 1105687583338018395}
30+
serializedVersion: 2
2931
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
3032
m_LocalPosition: {x: 0, y: 0, z: 0}
3133
m_LocalScale: {x: 1, y: 1, z: 1}
3234
m_ConstrainProportionsScale: 0
3335
m_Children: []
3436
m_Father: {fileID: 0}
35-
m_RootOrder: 0
3637
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3738
--- !u!20 &1105687583338018399
3839
Camera:
@@ -48,9 +49,17 @@ Camera:
4849
m_projectionMatrixMode: 1
4950
m_GateFitMode: 2
5051
m_FOVAxisMode: 0
52+
m_Iso: 200
53+
m_ShutterSpeed: 0.005
54+
m_Aperture: 16
55+
m_FocusDistance: 10
56+
m_FocalLength: 50
57+
m_BladeCount: 5
58+
m_Curvature: {x: 2, y: 11}
59+
m_BarrelClipping: 0.25
60+
m_Anamorphism: 0
5161
m_SensorSize: {x: 36, y: 24}
5262
m_LensShift: {x: 0, y: 0}
53-
m_FocalLength: 50
5463
m_NormalizedViewPortRect:
5564
serializedVersion: 2
5665
x: 0
@@ -95,6 +104,8 @@ MonoBehaviour:
95104
_minRange: 0.05
96105
_maxRange: 100
97106
_gaussianNoiseSigma: 0
107+
_depthCameraMat: {fileID: -876546973899608171, guid: a3c68fd340741ee4597690d59d7509a6,
108+
type: 3}
98109
--- !u!114 &859923666563037401
99110
MonoBehaviour:
100111
m_ObjectHideFlags: 0
@@ -107,4 +118,20 @@ MonoBehaviour:
107118
m_Script: {fileID: 11500000, guid: f2f05a788e73116488577387bd40affc, type: 3}
108119
m_Name:
109120
m_EditorClassIdentifier:
121+
_pointUtilitiesSO: {fileID: 11400000, guid: 5e210d04f3c81dc4986b2270af79835f, type: 2}
122+
_source: {fileID: 1105687583338018398}
123+
--- !u!114 &-1608031838711272521
124+
MonoBehaviour:
125+
m_ObjectHideFlags: 0
126+
m_CorrespondingSourceObject: {fileID: 0}
127+
m_PrefabInstance: {fileID: 0}
128+
m_PrefabAsset: {fileID: 0}
129+
m_GameObject: {fileID: 1105687583338018395}
130+
m_Enabled: 1
131+
m_EditorHideFlags: 0
132+
m_Script: {fileID: 11500000, guid: 5202acb8ddfd0c546b69f23eb10b4e60, type: 3}
133+
m_Name:
134+
m_EditorClassIdentifier:
110135
_source: {fileID: 1105687583338018398}
136+
_sourceTexture: 0
137+
_image: {fileID: 0}

0 commit comments

Comments
 (0)