From 6fbe2de7f5839ef875da3211a55f3a8007dcbd45 Mon Sep 17 00:00:00 2001 From: Théo de la Hogue Date: Wed, 5 Apr 2023 14:18:21 +0200 Subject: Fixing and testing multi ar scenes loading. --- src/argaze.test/ArFeatures.py | 6 +++--- src/argaze.test/utils/environment.json | 17 ++++++++++++++++- 2 files changed, 19 insertions(+), 4 deletions(-) (limited to 'src/argaze.test') diff --git a/src/argaze.test/ArFeatures.py b/src/argaze.test/ArFeatures.py index af8cfa8..054416a 100644 --- a/src/argaze.test/ArFeatures.py +++ b/src/argaze.test/ArFeatures.py @@ -37,11 +37,11 @@ class TestArEnvironmentClass(unittest.TestCase): self.assertIsNone(numpy.testing.assert_array_equal(ar_environment.aruco_detector.camera.D, [-1.0, -0.5, 0.0, 0.5, 1.0])) # Check environment scenes - self.assertEqual(len(ar_environment.scenes), 1) - self.assertIsNone(numpy.testing.assert_array_equal(list(ar_environment.scenes.keys()), ["TestScene"])) + self.assertEqual(len(ar_environment.scenes), 2) + self.assertIsNone(numpy.testing.assert_array_equal(list(ar_environment.scenes.keys()), ["TestSceneA", "TestSceneB"])) # Load test scene - ar_scene = ar_environment.scenes["TestScene"] + ar_scene = ar_environment.scenes["TestSceneA"] # Check Aruco scene self.assertEqual(len(ar_scene.aruco_scene.places), 2) diff --git a/src/argaze.test/utils/environment.json b/src/argaze.test/utils/environment.json index e4cf43a..9476a0d 100644 --- a/src/argaze.test/utils/environment.json +++ b/src/argaze.test/utils/environment.json @@ -40,7 +40,22 @@ "aprilTagDeglitch": 1 } }, - "TestScene" : { + "TestSceneA" : { + "aruco_scene": { + "0": { + "translation": [1, 0, 0], + "rotation": [0, 0, 0] + }, + "1": { + "translation": [0, 1, 0], + "rotation": [0, 90, 0] + } + }, + "aoi_scene": "aoi.obj", + "angle_tolerance": 1.0, + "distance_tolerance": 2.0 + }, + "TestSceneB" : { "aruco_scene": { "0": { "translation": [1, 0, 0], -- cgit v1.1