diff --git a/Assets/Resources/Stereo_Images.meta b/Assets/Resources/Stereo_Images.meta
new file mode 100644
index 000000000..18a8c223f
--- /dev/null
+++ b/Assets/Resources/Stereo_Images.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c34b0c155e2b01b4c91aff06d21a0200
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Stereo_Images/Left_Eye_Image.gif b/Assets/Resources/Stereo_Images/Left_Eye_Image.gif
new file mode 100644
index 000000000..6e833927f
Binary files /dev/null and b/Assets/Resources/Stereo_Images/Left_Eye_Image.gif differ
diff --git a/Assets/Resources/Stereo_Images/Left_Eye_Image.gif.meta b/Assets/Resources/Stereo_Images/Left_Eye_Image.gif.meta
new file mode 100644
index 000000000..077a8e141
--- /dev/null
+++ b/Assets/Resources/Stereo_Images/Left_Eye_Image.gif.meta
@@ -0,0 +1,76 @@
+fileFormatVersion: 2
+guid: b1f1e483a2f99714a9719617079cd928
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ serializedVersion: 4
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -1
+ wrapU: -1
+ wrapV: -1
+ wrapW: -1
+ nPOTScale: 1
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 0
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 0
+ spriteTessellationDetail: -1
+ textureType: 0
+ textureShape: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ spritePackingTag:
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Stereo_Images/Materials.meta b/Assets/Resources/Stereo_Images/Materials.meta
new file mode 100644
index 000000000..1211bb40b
--- /dev/null
+++ b/Assets/Resources/Stereo_Images/Materials.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 750e9ff78fa1faf4b8cafd209041643f
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Stereo_Images/Materials/Left_Eye_Image.mat b/Assets/Resources/Stereo_Images/Materials/Left_Eye_Image.mat
new file mode 100644
index 000000000..5e6a6e0fc
--- /dev/null
+++ b/Assets/Resources/Stereo_Images/Materials/Left_Eye_Image.mat
@@ -0,0 +1,76 @@
+%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: Left_Eye_Image
+ m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+ m_ShaderKeywords:
+ m_LightmapFlags: 4
+ 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: 2800000, guid: b1f1e483a2f99714a9719617079cd928, type: 3}
+ 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:
+ - _BumpScale: 1
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 0
+ - _GlossMapScale: 1
+ - _Glossiness: 0.5
+ - _GlossyReflections: 1
+ - _Metallic: 0
+ - _Mode: 0
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _SrcBlend: 1
+ - _UVSec: 0
+ - _ZWrite: 1
+ m_Colors:
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
diff --git a/Assets/Resources/Stereo_Images/Materials/Left_Eye_Image.mat.meta b/Assets/Resources/Stereo_Images/Materials/Left_Eye_Image.mat.meta
new file mode 100644
index 000000000..8542e9b72
--- /dev/null
+++ b/Assets/Resources/Stereo_Images/Materials/Left_Eye_Image.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f98e07d998433e04c9af96c2892a0c0d
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Stereo_Images/Materials/Right_Eye_Image.mat b/Assets/Resources/Stereo_Images/Materials/Right_Eye_Image.mat
new file mode 100644
index 000000000..0f16b1d0e
--- /dev/null
+++ b/Assets/Resources/Stereo_Images/Materials/Right_Eye_Image.mat
@@ -0,0 +1,76 @@
+%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: Right_Eye_Image
+ m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+ m_ShaderKeywords:
+ m_LightmapFlags: 4
+ 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: 2800000, guid: d9179da52c3784b4f8f5602beb0f2ddb, type: 3}
+ 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:
+ - _BumpScale: 1
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 0
+ - _GlossMapScale: 1
+ - _Glossiness: 0.5
+ - _GlossyReflections: 1
+ - _Metallic: 0
+ - _Mode: 0
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _SrcBlend: 1
+ - _UVSec: 0
+ - _ZWrite: 1
+ m_Colors:
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
diff --git a/Assets/Resources/Stereo_Images/Materials/Right_Eye_Image.mat.meta b/Assets/Resources/Stereo_Images/Materials/Right_Eye_Image.mat.meta
new file mode 100644
index 000000000..425536e15
--- /dev/null
+++ b/Assets/Resources/Stereo_Images/Materials/Right_Eye_Image.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 08dec8132fc305a4bb4855f4dc5c7431
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Stereo_Images/Right_Eye_Image.gif b/Assets/Resources/Stereo_Images/Right_Eye_Image.gif
new file mode 100644
index 000000000..cc4ff08bb
Binary files /dev/null and b/Assets/Resources/Stereo_Images/Right_Eye_Image.gif differ
diff --git a/Assets/Resources/Stereo_Images/Right_Eye_Image.gif.meta b/Assets/Resources/Stereo_Images/Right_Eye_Image.gif.meta
new file mode 100644
index 000000000..89d13896a
--- /dev/null
+++ b/Assets/Resources/Stereo_Images/Right_Eye_Image.gif.meta
@@ -0,0 +1,76 @@
+fileFormatVersion: 2
+guid: d9179da52c3784b4f8f5602beb0f2ddb
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ serializedVersion: 4
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -1
+ wrapU: -1
+ wrapV: -1
+ wrapW: -1
+ nPOTScale: 1
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 0
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 0
+ spriteTessellationDetail: -1
+ textureType: 0
+ textureShape: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ spritePackingTag:
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity
index fe9e42bc3..a8c53cea3 100644
--- a/Assets/Scenes/Main.unity
+++ b/Assets/Scenes/Main.unity
@@ -625,7 +625,7 @@ Transform:
- {fileID: 167235401}
- {fileID: 639558752}
m_Father: {fileID: 0}
- m_RootOrder: 5
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &146794964
MonoBehaviour:
@@ -706,25 +706,18 @@ MonoBehaviour:
droneSubscribers: 0500000001000000
simFlight: 1
attachedSensors:
- - sensorName: Perry_Mesh
- ipAddress: 75.25.126.85
+ - sensorName: Perry_Left_Video_Sensor
+ ipAddress: 192.168.101.52
port: 9090
- sensorType: 1
- sensorSubscribers: 01000000
- videoPlayers: 0
- - droneName: Apollo the Antelope
- ipAddress: 75.25.126.85
- port: 9090
- droneType: 1
- droneSubscribers: 0500000001000000
- simFlight: 1
- attachedSensors:
- - sensorName: Apollo_PCFace
- ipAddress: 75.25.126.85
+ sensorType: 4
+ sensorSubscribers: 0f000000
+ videoPlayers: 1
+ - sensorName: Perry_Right_Video_Sensor
+ ipAddress: 192.168.101.52
port: 9090
- sensorType: 3
- sensorSubscribers: 090000000a0000000b0000000c0000000d00000008000000
- videoPlayers: 0
+ sensorType: 4
+ sensorSubscribers: 10000000
+ videoPlayers: 2
success: 0
uniqueID: 0
--- !u!4 &167235401 stripped
@@ -832,7 +825,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 11400010, guid: 126d619cf4daa52469682f85c1378b4a, type: 2}
propertyPath: usePerEyeCameras
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 11400000, guid: 126d619cf4daa52469682f85c1378b4a, type: 2}
propertyPath: _trackingOriginType
@@ -868,6 +861,20 @@ Prefab:
propertyPath: m_BackGroundColor.b
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 20000012175207052, guid: 126d619cf4daa52469682f85c1378b4a,
+ type: 2}
+ propertyPath: m_CullingMask.m_Bits
+ value: 4294966783
+ objectReference: {fileID: 0}
+ - target: {fileID: 20000010189485334, guid: 126d619cf4daa52469682f85c1378b4a,
+ type: 2}
+ propertyPath: m_CullingMask.m_Bits
+ value: 4294967039
+ objectReference: {fileID: 0}
+ - target: {fileID: 100006, guid: 126d619cf4daa52469682f85c1378b4a, type: 2}
+ propertyPath: m_TagString
+ value: Untagged
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 126d619cf4daa52469682f85c1378b4a, type: 2}
m_IsPrefabParent: 0
@@ -980,7 +987,7 @@ Transform:
- {fileID: 1076179635}
- {fileID: 78194254}
m_Father: {fileID: 0}
- m_RootOrder: 7
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &279732760
GameObject:
@@ -1668,6 +1675,147 @@ Prefab:
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 804ac96ebacbb37488605e7a96725e34, type: 3}
m_IsPrefabParent: 0
+--- !u!1001 &363037730
+Prefab:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_LocalPosition.z
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_LocalRotation.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_LocalRotation.w
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_AnchoredPosition.y
+ value: 3.34
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_SizeDelta.x
+ value: 2.5319
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_SizeDelta.y
+ value: 1.5447
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 1969902371392506, guid: 6d08eddb9cb5442e1a49d5aa622b9962, type: 2}
+ propertyPath: m_Name
+ value: LeftCanvas_R
+ objectReference: {fileID: 0}
+ - target: {fileID: 1307634185272490, guid: 6d08eddb9cb5442e1a49d5aa622b9962, type: 2}
+ propertyPath: m_Name
+ value: RightVideo
+ objectReference: {fileID: 0}
+ - target: {fileID: 1307634185272490, guid: 6d08eddb9cb5442e1a49d5aa622b9962, type: 2}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 1969902371392506, guid: 6d08eddb9cb5442e1a49d5aa622b9962, type: 2}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 180
+ objectReference: {fileID: 0}
+ - target: {fileID: 114329330121848616, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_Color.a
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 114329330121848616, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_Color.r
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 114329330121848616, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_Color.g
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 114329330121848616, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_Color.b
+ value: 1
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_ParentPrefab: {fileID: 100100000, guid: 6d08eddb9cb5442e1a49d5aa622b9962, type: 2}
+ m_IsPrefabParent: 0
--- !u!1 &422848528
GameObject:
m_ObjectHideFlags: 0
@@ -1881,6 +2029,92 @@ CanvasRenderer:
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 459626910}
+--- !u!1 &466466949
+GameObject:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ serializedVersion: 5
+ m_Component:
+ - component: {fileID: 466466953}
+ - component: {fileID: 466466952}
+ - component: {fileID: 466466951}
+ - component: {fileID: 466466950}
+ m_Layer: 8
+ m_Name: Quad_Left
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!23 &466466950
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 466466949}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_Materials:
+ - {fileID: 2100000, guid: f98e07d998433e04c9af96c2892a0c0d, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_PreserveUVs: 1
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+--- !u!64 &466466951
+MeshCollider:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 466466949}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 3
+ m_Convex: 0
+ m_CookingOptions: 14
+ m_SkinWidth: 0.01
+ m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!33 &466466952
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 466466949}
+ m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!4 &466466953
+Transform:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 466466949}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 1, z: -0.58}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 10
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &491234449
GameObject:
m_ObjectHideFlags: 0
@@ -2211,7 +2445,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 4
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &639558751
Prefab:
@@ -2393,7 +2627,7 @@ Transform:
m_LocalScale: {x: 0.1, y: 0.100000024, z: 0.1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 3
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 83.595, y: 0, z: 0}
--- !u!4 &731156519 stripped
Transform:
@@ -4468,6 +4702,92 @@ Material:
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+--- !u!1 &1551634032
+GameObject:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ serializedVersion: 5
+ m_Component:
+ - component: {fileID: 1551634036}
+ - component: {fileID: 1551634035}
+ - component: {fileID: 1551634034}
+ - component: {fileID: 1551634033}
+ m_Layer: 9
+ m_Name: Quad_Right
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!23 &1551634033
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1551634032}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_Materials:
+ - {fileID: 2100000, guid: 08dec8132fc305a4bb4855f4dc5c7431, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_PreserveUVs: 1
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+--- !u!64 &1551634034
+MeshCollider:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1551634032}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 3
+ m_Convex: 0
+ m_CookingOptions: 14
+ m_SkinWidth: 0.01
+ m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!33 &1551634035
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1551634032}
+ m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!4 &1551634036
+Transform:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1551634032}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 1, z: -0.58}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 11
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1578342133 stripped
GameObject:
m_PrefabParentObject: {fileID: 100004, guid: 126d619cf4daa52469682f85c1378b4a, type: 2}
@@ -4886,7 +5206,7 @@ Transform:
- {fileID: 934963557}
- {fileID: 317661247}
m_Father: {fileID: 0}
- m_RootOrder: 1
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1699223319
MonoBehaviour:
@@ -4952,7 +5272,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 2
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -5294,7 +5614,7 @@ Transform:
- {fileID: 1026087570}
- {fileID: 1672332644}
m_Father: {fileID: 0}
- m_RootOrder: 6
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
--- !u!1 &1866386692
GameObject:
@@ -6000,6 +6320,90 @@ MonoBehaviour:
type: 2}
invalidLocationObject: {fileID: 1413768137026182, guid: af1c322da33b9ec40b0f5a418ed90ef4,
type: 2}
+--- !u!1 &2055479682
+GameObject:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ serializedVersion: 5
+ m_Component:
+ - component: {fileID: 2055479686}
+ - component: {fileID: 2055479685}
+ - component: {fileID: 2055479684}
+ - component: {fileID: 2055479683}
+ m_Layer: 0
+ m_Name: Cube
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!23 &2055479683
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 2055479682}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_Materials:
+ - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_PreserveUVs: 1
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+--- !u!65 &2055479684
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 2055479682}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 1, y: 1, z: 1}
+ m_Center: {x: 0, y: 0, z: 0}
+--- !u!33 &2055479685
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 2055479682}
+ m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!4 &2055479686
+Transform:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 2055479682}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 1.356, y: 3.326, z: 4.62}
+ m_LocalScale: {x: 14.637846, y: 7.957859, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 12
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2094584445
GameObject:
m_ObjectHideFlags: 0
@@ -6149,3 +6553,120 @@ CanvasRenderer:
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 2097199223}
+--- !u!1001 &2129100408
+Prefab:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_LocalPosition.z
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_LocalRotation.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_LocalRotation.w
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_RootOrder
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_AnchoredPosition.y
+ value: 3.34
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_SizeDelta.x
+ value: 2.5319
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_SizeDelta.y
+ value: 1.5447
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 1969902371392506, guid: 6d08eddb9cb5442e1a49d5aa622b9962, type: 2}
+ propertyPath: m_Name
+ value: LeftCanvas_L
+ objectReference: {fileID: 0}
+ - target: {fileID: 1307634185272490, guid: 6d08eddb9cb5442e1a49d5aa622b9962, type: 2}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 1969902371392506, guid: 6d08eddb9cb5442e1a49d5aa622b9962, type: 2}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 224324705107419824, guid: 6d08eddb9cb5442e1a49d5aa622b9962,
+ type: 2}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 180
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_ParentPrefab: {fileID: 100100000, guid: 6d08eddb9cb5442e1a49d5aa622b9962, type: 2}
+ m_IsPrefabParent: 0
diff --git a/Assets/Scripts/ROS Scripts/Camera Streaming Scripts/ImageVisualizer.cs b/Assets/Scripts/ROS Scripts/Camera Streaming Scripts/ImageVisualizer.cs
index 03cb4f914..d239d8442 100644
--- a/Assets/Scripts/ROS Scripts/Camera Streaming Scripts/ImageVisualizer.cs
+++ b/Assets/Scripts/ROS Scripts/Camera Streaming Scripts/ImageVisualizer.cs
@@ -16,6 +16,9 @@ public class ImageVisualizer : MonoBehaviour {
ImageMsg image;
RawImage m_RawImage;
+ bool first = true;
+ bool second = true;
+
// Use this for initialization
void Start () {
@@ -28,6 +31,11 @@ void Update () {
}
+ ///
+ /// called by OnReceiveMessage to set the videoPlayer to display given image data
+ ///
+ ///
+ ///
public void SetFrame(ImageMsg data, string videoPlayer)
{
Debug.Log(videoPlayer);
@@ -35,11 +43,27 @@ public void SetFrame(ImageMsg data, string videoPlayer)
{
return;
}
- Texture2D tex = new Texture2D((int)data.GetWidth(), (int)data.GetHeight(), TextureFormat.RGB24, false);
+
+ print(GameObject.Find(videoPlayer).ToString());
+ print("Encoding: " + data.GetEncoding());
+
GameObject.Find(videoPlayer).GetComponent().enabled = true;
GameObject.Find(videoPlayer).GetComponent().sizeDelta = new Vector2((int)data.GetWidth(), (int)data.GetHeight());
+ Texture2D tex = new Texture2D((int)data.GetWidth(), (int)data.GetHeight(), TextureFormat.Alpha8, false);
tex.LoadRawTextureData(data.GetImage());
tex.Apply();
GameObject.Find(videoPlayer).GetComponent().texture = tex;
+
+ /*
+ if (first || second)
+ {
+ first = false;
+ second = false;
+ byte[] _bytes = tex.EncodeToPNG();
+ System.IO.File.WriteAllBytes("C:\\Users\vrab\\Desktop\\" + videoPlayer, _bytes);
+ Debug.Log(_bytes.Length / 1024 + "Kb was saved as: " + "C:\\Users\vrab\\Desktop\\");
+
+ }
+ */
}
}
diff --git a/Assets/Scripts/ROS Scripts/ROS Connections v2/ROSManager.cs b/Assets/Scripts/ROS Scripts/ROS Connections v2/ROSManager.cs
index c96fc95f1..28e1c3097 100644
--- a/Assets/Scripts/ROS Scripts/ROS Connections v2/ROSManager.cs
+++ b/Assets/Scripts/ROS Scripts/ROS Connections v2/ROSManager.cs
@@ -35,7 +35,8 @@ public enum SensorSubscribers
{
surface_pointcloud, mesh,
colorized_points_0, colorized_points_1, colorized_points_2, colorized_points_3, colorized_points_4, colorized_points_5,
- colorized_points_faced_0, colorized_points_faced_1, colorized_points_faced_2, colorized_points_faced_3, colorized_points_faced_4, colorized_points_faced_5, fpv_camera_images
+ colorized_points_faced_0, colorized_points_faced_1, colorized_points_faced_2, colorized_points_faced_3, colorized_points_faced_4,
+ colorized_points_faced_5, fpv_camera_images, stereo_vga_front_left_images, stereo_vga_front_right_images
};
///
@@ -173,7 +174,7 @@ private void InstantiateDrone(ROSDroneConnectionInput rosDroneConnectionInput)
droneSim.InitDroneSim();
droneProperties.droneSimulationManager = droneSim;
- // Get DroneMenu and instansiate.
+ // Get DroneMenu and instantiate
DroneMenu droneMenu = droneGameObject.GetComponent();
droneMenu.InitDroneMenu(rosDroneConnection, droneSubscribers);
droneGameObject.GetComponent().droneMenu = droneMenu;
diff --git a/Assets/Scripts/ROS Scripts/ROS Connections v2/Sensors/CameraSensor_ROSSensorConnection.cs b/Assets/Scripts/ROS Scripts/ROS Connections v2/Sensors/CameraSensor_ROSSensorConnection.cs
index 18d1f0673..5650496b2 100644
--- a/Assets/Scripts/ROS Scripts/ROS Connections v2/Sensors/CameraSensor_ROSSensorConnection.cs
+++ b/Assets/Scripts/ROS Scripts/ROS Connections v2/Sensors/CameraSensor_ROSSensorConnection.cs
@@ -11,7 +11,7 @@ public class CameraSensor_ROSSensorConnection : MonoBehaviour, ROSTopicSubscribe
// Private connection variables
private ROSBridgeWebSocketConnection ros = null;
private string client_id;
- private float alpha = 0.8f;
+ //private float alpha = 0.8f;
private List sensorSubscriberTopics = new List();
private string videoType;
private Dictionary keyList = new Dictionary();
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 7c036f4ba..49e599120 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -298,8 +298,9 @@ PlayerSettings:
m_Enabled: 0
m_Devices: []
- m_BuildTarget: Standalone
- m_Enabled: 0
- m_Devices: []
+ m_Enabled: 1
+ m_Devices:
+ - Oculus
- m_BuildTarget: Tizen
m_Enabled: 0
m_Devices: []
@@ -635,9 +636,9 @@ PlayerSettings:
webGLUseWasm: 0
webGLCompressionFormat: 1
scriptingDefineSymbols:
- 1: VRTK_VERSION_3_3_0;VRTK_VERSION_3_3_0_OR_NEWER;VRTK_VERSION_3_1_0_OR_NEWER;VRTK_VERSION_3_2_0_OR_NEWER;VRTK_VERSION_3_2_1_OR_NEWER
+ 1: VRTK_DEFINE_OCULUS_UTILITIES_1_12_0_OR_NEWER;VRTK_DEFINE_SDK_OCULUS;VRTK_DEFINE_SDK_OCULUS_AVATAR;VRTK_VERSION_3_3_0;VRTK_VERSION_3_3_0_OR_NEWER;VRTK_VERSION_3_1_0_OR_NEWER;VRTK_VERSION_3_2_0_OR_NEWER;VRTK_VERSION_3_2_1_OR_NEWER
4: VRTK_VERSION_3_3_0;VRTK_VERSION_3_3_0_OR_NEWER;VRTK_VERSION_3_1_0_OR_NEWER;VRTK_VERSION_3_2_0_OR_NEWER;VRTK_VERSION_3_2_1_OR_NEWER
- 7: VRTK_VERSION_3_3_0;VRTK_VERSION_3_3_0_OR_NEWER;VRTK_VERSION_3_1_0_OR_NEWER;VRTK_VERSION_3_2_0_OR_NEWER;VRTK_VERSION_3_2_1_OR_NEWER
+ 7: VRTK_DEFINE_OCULUS_UTILITIES_1_12_0_OR_NEWER;VRTK_DEFINE_SDK_OCULUS;VRTK_DEFINE_SDK_OCULUS_AVATAR;VRTK_VERSION_3_3_0;VRTK_VERSION_3_3_0_OR_NEWER;VRTK_VERSION_3_1_0_OR_NEWER;VRTK_VERSION_3_2_0_OR_NEWER;VRTK_VERSION_3_2_1_OR_NEWER
13: VRTK_VERSION_3_3_0;VRTK_VERSION_3_3_0_OR_NEWER;VRTK_VERSION_3_1_0_OR_NEWER;VRTK_VERSION_3_2_0_OR_NEWER;VRTK_VERSION_3_2_1_OR_NEWER
14: VRTK_DEFINE_SDK_WINDOWSMR;VRTK_VERSION_3_3_0;VRTK_VERSION_3_3_0_OR_NEWER;VRTK_VERSION_3_1_0_OR_NEWER;VRTK_VERSION_3_2_0_OR_NEWER;VRTK_VERSION_3_2_1_OR_NEWER
17: VRTK_VERSION_3_3_0;VRTK_VERSION_3_3_0_OR_NEWER;VRTK_VERSION_3_1_0_OR_NEWER;VRTK_VERSION_3_2_0_OR_NEWER;VRTK_VERSION_3_2_1_OR_NEWER
diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset
index 47bf8a3bb..a78c3659e 100644
--- a/ProjectSettings/QualitySettings.asset
+++ b/ProjectSettings/QualitySettings.asset
@@ -17,6 +17,7 @@ QualitySettings:
shadowNearPlaneOffset: 2
shadowCascade2Split: 0.33333334
shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
+ shadowmaskMode: 0
blendWeights: 1
textureQuality: 1
anisotropicTextures: 0
@@ -31,6 +32,7 @@ QualitySettings:
particleRaycastBudget: 4
asyncUploadTimeSlice: 2
asyncUploadBufferSize: 4
+ resolutionScalingFixedDPIFactor: 1
excludedTargetPlatforms: []
- serializedVersion: 2
name: Fast
@@ -43,6 +45,7 @@ QualitySettings:
shadowNearPlaneOffset: 2
shadowCascade2Split: 0.33333334
shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
+ shadowmaskMode: 0
blendWeights: 2
textureQuality: 0
anisotropicTextures: 0
@@ -57,6 +60,7 @@ QualitySettings:
particleRaycastBudget: 16
asyncUploadTimeSlice: 2
asyncUploadBufferSize: 4
+ resolutionScalingFixedDPIFactor: 1
excludedTargetPlatforms: []
- serializedVersion: 2
name: Simple
@@ -69,6 +73,7 @@ QualitySettings:
shadowNearPlaneOffset: 2
shadowCascade2Split: 0.33333334
shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
+ shadowmaskMode: 0
blendWeights: 2
textureQuality: 0
anisotropicTextures: 1
@@ -83,6 +88,7 @@ QualitySettings:
particleRaycastBudget: 64
asyncUploadTimeSlice: 2
asyncUploadBufferSize: 4
+ resolutionScalingFixedDPIFactor: 1
excludedTargetPlatforms: []
- serializedVersion: 2
name: Good
@@ -95,6 +101,7 @@ QualitySettings:
shadowNearPlaneOffset: 2
shadowCascade2Split: 0.33333334
shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
+ shadowmaskMode: 1
blendWeights: 2
textureQuality: 0
anisotropicTextures: 1
@@ -109,6 +116,7 @@ QualitySettings:
particleRaycastBudget: 256
asyncUploadTimeSlice: 2
asyncUploadBufferSize: 4
+ resolutionScalingFixedDPIFactor: 1
excludedTargetPlatforms: []
- serializedVersion: 2
name: Beautiful
@@ -121,6 +129,7 @@ QualitySettings:
shadowNearPlaneOffset: 2
shadowCascade2Split: 0.33333334
shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
+ shadowmaskMode: 1
blendWeights: 4
textureQuality: 0
anisotropicTextures: 2
@@ -135,6 +144,7 @@ QualitySettings:
particleRaycastBudget: 1024
asyncUploadTimeSlice: 2
asyncUploadBufferSize: 4
+ resolutionScalingFixedDPIFactor: 1
excludedTargetPlatforms: []
- serializedVersion: 2
name: Fantastic
@@ -147,6 +157,7 @@ QualitySettings:
shadowNearPlaneOffset: 2
shadowCascade2Split: 0.33333334
shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
+ shadowmaskMode: 1
blendWeights: 4
textureQuality: 0
anisotropicTextures: 2
@@ -161,25 +172,6 @@ QualitySettings:
particleRaycastBudget: 4096
asyncUploadTimeSlice: 2
asyncUploadBufferSize: 4
+ resolutionScalingFixedDPIFactor: 1
excludedTargetPlatforms: []
- m_PerPlatformDefaultQuality:
- Android: 2
- BlackBerry: 2
- GLES Emulation: 5
- Nintendo 3DS: 5
- PS3: 5
- PS4: 5
- PSM: 5
- PSP2: 2
- Samsung TV: 2
- Standalone: 5
- Tizen: 2
- WP8: 5
- Web: 5
- WebGL: 3
- WiiU: 5
- Windows Store Apps: 5
- XBOX360: 5
- XboxOne: 5
- iPhone: 2
- tvOS: 5
+ m_PerPlatformDefaultQuality: {}
diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset
index dd1c20920..4f9f30130 100644
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -48,8 +48,8 @@ TagManager:
- UI
-
-
- -
- -
+ - Left_Eye_Layer
+ - Right_Eye_Layer
-
-
-
diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset
index 2943e4401..1be460051 100644
--- a/ProjectSettings/UnityConnectSettings.asset
+++ b/ProjectSettings/UnityConnectSettings.asset
@@ -3,12 +3,14 @@
--- !u!310 &1
UnityConnectSettings:
m_ObjectHideFlags: 0
- m_Enabled: 0
+ m_Enabled: 1
m_TestMode: 0
m_TestEventUrl:
m_TestConfigUrl:
+ m_TestInitMode: 0
CrashReportingSettings:
m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes
+ m_NativeEventUrl: https://perf-events.cloud.unity3d.com/symbolicate
m_Enabled: 0
m_CaptureEditorExceptions: 1
UnityPurchasingSettings:
@@ -24,6 +26,9 @@ UnityConnectSettings:
m_Enabled: 0
m_InitializeOnStartup: 1
m_TestMode: 0
- m_EnabledPlatforms: 4294967295
m_IosGameId:
m_AndroidGameId:
+ m_GameIds: {}
+ m_GameId:
+ PerformanceReportingSettings:
+ m_Enabled: 0