Skip to content

Commit 883efb1

Browse files
RyodoTanakaRyodoTanaka
authored
Merge pull request #199 from Bob-Eric/dev/working
Merged branch beta/v2.x.x to include panoramic camera, added fisheye camera with Equidistant and EUCM camera model; Fixed DepthBufferLidar warp issue
2 parents 71ad0ff + 5bd8d4e commit 883efb1

File tree

74 files changed

+5809
-450
lines changed

Some content is hidden

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

74 files changed

+5809
-450
lines changed

‎Assets/Resources/ROSConnectionPrefab.prefab‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ MonoBehaviour:
4545
m_Name:
4646
m_EditorClassIdentifier:
4747
m_RosIPAddress: 127.0.0.1
48-
m_RosPort: 10000
48+
m_RosPort: 11111
4949
m_ConnectOnStart: 1
5050
m_KeepaliveTime: 1
5151
m_NetworkTimeoutSeconds: 2

‎Assets/UnitySensors/Editor/Attributes/ReadOnlyDrawer.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
using UnityEngine;
2-
#if UNITY_EDITOR
32
using UnityEditor;
4-
#endif
53

64
namespace UnitySensors.Attribute
75
{
8-
#if UNITY_EDITOR
96
[CustomPropertyDrawer(typeof(ReadOnlyAttribute))]
107
public class ReadOnlyDrawer : PropertyDrawer
118
{
@@ -16,5 +13,4 @@ public override void OnGUI(Rect _position, SerializedProperty _property, GUICont
1613
EditorGUI.EndDisabledGroup();
1714
}
1815
}
19-
#endif
2016
}

‎Assets/UnitySensors/Editor/CustomInspector/FisheyeCameraEditor.cs‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
using UnityEditor;
2+
using UnitySensors.Sensor.Camera;
3+
4+
namespace UnitySensors.Editor
5+
{
6+
[CustomEditor(typeof(FisheyeCameraSensor))]
7+
public class FisheyeCameraEditor : UnityEditor.Editor
8+
{
9+
SerializedProperty cameraModelProp;
10+
SerializedProperty alphaProp;
11+
SerializedProperty betaProp;
12+
SerializedProperty focalLengthProp;
13+
SerializedProperty principalPointProp;
14+
readonly string cameraModelLabel = nameof(FisheyeCameraSensor._cameraModel);
15+
readonly string alphaLabel = nameof(FisheyeCameraSensor._alpha);
16+
readonly string betaLabel = nameof(FisheyeCameraSensor._beta);
17+
readonly string focalLengthLabel = nameof(FisheyeCameraSensor._focalLength);
18+
readonly string principalPointLabel = nameof(FisheyeCameraSensor._principalPoint);
19+
readonly string fovLabel = nameof(FisheyeCameraSensor._fov);
20+
readonly string scriptLabel = "m_Script";
21+
22+
void OnEnable()
23+
{
24+
cameraModelProp = serializedObject.FindProperty(cameraModelLabel);
25+
alphaProp = serializedObject.FindProperty(alphaLabel);
26+
betaProp = serializedObject.FindProperty(betaLabel);
27+
focalLengthProp = serializedObject.FindProperty(focalLengthLabel);
28+
principalPointProp = serializedObject.FindProperty(principalPointLabel);
29+
}
30+
31+
public override void OnInspectorGUI()
32+
{
33+
serializedObject.Update();
34+
35+
EditorGUI.BeginDisabledGroup(true);
36+
EditorGUILayout.PropertyField(serializedObject.FindProperty(scriptLabel));
37+
EditorGUI.EndDisabledGroup();
38+
39+
DrawPropertiesExcluding(serializedObject,
40+
cameraModelLabel, alphaLabel, betaLabel, focalLengthLabel, principalPointLabel, fovLabel, scriptLabel);
41+
42+
EditorGUILayout.PropertyField(cameraModelProp);
43+
if (cameraModelProp.enumValueIndex == (int)FisheyeCameraSensor.CameraModel.EUCM)
44+
{
45+
EditorGUILayout.PropertyField(alphaProp);
46+
EditorGUILayout.PropertyField(betaProp);
47+
EditorGUILayout.PropertyField(focalLengthProp);
48+
EditorGUILayout.PropertyField(principalPointProp);
49+
}
50+
serializedObject.ApplyModifiedProperties();
51+
}
52+
}
53+
}

‎Assets/UnitySensors/Editor/CustomInspector/FisheyeCameraEditor.cs.meta‎

Lines changed: 2 additions & 0 deletions
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 renamed to Assets/UnitySensors/Runtime/Materials/CustomMaterials/UnitySensors_DepthBufferLidarLegacy.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Material:
77
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
10-
m_Name: UnitySensors_DepthBufferLidar
10+
m_Name: UnitySensors_DepthBufferLidarLegacy
1111
m_Shader: {fileID: 4800000, guid: 9f39b9c496a4e9f489f510e6d57c5126, type: 3}
1212
m_Parent: {fileID: 0}
1313
m_ModifiedSerializedProperties: 0

Assets/UnitySensors/Runtime/Materials/CustomMaterials/UnitySensors_DepthBufferLidar.mat.meta renamed to Assets/UnitySensors/Runtime/Materials/CustomMaterials/UnitySensors_DepthBufferLidarLegacy.mat.meta

File renamed without changes.

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

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
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_FisheyeCamera
11+
m_Shader: {fileID: 4800000, guid: 0f1b10252ff95ea47bf127371a9f75d4, 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+
- _EquiDistant: 0
32+
- _Equidistant: 0
33+
m_Floats:
34+
- _Angle: 210
35+
- _alpha: 0.61
36+
- _beta: 1.07
37+
- _cx: 0.5
38+
- _cy: 0.5
39+
- _fx: 0.26953125
40+
- _fy: 0.26953125
41+
m_Colors: []
42+
m_BuildTextureStacks: []
43+
m_AllowLocking: 1

‎Assets/UnitySensors/Runtime/Materials/CustomMaterials/UnitySensors_FisheyeCamera.mat.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
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_Panoramic
11+
m_Shader: {fileID: 4800000, guid: 569ddeeee83cba249ab918801ca7ccc2, 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+
- _F: 150
33+
- _Y_COEF: 6
34+
- _Y_MAX: 1
35+
- _Y_MIN: 0.8333333
36+
m_Colors:
37+
- _Rotation: {r: 0, g: 0, b: 0, a: 0}
38+
m_BuildTextureStacks: []

‎Assets/UnitySensors/Runtime/Materials/CustomMaterials/UnitySensors_Panoramic.mat.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)