Skip to content
Permalink
Browse files

Update Unity wrapper with c# changes, added SLAM sample for T265, som…

…e UI changes and other fixes.
  • Loading branch information...
ogoshen committed Feb 19, 2019
1 parent 45eb153 commit 9841e2dad44e3979fe591a17b099e7a6cc05a328
Showing with 11,517 additions and 4,736 deletions.
  1. +5 −21 wrappers/unity/Assets/RealSenseSDK2.0/Editor/RsProcessingPipeEditor.cs
  2. +4 −3 wrappers/unity/Assets/RealSenseSDK2.0/Materials/ARBackgroundMat.mat
  3. +100 −0 wrappers/unity/Assets/RealSenseSDK2.0/Materials/GridMatMajor.mat
  4. +8 −0 wrappers/unity/Assets/RealSenseSDK2.0/Materials/GridMatMajor.mat.meta
  5. +100 −0 wrappers/unity/Assets/RealSenseSDK2.0/Materials/GridMatMinor.mat
  6. +8 −0 wrappers/unity/Assets/RealSenseSDK2.0/Materials/GridMatMinor.mat.meta
  7. +1 −1 wrappers/unity/Assets/RealSenseSDK2.0/Materials/PointCloudMat.mat
  8. +113 −0 wrappers/unity/Assets/RealSenseSDK2.0/Materials/TrailMat.mat
  9. +8 −0 wrappers/unity/Assets/RealSenseSDK2.0/Materials/TrailMat.mat.meta
  10. +1 −1 wrappers/unity/Assets/RealSenseSDK2.0/Materials/depthMat.mat
  11. +8 −0 wrappers/unity/Assets/RealSenseSDK2.0/Misc/Animation.meta
  12. +153 −0 wrappers/unity/Assets/RealSenseSDK2.0/Misc/Animation/PostProcessingDrawer.controller
  13. +8 −0 wrappers/unity/Assets/RealSenseSDK2.0/Misc/Animation/PostProcessingDrawer.controller.meta
  14. +677 −0 wrappers/unity/Assets/RealSenseSDK2.0/Misc/Animation/PostProcessingDrawerClosed.anim
  15. +8 −0 wrappers/unity/Assets/RealSenseSDK2.0/Misc/Animation/PostProcessingDrawerClosed.anim.meta
  16. +677 −0 wrappers/unity/Assets/RealSenseSDK2.0/Misc/Animation/PostProcessingDrawerOpen.anim
  17. +8 −0 wrappers/unity/Assets/RealSenseSDK2.0/Misc/Animation/PostProcessingDrawerOpen.anim.meta
  18. +2 −3 wrappers/unity/Assets/RealSenseSDK2.0/Misc/Prefabs/ErrorPanel.prefab
  19. +1 −1 wrappers/unity/Assets/RealSenseSDK2.0/Misc/Prefabs/SampleUI.prefab
  20. +6 −6 wrappers/unity/Assets/RealSenseSDK2.0/Misc/SampleSceneUI.unity
  21. BIN wrappers/unity/Assets/RealSenseSDK2.0/Misc/Textures/Icons/073-menu.png
  22. +86 −0 wrappers/unity/Assets/RealSenseSDK2.0/Misc/Textures/Icons/073-menu.png.meta
  23. BIN wrappers/unity/Assets/RealSenseSDK2.0/Misc/Textures/Icons/078-down.png
  24. +110 −0 wrappers/unity/Assets/RealSenseSDK2.0/Misc/Textures/Icons/078-down.png.meta
  25. +4 −5 wrappers/unity/Assets/RealSenseSDK2.0/Misc/Textures/Icons/087-on-off.png.meta
  26. BIN wrappers/unity/Assets/RealSenseSDK2.0/Misc/Textures/Icons/radiobox.png
  27. +154 −0 wrappers/unity/Assets/RealSenseSDK2.0/Misc/Textures/Icons/radiobox.png.meta
  28. BIN wrappers/unity/Assets/RealSenseSDK2.0/Misc/Textures/switch.png
  29. +126 −0 wrappers/unity/Assets/RealSenseSDK2.0/Misc/Textures/switch.png.meta
  30. +21 −0 wrappers/unity/Assets/RealSenseSDK2.0/Misc/Utils/BoolInvert.cs
  31. +11 −0 wrappers/unity/Assets/RealSenseSDK2.0/Misc/Utils/BoolInvert.cs.meta
  32. +38 −0 wrappers/unity/Assets/RealSenseSDK2.0/Misc/Utils/GridMesh.cs
  33. +11 −0 wrappers/unity/Assets/RealSenseSDK2.0/Misc/Utils/GridMesh.cs.meta
  34. +5 −2 wrappers/unity/Assets/RealSenseSDK2.0/Misc/Utils/OrbitCameraControl.cs
  35. +11 −3 wrappers/unity/Assets/RealSenseSDK2.0/Misc/Utils/RsDeviceListener.cs
  36. +8 −0 wrappers/unity/Assets/RealSenseSDK2.0/Models.meta
  37. +8 −0 wrappers/unity/Assets/RealSenseSDK2.0/Models/Materials.meta
  38. +81 −0 wrappers/unity/Assets/RealSenseSDK2.0/Models/Materials/blinn1.mat
  39. +8 −0 wrappers/unity/Assets/RealSenseSDK2.0/Models/Materials/blinn1.mat.meta
  40. +76 −0 wrappers/unity/Assets/RealSenseSDK2.0/Models/Materials/blinn2.mat
  41. +8 −0 wrappers/unity/Assets/RealSenseSDK2.0/Models/Materials/blinn2.mat.meta
  42. +76 −0 wrappers/unity/Assets/RealSenseSDK2.0/Models/Materials/blinn3.mat
  43. +8 −0 wrappers/unity/Assets/RealSenseSDK2.0/Models/Materials/blinn3.mat.meta
  44. +76 −0 wrappers/unity/Assets/RealSenseSDK2.0/Models/Materials/blinn4.mat
  45. +8 −0 wrappers/unity/Assets/RealSenseSDK2.0/Models/Materials/blinn4.mat.meta
  46. +76 −0 wrappers/unity/Assets/RealSenseSDK2.0/Models/Materials/blinn5.mat
  47. +8 −0 wrappers/unity/Assets/RealSenseSDK2.0/Models/Materials/blinn5.mat.meta
  48. BIN wrappers/unity/Assets/RealSenseSDK2.0/Models/T265.fbx
  49. +132 −0 wrappers/unity/Assets/RealSenseSDK2.0/Models/T265.fbx.meta
  50. +2 −2 wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/ARBackground.asset
  51. +48 −0 wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/PointCloudDepth.asset
  52. +8 −0 wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/PointCloudDepth.asset.meta
  53. +27 −27 wrappers/unity/Assets/RealSenseSDK2.0/ProcessingPipe/PointCloudProcessingBlocks.asset
  54. +390 −401 wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/ARBackground.unity
  55. +690 −804 wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/AlignmentSample.unity
  56. +20 −0 wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/BackgroundSegmentation.unity
  57. +44 −29 wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/PointCloudDepthAndColor.unity
  58. +4,961 −3,083 wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/PointCloudProcessingBlocks.unity
  59. +1,277 −0 wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/SLAM.unity
  60. +7 −0 wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/SLAM.unity.meta
  61. +20 −0 wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/TexturesDepthAndColor.unity
  62. +38 −23 wrappers/unity/Assets/RealSenseSDK2.0/Scenes/Samples/TexturesDepthAndInfrared.unity
  63. +665 −60 wrappers/unity/Assets/RealSenseSDK2.0/Scenes/StartHere.unity
  64. +5 −0 wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsHoleFillingFilter.cs
  65. +5 −0 wrappers/unity/Assets/RealSenseSDK2.0/Scripts/ProcessingBlocks/RsSpatialFilter.cs
  66. +1 −1 wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsARBackgroundRenderer.cs
  67. +4 −4 wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsDevice.cs
  68. +24 −54 wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsPointCloudRenderer.cs
  69. +96 −0 wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsPoseStreamTransformer.cs
  70. +11 −0 wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsPoseStreamTransformer.cs.meta
  71. +3 −1 wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsProcessingBlock.cs
  72. +32 −42 wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsProcessingPipe.cs
  73. +4 −7 wrappers/unity/Assets/RealSenseSDK2.0/Scripts/RsStreamTextureRenderer.cs
  74. +3 −1 wrappers/unity/Assets/RealSenseSDK2.0/Shaders/ARBackground.shader
  75. +48 −0 wrappers/unity/Assets/RealSenseSDK2.0/Shaders/UnlitTransparentShader.shader
  76. +9 −0 wrappers/unity/Assets/RealSenseSDK2.0/Shaders/UnlitTransparentShader.shader.meta
  77. BIN wrappers/unity/Assets/StreamingAssets/StreamingAssets
  78. +1 −1 wrappers/unity/Assets/StreamingAssets/StreamingAssets.manifest
  79. +1 −1 wrappers/unity/Assets/StreamingAssets/StreamingAssets.manifest.meta
  80. +1 −1 wrappers/unity/Assets/StreamingAssets/StreamingAssets.meta
  81. BIN wrappers/unity/Assets/StreamingAssets/sample_assets
  82. +20 −7 wrappers/unity/Assets/StreamingAssets/sample_assets.manifest
  83. BIN wrappers/unity/Assets/StreamingAssets/sample_scenes
  84. +6 −141 wrappers/unity/Assets/StreamingAssets/sample_scenes.manifest
