Skip to content

Commit ba472e2

Browse files
hijimasahijimasa
committed
Merge branch 'master' of https://github.com/hijimasa/UnitySensors.git into for-simulator-app
2 parents 74cdc0c + e4f63c9 commit ba472e2

File tree

134 files changed

+8674
-630
lines changed

Some content is hidden

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

134 files changed

+8674
-630
lines changed

‎.github/workflows/main.yml

+10-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
name: Unity 2022.3.x Test Runner
1+
name: CI check for Unity
22

33
on:
44
pull_request:
55
branches:
66
- master
77
- beta/**
8+
push:
9+
branches:
10+
- master
11+
- beta/**
812

913
jobs:
1014
test:
@@ -15,18 +19,19 @@ jobs:
1519
fail-fast: false
1620
matrix:
1721
unityVersion:
18-
- 2022.3.42f1
22+
- 2022.3.59f1
23+
- 2023.2.20f1
1924

2025
steps:
2126
# リポジトリをチェックアウト
2227
- name: Checkout repository
2328
uses: actions/checkout@v4
2429
with:
2530
lfs: true # Large File Storageが必要な場合に true を指定
26-
31+
2732
# Unity Test Runnerを実行 (エディットモードテスト)
2833
- name: Run Edit Mode Tests
29-
uses: game-ci/unity-test-runner@v4
34+
uses: game-ci/unity-test-runner@v4.3.1
3035
env:
3136
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
3237
UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
@@ -46,7 +51,7 @@ jobs:
4651

4752
# Unity Test Runnerを実行 (プレイモードテスト)
4853
- name: Run Play Mode Tests
49-
uses: game-ci/unity-test-runner@v4
54+
uses: game-ci/unity-test-runner@v4.3.1
5055
env:
5156
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
5257
UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}

‎.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/Runtime/Materials/CustomMaterials.meta

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

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

+34
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.

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

+34
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.

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

+36
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.

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

+36
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.

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

+36
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.

0 commit comments

Comments
 (0)