From 74fb292fd3fd8012dcf82f1d62a03ac738424b58 Mon Sep 17 00:00:00 2001
From: Théo de la Hogue
Date: Thu, 29 Feb 2024 16:09:50 +0100
Subject: Updating more test.

---
 .../ArUcoMarkers/utils/aruco_camera.json           | 39 +++++++++++++---------
 1 file changed, 24 insertions(+), 15 deletions(-)

(limited to 'src/argaze.test/ArUcoMarkers/utils')

diff --git a/src/argaze.test/ArUcoMarkers/utils/aruco_camera.json b/src/argaze.test/ArUcoMarkers/utils/aruco_camera.json
index 7648916..980dc9f 100644
--- a/src/argaze.test/ArUcoMarkers/utils/aruco_camera.json
+++ b/src/argaze.test/ArUcoMarkers/utils/aruco_camera.json
@@ -1,10 +1,10 @@
 {
 	"name": "TestArUcoCamera",
+    "size": [1920, 1080],
     "aruco_detector": {
     	"dictionary": {
             "name": "DICT_ARUCO_ORIGINAL"
         },
-    	"marker_size": 3.0,
     	"optic_parameters": {
             "rms": 1.0,
             "dimensions": [
@@ -45,45 +45,54 @@
     "scenes": {
         "TestSceneA" : {
             "aruco_markers_group": {
-                "marker_size": 3.0,
-                "dictionary": {
-                    "name": "DICT_ARUCO_ORIGINAL"
-                },
+                "dictionary": "DICT_ARUCO_ORIGINAL",
                 "places": {
                     "0": {
                         "translation": [1, 0, 0],
-                        "rotation": [0, 0, 0]
+                        "rotation": [0, 0, 0],
+                        "size": 3.0
                     },
                     "1": {
                         "translation": [0, 1, 0],
-                        "rotation": [0, 90, 0]
+                        "rotation": [0, 90, 0],
+                        "size": 3.0
                     }
                 }
             },
-            "aoi_scene": "aoi.obj",
+            "layers": {
+                "Main" : {
+                    "aoi_scene": "aoi_3d.obj"
+                }
+            },
             "angle_tolerance": 1.0,
             "distance_tolerance": 2.0
         },
         "TestSceneB" : {
             "aruco_markers_group": {
-                "marker_size": 3.0,
-                "dictionary": {
-                    "name": "DICT_ARUCO_ORIGINAL"
-                },
+                "dictionary": "DICT_ARUCO_ORIGINAL",
                 "places": {
                     "0": {
                         "translation": [1, 0, 0],
-                        "rotation": [0, 0, 0]
+                        "rotation": [0, 0, 0],
+                        "size": 3.0
                     },
                     "1": {
                         "translation": [0, 1, 0],
-                        "rotation": [0, 90, 0]
+                        "rotation": [0, 90, 0],
+                        "size": 3.0
                     }
                 }
             },
-            "aoi_scene": "aoi.obj",
+            "layers": {
+                "Main" : {
+                    "aoi_scene": "aoi_3d.obj"
+                }
+            },
             "angle_tolerance": 1.0,
             "distance_tolerance": 2.0
         }
+    },
+    "layers": {
+        "Main": {}
     }
 }
\ No newline at end of file
-- 
cgit v1.1