From 952d992ad025113de4440c29b8d2ef8c6ac56baa Mon Sep 17 00:00:00 2001
From: Théo de la Hogue
Date: Wed, 12 Apr 2023 11:54:02 +0200
Subject: Adding a scenes field to json description and loading it properly.

---
 src/argaze.test/utils/environment.json       | 54 +++++++++--------
 src/argaze/ArFeatures.py                     |  2 +-
 src/argaze/utils/demo_environment/setup.json | 90 ++++++++++++++--------------
 3 files changed, 75 insertions(+), 71 deletions(-)

diff --git a/src/argaze.test/utils/environment.json b/src/argaze.test/utils/environment.json
index d4d6f2b..17920d8 100644
--- a/src/argaze.test/utils/environment.json
+++ b/src/argaze.test/utils/environment.json
@@ -42,34 +42,36 @@
             "aprilTagDeglitch": 1
         }
     },
-    "TestSceneA" : {
-        "aruco_scene": {
-            "0": {
-                "translation": [1, 0, 0],
-                "rotation": [0, 0, 0]
+    "scenes": {
+        "TestSceneA" : {
+            "aruco_scene": {
+                "0": {
+                    "translation": [1, 0, 0],
+                    "rotation": [0, 0, 0]
+                },
+                "1": {
+                    "translation": [0, 1, 0],
+                    "rotation": [0, 90, 0]
+                }
             },
-            "1": {
-                "translation": [0, 1, 0],
-                "rotation": [0, 90, 0]
-            }
+            "aoi_scene": "aoi.obj",
+            "angle_tolerance": 1.0,
+            "distance_tolerance": 2.0
         },
-        "aoi_scene": "aoi.obj",
-        "angle_tolerance": 1.0,
-        "distance_tolerance": 2.0
-    },
-    "TestSceneB" : {
-        "aruco_scene": {
-            "0": {
-                "translation": [1, 0, 0],
-                "rotation": [0, 0, 0]
+        "TestSceneB" : {
+            "aruco_scene": {
+                "0": {
+                    "translation": [1, 0, 0],
+                    "rotation": [0, 0, 0]
+                },
+                "1": {
+                    "translation": [0, 1, 0],
+                    "rotation": [0, 90, 0]
+                }
             },
-            "1": {
-                "translation": [0, 1, 0],
-                "rotation": [0, 90, 0]
-            }
-        },
-        "aoi_scene": "aoi.obj",
-        "angle_tolerance": 1.0,
-        "distance_tolerance": 2.0
+            "aoi_scene": "aoi.obj",
+            "angle_tolerance": 1.0,
+            "distance_tolerance": 2.0
+        }
     }
 }
\ No newline at end of file
diff --git a/src/argaze/ArFeatures.py b/src/argaze/ArFeatures.py
index 467aa03..112b7d1 100644
--- a/src/argaze/ArFeatures.py
+++ b/src/argaze/ArFeatures.py
@@ -72,7 +72,7 @@ class ArEnvironment():
 			new_aruco_detector = ArUcoDetector.ArUcoDetector(new_aruco_dictionary, new_marker_size, new_aruco_camera, new_aruco_detecor_parameters)
 
 			new_scenes = {}
-			for scene_name, scene_data in data.items():
+			for scene_name, scene_data in data.pop('scenes').items():
 
 				new_aruco_scene = None
 				new_aoi_scene = None
diff --git a/src/argaze/utils/demo_environment/setup.json b/src/argaze/utils/demo_environment/setup.json
index f4b9659..d67b53f 100644
--- a/src/argaze/utils/demo_environment/setup.json
+++ b/src/argaze/utils/demo_environment/setup.json
@@ -12,53 +12,55 @@
             "aprilTagDeglitch": 1
         }
     },
-    "AR Scene Demo" : {
-        "aruco_scene": "aruco_scene.obj",
-        "aoi_scene": "aoi_scene.obj",
-        "aruco_axis": {
-            "lower_left_corner": {
-                "origin_marker": 2,
-                "horizontal_axis_marker": 3,
-                "vertical_axis_marker": 0
-            },
-            "lower_right_corner": {
-                "origin_marker": 3,
-                "horizontal_axis_marker": 2,
-                "vertical_axis_marker": 1
-            },
-            "upper_left_corner": {
-                "origin_marker": 0,
-                "horizontal_axis_marker": 1,
-                "vertical_axis_marker": 2
-            },
-            "upper_right_corner": {
-                "origin_marker": 1,
-                "horizontal_axis_marker": 0,
-                "vertical_axis_marker": 3
-            }
-        },
-        "aruco_aoi": {
-            "Screen_Plan": {
-                "upper_left_corner": {
-                    "marker_identifier": 0,
-                    "marker_corner_index": 2
-                },
-                "upper_right_corner": {
-                    "marker_identifier": 1,
-                    "marker_corner_index": 3
-                },
+    "scenes": {
+        "AR Scene Demo" : {
+            "aruco_scene": "aruco_scene.obj",
+            "aoi_scene": "aoi_scene.obj",
+            "aruco_axis": {
                 "lower_left_corner": {
-                    "marker_identifier": 2,
-                    "marker_corner_index": 1
+                    "origin_marker": 2,
+                    "horizontal_axis_marker": 3,
+                    "vertical_axis_marker": 0
                 },
                 "lower_right_corner": {
-                    "marker_identifier": 3,
-                    "marker_corner_index": 0
+                    "origin_marker": 3,
+                    "horizontal_axis_marker": 2,
+                    "vertical_axis_marker": 1
                 },
-                "inner_aoi": "all"
-            }
-        },
-        "angle_tolerance": 15.0,
-        "distance_tolerance": 2.54
+                "upper_left_corner": {
+                    "origin_marker": 0,
+                    "horizontal_axis_marker": 1,
+                    "vertical_axis_marker": 2
+                },
+                "upper_right_corner": {
+                    "origin_marker": 1,
+                    "horizontal_axis_marker": 0,
+                    "vertical_axis_marker": 3
+                }
+            },
+            "aruco_aoi": {
+                "Screen_Plan": {
+                    "upper_left_corner": {
+                        "marker_identifier": 0,
+                        "marker_corner_index": 2
+                    },
+                    "upper_right_corner": {
+                        "marker_identifier": 1,
+                        "marker_corner_index": 3
+                    },
+                    "lower_left_corner": {
+                        "marker_identifier": 2,
+                        "marker_corner_index": 1
+                    },
+                    "lower_right_corner": {
+                        "marker_identifier": 3,
+                        "marker_corner_index": 0
+                    },
+                    "inner_aoi": "all"
+                }
+            },
+            "angle_tolerance": 15.0,
+            "distance_tolerance": 2.54
+        }
     }
 }
\ No newline at end of file
-- 
cgit v1.1