Merge pull request unity3d-jp#19 from Tiryoh/feature/cleanup

ファイル整理

Author: comoc

.github/scripts/sync_scripts.sh

@@ -0,0 +1,7 @@
+#/bin/bash -eu
+
+SRC_DIR=$(cd $(dirname ${BASH_SOURCE:-$0})/../../; pwd)
+echo "Run sync script in $SRC_DIR"
+rsync -av --delete $SRC_DIR/MobileRobotUITutorialProject/Assets/Scripts/ $SRC_DIR/UnityScripts/Scripts
+rsync -av --delete $SRC_DIR/MobileRobotUITutorialProject/Assets/OdometryViewer/ $SRC_DIR/UnityScripts/OdometryViewer
+rsync -av --delete $SRC_DIR/MobileRobotUITutorialProject/Assets/PointCloud/ $SRC_DIR/UnityScripts/PointCloud

.github/workflows/check_tutorial_files.yaml

@@ -0,0 +1,18 @@
+name: Check for the tutorial update
+
+on:
+  pull_request:
+    paths:
+      - "MobileRobotUITutorialProject/**"
+      - "UnityScripts/**"
+
+jobs:
+  check-tutorial-files:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: File sync
+        run: |
+          ./.github/scripts/sync_scripts.sh
+          git status | grep "working tree clean" && exit 0 || git status; exit 1;

MobileRobotUITutorialProject/Assets/Scripts/ImageSubscriber.cs

@@ -77,5 +77,5 @@ void ProcessMessage()
 /// </summary>
 class CameraImage
 {
-    public byte[] imageData　{ get; set; }
+    public byte[] imageData { get; set; }
 }

UnityScripts/PointCloud/Prefabs/Sphere.prefab

@@ -49,8 +49,8 @@ MeshRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2278637883144382342}
   m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
   m_DynamicOccludee: 1
   m_MotionVectors: 1
   m_LightProbeUsage: 1

UnityScripts/Scripts/ImageSubscriber.cs

@@ -4,8 +4,7 @@
 using CompressedImageMsg = RosMessageTypes.Sensor.CompressedImageMsg;
 
 /// <summary>
-/// LiDARスキャンデータ（LaserScanMsg）を受信するためのクラス
-/// 主にスキャンデータの取得および座標変換に使い、描画は別のスクリプトを用意することを想定
+/// カメラデータ（CompressedImageMsg）を受信し、描画するためのクラス
 /// </summary>
 public class ImageSubscriber : MonoBehaviour
 {
@@ -17,7 +16,7 @@ public class ImageSubscriber : MonoBehaviour
     [SerializeField] RawImage rawImage;
 
     private Texture2D texture2D;
-    private byte[] imageData;
+    private CameraImage cameraImage = new CameraImage();
     private bool isMessageReceived;
 
     /// <summary>
@@ -47,22 +46,36 @@ void Update()
     /// </summary>
     void ImageMsgUpdate(CompressedImageMsg rawImage)
     {
-        imageData = rawImage.data;
-        isMessageReceived = true;
-        if (isDebugMode)
+        lock (cameraImage)
         {
-            Debug.Log("rawImage recieved. length :" + System.Buffer.ByteLength(imageData));
+            cameraImage.imageData = rawImage.data;
+            if (isDebugMode)
+            {
+                Debug.Log("rawImage recieved. length :" + System.Buffer.ByteLength(cameraImage.imageData));
+            }
         }
+        isMessageReceived = true;
     }
 
     /// <summary>
     /// ImageMsgのデータをTextureに反映する関数
     /// </summary>
     void ProcessMessage()
     {
-        texture2D.LoadImage(imageData);
-        texture2D.Apply();
+        lock (cameraImage)
+        {
+            texture2D.LoadImage(cameraImage.imageData);
+            texture2D.Apply();
+        }
         rawImage.texture = texture2D;
         isMessageReceived = false;
     }
+}
+
+/// <summary>
+/// アクセス制限用のカメライメージデータ格納配列
+/// </summary>
+class CameraImage
+{
+    public byte[] imageData { get; set; }
 }