From edbbfbdd9ec59b4321862b99cab7abef5ffc706a Mon Sep 17 00:00:00 2001 From: Tobias Hienzsch Date: Wed, 21 Aug 2024 07:23:28 +0200 Subject: [PATCH] Improve ProStudio model --- data/models/ProStudio/model.json | 2 +- data/models/ProStudio/model.obj | 83 -------- data/models/ProStudio/model_atc_left.obj | 33 +++ data/models/ProStudio/model_atc_right.obj | 33 +++ data/models/ProStudio/model_ceiling.obj | 40 ++-- data/models/ProStudio/model_console.obj | 83 ++++++++ data/models/ProStudio/model_couch.obj | 207 +++++++++++++++++++ data/models/ProStudio/model_floor.obj | 34 +-- data/models/ProStudio/model_rack.obj | 73 +++++++ data/models/ProStudio/model_raised_floor.obj | 53 +++++ data/models/ProStudio/model_walls.obj | 55 ----- data/models/ProStudio/model_walls_back.obj | 27 +++ data/models/ProStudio/model_walls_front.obj | 25 +++ data/models/ProStudio/model_walls_side.obj | 17 ++ run_3d.sh | 15 +- src/python/ProStudio_cpu.py | 14 +- src/python/ProStudio_model.py | 164 +++++++++++++-- src/python/analysis/response.py | 3 + 18 files changed, 757 insertions(+), 204 deletions(-) delete mode 100644 data/models/ProStudio/model.obj create mode 100644 data/models/ProStudio/model_atc_left.obj create mode 100644 data/models/ProStudio/model_atc_right.obj create mode 100644 data/models/ProStudio/model_console.obj create mode 100644 data/models/ProStudio/model_couch.obj create mode 100644 data/models/ProStudio/model_rack.obj create mode 100644 data/models/ProStudio/model_raised_floor.obj delete mode 100644 data/models/ProStudio/model_walls.obj create mode 100644 data/models/ProStudio/model_walls_back.obj create mode 100644 data/models/ProStudio/model_walls_front.obj create mode 100644 data/models/ProStudio/model_walls_side.obj diff --git a/data/models/ProStudio/model.json b/data/models/ProStudio/model.json index 63b8262..a5517c1 100644 --- a/data/models/ProStudio/model.json +++ b/data/models/ProStudio/model.json @@ -1 +1 @@ -{"mats_hash": {"Ceiling": {"tris": [[3, 5, 4], [6, 5, 3], [1, 3, 2], [8, 7, 6], [0, 6, 3], [0, 3, 1], [0, 8, 6]], "pts": [[5.235945801, 7.123926758, 3.5], [7.014450684000001, 2.237524902, 3.5], [6.444097656, 1.014399231, 3.5], [3.79173999, 0.04902, 3.5], [0.969159973, 0.04902, 3.5], [0.014869901999999999, 1.00331012, 3.5], [0.014869901999999999, 6.2033100590000005, 3.5], [1.403930176, 7.368870117, 3.5], [3.532010986, 7.744107909999999, 3.5]], "color": [2, 2, 2], "sides": [1, 1, 1, 1, 1, 1, 1]}, "Floor": {"tris": [[5, 3, 4], [5, 6, 3], [3, 0, 2], [7, 8, 6], [6, 1, 3], [3, 1, 0], [8, 1, 6]], "pts": [[7.014450684000001, 2.237524902, 0.0], [5.235945801, 7.123926758, 0.0], [6.444097656, 1.014399231, 0.0], [3.79173999, 0.04902, 0.0], [0.969159973, 0.04902, 0.0], [0.014869901999999999, 1.00331012, 0.0], [0.014869901999999999, 6.2033100590000005, 0.0], [1.403930176, 7.368870117, 0.0], [3.532010986, 7.744107909999999, 0.0]], "color": [2, 2, 2], "sides": [1, 1, 1, 1, 1, 1, 1]}, "Walls": {"tris": [[0, 1, 2], [0, 2, 3], [4, 0, 3], [4, 3, 5], [4, 5, 6], [7, 4, 6], [8, 7, 6], [8, 6, 9], [8, 9, 10], [11, 8, 10], [12, 11, 10], [13, 11, 12], [14, 13, 12], [14, 12, 15], [14, 15, 16], [17, 14, 16], [1, 17, 16], [1, 16, 2]], "pts": [[7.014450684000001, 2.237524902, 0.0], [5.235945801, 7.123926758, 0.0], [5.235945801, 7.123926758, 3.5], [7.014450684000001, 2.237524902, 3.5], [6.444097656, 1.014399231, 0.0], [6.444097656, 1.014399231, 3.5], [3.79173999, 0.04902, 3.5], [3.79173999, 0.04902, 0.0], [0.969159973, 0.04902, 0.0], [0.969159973, 0.04902, 3.5], [0.014869901999999999, 1.00331012, 3.5], [0.014869901999999999, 1.00331012, 0.0], [0.014869901999999999, 6.2033100590000005, 3.5], [0.014869901999999999, 6.2033100590000005, 0.0], [1.403930176, 7.368870117, 0.0], [1.403930176, 7.368870117, 3.5], [3.532010986, 7.744107909999999, 3.5], [3.532010986, 7.744107909999999, 0.0]], "color": [255, 255, 255], "sides": [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]}}, "sources": [{"name": "S1", "xyz": [0.85, 6.7, 1.4]}], "receivers": [{"name": "R1", "xyz": [2.9, 5.5, 1.2]}, {"name": "R2", "xyz": [3.8, 1.0, 1.2]}]} +{"mats_hash": {"ATC Left": {"tris": [[2, 1, 0], [3, 1, 2], [3, 4, 1], [5, 4, 3], [5, 6, 4], [7, 6, 5], [7, 0, 6], [2, 0, 7], [1, 4, 0], [4, 6, 0], [3, 2, 5], [5, 2, 7]], "pts": [[1.305857422, 7.146186523, 1.062], [1.517857422, 6.7789916990000005, 1.062], [1.305857422, 7.146186523, 1.894], [1.517857422, 6.7789916990000005, 1.894], [2.148323975, 7.142991699, 1.062], [2.148323975, 7.142991699, 1.894], [1.9363238530000002, 7.510186523000001, 1.062], [1.9363238530000002, 7.510186523000001, 1.894]], "color": [5, 5, 5], "sides": [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]}, "ATC Right": {"tris": [[2, 1, 0], [3, 1, 2], [3, 4, 1], [5, 4, 3], [5, 6, 4], [7, 6, 5], [7, 0, 6], [2, 0, 7], [1, 6, 0], [4, 6, 1], [3, 2, 7], [5, 3, 7]], "pts": [[4.839456054999999, 7.510186523000001, 1.062], [4.627456055, 7.142991699, 1.062], [4.839456054999999, 7.510186523000001, 1.894], [4.627456055, 7.142991699, 1.894], [5.257922852, 6.7789916990000005, 1.062], [5.257922852, 6.7789916990000005, 1.894], [5.469922852, 7.146186523, 1.062], [5.469922852, 7.146186523, 1.894]], "color": [5, 5, 5], "sides": [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]}, "Ceiling": {"tris": [[6, 2, 0], [1, 6, 0], [4, 3, 2], [6, 5, 4], [6, 4, 2]], "pts": [[5.790823242, 7.062, 3.45], [0.9849625240000001, 7.062, 3.45], [6.775785645, 1.476, 4.435], [6.073909668000001, 0.473617249, 4.109021973], [3.387892822, -0.0, 3.955], [0.701875977, 0.473617249, 4.109021973], [-0.0, 1.476, 4.435]], "color": [60, 60, 60], "sides": [1, 1, 1, 1, 1]}, "Console": {"tris": [[1, 0, 13], [1, 13, 12], [2, 1, 12], [2, 12, 10], [2, 10, 14], [3, 2, 14], [4, 3, 14], [4, 14, 15], [5, 4, 15], [5, 15, 16], [6, 5, 16], [6, 16, 17], [7, 6, 17], [7, 17, 8], [9, 7, 8], [9, 8, 11], [0, 9, 11], [0, 11, 13], [12, 11, 10], [12, 13, 11], [11, 14, 10], [14, 8, 15], [11, 8, 14], [8, 16, 15], [8, 17, 16], [1, 2, 9], [1, 9, 0], [9, 2, 3], [3, 4, 7], [9, 3, 7], [7, 4, 5], [7, 5, 6]], "pts": [[5.203890137, 6.358, 1.025], [5.203890137, 6.518, 1.025], [5.203890137, 6.518, 0.476], [5.203890137, 5.753, 0.476], [5.203890137, 5.653, 0.647361084], [5.203890137, 5.283, 0.678], [5.203890137, 5.283, 0.736], [5.203890137, 5.653, 0.736], [1.571890015, 5.653, 0.736], [5.203890137, 6.263627441, 0.875], [1.571890015, 6.518, 0.476], [1.571890015, 6.263627441, 0.875], [1.571890015, 6.518, 1.025], [1.571890015, 6.358, 1.025], [1.571890015, 5.753, 0.476], [1.571890015, 5.653, 0.647361084], [1.571890015, 5.283, 0.678], [1.571890015, 5.283, 0.736]], "color": [60, 60, 60], "sides": [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]}, "Couch": {"tris": [[1, 0, 12], [2, 0, 1], [2, 3, 0], [4, 3, 2], [4, 5, 3], [6, 5, 4], [6, 12, 5], [1, 12, 6], [0, 5, 12], [3, 5, 0], [2, 1, 6], [4, 2, 6], [9, 8, 7], [10, 8, 9], [10, 0, 8], [11, 0, 10], [11, 12, 0], [13, 12, 11], [13, 7, 12], [9, 7, 13], [8, 12, 7], [0, 12, 8], [10, 9, 13], [11, 10, 13], [14, 3, 5], [15, 3, 14], [15, 16, 3], [17, 16, 15], [17, 18, 16], [19, 18, 17], [19, 5, 18], [14, 5, 19], [3, 18, 5], [16, 18, 3], [15, 14, 19], [17, 15, 19], [21, 20, 1], [20, 22, 1], [20, 23, 22], [23, 24, 22], [23, 25, 24], [25, 26, 24], [25, 21, 26], [21, 1, 26], [22, 24, 1], [24, 26, 1], [20, 21, 23], [23, 21, 25], [25, 23, 26], [23, 24, 26], [23, 27, 24], [27, 28, 24], [27, 29, 28], [29, 30, 28], [29, 25, 30], [25, 26, 30], [24, 28, 26], [28, 30, 26], [23, 25, 27], [27, 25, 29], [29, 27, 30], [27, 28, 30], [27, 31, 28], [31, 32, 28], [31, 33, 32], [33, 34, 32], [33, 29, 34], [29, 30, 34], [28, 32, 30], [32, 34, 30], [27, 29, 31], [31, 29, 33], [33, 31, 34], [31, 32, 34], [31, 35, 32], [35, 36, 32], [35, 37, 36], [37, 6, 36], [37, 33, 6], [33, 34, 6], [32, 36, 34], [36, 6, 34], [31, 33, 35], [35, 33, 37]], "pts": [[1.927890015, 0.67, 0.328], [1.927890015, 1.65, 0.508], [1.927890015, 0.67, 0.508], [4.847890137, 0.67, 0.328], [4.847890137, 0.67, 0.508], [4.847890137, 1.65, 0.328], [4.847890137, 1.65, 0.508], [1.7778900149999999, 1.65, 0.328], [1.7778900149999999, 0.67, 0.328], [1.7778900149999999, 1.65, 1.008], [1.7778900149999999, 0.67, 1.008], [1.927890015, 0.67, 1.008], [1.927890015, 1.65, 0.328], [1.927890015, 1.65, 1.008], [4.847890137, 1.65, 1.008], [4.847890137, 0.67, 1.008], [4.997890137000001, 0.67, 0.328], [4.997890137000001, 0.67, 1.008], [4.997890137000001, 1.65, 0.328], [4.997890137000001, 1.65, 1.008], [1.927890015, 1.1, 0.748], [1.927890015, 1.65, 0.748], [1.927890015, 1.1, 0.508], [2.657889893, 1.1, 0.748], [2.657889893, 1.1, 0.508], [2.657889893, 1.65, 0.748], [2.657889893, 1.65, 0.508], [3.387889893, 1.1, 0.748], [3.387889893, 1.1, 0.508], [3.387889893, 1.65, 0.748], [3.387889893, 1.65, 0.508], [4.117890137000001, 1.1, 0.748], [4.117890137000001, 1.1, 0.508], [4.117890137000001, 1.65, 0.748], [4.117890137000001, 1.65, 0.508], [4.847890137, 1.1, 0.748], [4.847890137, 1.1, 0.508], [4.847890137, 1.65, 0.748]], "color": [5, 5, 48], "sides": [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]}, "Floor": {"tris": [[2, 3, 4], [2, 5, 3], [3, 6, 7], [1, 8, 5], [0, 8, 1], [5, 8, 3], [3, 8, 6]], "pts": [[4.857248047, 7.601, 0.0], [1.9185378419999999, 7.601, 0.0], [-0.0, 1.476, 0.0], [3.387892822, -0.0, 0.0], [0.701875977, 0.473617249, 0.0], [0.9849625240000001, 7.062, 0.0], [6.775785645, 1.476, 0.0], [6.073909668000001, 0.473617249, 0.0], [5.790823242, 7.062, 0.0]], "color": [53, 33, 0], "sides": [1, 1, 1, 1, 1, 1, 1]}, "Rack": {"tris": [[2, 1, 0], [3, 1, 2], [3, 4, 1], [5, 4, 3], [5, 6, 4], [7, 6, 5], [7, 8, 6], [9, 8, 7], [9, 10, 8], [11, 10, 9], [12, 10, 11], [12, 13, 10], [12, 14, 13], [15, 14, 12], [2, 14, 15], [2, 0, 14], [1, 14, 0], [4, 14, 1], [6, 13, 4], [4, 13, 14], [6, 8, 13], [8, 10, 13], [3, 2, 15], [5, 3, 15], [7, 5, 12], [5, 15, 12], [7, 12, 9], [9, 12, 11]], "pts": [[1.9898900149999998, 4.091, 0.025], [1.833890015, 3.304, 0.025], [1.9898900149999998, 4.091, 0.975], [1.833890015, 3.304, 0.975], [2.483889893, 3.189, 0.025], [2.483889893, 3.189, 0.975], [4.291890137, 3.189, 0.025], [4.291890137, 3.189, 0.975], [4.941890137000001, 3.304, 0.025], [4.941890137000001, 3.304, 0.975], [4.785890137, 4.091, 0.025], [4.785890137, 4.091, 0.975], [4.218390137, 3.9905961910000003, 0.975], [4.218390137, 3.9905961910000003, 0.025], [2.557389893, 3.9905961910000003, 0.025], [2.557389893, 3.9905961910000003, 0.975]], "color": [25, 25, 25], "sides": [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]}, "Raised Floor": {"tris": [[2, 1, 0], [3, 1, 2], [3, 4, 1], [5, 4, 3], [5, 6, 4], [7, 6, 5], [9, 8, 6], [7, 9, 6], [11, 10, 9], [9, 10, 8], [2, 0, 10], [11, 2, 10], [1, 10, 0], [1, 4, 10], [4, 8, 10], [4, 6, 8], [3, 2, 11], [3, 11, 5], [5, 11, 9], [5, 9, 7]], "pts": [[1.8688900149999998, 3.281033203, 0.0], [1.385890015, 0.65, 0.0], [1.8688900149999998, 3.281033203, 0.268], [1.385890015, 0.65, 0.268], [5.389890137, 0.65, 0.0], [5.389890137, 0.65, 0.268], [4.906890137, 3.281033203, 0.0], [4.906890137, 3.281033203, 0.268], [4.275890137, 3.157388672, 0.0], [4.275890137, 3.157388672, 0.268], [2.501889893, 3.157388672, 0.0], [2.501889893, 3.157388672, 0.268]], "color": [25, 25, 25], "sides": [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]}, "Walls Back": {"tris": [[3, 5, 6], [4, 3, 6], [4, 6, 7], [1, 4, 7], [2, 1, 7], [2, 7, 8], [0, 2, 8], [0, 8, 9]], "pts": [[-0.0, 1.476, 0.0], [3.387889893, 0.0, 0.0], [0.701876343, 0.473616669, 0.0], [6.775779785, 1.476, 0.0], [6.073903809, 0.473616669, 0.0], [6.775779785, 1.476, 4.435], [6.073903809, 0.473616669, 4.1090214839999994], [3.387889893, -0.0, 3.955], [0.701876343, 0.473616669, 4.1090214839999994], [-0.0, 1.476, 4.435]], "color": [100, 100, 100], "sides": [1, 1, 1, 1, 1, 1, 1, 1]}, "Walls Front": {"tris": [[0, 1, 2], [0, 2, 3], [5, 0, 3], [5, 3, 6], [2, 7, 6], [2, 6, 3], [4, 7, 2], [1, 4, 2]], "pts": [[4.857242188, 7.601, 0.0], [1.9185378419999999, 7.601, 0.0], [1.9185378419999999, 7.601, 2.0], [4.857242188, 7.601, 2.0], [0.9849625240000001, 7.062, 0.0], [5.790817382999999, 7.062, 0.0], [5.790817382999999, 7.062, 3.45], [0.9849625240000001, 7.062, 3.45]], "color": [100, 100, 100], "sides": [1, 1, 1, 1, 1, 1, 1, 1]}, "Walls Side": {"tris": [[2, 3, 4], [2, 4, 6], [5, 0, 7], [1, 0, 5]], "pts": [[-0.0, 1.476, 0.0], [0.9849625240000001, 7.062, 0.0], [6.775779785, 1.476, 0.0], [5.790817382999999, 7.062, 0.0], [5.790817382999999, 7.062, 3.45], [0.9849625240000001, 7.062, 3.45], [6.775779785, 1.476, 4.435], [-0.0, 1.476, 4.435]], "color": [180, 180, 180], "sides": [1, 1, 1, 1]}}, "sources": [{"name": "S1", "xyz": [1.7438900000000002, 6.83, 1.3940000000000001]}, {"name": "S2", "xyz": [5.03189, 6.83, 1.3940000000000001]}, {"name": "SUB1", "xyz": [1.7438900000000002, 6.83, 0.07]}], "receivers": [{"name": "R1", "xyz": [3.38789, 4.982508472356766, 1.2]}, {"name": "R2", "xyz": [3.38789, 1.2, 1.3]}, {"name": "R3", "xyz": [2.29289, 1.2, 1.3]}, {"name": "R4", "xyz": [3.0228900000000003, 1.2, 1.3]}, {"name": "R5", "xyz": [3.75289, 1.2, 1.3]}, {"name": "R6", "xyz": [4.48289, 1.2, 1.3]}]} diff --git a/data/models/ProStudio/model.obj b/data/models/ProStudio/model.obj deleted file mode 100644 index c25fe41..0000000 --- a/data/models/ProStudio/model.obj +++ /dev/null @@ -1,83 +0,0 @@ -# Created by FreeCAD -v 7014.450684 2237.524902 0.000000 173 181 189 -v 5235.945801 7123.926758 0.000000 173 181 189 -v 5235.945801 7123.926758 3500.000000 173 181 189 -v 7014.450684 2237.524902 3500.000000 173 181 189 -v 6444.097656 1014.399231 0.000000 173 181 189 -v 6444.097656 1014.399231 3500.000000 173 181 189 -v 3791.739990 49.020000 3500.000000 173 181 189 -v 3791.739990 49.020000 0.000000 173 181 189 -v 969.159973 49.020000 0.000000 173 181 189 -v 969.159973 49.020000 3500.000000 173 181 189 -v 14.869902 1003.310120 3500.000000 173 181 189 -v 14.869902 1003.310120 0.000000 173 181 189 -v 14.869902 6203.310059 3500.000000 173 181 189 -v 14.869902 6203.310059 0.000000 173 181 189 -v 1403.930176 7368.870117 0.000000 173 181 189 -v 1403.930176 7368.870117 3500.000000 173 181 189 -v 3532.010986 7744.107910 3500.000000 173 181 189 -v 3532.010986 7744.107910 0.000000 173 181 189 -vn 0.939693 0.342020 0.000000 -vn 0.939693 0.342020 -0.000000 -vn 0.906308 -0.422618 0.000000 -vn 0.906308 -0.422618 0.000000 -vn 0.342020 -0.939693 0.000000 -vn 0.342020 -0.939693 0.000000 -vn 0.000000 -1.000000 0.000000 -vn 0.000000 -1.000000 0.000000 -vn -0.707107 -0.707107 0.000000 -vn -0.707107 -0.707107 0.000000 -vn -1.000000 -0.000000 0.000000 -vn -1.000000 0.000000 0.000000 -vn -0.642788 0.766044 -0.000000 -vn -0.642788 0.766044 0.000000 -vn -0.173648 0.984808 0.000000 -vn -0.173648 0.984808 0.000000 -vn 0.342020 0.939693 -0.000000 -vn 0.342020 0.939693 -0.000000 -vn 0.000000 0.000000 -1.000000 -vn 0.000000 0.000000 -1.000000 -vn 0.000000 0.000000 -1.000000 -vn 0.000000 -0.000000 -1.000000 -vn 0.000000 0.000000 -1.000000 -vn 0.000000 0.000000 -1.000000 -vn 0.000000 -0.000000 -1.000000 -vn 0.000000 0.000000 1.000000 -vn 0.000000 0.000000 1.000000 -vn 0.000000 0.000000 1.000000 -vn 0.000000 0.000000 1.000000 -vn 0.000000 0.000000 1.000000 -vn 0.000000 0.000000 1.000000 -vn 0.000000 0.000000 1.000000 -f 1//1 2//1 3//1 -f 1//2 3//2 4//2 -f 5//3 1//3 4//3 -f 5//4 4//4 6//4 -f 5//5 6//5 7//5 -f 8//6 5//6 7//6 -f 9//7 8//7 7//7 -f 9//8 7//8 10//8 -f 9//9 10//9 11//9 -f 12//10 9//10 11//10 -f 13//11 12//11 11//11 -f 14//12 12//12 13//12 -f 15//13 14//13 13//13 -f 15//14 13//14 16//14 -f 15//15 16//15 17//15 -f 18//16 15//16 17//16 -f 2//17 18//17 17//17 -f 2//18 17//18 3//18 -f 12//19 8//19 9//19 -f 12//20 14//20 8//20 -f 8//21 1//21 5//21 -f 15//22 18//22 14//22 -f 14//23 2//23 8//23 -f 8//24 2//24 1//24 -f 18//25 2//25 14//25 -f 7//26 11//26 10//26 -f 13//27 11//27 7//27 -f 4//28 7//28 6//28 -f 17//29 16//29 13//29 -f 3//30 13//30 7//30 -f 3//31 7//31 4//31 -f 3//32 17//32 13//32 diff --git a/data/models/ProStudio/model_atc_left.obj b/data/models/ProStudio/model_atc_left.obj new file mode 100644 index 0000000..ed37b9c --- /dev/null +++ b/data/models/ProStudio/model_atc_left.obj @@ -0,0 +1,33 @@ +# Created by FreeCAD +v 1305.857422 7146.186523 1062.000000 173 181 189 +v 1517.857422 6778.991699 1062.000000 173 181 189 +v 1305.857422 7146.186523 1894.000000 173 181 189 +v 1517.857422 6778.991699 1894.000000 173 181 189 +v 2148.323975 7142.991699 1062.000000 173 181 189 +v 2148.323975 7142.991699 1894.000000 173 181 189 +v 1936.323853 7510.186523 1062.000000 173 181 189 +v 1936.323853 7510.186523 1894.000000 173 181 189 +vn -0.866025 -0.500000 0.000000 +vn -0.866025 -0.500000 0.000000 +vn 0.500000 -0.866025 0.000000 +vn 0.500000 -0.866025 -0.000000 +vn 0.866025 0.500000 -0.000000 +vn 0.866025 0.500000 -0.000000 +vn -0.500000 0.866025 0.000000 +vn -0.500000 0.866025 -0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +f 1//1 2//1 3//1 +f 3//2 2//2 4//2 +f 2//3 5//3 4//3 +f 4//4 5//4 6//4 +f 5//5 7//5 6//5 +f 6//6 7//6 8//6 +f 7//7 1//7 8//7 +f 8//8 1//8 3//8 +f 1//9 5//9 2//9 +f 1//10 7//10 5//10 +f 6//11 3//11 4//11 +f 8//12 3//12 6//12 diff --git a/data/models/ProStudio/model_atc_right.obj b/data/models/ProStudio/model_atc_right.obj new file mode 100644 index 0000000..df500ad --- /dev/null +++ b/data/models/ProStudio/model_atc_right.obj @@ -0,0 +1,33 @@ +# Created by FreeCAD +v 4839.456055 7510.186523 1062.000000 173 181 189 +v 4627.456055 7142.991699 1062.000000 173 181 189 +v 4839.456055 7510.186523 1894.000000 173 181 189 +v 4627.456055 7142.991699 1894.000000 173 181 189 +v 5257.922852 6778.991699 1062.000000 173 181 189 +v 5257.922852 6778.991699 1894.000000 173 181 189 +v 5469.922852 7146.186523 1062.000000 173 181 189 +v 5469.922852 7146.186523 1894.000000 173 181 189 +vn -0.866025 0.500000 0.000000 +vn -0.866025 0.500000 -0.000000 +vn -0.500000 -0.866026 0.000000 +vn -0.500000 -0.866026 -0.000000 +vn 0.866025 -0.500000 0.000000 +vn 0.866025 -0.500000 -0.000000 +vn 0.500000 0.866026 -0.000000 +vn 0.500000 0.866026 -0.000000 +vn 0.000000 -0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +f 1//1 2//1 3//1 +f 3//2 2//2 4//2 +f 2//3 5//3 4//3 +f 4//4 5//4 6//4 +f 5//5 7//5 6//5 +f 6//6 7//6 8//6 +f 7//7 1//7 8//7 +f 8//8 1//8 3//8 +f 1//9 7//9 2//9 +f 2//10 7//10 5//10 +f 8//11 3//11 4//11 +f 8//12 4//12 6//12 diff --git a/data/models/ProStudio/model_ceiling.obj b/data/models/ProStudio/model_ceiling.obj index 54141ed..2e7cd52 100644 --- a/data/models/ProStudio/model_ceiling.obj +++ b/data/models/ProStudio/model_ceiling.obj @@ -1,24 +1,18 @@ # Created by FreeCAD -v 5235.945801 7123.926758 3500.000000 173 181 189 -v 7014.450684 2237.524902 3500.000000 173 181 189 -v 6444.097656 1014.399231 3500.000000 173 181 189 -v 3791.739990 49.020000 3500.000000 173 181 189 -v 969.159973 49.020000 3500.000000 173 181 189 -v 14.869902 1003.310120 3500.000000 173 181 189 -v 14.869902 6203.310059 3500.000000 173 181 189 -v 1403.930176 7368.870117 3500.000000 173 181 189 -v 3532.010986 7744.107910 3500.000000 173 181 189 -vn 0.000000 0.000000 1.000000 -vn 0.000000 0.000000 1.000000 -vn 0.000000 0.000000 1.000000 -vn 0.000000 0.000000 1.000000 -vn 0.000000 0.000000 1.000000 -vn 0.000000 0.000000 1.000000 -vn 0.000000 0.000000 1.000000 -f 4//1 6//1 5//1 -f 7//2 6//2 4//2 -f 2//3 4//3 3//3 -f 9//4 8//4 7//4 -f 1//5 7//5 4//5 -f 1//6 4//6 2//6 -f 1//7 9//7 7//7 +v 5790.823242 7062.000000 3450.000000 173 181 189 +v 984.962524 7062.000000 3450.000000 173 181 189 +v 6775.785645 1476.000000 4435.000000 173 181 189 +v 6073.909668 473.617249 4109.021973 173 181 189 +v 3387.892822 -0.000000 3955.000000 173 181 189 +v 701.875977 473.617249 4109.021973 173 181 189 +v -0.000000 1476.000000 4435.000000 173 181 189 +vn -0.000000 0.173655 0.984807 +vn -0.000000 0.173655 0.984807 +vn -0.000000 -0.309261 0.950977 +vn 0.000000 -0.309261 0.950977 +vn 0.000000 -0.309261 0.950977 +f 7//1 3//1 1//1 +f 2//2 7//2 1//2 +f 5//3 4//3 3//3 +f 7//4 6//4 5//4 +f 7//5 5//5 3//5 diff --git a/data/models/ProStudio/model_console.obj b/data/models/ProStudio/model_console.obj new file mode 100644 index 0000000..39fd82d --- /dev/null +++ b/data/models/ProStudio/model_console.obj @@ -0,0 +1,83 @@ +# Created by FreeCAD +v 5203.890137 6358.000000 1025.000000 173 181 189 +v 5203.890137 6518.000000 1025.000000 173 181 189 +v 5203.890137 6518.000000 476.000000 173 181 189 +v 5203.890137 5753.000000 476.000000 173 181 189 +v 5203.890137 5653.000000 647.361084 173 181 189 +v 5203.890137 5283.000000 678.000000 173 181 189 +v 5203.890137 5283.000000 736.000000 173 181 189 +v 5203.890137 5653.000000 736.000000 173 181 189 +v 1571.890015 5653.000000 736.000000 173 181 189 +v 5203.890137 6263.627441 875.000000 173 181 189 +v 1571.890015 6518.000000 476.000000 173 181 189 +v 1571.890015 6263.627441 875.000000 173 181 189 +v 1571.890015 6518.000000 1025.000000 173 181 189 +v 1571.890015 6358.000000 1025.000000 173 181 189 +v 1571.890015 5753.000000 476.000000 173 181 189 +v 1571.890015 5653.000000 647.361084 173 181 189 +v 1571.890015 5283.000000 678.000000 173 181 189 +v 1571.890015 5283.000000 736.000000 173 181 189 +vn 0.000000 0.000000 1.000000 +vn -0.000000 0.000000 1.000000 +vn -0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 -0.863693 -0.504019 +vn 0.000000 -0.863693 -0.504019 +vn 0.000000 -0.082525 -0.996589 +vn 0.000000 -0.082525 -0.996589 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn -0.000000 0.000000 1.000000 +vn 0.000000 -0.221957 0.975057 +vn 0.000000 -0.221957 0.975057 +vn 0.000000 -0.846416 0.532523 +vn 0.000000 -0.846416 0.532523 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 1.000000 -0.000000 0.000000 +vn 1.000000 -0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 -0.000000 0.000000 +vn 1.000000 -0.000000 0.000000 +vn 1.000000 -0.000000 0.000000 +f 14//1 1//1 2//1 +f 13//2 14//2 2//2 +f 13//3 2//3 3//3 +f 11//4 13//4 3//4 +f 15//5 11//5 3//5 +f 15//6 3//6 4//6 +f 15//7 4//7 5//7 +f 16//8 15//8 5//8 +f 16//9 5//9 6//9 +f 17//10 16//10 6//10 +f 17//11 6//11 7//11 +f 18//12 17//12 7//12 +f 18//13 7//13 8//13 +f 9//14 18//14 8//14 +f 9//15 8//15 10//15 +f 12//16 9//16 10//16 +f 12//17 10//17 1//17 +f 14//18 12//18 1//18 +f 11//19 12//19 13//19 +f 12//20 14//20 13//20 +f 11//21 15//21 12//21 +f 16//22 9//22 15//22 +f 15//23 9//23 12//23 +f 16//24 17//24 9//24 +f 17//25 18//25 9//25 +f 10//26 3//26 2//26 +f 1//27 10//27 2//27 +f 4//28 3//28 10//28 +f 8//29 5//29 4//29 +f 8//30 4//30 10//30 +f 6//31 5//31 8//31 +f 7//32 6//32 8//32 diff --git a/data/models/ProStudio/model_couch.obj b/data/models/ProStudio/model_couch.obj new file mode 100644 index 0000000..144c5f5 --- /dev/null +++ b/data/models/ProStudio/model_couch.obj @@ -0,0 +1,207 @@ +# Created by FreeCAD +v 1927.890015 670.000000 328.000000 173 181 189 +v 1927.890015 1650.000000 508.000000 173 181 189 +v 1927.890015 670.000000 508.000000 173 181 189 +v 4847.890137 670.000000 328.000000 173 181 189 +v 4847.890137 670.000000 508.000000 173 181 189 +v 4847.890137 1650.000000 328.000000 173 181 189 +v 4847.890137 1650.000000 508.000000 173 181 189 +v 1777.890015 1650.000000 328.000000 173 181 189 +v 1777.890015 670.000000 328.000000 173 181 189 +v 1777.890015 1650.000000 1008.000000 173 181 189 +v 1777.890015 670.000000 1008.000000 173 181 189 +v 1927.890015 670.000000 1008.000000 173 181 189 +v 1927.890015 1650.000000 328.000000 173 181 189 +v 1927.890015 1650.000000 1008.000000 173 181 189 +v 4847.890137 1650.000000 1008.000000 173 181 189 +v 4847.890137 670.000000 1008.000000 173 181 189 +v 4997.890137 670.000000 328.000000 173 181 189 +v 4997.890137 670.000000 1008.000000 173 181 189 +v 4997.890137 1650.000000 328.000000 173 181 189 +v 4997.890137 1650.000000 1008.000000 173 181 189 +v 1927.890015 1100.000000 748.000000 173 181 189 +v 1927.890015 1650.000000 748.000000 173 181 189 +v 1927.890015 1100.000000 508.000000 173 181 189 +v 2657.889893 1100.000000 748.000000 173 181 189 +v 2657.889893 1100.000000 508.000000 173 181 189 +v 2657.889893 1650.000000 748.000000 173 181 189 +v 2657.889893 1650.000000 508.000000 173 181 189 +v 3387.889893 1100.000000 748.000000 173 181 189 +v 3387.889893 1100.000000 508.000000 173 181 189 +v 3387.889893 1650.000000 748.000000 173 181 189 +v 3387.889893 1650.000000 508.000000 173 181 189 +v 4117.890137 1100.000000 748.000000 173 181 189 +v 4117.890137 1100.000000 508.000000 173 181 189 +v 4117.890137 1650.000000 748.000000 173 181 189 +v 4117.890137 1650.000000 508.000000 173 181 189 +v 4847.890137 1100.000000 748.000000 173 181 189 +v 4847.890137 1100.000000 508.000000 173 181 189 +v 4847.890137 1650.000000 748.000000 173 181 189 +vn -1.000000 0.000000 0.000000 +vn -1.000000 -0.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 -0.000000 0.000000 +vn 0.000000 1.000000 -0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 -0.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 -0.000000 0.000000 +vn 0.000000 1.000000 -0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 -0.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 -0.000000 0.000000 +vn 0.000000 1.000000 -0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 1.000000 -0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 1.000000 -0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 1.000000 -0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 1.000000 -0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +f 13//1 1//1 2//1 +f 2//2 1//2 3//2 +f 1//3 4//3 3//3 +f 3//4 4//4 5//4 +f 4//5 6//5 5//5 +f 5//6 6//6 7//6 +f 6//7 13//7 7//7 +f 7//8 13//8 2//8 +f 13//9 6//9 1//9 +f 1//10 6//10 4//10 +f 7//11 2//11 3//11 +f 7//12 3//12 5//12 +f 8//13 9//13 10//13 +f 10//14 9//14 11//14 +f 9//15 1//15 11//15 +f 11//16 1//16 12//16 +f 1//17 13//17 12//17 +f 12//18 13//18 14//18 +f 13//19 8//19 14//19 +f 14//20 8//20 10//20 +f 8//21 13//21 9//21 +f 9//22 13//22 1//22 +f 14//23 10//23 11//23 +f 14//24 11//24 12//24 +f 6//25 4//25 15//25 +f 15//26 4//26 16//26 +f 4//27 17//27 16//27 +f 16//28 17//28 18//28 +f 17//29 19//29 18//29 +f 18//30 19//30 20//30 +f 19//31 6//31 20//31 +f 20//32 6//32 15//32 +f 6//33 19//33 4//33 +f 4//34 19//34 17//34 +f 20//35 15//35 16//35 +f 20//36 16//36 18//36 +f 2//37 21//37 22//37 +f 2//38 23//38 21//38 +f 23//39 24//39 21//39 +f 23//40 25//40 24//40 +f 25//41 26//41 24//41 +f 25//42 27//42 26//42 +f 27//43 22//43 26//43 +f 27//44 2//44 22//44 +f 2//45 25//45 23//45 +f 2//46 27//46 25//46 +f 24//47 22//47 21//47 +f 26//48 22//48 24//48 +f 27//49 24//49 26//49 +f 27//50 25//50 24//50 +f 25//51 28//51 24//51 +f 25//52 29//52 28//52 +f 29//53 30//53 28//53 +f 29//54 31//54 30//54 +f 31//55 26//55 30//55 +f 31//56 27//56 26//56 +f 27//57 29//57 25//57 +f 27//58 31//58 29//58 +f 28//59 26//59 24//59 +f 30//60 26//60 28//60 +f 31//61 28//61 30//61 +f 31//62 29//62 28//62 +f 29//63 32//63 28//63 +f 29//64 33//64 32//64 +f 33//65 34//65 32//65 +f 33//66 35//66 34//66 +f 35//67 30//67 34//67 +f 35//68 31//68 30//68 +f 31//69 33//69 29//69 +f 31//70 35//70 33//70 +f 32//71 30//71 28//71 +f 34//72 30//72 32//72 +f 35//73 32//73 34//73 +f 35//74 33//74 32//74 +f 33//75 36//75 32//75 +f 33//76 37//76 36//76 +f 37//77 38//77 36//77 +f 37//78 7//78 38//78 +f 7//79 34//79 38//79 +f 7//80 35//80 34//80 +f 35//81 37//81 33//81 +f 35//82 7//82 37//82 +f 36//83 34//83 32//83 +f 38//84 34//84 36//84 diff --git a/data/models/ProStudio/model_floor.obj b/data/models/ProStudio/model_floor.obj index cb2d571..08686ff 100644 --- a/data/models/ProStudio/model_floor.obj +++ b/data/models/ProStudio/model_floor.obj @@ -1,24 +1,24 @@ # Created by FreeCAD -v 7014.450684 2237.524902 0.000000 173 181 189 -v 5235.945801 7123.926758 0.000000 173 181 189 -v 6444.097656 1014.399231 0.000000 173 181 189 -v 3791.739990 49.020000 0.000000 173 181 189 -v 969.159973 49.020000 0.000000 173 181 189 -v 14.869902 1003.310120 0.000000 173 181 189 -v 14.869902 6203.310059 0.000000 173 181 189 -v 1403.930176 7368.870117 0.000000 173 181 189 -v 3532.010986 7744.107910 0.000000 173 181 189 +v 4857.248047 7601.000000 0.000000 173 181 189 +v 1918.537842 7601.000000 0.000000 173 181 189 +v -0.000000 1476.000000 0.000000 173 181 189 +v 3387.892822 -0.000000 0.000000 173 181 189 +v 701.875977 473.617249 0.000000 173 181 189 +v 984.962524 7062.000000 0.000000 173 181 189 +v 6775.785645 1476.000000 0.000000 173 181 189 +v 6073.909668 473.617249 0.000000 173 181 189 +v 5790.823242 7062.000000 0.000000 173 181 189 vn 0.000000 0.000000 -1.000000 vn 0.000000 0.000000 -1.000000 vn 0.000000 0.000000 -1.000000 vn 0.000000 -0.000000 -1.000000 +vn -0.000000 -0.000000 -1.000000 vn 0.000000 0.000000 -1.000000 vn 0.000000 0.000000 -1.000000 -vn 0.000000 -0.000000 -1.000000 -f 6//1 4//1 5//1 -f 6//2 7//2 4//2 -f 4//3 1//3 3//3 -f 8//4 9//4 7//4 -f 7//5 2//5 4//5 -f 4//6 2//6 1//6 -f 9//7 2//7 7//7 +f 3//1 4//1 5//1 +f 3//2 6//2 4//2 +f 4//3 7//3 8//3 +f 2//4 9//4 6//4 +f 1//5 9//5 2//5 +f 6//6 9//6 4//6 +f 4//7 9//7 7//7 diff --git a/data/models/ProStudio/model_rack.obj b/data/models/ProStudio/model_rack.obj new file mode 100644 index 0000000..d2f18f5 --- /dev/null +++ b/data/models/ProStudio/model_rack.obj @@ -0,0 +1,73 @@ +# Created by FreeCAD +v 1989.890015 4091.000000 25.000000 173 181 189 +v 1833.890015 3304.000000 25.000000 173 181 189 +v 1989.890015 4091.000000 975.000000 173 181 189 +v 1833.890015 3304.000000 975.000000 173 181 189 +v 2483.889893 3189.000000 25.000000 173 181 189 +v 2483.889893 3189.000000 975.000000 173 181 189 +v 4291.890137 3189.000000 25.000000 173 181 189 +v 4291.890137 3189.000000 975.000000 173 181 189 +v 4941.890137 3304.000000 25.000000 173 181 189 +v 4941.890137 3304.000000 975.000000 173 181 189 +v 4785.890137 4091.000000 25.000000 173 181 189 +v 4785.890137 4091.000000 975.000000 173 181 189 +v 4218.390137 3990.596191 975.000000 173 181 189 +v 4218.390137 3990.596191 25.000000 173 181 189 +v 2557.389893 3990.596191 25.000000 173 181 189 +v 2557.389893 3990.596191 975.000000 173 181 189 +vn -0.980915 0.194438 0.000000 +vn -0.980915 0.194438 0.000000 +vn -0.174217 -0.984707 0.000000 +vn -0.174217 -0.984707 -0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.174217 -0.984707 0.000000 +vn 0.174217 -0.984707 0.000000 +vn 0.980915 0.194438 -0.000000 +vn 0.980915 0.194438 0.000000 +vn -0.174217 0.984707 0.000000 +vn -0.174217 0.984707 0.000000 +vn 0.000000 1.000000 -0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.174217 0.984707 0.000000 +vn 0.174217 0.984707 -0.000000 +vn 0.000000 -0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 -0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +f 1//1 2//1 3//1 +f 3//2 2//2 4//2 +f 2//3 5//3 4//3 +f 4//4 5//4 6//4 +f 5//5 7//5 6//5 +f 6//6 7//6 8//6 +f 7//7 9//7 8//7 +f 8//8 9//8 10//8 +f 9//9 11//9 10//9 +f 10//10 11//10 12//10 +f 12//11 11//11 13//11 +f 11//12 14//12 13//12 +f 14//13 15//13 13//13 +f 13//14 15//14 16//14 +f 16//15 15//15 3//15 +f 15//16 1//16 3//16 +f 1//17 15//17 2//17 +f 2//18 15//18 5//18 +f 5//19 14//19 7//19 +f 15//20 14//20 5//20 +f 14//21 9//21 7//21 +f 14//22 11//22 9//22 +f 16//23 3//23 4//23 +f 16//24 4//24 6//24 +f 13//25 6//25 8//25 +f 13//26 16//26 6//26 +f 10//27 13//27 8//27 +f 12//28 13//28 10//28 diff --git a/data/models/ProStudio/model_raised_floor.obj b/data/models/ProStudio/model_raised_floor.obj new file mode 100644 index 0000000..2e21201 --- /dev/null +++ b/data/models/ProStudio/model_raised_floor.obj @@ -0,0 +1,53 @@ +# Created by FreeCAD +v 1868.890015 3281.033203 0.000000 173 181 189 +v 1385.890015 650.000000 0.000000 173 181 189 +v 1868.890015 3281.033203 268.000000 173 181 189 +v 1385.890015 650.000000 268.000000 173 181 189 +v 5389.890137 650.000000 0.000000 173 181 189 +v 5389.890137 650.000000 268.000000 173 181 189 +v 4906.890137 3281.033203 0.000000 173 181 189 +v 4906.890137 3281.033203 268.000000 173 181 189 +v 4275.890137 3157.388672 0.000000 173 181 189 +v 4275.890137 3157.388672 268.000000 173 181 189 +v 2501.889893 3157.388672 0.000000 173 181 189 +v 2501.889893 3157.388672 268.000000 173 181 189 +vn -0.983564 0.180561 0.000000 +vn -0.983564 0.180561 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.983564 0.180561 -0.000000 +vn 0.983564 0.180561 -0.000000 +vn -0.192293 0.981337 -0.000000 +vn -0.192293 0.981337 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 -0.000000 +vn 0.191708 0.981452 0.000000 +vn 0.191708 0.981452 -0.000000 +vn 0.000000 -0.000000 -1.000000 +vn 0.000000 -0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +f 1//1 2//1 3//1 +f 3//2 2//2 4//2 +f 2//3 5//3 4//3 +f 4//4 5//4 6//4 +f 5//5 7//5 6//5 +f 6//6 7//6 8//6 +f 7//7 9//7 10//7 +f 7//8 10//8 8//8 +f 10//9 11//9 12//9 +f 9//10 11//10 10//10 +f 11//11 1//11 3//11 +f 11//12 3//12 12//12 +f 1//13 11//13 2//13 +f 11//14 5//14 2//14 +f 11//15 9//15 5//15 +f 9//16 7//16 5//16 +f 12//17 3//17 4//17 +f 6//18 12//18 4//18 +f 10//19 12//19 6//19 +f 8//20 10//20 6//20 diff --git a/data/models/ProStudio/model_walls.obj b/data/models/ProStudio/model_walls.obj deleted file mode 100644 index a78884a..0000000 --- a/data/models/ProStudio/model_walls.obj +++ /dev/null @@ -1,55 +0,0 @@ -# Created by FreeCAD -v 7014.450684 2237.524902 0.000000 173 181 189 -v 5235.945801 7123.926758 0.000000 173 181 189 -v 5235.945801 7123.926758 3500.000000 173 181 189 -v 7014.450684 2237.524902 3500.000000 173 181 189 -v 6444.097656 1014.399231 0.000000 173 181 189 -v 6444.097656 1014.399231 3500.000000 173 181 189 -v 3791.739990 49.020000 3500.000000 173 181 189 -v 3791.739990 49.020000 0.000000 173 181 189 -v 969.159973 49.020000 0.000000 173 181 189 -v 969.159973 49.020000 3500.000000 173 181 189 -v 14.869902 1003.310120 3500.000000 173 181 189 -v 14.869902 1003.310120 0.000000 173 181 189 -v 14.869902 6203.310059 3500.000000 173 181 189 -v 14.869902 6203.310059 0.000000 173 181 189 -v 1403.930176 7368.870117 0.000000 173 181 189 -v 1403.930176 7368.870117 3500.000000 173 181 189 -v 3532.010986 7744.107910 3500.000000 173 181 189 -v 3532.010986 7744.107910 0.000000 173 181 189 -vn 0.939693 0.342020 0.000000 -vn 0.939693 0.342020 -0.000000 -vn 0.906308 -0.422618 0.000000 -vn 0.906308 -0.422618 0.000000 -vn 0.342020 -0.939693 0.000000 -vn 0.342020 -0.939693 0.000000 -vn 0.000000 -1.000000 0.000000 -vn 0.000000 -1.000000 0.000000 -vn -0.707107 -0.707107 0.000000 -vn -0.707107 -0.707107 0.000000 -vn -1.000000 -0.000000 0.000000 -vn -1.000000 0.000000 0.000000 -vn -0.642788 0.766044 -0.000000 -vn -0.642788 0.766044 0.000000 -vn -0.173648 0.984808 0.000000 -vn -0.173648 0.984808 0.000000 -vn 0.342020 0.939693 -0.000000 -vn 0.342020 0.939693 -0.000000 -f 1//1 2//1 3//1 -f 1//2 3//2 4//2 -f 5//3 1//3 4//3 -f 5//4 4//4 6//4 -f 5//5 6//5 7//5 -f 8//6 5//6 7//6 -f 9//7 8//7 7//7 -f 9//8 7//8 10//8 -f 9//9 10//9 11//9 -f 12//10 9//10 11//10 -f 13//11 12//11 11//11 -f 14//12 12//12 13//12 -f 15//13 14//13 13//13 -f 15//14 13//14 16//14 -f 15//15 16//15 17//15 -f 18//16 15//16 17//16 -f 2//17 18//17 17//17 -f 2//18 17//18 3//18 diff --git a/data/models/ProStudio/model_walls_back.obj b/data/models/ProStudio/model_walls_back.obj new file mode 100644 index 0000000..86befb1 --- /dev/null +++ b/data/models/ProStudio/model_walls_back.obj @@ -0,0 +1,27 @@ +# Created by FreeCAD +v -0.000000 1476.000000 0.000000 173 181 189 +v 3387.889893 0.000000 0.000000 173 181 189 +v 701.876343 473.616669 0.000000 173 181 189 +v 6775.779785 1476.000000 0.000000 173 181 189 +v 6073.903809 473.616669 0.000000 173 181 189 +v 6775.779785 1476.000000 4435.000000 173 181 189 +v 6073.903809 473.616669 4109.021484 173 181 189 +v 3387.889893 -0.000000 3955.000000 173 181 189 +v 701.876343 473.616669 4109.021484 173 181 189 +v -0.000000 1476.000000 4435.000000 173 181 189 +vn 0.819152 -0.573576 0.000000 +vn 0.819152 -0.573576 0.000000 +vn 0.173648 -0.984808 0.000000 +vn 0.173648 -0.984808 -0.000000 +vn -0.173648 -0.984808 0.000000 +vn -0.173648 -0.984808 0.000000 +vn -0.819152 -0.573576 -0.000000 +vn -0.819152 -0.573576 -0.000000 +f 4//1 6//1 7//1 +f 5//2 4//2 7//2 +f 5//3 7//3 8//3 +f 2//4 5//4 8//4 +f 3//5 2//5 8//5 +f 3//6 8//6 9//6 +f 1//7 3//7 9//7 +f 1//8 9//8 10//8 diff --git a/data/models/ProStudio/model_walls_front.obj b/data/models/ProStudio/model_walls_front.obj new file mode 100644 index 0000000..a8b14cb --- /dev/null +++ b/data/models/ProStudio/model_walls_front.obj @@ -0,0 +1,25 @@ +# Created by FreeCAD +v 4857.242188 7601.000000 0.000000 173 181 189 +v 1918.537842 7601.000000 0.000000 173 181 189 +v 1918.537842 7601.000000 2000.000000 173 181 189 +v 4857.242188 7601.000000 2000.000000 173 181 189 +v 984.962524 7062.000000 0.000000 173 181 189 +v 5790.817383 7062.000000 0.000000 173 181 189 +v 5790.817383 7062.000000 3450.000000 173 181 189 +v 984.962524 7062.000000 3450.000000 173 181 189 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 -0.000000 +vn 0.500000 0.866025 0.000000 +vn 0.500000 0.866025 -0.000000 +vn 0.000000 0.937335 0.348430 +vn -0.000000 0.937335 0.348430 +vn -0.500000 0.866025 0.000000 +vn -0.500000 0.866025 0.000000 +f 1//1 2//1 3//1 +f 1//2 3//2 4//2 +f 6//3 1//3 4//3 +f 6//4 4//4 7//4 +f 3//5 8//5 7//5 +f 3//6 7//6 4//6 +f 5//7 8//7 3//7 +f 2//8 5//8 3//8 diff --git a/data/models/ProStudio/model_walls_side.obj b/data/models/ProStudio/model_walls_side.obj new file mode 100644 index 0000000..0396d2c --- /dev/null +++ b/data/models/ProStudio/model_walls_side.obj @@ -0,0 +1,17 @@ +# Created by FreeCAD +v -0.000000 1476.000000 0.000000 173 181 189 +v 984.962524 7062.000000 0.000000 173 181 189 +v 6775.779785 1476.000000 0.000000 173 181 189 +v 5790.817383 7062.000000 0.000000 173 181 189 +v 5790.817383 7062.000000 3450.000000 173 181 189 +v 984.962524 7062.000000 3450.000000 173 181 189 +v 6775.779785 1476.000000 4435.000000 173 181 189 +v -0.000000 1476.000000 4435.000000 173 181 189 +vn 0.984808 0.173648 0.000000 +vn 0.984808 0.173648 -0.000000 +vn -0.984808 0.173648 0.000000 +vn -0.984808 0.173648 0.000000 +f 3//1 4//1 5//1 +f 3//2 5//2 7//2 +f 6//3 1//3 8//3 +f 2//4 1//4 6//4 diff --git a/run_3d.sh b/run_3d.sh index 2058296..17f712f 100755 --- a/run_3d.sh +++ b/run_3d.sh @@ -14,8 +14,9 @@ sim_dir="$root_dir/data/sim_data/$sim_name/cpu" model_dir="$root_dir/data/models/$sim_name" materials_dir="$root_dir/data/materials" -fmin=10 +fmin=20 fmax=800 +smoothing=12 # Delete old sim rm -rf "$sim_dir" @@ -35,9 +36,13 @@ $engine_exe # Post-process cd "$python_dir" -python -m sim3d.process_outputs --data_dir="$sim_dir" --fcut_lowpass "$fmax" --N_order_lowpass=8 --symmetric --fcut_lowcut "$fmin" --N_order_lowcut=4 --air_abs_filter="modal" --save_wav --plot -python -m analysis.response --fmax=0.0 ../../data/sim_data/$sim_name/cpu/R001_out_normalised.wav ../../data/sim_data/$sim_name/cpu/R002_out_normalised.wav -python -m analysis.t60 --fmin=$fmin --fmax="$fmax" --target=0.25 ../../data/sim_data/$sim_name/cpu/R001_out_normalised.wav -python -m analysis.waterfall ../../data/sim_data/$sim_name/cpu/R001_out_normalised.wav +python -m sim3d.process_outputs --data_dir="$sim_dir" --fcut_lowpass "$fmax" --N_order_lowpass=8 --symmetric --fcut_lowcut "$fmin" --N_order_lowcut=4 --air_abs_filter="none" --save_wav --plot +python -m analysis.response --fmin=10 --target="-7.4" --smoothing=$smoothing --fmax=$fmax ../../data/sim_data/$sim_name/cpu/R001_out_normalised.wav ../../data/sim_data/$sim_name/cpu/R002_out_normalised.wav +python -m analysis.response --fmin=10 --target="-7.1" --smoothing=$smoothing --fmax=$fmax ../../data/sim_data/$sim_name/cpu/R001_out_normalised.wav ../../data/sim_data/$sim_name/cpu/R003_out_normalised.wav +python -m analysis.response --fmin=10 --target="-7.3" --smoothing=$smoothing --fmax=$fmax ../../data/sim_data/$sim_name/cpu/R001_out_normalised.wav ../../data/sim_data/$sim_name/cpu/R004_out_normalised.wav +python -m analysis.response --fmin=10 --target="-7.6" --smoothing=$smoothing --fmax=$fmax ../../data/sim_data/$sim_name/cpu/R001_out_normalised.wav ../../data/sim_data/$sim_name/cpu/R005_out_normalised.wav +python -m analysis.response --fmin=10 --target="-8.0" --smoothing=$smoothing --fmax=$fmax ../../data/sim_data/$sim_name/cpu/R001_out_normalised.wav ../../data/sim_data/$sim_name/cpu/R006_out_normalised.wav +# python -m analysis.waterfall ../../data/sim_data/$sim_name/cpu/R001_out_normalised.wav +# python -m analysis.t60 --fmin=$fmin --fmax="$fmax" --target=0.3 ../../data/sim_data/$sim_name/cpu/R001_out_normalised.wav # python -m analysis.t60 --data_dir="$sim_dir" --fmin=$fmin --fmax="$fmax" --target=0.25 # python -m analysis.room_modes --data_dir="$sim_dir" --fmin=$fmin --fmax=$fmax --modes=20 diff --git a/src/python/ProStudio_cpu.py b/src/python/ProStudio_cpu.py index 1323055..dd45523 100644 --- a/src/python/ProStudio_cpu.py +++ b/src/python/ProStudio_cpu.py @@ -7,11 +7,19 @@ insig_type='impulse', diff_source=True, mat_files_dict={ - 'Ceiling': 'absorber_8000_200mm_gap_100mm.h5', + 'ATC Left': 'floor_wood.h5', + 'ATC Right': 'floor_wood.h5', + 'Ceiling': 'sabine_9512.h5', + 'Console': 'sabine_01.h5', + 'Couch': 'absorber_8000_100mm.h5', 'Floor': 'floor_wood.h5', - 'Walls': 'absorber_8000_200mm_gap_100mm.h5', + 'Rack': 'floor_wood.h5', + 'Raised Floor': 'floor_wood.h5', + 'Walls Back': 'absorber_8000_200mm.h5', + 'Walls Front': 'absorber_8000_200mm.h5', + 'Walls Side': 'sabine_01.h5', }, - duration=1.6, + duration=0.4, Tc=20, rh=50, fcc_flag=False, diff --git a/src/python/ProStudio_model.py b/src/python/ProStudio_model.py index 3f93300..452c973 100644 --- a/src/python/ProStudio_model.py +++ b/src/python/ProStudio_model.py @@ -1,8 +1,12 @@ import json import pathlib +import numpy as np -def load_surface_mesh(obj_file): +from common.room_builder import find_third_vertex + + +def load_mesh(obj_file, reverse=False): with open(obj_file) as f: lines = [line.rstrip() for line in f] @@ -20,46 +24,172 @@ def load_surface_mesh(obj_file): parts = line.split(" ") parts = parts[1:4] parts = [int(part.split("/")[0])-1 for part in parts] - tris.append(parts) + tris.append(parts if not reverse else parts[::-1]) return pts, tris +def point_along_line(p1, p2, t): + return [ + p1[0] + (p2[0]-p1[0]) * t, + p1[1] + (p2[1]-p1[1]) * t, + p1[2] + (p2[2]-p1[2]) * t, + ] + + +def with_x_offset(p: list, offset): + tmp = p.copy() + tmp[0] += offset + return tmp + + +def with_z(p: list, z): + tmp = p.copy() + tmp[2] = z + return tmp + + def main(): - model_dir = pathlib.Path("../../data/models/ProStudio") - ceiling_pts, ceiling_tris = load_surface_mesh(model_dir/'model_ceiling.obj') - floor_pts, floor_tris = load_surface_mesh(model_dir/'model_floor.obj') - walls_pts, walls_tris = load_surface_mesh(model_dir/'model_walls.obj') + dir = pathlib.Path("../../data/models/ProStudio") + + ceiling_pts, ceiling_tris = load_mesh(dir / 'model_ceiling.obj') + floor_pts, floor_tris = load_mesh(dir / 'model_floor.obj') + walls_back_pts, walls_back_tris = load_mesh(dir / 'model_walls_back.obj') + walls_front_pts, walls_front_tris = load_mesh(dir / 'model_walls_front.obj') + walls_side_pts, walls_side_tris = load_mesh(dir / 'model_walls_side.obj') + + atc_left_pts, atc_left_tris = load_mesh(dir / 'model_atc_left.obj', reverse=True) + atc_right_pts, atc_right_tris = load_mesh(dir / 'model_atc_right.obj', reverse=True) + couch_pts, couch_tris = load_mesh(dir / 'model_couch.obj', reverse=True) + rack_pts, rack_tris = load_mesh(dir / 'model_rack.obj', reverse=True) + raised_floor_pts, raised_floor_tris = load_mesh( + dir / 'model_raised_floor.obj', reverse=True) + console_pts, console_tris = load_mesh( + dir / 'model_console.obj', reverse=True) + + offset = 0.07 + s1 = [3.38789-3.288/2, 6.90-offset, 1.062+0.332] + sub1 = s1.copy() + sub1[2] = 0.0 + offset + + s2 = s1.copy() + s2[0] += 3.288 + + r1 = list(find_third_vertex(s1, s2)[1]) + r1[1] += (1.0-0.0) + r1[2] = 1.2 + + # r1 = [3.58, 5.5, 1.2] + # r2 = [3.58, 0.7+offset, 1.2] + + r2 = r1.copy() + r2[1] = 1.2 + r2[2] = 1.3 + + # r3 = point_along_line(r2, r1, 0.1) + # r4 = point_along_line(r2, r1, 0.2) + # r5 = point_along_line(r2, r1, 0.3) + + r3 = with_x_offset(r2, -0.73*1.5) + r4 = with_x_offset(r2, -0.73*0.5) + r5 = with_x_offset(r2, +0.73*0.5) + r6 = with_x_offset(r2, +0.73*1.5) + + # r3 = with_z(r2, 1.0) + # r4 = with_z(r2, 1.5) + # r5 = with_z(r2, 2.1) root = { "mats_hash": { + "ATC Left": { + "tris": atc_left_tris, + "pts": atc_left_pts, + "color": [5, 5, 5], + "sides": [1]*len(atc_left_tris) + }, + "ATC Right": { + "tris": atc_right_tris, + "pts": atc_right_pts, + "color": [5, 5, 5], + "sides": [1]*len(atc_right_tris) + }, "Ceiling": { "tris": ceiling_tris, "pts": ceiling_pts, - "color": [2, 2, 2], + "color": [60, 60, 60], "sides": [1]*len(ceiling_tris) }, + "Console": { + "tris": console_tris, + "pts": console_pts, + "color": [60, 60, 60], + "sides": [1]*len(console_tris) + }, + "Couch": { + "tris": couch_tris, + "pts": couch_pts, + "color": [5, 5, 48], + "sides": [1]*len(couch_tris) + }, "Floor": { "tris": floor_tris, "pts": floor_pts, - "color": [2, 2, 2], + "color": [53, 33, 0], "sides": [1]*len(floor_tris) }, - "Walls": { - "tris": walls_tris, - "pts": walls_pts, - "color": [255, 255, 255], - "sides": [1]*len(walls_tris) + "Rack": { + "tris": rack_tris, + "pts": rack_pts, + "color": [25, 25, 25], + "sides": [1]*len(rack_tris) + }, + "Raised Floor": { + "tris": raised_floor_tris, + "pts": raised_floor_pts, + "color": [25, 25, 25], + "sides": [1]*len(raised_floor_tris) + }, + "Walls Back": { + "tris": walls_back_tris, + "pts": walls_back_pts, + "color": [100, 100, 100], + "sides": [1]*len(walls_back_tris) + }, + "Walls Front": { + "tris": walls_front_tris, + "pts": walls_front_pts, + "color": [100, 100, 100], + "sides": [1]*len(walls_front_tris) + }, + "Walls Side": { + "tris": walls_side_tris, + "pts": walls_side_pts, + "color": [180, 180, 180], + "sides": [1]*len(walls_side_tris) }, }, - "sources": [{"name": "S1", "xyz": [0.85, 6.7, 1.4]}], + "sources": [ + {"name": "S1", "xyz": s1}, + {"name": "S2", "xyz": s2}, + {"name": "SUB1", "xyz": sub1}, + ], "receivers": [ - {"name": "R1", "xyz": [2.9, 5.5, 1.2]}, - {"name": "R2", "xyz": [3.8, 1.0, 1.2]}, + {"name": "R1", "xyz": r1}, + {"name": "R2", "xyz": r2}, + {"name": "R3", "xyz": r3}, + {"name": "R4", "xyz": r4}, + {"name": "R5", "xyz": r5}, + {"name": "R6", "xyz": r6}, ] } - model_file = model_dir/'model.json' + src = np.array(root["sources"][0]["xyz"]) + distance_ref = np.linalg.norm(src - np.array(root["receivers"][0]["xyz"])) + for r in root["receivers"]: + distance = np.linalg.norm(src - np.array(r["xyz"])) + print(r["name"], 20*np.log10(distance_ref/distance)) + + model_file = dir / 'model.json' with open(model_file, "w") as f: json.dump(root, f) diff --git a/src/python/analysis/response.py b/src/python/analysis/response.py index 689d2b2..da29d77 100644 --- a/src/python/analysis/response.py +++ b/src/python/analysis/response.py @@ -68,6 +68,7 @@ def main(): parser.add_argument('--label_a', type=str, default='A') parser.add_argument('--label_b', type=str, default='B') parser.add_argument('--smoothing', type=float, default=0.0) + parser.add_argument('--target', type=float, default=0.0) args = parser.parse_args() @@ -128,6 +129,8 @@ def main(): label = f'{label_b}-{label_a}' ax[1].semilogx(freqs, difference, linestyle='-', label=label) + if args.target != 0.0: + ax[1].hlines(args.target, args.fmin, fmax, linestyle='--', label=f"Target {args.target} dB") ax[1].set_title('Difference') ax[1].set_xlabel('Frequency [Hz]') ax[1].set_ylabel('Amplitude [dB]')