Skip to content

Commit 3ae6696

Browse files
committed
UntyプロジェクトとUnityScriptsフォルダ内を同期
1 parent 7a1e40b commit 3ae6696

File tree

2 files changed

+24
-11
lines changed

2 files changed

+24
-11
lines changed

UnityScripts/PointCloud/Prefabs/Sphere.prefab

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ MeshRenderer:
4949
m_PrefabAsset: {fileID: 0}
5050
m_GameObject: {fileID: 2278637883144382342}
5151
m_Enabled: 1
52-
m_CastShadows: 1
53-
m_ReceiveShadows: 1
52+
m_CastShadows: 0
53+
m_ReceiveShadows: 0
5454
m_DynamicOccludee: 1
5555
m_MotionVectors: 1
5656
m_LightProbeUsage: 1

UnityScripts/Scripts/ImageSubscriber.cs

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
using CompressedImageMsg = RosMessageTypes.Sensor.CompressedImageMsg;
55

66
/// <summary>
7-
/// LiDARスキャンデータ(LaserScanMsg)を受信するためのクラス
8-
/// 主にスキャンデータの取得および座標変換に使い、描画は別のスクリプトを用意することを想定
7+
/// カメラデータ(CompressedImageMsg)を受信し、描画するためのクラス
98
/// </summary>
109
public class ImageSubscriber : MonoBehaviour
1110
{
@@ -17,7 +16,7 @@ public class ImageSubscriber : MonoBehaviour
1716
[SerializeField] RawImage rawImage;
1817

1918
private Texture2D texture2D;
20-
private byte[] imageData;
19+
private CameraImage cameraImage = new CameraImage();
2120
private bool isMessageReceived;
2221

2322
/// <summary>
@@ -47,22 +46,36 @@ void Update()
4746
/// </summary>
4847
void ImageMsgUpdate(CompressedImageMsg rawImage)
4948
{
50-
imageData = rawImage.data;
51-
isMessageReceived = true;
52-
if (isDebugMode)
49+
lock (cameraImage)
5350
{
54-
Debug.Log("rawImage recieved. length :" + System.Buffer.ByteLength(imageData));
51+
cameraImage.imageData = rawImage.data;
52+
if (isDebugMode)
53+
{
54+
Debug.Log("rawImage recieved. length :" + System.Buffer.ByteLength(cameraImage.imageData));
55+
}
5556
}
57+
isMessageReceived = true;
5658
}
5759

5860
/// <summary>
5961
/// ImageMsgのデータをTextureに反映する関数
6062
/// </summary>
6163
void ProcessMessage()
6264
{
63-
texture2D.LoadImage(imageData);
64-
texture2D.Apply();
65+
lock (cameraImage)
66+
{
67+
texture2D.LoadImage(cameraImage.imageData);
68+
texture2D.Apply();
69+
}
6570
rawImage.texture = texture2D;
6671
isMessageReceived = false;
6772
}
73+
}
74+
75+
/// <summary>
76+
/// アクセス制限用のカメライメージデータ格納配列
77+
/// </summary>
78+
class CameraImage
79+
{
80+
public byte[] imageData { get; set; }
6881
}

0 commit comments

Comments
 (0)