@@ -156,6 +156,9 @@ private float GetElementHeightCallback(int index)
enterChildren = false;
}

iterator.Dispose();
obj.Dispose();

return h;
}

@@ -164,26 +167,6 @@ private void DrawListHeader(Rect rect)
GUI.Label(rect, "Processing Blocks");
}

private static GUIStyle inspectorTitlebar;
private static GUIStyle inspectorTitlebarText;

public static bool InspectorFoldout(Rect position, bool foldout, UnityEngine.Object[] targetObjs)
{
if (inspectorTitlebar == null)
{
inspectorTitlebar = "IN Title";
inspectorTitlebarText = "IN TitleText";
}

foldout = EditorGUI.Foldout(position, foldout, GUIContent.none, true, inspectorTitlebar);

position = inspectorTitlebar.padding.Remove(position);
if (Event.current.type == EventType.Repaint)
inspectorTitlebarText.Draw(position, ObjectNames.GetInspectorTitle(targetObjs[0]), false, false, foldout, false);

return foldout;
}

private void DrawListElement(Rect rect, int index, bool isActive, bool isFocused)
{
var item = _property.GetArrayElementAtIndex(index);
@@ -206,6 +189,7 @@ private void DrawListElement(Rect rect, int index, bool isActive, bool isFocused
if (!item.isExpanded)
{
obj.ApplyModifiedProperties();
obj.Dispose();
return;
}

@@ -226,8 +210,8 @@ private void DrawListElement(Rect rect, int index, bool isActive, bool isFocused
enterChildren = false;
r.y += r.height + 4f;
}

obj.ApplyModifiedProperties();
obj.Dispose();
}

protected override bool ShouldHideOpenButton()
@@ -8,7 +8,7 @@ Material:
m_PrefabInternal: {fileID: 0}
m_Name: ARBackgroundMat
m_Shader: {fileID: 4800000, guid: 66fdfcada2704184485a90166c079a87, type: 3}
m_ShaderKeywords: _COLORMAP_VIRIDIS
m_ShaderKeywords: _COLORMAP_RAINBOW
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
@@ -31,7 +31,8 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _Colormap: 6
- _Colormap: 4
- _MaxRange: 5.4285717
- _MinRange: 0
m_Colors: []
m_Colors:
- _BgColor: {r: 0.003921569, g: 0.7098039, b: 0.9333333, a: 1}
@@ -0,0 +1,100 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: GridMatMajor
m_Shader: {fileID: 4800000, guid: 836d1e4aaa198ef439a5f3299f2e3630, type: 3}
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _COLORCOLOR_ON _EMISSION
m_LightmapFlags: 0
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BlendOp: 0
- _BumpScale: 1
- _CameraFadingEnabled: 0
- _CameraFarFadeDistance: 2
- _CameraNearFadeDistance: 1
- _ColorMode: 4
- _Cull: 2
- _Cutoff: 0.425
- _DetailNormalMapScale: 1
- _DistortionBlend: 0.5
- _DistortionEnabled: 0
- _DistortionStrength: 1
- _DistortionStrengthScaled: 0
- _DstBlend: 10
- _EmissionEnabled: 0
- _FlipbookMode: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _InvFade: 1
- _LightingEnabled: 0
- _Metallic: 0
- _Mode: 3
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Shininess: 0.7
- _SmoothnessTextureChannel: 0
- _SoftParticlesEnabled: 0
- _SoftParticlesFarFadeDistance: 1
- _SoftParticlesNearFadeDistance: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 0
m_Colors:
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 0.5019608}
- _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
- _Emission: {r: 0, g: 0, b: 0, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 1, g: 1, b: 1, a: 0}
- _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -0,0 +1,100 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: GridMatMinor
m_Shader: {fileID: 4800000, guid: 836d1e4aaa198ef439a5f3299f2e3630, type: 3}
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _COLORCOLOR_ON _EMISSION
m_LightmapFlags: 0
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BlendOp: 0
- _BumpScale: 1
- _CameraFadingEnabled: 0
- _CameraFarFadeDistance: 2
- _CameraNearFadeDistance: 1
- _ColorMode: 4
- _Cull: 2
- _Cutoff: 0.425
- _DetailNormalMapScale: 1
- _DistortionBlend: 0.5
- _DistortionEnabled: 0
- _DistortionStrength: 1
- _DistortionStrengthScaled: 0
- _DstBlend: 10
- _EmissionEnabled: 0
- _FlipbookMode: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _InvFade: 1
- _LightingEnabled: 0
- _Metallic: 0
- _Mode: 3
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Shininess: 0.7
- _SmoothnessTextureChannel: 0
- _SoftParticlesEnabled: 0
- _SoftParticlesFarFadeDistance: 1
- _SoftParticlesNearFadeDistance: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 0
m_Colors:
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 0.11764706}
- _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
- _Emission: {r: 0, g: 0, b: 0, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 1, g: 1, b: 1, a: 0}
- _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -4,7 +4,7 @@
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: PointCloudMat
m_Shader: {fileID: 4800000, guid: 3a8f8c691fcc38d4c956485dfc073ab4, type: 3}
Oops, something went wrong.

0 comments on commit 9841e2d

Please sign in to comment.
You can’t perform that action at this time.